directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1806609 - in /directory/studio/branches/studio-value/plugins/openldap.config.editor: ./ src/main/java/org/apache/directory/studio/openldap/config/
Date Tue, 29 Aug 2017 15:15:41 GMT
Author: elecharny
Date: Tue Aug 29 15:15:40 2017
New Revision: 1806609

URL: http://svn.apache.org/viewvc?rev=1806609&view=rev
Log:
o Get rid of Plugin_id in plugin.properties
o Removed the various ID defined in plugin.properties that are used only once
o Fixed a missing ID
o Some cleanup

Modified:
    directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.properties
    directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.xml
    directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPlugin.java
    directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java

Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.properties?rev=1806609&r1=1806608&r2=1806609&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.properties
(original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.properties
Tue Aug 29 15:15:40 2017
@@ -14,11 +14,23 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#---------------------------------------------------------------------------------------------------
+# The IDs used more than once
+#---------------------------------------------------------------------------------------------------
+NewWizards_Category_id=org.apache.directory.studio.openldap.newWizards
+ActionSet_OpenLdapMenuActionSet_id==org.apache.directory.studio.openldap.ldapMenuActionSet
+##ActionSet_OpenLdapMenu_id=
 
-Plugin_id=org.apache.directory.studio.openldap.config.editor
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
+Action_OpenDirectoryConfigurationAction_label=AAA
+Action_OpenDirectoryConfigurationAction_menubarpath=BBB
 
-NewWizards_Category_id=org.apache.directory.studio.openldap.newWizards
-NewWizards_Category_name=OpenLDAP
+ActionSet_OpenLdapMenuActionSet_label=CCC
+ActionSet_OpenLdapMenu_label=DDD
 
-NewWizards_NewOpenLDAPConfigurationFileWizard_id=org.apache.directory.studio.openldap.config.wizards.NewOpenLDAPConfigurationFileWizard
+GroupMarker_OpenConfiguration_name=EEE
+
+NewWizards_Category_name=OpenLDAP
 NewWizards_NewOpenLDAPConfigurationFileWizard_name=OpenLDAP Configuration File

Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.xml?rev=1806609&r1=1806608&r2=1806609&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/plugin.xml Tue Aug
29 15:15:40 2017
@@ -19,7 +19,7 @@
 -->
 <?eclipse version="3.2"?>
 <plugin>
-  <!-- The context menu which will be used to open the server's configuration -->
+  <!-- The context menu which will be used to open the OpenLDAP configuration -->
   <extension point="org.eclipse.ui.editors">
     <editor
         class="org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor"
@@ -30,6 +30,7 @@
     </editor>
   </extension>
    
+   <!-- Adds an item in the connection context menu -->
   <extension point="org.eclipse.ui.popupMenus">
     <objectContribution
         objectClass="org.apache.directory.studio.connection.core.Connection"
@@ -41,32 +42,33 @@
           label="Open Configuration"
           icon="resources/icons/editor.gif"/>
       <visibility> 
-         <or>
-            <objectState name="serverType" value="OPENLDAP_2_3"/>
-            <objectState name="serverType" value="OPENLDAP_2_4"/>
-         </or>
+        <!-- We support OpenLDAP 2.3 and 2.4 atm -->
+        <or>
+          <objectState name="serverType" value="OPENLDAP_2_3"/>
+          <objectState name="serverType" value="OPENLDAP_2_4"/>
+        </or>
       </visibility>
    </objectContribution>
   </extension>
 
   <extension point="org.eclipse.ui.perspectiveExtensions">
-    <perspectiveExtension targetID="%Perspective_LdapPerspective_id">
+    <perspectiveExtension targetID="org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective">
       <actionSet id="%ActionSet_OpenLdapMenuActionSet_id"/>
     </perspectiveExtension>
   </extension>
    
   <extension point="org.eclipse.ui.actionSets">
     <actionSet
-        id="%ActionSet_OpenLdapMenuActionSet_id"
+        id="org.apache.directory.studio.openldap.config.actions.ldapMenuActionSet"
         label="%ActionSet_OpenLdapMenuActionSet_label"
         visible="false">
-      <menu id="%ActionSet_OpenLdapMenu_id" label="%ActionSet_OpenLdapMenu_label">
+      <menu id="org.apache.directory.studio.openldap.config.actions.ldapMenu" label="%ActionSet_OpenLdapMenu_label">
         <groupMarker name="%GroupMarker_OpenConfiguration_name"/>
       </menu>
       <action
           class="org.apache.directory.studio.openldap.config.actions.OpenDirectoryConfigurationAction"
           icon="resources/icons/open_configuration.gif"
-          id="%Action_OpenDirectoryConfigurationAction_id"
+          id="org.apache.directory.studio.openldap.config.actions.OpenDirectoryConfigurationAction"
           label="%Action_OpenDirectoryConfigurationAction_label"
           menubarPath="%Action_OpenDirectoryConfigurationAction_menubarpath"
           style="push"/>
@@ -78,13 +80,13 @@
   <extension point="org.eclipse.ui.newWizards">
     <category id="%NewWizards_Category_id" name="%NewWizards_Category_name" />
     <wizard
-      canFinishEarly="true"
-      category="%NewWizards_Category_id"
-      class="org.apache.directory.studio.openldap.config.wizards.NewOpenLDAPConfigurationFileWizard"
-      hasPages="false"
-      icon="resources/icons/editor_new.gif"
-      id="%NewWizards_NewOpenLDAPConfigurationFileWizard_id"
-      name="%NewWizards_NewOpenLDAPConfigurationFileWizard_name"
-      project="false"/>
+        canFinishEarly="true"
+        category="%NewWizards_Category_id"
+        class="org.apache.directory.studio.openldap.config.wizards.NewOpenLDAPConfigurationFileWizard"
+        hasPages="false"
+        icon="resources/icons/editor_new.gif"
+        id="org.apache.directory.studio.openldap.config.wizards.NewOpenLDAPConfigurationFileWizard"
+        name="%NewWizards_NewOpenLDAPConfigurationFileWizard_name"
+        project="false"/>
   </extension>
 </plugin>

Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPlugin.java?rev=1806609&r1=1806608&r2=1806609&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPlugin.java
(original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPlugin.java
Tue Aug 29 15:15:40 2017
@@ -32,7 +32,6 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
 
 
 /**
@@ -71,6 +70,8 @@ public class OpenLdapConfigurationPlugin
     {
         if ( schemaManager == null )
         {
+            long t0 = System.currentTimeMillis();
+            
             // Initializing the schema manager
             schemaManager = new DefaultSchemaManager( new OpenLdapSchemaLoader() );
 
@@ -83,6 +84,9 @@ public class OpenLdapConfigurationPlugin
                 schemaManager = null;
                 throw new Exception( "Could not load the OpenLDAP schema correctly." );
             }
+            long t1 = System.currentTimeMillis();
+            long delta = t1 - t0;
+            System.out.println( "delta : " + delta );
         }
 
         return schemaManager;

Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java?rev=1806609&r1=1806608&r2=1806609&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java
(original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginConstants.java
Tue Aug 29 15:15:40 2017
@@ -28,8 +28,7 @@ package org.apache.directory.studio.open
 public interface OpenLdapConfigurationPluginConstants
 {
     /** The plug-in ID */
-    String PLUGIN_ID = OpenLdapConfigurationPlugin.getDefault().getPluginProperties()
-        .getString( "Plugin_id" ); //$NON-NLS-1$
+    String PLUGIN_ID = OpenLdapConfigurationPluginConstants.class.getPackage().getName();
 
     // ------
     // IMAGES



Mime
View raw message