[173617][api] make internal: rse.services.Activator, CommandPattern, OutputPattern

rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services
 Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.rse.services.Activator
+Bundle-Activator: org.eclipse.rse.internal.services.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
@@ -20,5 +20,7 @@ Export-Package: org.eclipse.rse.services,
  org.eclipse.rse.services.files,
  org.eclipse.rse.services.processes,
  org.eclipse.rse.services.search,
- org.eclipse.rse.services.shells
+ org.eclipse.rse.services.shells,
+ org.eclipse.rse.internal.services;x-internal:=true,
+ org.eclipse.rse.internal.services.shells;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/Activator.java

@@ -0,0 +1,117 @@
+/********************************************************************************
+ * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight, Kushal Munir, 
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ * 
+ * Contributors:
+ * {Name} (company) - description of contribution.
+ ********************************************************************************/
+
+package org.eclipse.rse.internal.services;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class Activator extends Plugin {
+
+	//The shared instance.
+	private static Activator plugin;
+	
+	/**
+	 * The constructor.
+	 */
+	public Activator() {
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Logs an throwable to the log for this plugin.
+	 * @param t the Throwable to be logged.
+	 */
+	public void logException(Throwable t) {
+		ILog log = getLog();
+		String id = getBundle().getSymbolicName();
+		IStatus status = new Status(IStatus.ERROR, id, 0, "Unexpected exception", t); //$NON-NLS-1$
+		log.log(status);
+	}
+
+	//<tracing code>----------------------------------------------------
+
+	private static Boolean fTracingOn = null;
+	public static boolean isTracingOn() {
+		if (fTracingOn==null) {
+			String id = plugin.getBundle().getSymbolicName();
+			String val = Platform.getDebugOption(id + "/debug"); //$NON-NLS-1$
+			if ("true".equals(val)) { //$NON-NLS-1$
+				fTracingOn = Boolean.TRUE;
+			} else {
+				fTracingOn = Boolean.FALSE;
+			}
+		}
+		return fTracingOn.booleanValue();
+	}
+	public static String getTimestamp() {
+		try {
+			DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$
+			return formatter.format(new Date());
+		} catch (Exception e) {
+			// If there were problems writing out the date, ignore and
+			// continue since that shouldn't stop us from logging the rest
+			// of the information
+		}
+		return Long.toString(System.currentTimeMillis());
+	}
+	public static void trace(String msg) {
+		if (isTracingOn()) {
+			String fullMsg = getTimestamp() + " | " + Thread.currentThread().getName() + " | " + msg; //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println(fullMsg);
+			System.out.flush();
+		}
+	}
+
+	//</tracing code>---------------------------------------------------
+
+}

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/CommandPattern.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines Corporation. All rights reserved.
+ * Copyright (c) 2001, 2007 IBM Corporation and International Business Machines Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,14 +11,16 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Martin Oberhuber (Wind River) - Moved from org.eclipse.rse.services.shells
  ********************************************************************************/
 
-package org.eclipse.rse.services.shells;
+package org.eclipse.rse.internal.services.shells;
 
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
+import org.eclipse.rse.services.shells.ParsedOutput;
+
 public class CommandPattern
 {
 

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/shells/OutputPattern.java

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines Corporation. All rights reserved.
+ * Copyright (c) 2001, 2007 IBM Corporation and International Business Machines Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,15 +11,17 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Martin Oberhuber (Wind River) - Moved from org.eclipse.rse.services.shells
  ********************************************************************************/
 
-package org.eclipse.rse.services.shells;
+package org.eclipse.rse.internal.services.shells;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.eclipse.rse.services.shells.ParsedOutput;
+
 public class OutputPattern
 {
 

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java

@@ -17,6 +17,8 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 
+import org.eclipse.rse.internal.services.Activator;
+
 /**
  * A Mutual Exclusion Lock for Threads that need to access a resource
  * in a serialized manner. An Eclipse ProgressMonitor is accepted

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/Patterns.java

@@ -23,7 +23,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
-import org.eclipse.rse.services.Activator;
+import org.eclipse.rse.internal.services.Activator;
+import org.eclipse.rse.internal.services.shells.CommandPattern;
+import org.eclipse.rse.internal.services.shells.OutputPattern;
+
 import org.osgi.framework.Bundle;
 
 public class Patterns {