[Title] change ConnectionActivator to ConnectionPlugin

[Type] Enhancement
[Module] common-plugin
[Priority]
[CQ#]
[Redmine#]2969

diff --git a/com.samsung.slp.common.connection/META-INF/MANIFEST.MF b/com.samsung.slp.common.connection/META-INF/MANIFEST.MF
index 6813340..798674e 100644 (file)
--- a/com.samsung.slp.common.connection/META-INF/MANIFEST.MF
+++ b/com.samsung.slp.common.connection/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Connection
 Bundle-SymbolicName: com.samsung.slp.common.connection;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: com.samsung.slp.common.connection.ConnectionActivator
+Bundle-Activator: com.samsung.slp.common.connection.ConnectionPlugin
 Bundle-Vendor: SAMSUNG
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ConnectionActivator.java b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ConnectionPlugin.java
similarity index 94%
rename from com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ConnectionActivator.java
rename to com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ConnectionPlugin.java
index e04bffb..5c1ca3f 100644 (file)
--- a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ConnectionActivator.java
+++ b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ConnectionPlugin.java
@@ -16,13 +16,13 @@ import com.samsung.slp.sdblib.IDevice;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class ConnectionActivator extends AbstractUIPlugin {
+public class ConnectionPlugin extends AbstractUIPlugin {
 
        // The plug-in ID
        public static final String PLUGIN_ID = "com.samsung.slp.common.connection"; //$NON-NLS-1$
 
        // The shared instance
-       private static ConnectionActivator plugin;
+       private static ConnectionPlugin plugin;
        
        private IDevice mCurrentDevice;
 //     private final ArrayList<ISelectionListener> mListeners = new ArrayList<ISelectionListener>();
@@ -46,7 +46,7 @@ public class ConnectionActivator extends AbstractUIPlugin {
        /**
         * The constructor
         */
-       public ConnectionActivator() {
+       public ConnectionPlugin() {
        }
 
        /*
@@ -94,7 +94,7 @@ public class ConnectionActivator extends AbstractUIPlugin {
         *
         * @return the shared instance
         */
-       public static ConnectionActivator getDefault() {
+       public static ConnectionPlugin getDefault() {
                return plugin;
        }
        

diff --git a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/sdblib/dnd/FileEntryDropAdapter.java b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/sdblib/dnd/FileEntryDropAdapter.java
index 645f65f..971ca85 100644 (file)
--- a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/sdblib/dnd/FileEntryDropAdapter.java
+++ b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/sdblib/dnd/FileEntryDropAdapter.java
@@ -11,7 +11,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.ui.part.IDropActionDelegate;
 
-import com.samsung.slp.common.connection.ConnectionActivator;
+import com.samsung.slp.common.connection.ConnectionPlugin;
 import com.samsung.slp.common.connection.ddmuilib.FileDialogUtils;
 import com.samsung.slp.common.connection.ddmuilib.console.DdmConsole;
 import com.samsung.slp.sdblib.SdbCommandRejectedException;
@@ -47,7 +47,7 @@ public class FileEntryDropAdapter implements IDropActionDelegate {
                
                SyncService sync = null;
                try {
-                       sync = ConnectionActivator.getDefault().getCurrentDevice().getSyncService();
+                       sync = ConnectionPlugin.getDefault().getCurrentDevice().getSyncService();
                } catch (TimeoutException e) {
                        // TODO Auto-generated catch block
                        e.printStackTrace();

diff --git a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java
index 7aa3e22..96d702c 100644 (file)
--- a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java
+++ b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorer.java
@@ -32,8 +32,8 @@ import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.dialogs.PropertyDialogAction;
 import org.eclipse.ui.part.ViewPart;
 
-import com.samsung.slp.common.connection.ConnectionActivator;
-import com.samsung.slp.common.connection.ConnectionActivator.ISelectionListener;
+import com.samsung.slp.common.connection.ConnectionPlugin;
+import com.samsung.slp.common.connection.ConnectionPlugin.ISelectionListener;
 import com.samsung.slp.common.connection.ddmuilib.FileDialogUtils;
 import com.samsung.slp.common.connection.ddmuilib.ImageLoader;
 import com.samsung.slp.common.properties.InstallPathConfig;
@@ -44,17 +44,17 @@ import com.samsung.slp.sdblib.IDevice;
 
 public class ConnectionExplorer extends ViewPart implements ISelectionListener {
 
-       private final static String COLUMN_NAME = ConnectionActivator.PLUGIN_ID
+       private final static String COLUMN_NAME = ConnectionPlugin.PLUGIN_ID
                        + ".explorer.name"; //$NON-NLS-1S
-       private final static String COLUMN_SIZE = ConnectionActivator.PLUGIN_ID
+       private final static String COLUMN_SIZE = ConnectionPlugin.PLUGIN_ID
                        + ".explorer.size"; //$NON-NLS-1S
-       private final static String COLUMN_DATE = ConnectionActivator.PLUGIN_ID
+       private final static String COLUMN_DATE = ConnectionPlugin.PLUGIN_ID
                        + ".explorer.data"; //$NON-NLS-1S
-       private final static String COLUMN_TIME = ConnectionActivator.PLUGIN_ID
+       private final static String COLUMN_TIME = ConnectionPlugin.PLUGIN_ID
                        + ".explorer.time"; //$NON-NLS-1S
-       private final static String COLUMN_PERMISSIONS = ConnectionActivator.PLUGIN_ID
+       private final static String COLUMN_PERMISSIONS = ConnectionPlugin.PLUGIN_ID
                        + ".explorer.permissions"; //$NON-NLS-1S
-       private final static String COLUMN_INFO = ConnectionActivator.PLUGIN_ID
+       private final static String COLUMN_INFO = ConnectionPlugin.PLUGIN_ID
                        + ".explorer.info"; //$NON-NLS-1$
        
        private final static boolean USE_SELECTED_DEBUG_PORT = true;
@@ -572,8 +572,8 @@ public class ConnectionExplorer extends ViewPart implements ISelectionListener {
                //TODO: DeviceId argument will be added and start named VirtualDevice
                //TODO: path
                String exePath = null;
-               int osType = ConnectionActivator.getDefault().OS;
-               int linuxType = ConnectionActivator.getDefault().LINUX;
+               int osType = ConnectionPlugin.getDefault().OS;
+               int linuxType = ConnectionPlugin.getDefault().LINUX;
                
                if( osType == linuxType )
                {
@@ -605,8 +605,8 @@ public class ConnectionExplorer extends ViewPart implements ISelectionListener {
        public boolean stopEmulator()
        {
                String command = null;
-               int osType = ConnectionActivator.getDefault().OS;
-               int linuxType = ConnectionActivator.getDefault().LINUX;
+               int osType = ConnectionPlugin.getDefault().OS;
+               int linuxType = ConnectionPlugin.getDefault().LINUX;
 
                String path = EMULATOR_PATH + File.separatorChar + EMULATOR_PID_PATH; 
                String pid = HostUtil.getContents( path );

diff --git a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorerPanel.java b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorerPanel.java
index 9407d5f..879f9fd 100644 (file)
--- a/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorerPanel.java
+++ b/com.samsung.slp.common.connection/src/com/samsung/slp/common/connection/ui/ConnectionExplorerPanel.java
@@ -42,8 +42,8 @@ import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.part.PluginTransfer;
 import org.eclipse.ui.part.PluginTransferData;
 
-import com.samsung.slp.common.connection.ConnectionActivator;
-import com.samsung.slp.common.connection.ConnectionActivator.ISelectionListener;
+import com.samsung.slp.common.connection.ConnectionPlugin;
+import com.samsung.slp.common.connection.ConnectionPlugin.ISelectionListener;
 import com.samsung.slp.common.connection.ddmuilib.DdmUiPreferences;
 import com.samsung.slp.common.connection.ddmuilib.Panel;
 import com.samsung.slp.common.connection.ddmuilib.SyncProgressMonitor;
@@ -1242,7 +1242,7 @@ public class ConnectionExplorerPanel extends Panel implements SmartDevelopmentBr
                            mCurrentDevice = null;
                    }
                    
-                   ConnectionActivator.getDefault().setCurrentDevice(mCurrentDevice);
+                   ConnectionPlugin.getDefault().setCurrentDevice(mCurrentDevice);
 //             if (selectedDevice != mCurrentDevice) {
 //                 mCurrentDevice = selectedDevice;
 //