directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r690900 - in /directory/studio/trunk: aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ apacheds/ apacheds/src/main/java/org/apache/directory/studio/apacheds/
Date Mon, 01 Sep 2008 08:03:51 GMT
Author: pamarcelot
Date: Mon Sep  1 01:03:50 2008
New Revision: 690900

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

Modified:
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
    directory/studio/trunk/apacheds/plugin.properties
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
    directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java

Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java?rev=690900&r1=690899&r2=690900&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
(original)
+++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
Mon Sep  1 01:03:50 2008
@@ -52,9 +52,6 @@
  */
 public class Activator extends AbstractUIPlugin
 {
-    /** The plug-in ID */
-//    public static final String PLUGIN_ID = "org.apache.directory.studio.aciitemeditor";
//$NON-NLS-1$
-
     /** The shared instance */
     private static Activator plugin;
 

Modified: directory/studio/trunk/apacheds/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/plugin.properties?rev=690900&r1=690899&r2=690900&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/plugin.properties (original)
+++ directory/studio/trunk/apacheds/plugin.properties Mon Sep  1 01:03:50 2008
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+Plugin_id=org.apache.directory.studio.apacheds
+
 Pref_MainPage_id=org.apache.directory.studio.apacheds.prefs.MainPage
 Pref_MainPage_name=Apache DS
 

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java?rev=690900&r1=690899&r2=690900&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
Mon Sep  1 01:03:50 2008
@@ -39,9 +39,6 @@
  */
 public class ApacheDsPlugin extends AbstractUIPlugin
 {
-    /** The plug-in ID */
-    public static final String PLUGIN_ID = "org.apache.directory.studio.apacheds";
-
     /** The shared instance */
     private static ApacheDsPlugin plugin;
 
@@ -169,8 +166,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, ApacheDsPlugin.PLUGIN_ID, Status.OK,
+                    new Status( Status.ERROR, "org.apache.directory.studio.apacheds", Status.OK,
                         "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java?rev=690900&r1=690899&r2=690900&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
Mon Sep  1 01:03:50 2008
@@ -20,6 +20,7 @@
 package org.apache.directory.studio.apacheds;
 
 
+
 /**
  * This interface stores all the constants used in the plugin.
  *
@@ -28,6 +29,9 @@
  */
 public interface ApacheDsPluginConstants
 {
+    /** The plug-in ID */
+    public static final String PLUGIN_ID = ApacheDsPlugin.getDefault().getPluginProperties().getString(
"Plugin_id" );
+    
     // ------
     // IMAGES
     // ------



Mime
View raw message