directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r690906 - in /directory/studio/trunk/ldapbrowser-common: ./ src/main/java/org/apache/directory/studio/ldapbrowser/common/ src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ src/main/java/org/apache/directory/studio/ldapbr...
Date Mon, 01 Sep 2008 08:18:17 GMT
Author: pamarcelot
Date: Mon Sep  1 01:18:16 2008
New Revision: 690906

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

Modified:
    directory/studio/trunk/ldapbrowser-common/plugin.properties
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeWizard.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java

Modified: directory/studio/trunk/ldapbrowser-common/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/plugin.properties?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/plugin.properties (original)
+++ directory/studio/trunk/ldapbrowser-common/plugin.properties Mon Sep  1 01:18:16 2008
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+Plugin_id=org.apache.directory.studio.ldapbrowser.common
+
 ExtensionPoint_ValueEditors_id=org.apache.directory.studio.valueeditors
 ExtensionPoint_ValueEditors_name=Value Editors
 

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonActivator.java
Mon Sep  1 01:18:16 2008
@@ -54,9 +54,6 @@
  */
 public class BrowserCommonActivator extends AbstractUIPlugin
 {
-    /** The plug-in ID */
-    public static final String PLUGIN_ID = "org.apache.directory.studio.ldapbrowser.common";
-
     /** The shared instance */
     private static BrowserCommonActivator plugin;
 
@@ -390,7 +387,7 @@
             catch ( IOException e )
             {
                 getLog().log(
-                    new Status( Status.ERROR, BrowserCommonActivator.PLUGIN_ID, Status.OK,
+                    new Status( Status.ERROR, "org.apache.directory.studio.ldapbrowser.common",
Status.OK,
                         "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
Mon Sep  1 01:18:16 2008
@@ -22,6 +22,10 @@
 
 public interface BrowserCommonConstants
 {
+    /** The plug-in ID */
+    public static final String PLUGIN_ID = BrowserCommonActivator.getDefault().getPluginProperties().getString(
+        "Plugin_id" );
+
     public static final int HISTORYSIZE = 20;
 
     public static final String CONTEXT_WINDOWS = BrowserCommonActivator.getDefault().getPluginProperties().getString(
@@ -46,9 +50,9 @@
 
     public static final String FILTER_TEMPLATE_ID = BrowserCommonActivator.getDefault().getPluginProperties()
         .getString( "CtxType_LdapFilter_Template_id" );
-    
-    public static final String EXTENSION_POINT_VALUE_EDITORS = BrowserCommonActivator.getDefault().getPluginProperties()
-    .getString( "ExtensionPoint_ValueEditors_id" );
+
+    public static final String EXTENSION_POINT_VALUE_EDITORS = BrowserCommonActivator.getDefault()
+        .getPluginProperties().getString( "ExtensionPoint_ValueEditors_id" );
 
     public static final String PREFERENCE_TIME_LIMIT = "timeLimit";
     public static final String PREFERENCE_COUNT_LIMIT = "countLimit";

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java
Mon Sep  1 01:18:16 2008
@@ -116,13 +116,13 @@
                 catch ( FileNotFoundException e )
                 {
                     ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                        new Status( IStatus.ERROR, BrowserCommonActivator.PLUGIN_ID, IStatus.ERROR,
+                        new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR,
                             "Can't write to file", e ) );
                 }
                 catch ( IOException e )
                 {
                     ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                        new Status( IStatus.ERROR, BrowserCommonActivator.PLUGIN_ID, IStatus.ERROR,
+                        new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR,
                             "Can't write to file", e ) );
                 }
             }
@@ -153,13 +153,13 @@
                 catch ( FileNotFoundException e )
                 {
                     ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                        new Status( IStatus.ERROR, BrowserCommonActivator.PLUGIN_ID, IStatus.ERROR,
"Can't read file",
+                        new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR,
"Can't read file",
                             e ) );
                 }
                 catch ( IOException e )
                 {
                     ConnectionUIPlugin.getDefault().getExceptionHandler().handleException(
-                        new Status( IStatus.ERROR, BrowserCommonActivator.PLUGIN_ID, IStatus.ERROR,
"Can't read file",
+                        new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, IStatus.ERROR,
"Can't read file",
                             e ) );
                 }
             }

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeWizard.java?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeWizard.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeWizard.java
Mon Sep  1 01:18:16 2008
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.common.wizards;
 
 
-import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
+import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -155,9 +155,9 @@
 
         // set help context ID
         PlatformUI.getWorkbench().getHelpSystem().setHelp( typePage.getControl(),
-            BrowserCommonActivator.PLUGIN_ID + "." + "tools_attribute_wizard" );
+            BrowserCommonConstants.PLUGIN_ID + "." + "tools_attribute_wizard" );
         PlatformUI.getWorkbench().getHelpSystem().setHelp( optionsPage.getControl(),
-            BrowserCommonActivator.PLUGIN_ID + "." + "tools_attribute_wizard" );
+            BrowserCommonConstants.PLUGIN_ID + "." + "tools_attribute_wizard" );
     }
 
     /** 

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryWizard.java
Mon Sep  1 01:18:16 2008
@@ -222,22 +222,22 @@
             if ( typePage != null )
             {
                 PlatformUI.getWorkbench().getHelpSystem().setHelp( typePage.getControl(),
-                    BrowserCommonActivator.PLUGIN_ID + "." + "tools_newentry_wizard" );
+                    BrowserCommonConstants.PLUGIN_ID + "." + "tools_newentry_wizard" );
             }
             if ( ocPage != null )
             {
                 PlatformUI.getWorkbench().getHelpSystem().setHelp( ocPage.getControl(),
-                    BrowserCommonActivator.PLUGIN_ID + "." + "tools_newentry_wizard" );
+                    BrowserCommonConstants.PLUGIN_ID + "." + "tools_newentry_wizard" );
             }
             if ( dnPage != null )
             {
                 PlatformUI.getWorkbench().getHelpSystem().setHelp( dnPage.getControl(),
-                    BrowserCommonActivator.PLUGIN_ID + "." + "tools_newentry_wizard" );
+                    BrowserCommonConstants.PLUGIN_ID + "." + "tools_newentry_wizard" );
             }
             if ( attributePage != null )
             {
                 PlatformUI.getWorkbench().getHelpSystem().setHelp( attributePage.getControl(),
-                    BrowserCommonActivator.PLUGIN_ID + "." + "tools_newentry_wizard" );
+                    BrowserCommonConstants.PLUGIN_ID + "." + "tools_newentry_wizard" );
             }
         }
     }

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java?rev=690906&r1=690905&r2=690906&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
(original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/valueeditors/ValueEditorManager.java
Mon Sep  1 01:18:16 2008
@@ -714,7 +714,7 @@
             catch ( Exception e )
             {
                 BrowserCommonActivator.getDefault().getLog().log(
-                    new Status( IStatus.ERROR, BrowserCommonActivator.PLUGIN_ID, 1, "Unable
to create ValueEditor "
+                    new Status( IStatus.ERROR, BrowserCommonConstants.PLUGIN_ID, 1, "Unable
to create ValueEditor "
                         + vee.className, e ) );
             }
         }



Mime
View raw message