Author: pamarcelot
Date: Mon Sep  1 01:15:34 2008
New Revision: 690905

URL: http://svn.apache.org/viewvc?rev=690905&view=rev
Log:
Part of a fix for DIRSTUDIO-375 (Move each plugin IDs in a plugin.properties file).

Modified:
    directory/studio/trunk/connection-ui/plugin.properties
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
    directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java

Modified: directory/studio/trunk/connection-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/plugin.properties?rev=690905&r1=690904&r2=690905&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/plugin.properties (original)
+++ directory/studio/trunk/connection-ui/plugin.properties Mon Sep  1 01:15:34 2008
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+Plugin_id=org.apache.directory.studio.connection.ui
+
 ExtensionPoint_ConnectionParameterPages_id=org.apache.directory.studio.connectionparameterpages
 ExtensionPoint_ConnectionParameterPages_name=Connection Parameter Pages
 

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java?rev=690905&r1=690904&r2=690905&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPageManager.java Mon Sep  1 01:15:34 2008
@@ -73,7 +73,7 @@
             catch ( Exception e )
             {
                 ConnectionUIPlugin.getDefault().getLog().log(
-                    new Status( IStatus.ERROR, ConnectionUIPlugin.PLUGIN_ID, 1,
+                    new Status( IStatus.ERROR, ConnectionUIConstants.PLUGIN_ID, 1,
                         "Unable to create connection parameter page " + member.getAttribute( "class" ), e ) );
             }
         }

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java?rev=690905&r1=690904&r2=690905&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java Mon Sep  1 01:15:34 2008
@@ -21,6 +21,8 @@
 package org.apache.directory.studio.connection.ui;
 
 
+
+
 /**
  * Constants used in the connection UI plugin.
  *
@@ -29,6 +31,9 @@
  */
 public interface ConnectionUIConstants
 {
+    /** The plug-in ID */
+    public static final String PLUGIN_ID = ConnectionUIPlugin.getDefault().getPluginProperties()
+        .getString( "Plugin_id" );
 
     /** The dialog setting key used for the history of host names. */
     public static final String DIALOGSETTING_KEY_HOST_HISTORY = "hostHistory";
@@ -50,7 +55,7 @@
 
     /** The image used to display the disconnected state of connections. */
     public static final String IMG_CONNECTION_DISCONNECTED = "resources/icons/connection_disconnected.gif";
-    
+
     /** The image used to display the connected state of SSL connections. */
     public static final String IMG_CONNECTION_SSL_CONNECTED = "resources/icons/connection_ssl_connected.gif";
 

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java?rev=690905&r1=690904&r2=690905&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIPlugin.java Mon Sep  1 01:15:34 2008
@@ -41,9 +41,6 @@
  */
 public class ConnectionUIPlugin extends AbstractUIPlugin
 {
-    /** The Constant PLUGIN_ID. */
-    public static final String PLUGIN_ID = "org.apache.directory.studio.connection.ui";
-
     /** The shared plugin instance. */
     private static ConnectionUIPlugin plugin;
 
@@ -211,8 +208,10 @@
             }
             catch ( IOException e )
             {
+                // We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
+                // So we're using a default plugin id.
                 getLog().log(
-                    new Status( Status.ERROR, ConnectionUIPlugin.PLUGIN_ID, Status.OK,
+                    new Status( Status.ERROR, "org.apache.directory.studio.connection.ui", Status.OK,
                         "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java?rev=690905&r1=690904&r2=690905&view=diff
==============================================================================
--- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java (original)
+++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Mon Sep  1 01:15:34 2008
@@ -129,7 +129,7 @@
         catch ( Exception ex )
         {
             ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                new Status( IStatus.ERROR, ConnectionUIPlugin.PLUGIN_ID, IStatus.ERROR, ex.getMessage() != null ? ex
+                new Status( IStatus.ERROR, ConnectionUIConstants.PLUGIN_ID, IStatus.ERROR, ex.getMessage() != null ? ex
                     .getMessage() : "", ex ) );
         }