directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r690870 - in /directory/studio/trunk/aciitemeditor: ./ src/main/java/org/apache/directory/studio/aciitemeditor/ src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ src/main/java/org/apache/directory/studio/aciitemeditor/widgets/
Date Mon, 01 Sep 2008 07:11:15 GMT
Author: pamarcelot
Date: Mon Sep  1 00:11:14 2008
New Revision: 690870

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

Modified:
    directory/studio/trunk/aciitemeditor/plugin.properties
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ACIItemDialog.java
    directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemTabFolderComposite.java

Modified: directory/studio/trunk/aciitemeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/plugin.properties?rev=690870&r1=690869&r2=690870&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/plugin.properties (original)
+++ directory/studio/trunk/aciitemeditor/plugin.properties Mon Sep  1 00:11:14 2008
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+Plugin_id=org.apache.directory.studio.aciitemeditor
+
 ValueEditor_AciItemValueEditor_name=ACI Item Editor
 
 ValueEditor_SubtreeValueEditor_name=Subtree Specification Editor

Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java?rev=690870&r1=690869&r2=690870&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
(original)
+++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java
Mon Sep  1 00:11:14 2008
@@ -20,6 +20,7 @@
 package org.apache.directory.studio.aciitemeditor;
 
 
+
 /**
  * This interface is used to store all constants related to the ACI Item Editor Plugin
  *
@@ -28,6 +29,9 @@
  */
 public interface ACIITemConstants
 {
+    /** The plug-in ID */
+    public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString(
"Plugin_id" );
+    
     /** The ID for ACI Item Template */
     public static final String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties().getString(
         "CtxType_AciItem_Template_id" );; //$NON-NLS-1$

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=690870&r1=690869&r2=690870&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 00:11:14 2008
@@ -53,7 +53,7 @@
 public class Activator extends AbstractUIPlugin
 {
     /** The plug-in ID */
-    public static final String PLUGIN_ID = "org.apache.directory.studio.aciitemeditor"; //$NON-NLS-1$
+//    public static final String PLUGIN_ID = "org.apache.directory.studio.aciitemeditor";
//$NON-NLS-1$
 
     /** The shared instance */
     private static Activator plugin;
@@ -150,7 +150,7 @@
      */
     public static ImageDescriptor getImageDescriptor( String path )
     {
-        return imageDescriptorFromPlugin( PLUGIN_ID, path );
+        return imageDescriptorFromPlugin( ACIITemConstants.PLUGIN_ID, path );
     }
 
 
@@ -291,7 +291,7 @@
                 // So we're using a default plugin id.
                 getLog()
                     .log(
-                        new Status( Status.ERROR, Activator.PLUGIN_ID, Status.OK,
+                        new Status( Status.ERROR, "org.apache.directory.studio.aciitemeditor",
Status.OK,
                             "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ACIItemDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ACIItemDialog.java?rev=690870&r1=690869&r2=690870&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ACIItemDialog.java
(original)
+++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ACIItemDialog.java
Mon Sep  1 00:11:14 2008
@@ -22,6 +22,7 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.studio.aciitemeditor.ACIITemConstants;
 import org.apache.directory.studio.aciitemeditor.ACIItemValueWithContext;
 import org.apache.directory.studio.aciitemeditor.Activator;
 import org.apache.directory.studio.aciitemeditor.widgets.ACIItemTabFolderComposite;
@@ -128,7 +129,7 @@
             }
             catch ( ParseException pe )
             {
-                IStatus status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, 1, Messages
+                IStatus status = new Status( IStatus.ERROR, ACIITemConstants.PLUGIN_ID, 1,
Messages
                     .getString( "ACIItemDialog.error.invalidSyntax" ), pe ); //$NON-NLS-1$
                 ErrorDialog.openError( getShell(), Messages.getString( "ACIItemDialog.error.title"
), null, status ); //$NON-NLS-1$
             }
@@ -151,7 +152,7 @@
         }
         catch ( ParseException pe )
         {
-            IStatus status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, 1, Messages
+            IStatus status = new Status( IStatus.ERROR, ACIITemConstants.PLUGIN_ID, 1, Messages
                 .getString( "ACIItemDialog.error.invalidSyntax" ), pe ); //$NON-NLS-1$
             ErrorDialog.openError( getShell(), Messages.getString( "ACIItemDialog.error.title"
), null, status ); //$NON-NLS-1$
         }

Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemTabFolderComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemTabFolderComposite.java?rev=690870&r1=690869&r2=690870&view=diff
==============================================================================
--- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemTabFolderComposite.java
(original)
+++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemTabFolderComposite.java
Mon Sep  1 00:11:14 2008
@@ -22,8 +22,8 @@
 
 import java.text.ParseException;
 
+import org.apache.directory.studio.aciitemeditor.ACIITemConstants;
 import org.apache.directory.studio.aciitemeditor.ACIItemValueWithContext;
-import org.apache.directory.studio.aciitemeditor.Activator;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
@@ -192,7 +192,7 @@
             }
             catch ( ParseException pe )
             {
-                IStatus status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, 1, Messages
+                IStatus status = new Status( IStatus.ERROR, ACIITemConstants.PLUGIN_ID, 1,
Messages
                     .getString( "ACIItemTabFolderComposite.error.onVisualEditor" ), pe );
//$NON-NLS-1$
                 ErrorDialog.openError( getShell(),
                     Messages.getString( "ACIItemTabFolderComposite.error.title" ), null,
status ); //$NON-NLS-1$
@@ -210,7 +210,7 @@
             }
             catch ( ParseException pe )
             {
-                IStatus status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, 1, Messages
+                IStatus status = new Status( IStatus.ERROR, ACIITemConstants.PLUGIN_ID, 1,
Messages
                     .getString( "ACIItemTabFolderComposite.error.onSourceEditor" ), pe );
//$NON-NLS-1$
                 ErrorDialog.openError( getShell(),
                     Messages.getString( "ACIItemTabFolderComposite.error.title" ), null,
status ); //$NON-NLS-1$
@@ -238,7 +238,7 @@
         }
         catch ( ParseException pe )
         {
-            IStatus status = new Status( IStatus.ERROR, Activator.PLUGIN_ID, 1, Messages
+            IStatus status = new Status( IStatus.ERROR, ACIITemConstants.PLUGIN_ID, 1, Messages
                 .getString( "ACIItemTabFolderComposite.error.onInput" ), pe ); //$NON-NLS-1$
             ErrorDialog.openError( getShell(),
                 Messages.getString( "ACIItemTabFolderComposite.error.title" ), null, status
); //$NON-NLS-1$



Mime
View raw message