directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1806446 - in /directory/studio/branches/studio-value/plugins/ldapbrowser.common: plugin.properties plugin.xml src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
Date Mon, 28 Aug 2017 12:39:41 GMT
Author: elecharny
Date: Mon Aug 28 12:39:41 2017
New Revision: 1806446

URL: http://svn.apache.org/viewvc?rev=1806446&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

Modified:
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.properties
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.xml
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java

Modified: directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.properties?rev=1806446&r1=1806445&r2=1806446&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.properties Mon
Aug 28 12:39:41 2017
@@ -14,10 +14,43 @@
 # 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
+#---------------------------------------------------------------------------------------------------
+PrefPage_MainPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.MainPreferencePage
+PrefPage_AttributesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.AttributesPreferencePage
+PrefPage_ValueEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ValueEditorsPreferencePage
+PrefPage_ViewsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ViewsPreferencePage
+
+CtxType_LdapFilter_Template_id=org.apache.directory.studio.ldapbrowser.common.templates.filter
+
+Keyword_LDAP_id=org.apache.directory.studio.ldapbrowser.keyword.ldap
+Keyword_LDIF_id=org.apache.directory.studio.ldapbrowser.keyword.ldif
+
+Cmd_Category_id=org.apache.directory.studio.ldapbrowser.commands
+Cmd_AddValue_id=org.apache.directory.studio.ldapbrowser.action.addValue
+Cmd_AddAttribute_id=org.apache.directory.studio.ldapbrowser.action.addAttribute
+Cmd_EditAttributeDescription_id=org.apache.directory.studio.ldapbrowser.action.editAttributeDescription
+Cmd_EditValue_id=org.apache.directory.studio.ldapbrowser.action.editValue
+Cmd_EditRecord_id=org.apache.directory.studio.ldapbrowser.action.editRecord
+Cmd_Delete_id=org.apache.directory.studio.ldapbrowser.action.delete
+Cmd_Copy_id=org.apache.directory.studio.ldapbrowser.action.copy
+Cmd_Paste_id=org.apache.directory.studio.ldapbrowser.action.paste
+Cmd_Find_id=org.apache.directory.studio.ldapbrowser.action.find
+Cmd_Properties_id=org.apache.directory.studio.ldapbrowser.action.properties
+Cmd_LocateInDit_id=org.apache.directory.studio.ldapbrowser.action.locateInDit
+Cmd_OpenSearchResult_id=org.apache.directory.studio.ldapbrowser.action.openSearchResult
+
+Ctx_LdapBrowserWindows_id=org.apache.directory.studio.ldapbrowser.contexts.window
+Ctx_LdapBrowserDialogs_id=org.apache.directory.studio.ldapbrowser.contexts.dialog
+
+ConnectionParameterPage_BrowserParameterPage_id=org.apache.directory.studio.ldapbrowser.common.widgets.connection.BrowserParameterPage
 
-Plugin_id=org.apache.directory.studio.ldapbrowser.common
+NewWizards_Category_id=org.apache.directory.studio.ldapbrowser.newWizards
 
-ExtensionPoint_ValueEditors_id=org.apache.directory.studio.valueeditors
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
 ExtensionPoint_ValueEditors_name=Value Editors
 
 ValueEditors_InPlaceTextValueEditor_name=In-Place Text Editor
@@ -26,133 +59,83 @@ ValueEditors_TextValueEditor_name=Text E
 
 ValueEditors_HexValueEditor_name=Hex Editor
 
-NewWizards_Category_id=org.apache.directory.studio.ldapbrowser.newWizards
 NewWizards_Category_name=LDAP Browser
 
-PrefPage_StudioPage_id=org.apache.directory.studio.StudioPreferencePage
-PrefPage_EntryEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage
 
-PrefPage_MainPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.MainPreferencePage
 PrefPage_MainPreferencePage_name=LDAP Browser
 
-PrefPage_AttributesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.AttributesPreferencePage
 PrefPage_AttributesPreferencePage_name=Attributes
 
-PrefPage_BinaryAttributesAndSyntaxesPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.BinaryAttributesAndSyntaxesPreferencePage
 PrefPage_BinaryAttributesAndSyntaxesPreferencePage_name=Binary Attributes
 
-PrefPage_ValueEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ValueEditorsPreferencePage
 PrefPage_ValueEditorsPreferencePage_name=Value Editors
 
-PrefPage_BrowserPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.BrowserPreferencePage
 PrefPage_BrowserPreferencePage_name=Browser View
 
-PrefPage_EntryEditorPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorPreferencePage
 PrefPage_EntryEditorPreferencePage_name=Table Entry Editor
 
-PrefPage_TextFormatsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.TextFormatsPreferencePage
 PrefPage_TextFormatsPreferencePage_name=Text Formats
 
-PrefPage_ViewsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.ViewsPreferencePage
 PrefPage_ViewsPreferencePage_name=Views
 
-
-CtxType_LdapFilter_Template_id=org.apache.directory.studio.ldapbrowser.common.templates.filter
 CtxType_LdapFilter_Template_name=LDAP Filter
 
-
-
-Keyword_Colors_id=org.apache.directory.studio.ldapbrowser.keyword.colors
 Keyword_Colors_label=Colors
 
-Keyword_Fonts_id=org.apache.directory.studio.ldapbrowser.keyword.fonts
 Keyword_Fonts_label=Fonts
 
-Keyword_LDAP_id=org.apache.directory.studio.ldapbrowser.keyword.ldap
 Keyword_LDAP_label=LDAP
 
-Keyword_LDIF_id=org.apache.directory.studio.ldapbrowser.keyword.ldif
 Keyword_LDIF_label=LDIF
 
-Cmd_Category_id=org.apache.directory.studio.ldapbrowser.commands
 Cmd_Category_name=LDAP Browser
 
-Cmd_AddValue_id=org.apache.directory.studio.ldapbrowser.action.addValue
 Cmd_AddValue_name=Add Value
 Cmd_AddValue_description=Add a value to an existing attribute
 
-Cmd_AddAttribute_id=org.apache.directory.studio.ldapbrowser.action.addAttribute
 Cmd_AddAttribute_name=Add Attribute
 Cmd_AddAttribute_description=Add an attribute to an existing entry
 
-Cmd_EditAttributeDescription_id=org.apache.directory.studio.ldapbrowser.action.editAttributeDescription
 Cmd_EditAttributeDescription_name=Edit Attribute Description
 Cmd_EditAttributeDescription_description=Edit an attribute description
 
-Cmd_EditValue_id=org.apache.directory.studio.ldapbrowser.action.editValue
 Cmd_EditValue_name=Edit Value
 Cmd_EditValue_description=Edit a value
 
-Cmd_EditRecord_id=org.apache.directory.studio.ldapbrowser.action.editRecord
 Cmd_EditRecord_name=Edit Record
 Cmd_EditRecord_description=Edit a record
 
-Cmd_Delete_id=org.apache.directory.studio.ldapbrowser.action.delete
 Cmd_Delete_name=Delete
 Cmd_Delete_description=Delete an element
 
-Cmd_Copy_id=org.apache.directory.studio.ldapbrowser.action.copy
 Cmd_Copy_name=Copy
 Cmd_Copy_description=Copy an element
 
-Cmd_Paste_id=org.apache.directory.studio.ldapbrowser.action.paste
 Cmd_Paste_name=Paste
 Cmd_Paste_description=Paste an element
 
-Cmd_Find_id=org.apache.directory.studio.ldapbrowser.action.find
 Cmd_Find_name=Find
 Cmd_Find_description=Find an element
 
-Cmd_Properties_id=org.apache.directory.studio.ldapbrowser.action.properties
 Cmd_Properties_name=Properties
 Cmd_Properties_description=Properties of an element
 
-Cmd_LocateInDit_id=org.apache.directory.studio.ldapbrowser.action.locateInDit
 Cmd_LocateInDit_name=Locate in DIT
 Cmd_LocateInDit_description=Locate a DN or search result in DIT
 
-Cmd_OpenSearchResult_id=org.apache.directory.studio.ldapbrowser.action.openSearchResult
 Cmd_OpenSearchResult_name=Open Search Result
 Cmd_OpenSearchResult_description=Open a search result
 
-Ctx_LdapBrowserWindows_id=org.apache.directory.studio.ldapbrowser.contexts.window
 Ctx_LdapBrowserWindows_name=In LDAP Browser Windows
 Ctx_LdapBrowserWindows_description=In LDAP Browser Windows
 
-Ctx_LdapBrowserDialogs_id=org.apache.directory.studio.ldapbrowser.contexts.dialog
 Ctx_LdapBrowserDialogs_name=In LDAP Browser Dialogs
 Ctx_LdapBrowserDialogs_description=In LDAP Browser Dialogs
 
-ConnectionParameterPage_BrowserParameterPage_id=org.apache.directory.studio.ldapbrowser.common.widgets.connection.BrowserParameterPage
 ConnectionParameterPage_BrowserParameterPage_name=Browser Options
 ConnectionParameterPage_BrowserParameterPage_description=You can specify additional parameters
for browsing the directory.
 
-ConnectionParameterPage_EditorParameterPage_id=org.apache.directory.studio.ldapbrowser.common.widgets.connection.EditorParameterPage
 ConnectionParameterPage_EditorParameterPage_name=Edit Options
 ConnectionParameterPage_EditorParameterPage_description=You can specify additional parameters
for editing entries.
 
-ConnectionParameterPage_AuthenticationParameterPage_id=org.apache.directory.studio.connection.ui.widgets.AuthenticationParameterPage
 
-PropPage_Search_id=org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.SearchPropertyPage
-PropPage_Entry_id=org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.EntryPropertyPage
-PropPage_Attribute_id=org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.AttributePropertyPage
-PropPage_Value_id=org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.ValuePropertyPage
-PropPage_Bookmark_id=org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.BookmarkPropertyPage
-
-DnD_EntryTransfer=org.apache.directory.studio.ldapbrowser.entry
-DnD_SearchTransfer=org.apache.directory.studio.ldapbrowser.search
-DnD_ValuesTransfer=org.apache.directory.studio.ldapbrowser.value
-
-Wizard_AttributeWizard_id=org.apache.directory.studio.ldapbrowser.common.wizards.AttributeWizard
-NewWizard_NewEntryWizard_id=org.apache.directory.studio.ldapbrowser.common.wizards.NewEntryWizard
-NewWizard_NewContextEntryWizard_id=org.apache.directory.studio.ldapbrowser.common.wizards.NewContextEntryWizard
\ No newline at end of file

Modified: directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.xml?rev=1806446&r1=1806445&r2=1806446&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapbrowser.common/plugin.xml Mon Aug 28
12:39:41 2017
@@ -19,303 +19,340 @@
   under the License.
 -->
 <plugin>
-   <extension-point id="org.apache.directory.studio.valueeditors" name="Value Editors"
schema="src/main/resources/valueEditors.exsd"/>
+  <extension-point id="org.apache.directory.studio.valueeditors" name="Value Editors"
schema="src/main/resources/valueEditors.exsd"/>
 
- <extension
-       point="org.apache.directory.studio.valueeditors">
+  <extension
+      point="org.apache.directory.studio.valueeditors">
     <valueEditor
-          class="org.apache.directory.studio.valueeditors.InPlaceTextValueEditor"
-          icon="resources/icons/inplace_texteditor.gif"
-          name="%ValueEditors_InPlaceTextValueEditor_name"/>
+        class="org.apache.directory.studio.valueeditors.InPlaceTextValueEditor"
+        icon="resources/icons/inplace_texteditor.gif"
+        name="%ValueEditors_InPlaceTextValueEditor_name"/>
+        
     <valueEditor
-          class="org.apache.directory.studio.valueeditors.TextValueEditor"
-          icon="resources/icons/texteditor.gif"
-          name="%ValueEditors_TextValueEditor_name"/>
+        class="org.apache.directory.studio.valueeditors.TextValueEditor"
+        icon="resources/icons/texteditor.gif"
+        name="%ValueEditors_TextValueEditor_name"/>
+        
     <valueEditor
-          class="org.apache.directory.studio.valueeditors.HexValueEditor"
-          icon="resources/icons/hexeditor.gif"
-          name="%ValueEditors_HexValueEditor_name"/>
+        class="org.apache.directory.studio.valueeditors.HexValueEditor"
+        icon="resources/icons/hexeditor.gif"
+        name="%ValueEditors_HexValueEditor_name"/>
   </extension>
   
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%NewWizards_Category_name"
-            id="%NewWizards_Category_id"/>
-   </extension>  
-
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.apache.directory.studio.ldapbrowser.common.BrowserCommonPreferencesInitializer"/>
-   </extension> 
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="%PrefPage_StudioPage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.MainPreferencePage"
-            id="%PrefPage_MainPreferencePage_id"
-            name="%PrefPage_MainPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-      </page>
-      <page
-            category="%PrefPage_MainPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.AttributesPreferencePage"
-            id="%PrefPage_AttributesPreferencePage_id"
-            name="%PrefPage_AttributesPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-      </page>
-      <page
-            category="%PrefPage_AttributesPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.BinaryAttributesAndSyntaxesPreferencePage"
-            id="%PrefPage_BinaryAttributesAndSyntaxesPreferencePage_id"
-            name="%PrefPage_BinaryAttributesAndSyntaxesPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-      </page>
-      <page
-            category="%PrefPage_MainPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ValueEditorsPreferencePage"
-            id="%PrefPage_ValueEditorsPreferencePage_id"
-            name="%PrefPage_ValueEditorsPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-      </page>
-      <page
-            category="%PrefPage_ViewsPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.BrowserPreferencePage"
-            id="%PrefPage_BrowserPreferencePage_id"
-            name="%PrefPage_BrowserPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-      </page>            
-      <page
-            category="%PrefPage_EntryEditorsPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.EntryEditorPreferencePage"
-            id="%PrefPage_EntryEditorPreferencePage_id"
-            name="%PrefPage_EntryEditorPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-      </page>
-      <page
-            category="%PrefPage_MainPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.TextFormatsPreferencePage"
-            id="%PrefPage_TextFormatsPreferencePage_id"
-            name="%PrefPage_TextFormatsPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-         <keywordReference id="%Keyword_LDIF_id"/>
-      </page>    
-      <page
-            category="%PrefPage_MainPreferencePage_id"
-            class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ViewsPreferencePage"
-            id="%PrefPage_ViewsPreferencePage_id"
-            name="%PrefPage_ViewsPreferencePage_name">
-         <keywordReference id="%Keyword_LDAP_id"/>
-         <keywordReference id="%Keyword_LDIF_id"/>
-      </page>            
-   </extension>
+  <extension
+      point="org.eclipse.ui.newWizards">
+    <category
+        name="%NewWizards_Category_name"
+        id="%NewWizards_Category_id"/>
+  </extension>  
 
-   <extension
-         point="org.eclipse.ui.editors.templates">
-      <contextType
-            class="org.eclipse.jface.text.templates.TemplateContextType"
-            name="%CtxType_LdapFilter_Template_name"
-            id="%CtxType_LdapFilter_Template_id"/>
-      <include file="resources/templates/templates.xml"/>
-   </extension>
+  <extension
+      point="org.eclipse.core.runtime.preferences">
+    <initializer class="org.apache.directory.studio.ldapbrowser.common.BrowserCommonPreferencesInitializer"/>
+  </extension> 
+
+  <extension
+      point="org.eclipse.ui.preferencePages">
+    <page
+        category="org.apache.directory.studio.StudioPreferencePage"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.MainPreferencePage"
+        id="%PrefPage_MainPreferencePage_id"
+        name="%PrefPage_MainPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+    </page>
+
+    <page
+        category="%PrefPage_MainPreferencePage_id"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.AttributesPreferencePage"
+        id="%PrefPage_AttributesPreferencePage_id"
+        name="%PrefPage_AttributesPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+    </page>
+
+    <page
+        category="%PrefPage_AttributesPreferencePage_id"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.BinaryAttributesAndSyntaxesPreferencePage"
+        id="org.apache.directory.studio.ldapbrowser.preferences.BinaryAttributesAndSyntaxesPreferencePage"
+        name="%PrefPage_BinaryAttributesAndSyntaxesPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+    </page>
+
+    <page
+        category="%PrefPage_MainPreferencePage_id"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ValueEditorsPreferencePage"
+        id="%PrefPage_ValueEditorsPreferencePage_id"
+        name="%PrefPage_ValueEditorsPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+    </page>
+
+    <page
+        category="%PrefPage_ViewsPreferencePage_id"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.BrowserPreferencePage"
+        id="org.apache.directory.studio.ldapbrowser.preferences.BrowserPreferencePage"
+        name="%PrefPage_BrowserPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+    </page>
+
+    <page
+        category="org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.EntryEditorPreferencePage"
+        id="org.apache.directory.studio.ldapbrowser.preferences.EntryEditorPreferencePage"
+        name="%PrefPage_EntryEditorPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+    </page>
+      
+    <page
+        category="%PrefPage_MainPreferencePage_id"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.TextFormatsPreferencePage"
+        id="org.apache.directory.studio.ldapbrowser.preferences.TextFormatsPreferencePage"
+        name="%PrefPage_TextFormatsPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+      <keywordReference id="%Keyword_LDIF_id"/>
+    </page>
+      
+    <page
+        category="%PrefPage_MainPreferencePage_id"
+        class="org.apache.directory.studio.ldapbrowser.common.dialogs.preferences.ViewsPreferencePage"
+        id="%PrefPage_ViewsPreferencePage_id"
+        name="%PrefPage_ViewsPreferencePage_name">
+      <keywordReference id="%Keyword_LDAP_id"/>
+      <keywordReference id="%Keyword_LDIF_id"/>
+    </page>
+  </extension>
 
- <extension
-       point="org.eclipse.ui.keywords">
+  <extension
+      point="org.eclipse.ui.editors.templates">
+    <contextType
+        class="org.eclipse.jface.text.templates.TemplateContextType"
+        name="%CtxType_LdapFilter_Template_name"
+        id="%CtxType_LdapFilter_Template_id"/>
+    <include file="resources/templates/templates.xml"/>
+  </extension>
+
+  <extension
+      point="org.eclipse.ui.keywords">
     <keyword
-          id="%Keyword_Colors_id"
-          label="%Keyword_Colors_label"/>
+        id="org.apache.directory.studio.ldapbrowser.keyword.colors"
+        label="%Keyword_Colors_label"/>
     <keyword
-          id="%Keyword_Fonts_id"
-          label="%Keyword_Fonts_label"/>
+        id="org.apache.directory.studio.ldapbrowser.keyword.fonts"
+        label="%Keyword_Fonts_label"/>
     <keyword
-          id="%Keyword_LDAP_id"
-          label="%Keyword_LDAP_label"/>
+        id="%Keyword_LDAP_id"
+        label="%Keyword_LDAP_label"/>
     <keyword
-          id="%Keyword_LDIF_id"
-          label="%Keyword_LDIF_label"/>
- </extension>
-
- <extension
-       point="org.eclipse.ui.bindings">
-    <key
-          commandId="%Cmd_AddValue_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="M1++"/>
-    <key
-          commandId="%Cmd_AddAttribute_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="M1+M2++"/>
-    <key
-          commandId="%Cmd_EditAttributeDescription_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F6"/>  
-    <key
-          commandId="%Cmd_EditValue_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F7"/>  
-    <key
-          commandId="%Cmd_EditRecord_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F8"/>
-    <key
-          commandId="%Cmd_LocateInDit_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F3"/>
-    <key
-          commandId="%Cmd_OpenSearchResult_id"
-          contextId="%Ctx_LdapBrowserWindows_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F4"/>
-    <key
-          commandId="%Cmd_Delete_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="DEL"/>
-    <key
-          commandId="%Cmd_Copy_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="CTRL+C"/>
-    <key
-          commandId="%Cmd_Paste_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="CTRL+V"/>
-    <key
-          commandId="%Cmd_Find_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="CTRL+F"/>
-    <key
-          commandId="%Cmd_Properties_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="ALT+RETURN"/>
-    <key
-          commandId="%Cmd_AddValue_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="M1++"/>
-    <key
-          commandId="%Cmd_AddAttribute_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="M1+M2++"/>
-    <key
-          commandId="%Cmd_EditAttributeDescription_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F6"/>  
-    <key
-          commandId="%Cmd_EditValue_id"
-          contextId="%Ctx_LdapBrowserDialogs_id"
-          schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-          sequence="F7"/>            
- </extension>
+        id="%Keyword_LDIF_id"
+        label="%Keyword_LDIF_label"/>
+   </extension>
+
+  <extension
+      point="org.eclipse.ui.bindings">
+    <key
+        commandId="%Cmd_AddValue_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="M1++"/>
+
+    <key
+        commandId="%Cmd_AddAttribute_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="M1+M2++"/>
+
+    <key
+        commandId="%Cmd_EditAttributeDescription_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F6"/>  
+
+    <key
+        commandId="%Cmd_EditValue_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F7"/>  
+
+    <key
+        commandId="%Cmd_EditRecord_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F8"/>
+
+    <key
+        commandId="%Cmd_LocateInDit_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F3"/>
+
+    <key
+        commandId="%Cmd_OpenSearchResult_id"
+        contextId="%Ctx_LdapBrowserWindows_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F4"/>
+
+    <key
+        commandId="%Cmd_Delete_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="DEL"/>
+
+    <key
+        commandId="%Cmd_Copy_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="CTRL+C"/>
+
+    <key
+        commandId="%Cmd_Paste_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="CTRL+V"/>
+
+    <key
+        commandId="%Cmd_Find_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="CTRL+F"/>
+
+    <key
+        commandId="%Cmd_Properties_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="ALT+RETURN"/>
+
+    <key
+        commandId="%Cmd_AddValue_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="M1++"/>
+
+    <key
+        commandId="%Cmd_AddAttribute_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="M1+M2++"/>
+
+    <key
+        commandId="%Cmd_EditAttributeDescription_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F6"/>
 
- <extension
-       point="org.eclipse.ui.commands">
+    <key
+        commandId="%Cmd_EditValue_id"
+        contextId="%Ctx_LdapBrowserDialogs_id"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="F7"/>
+  </extension>
+
+  <extension
+      point="org.eclipse.ui.commands">
     <category
-          id="%Cmd_Category_id"
-          name="%Cmd_Category_name"/>
+        id="%Cmd_Category_id"
+        name="%Cmd_Category_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_AddValue_description"
+        id="%Cmd_AddValue_id"
+        name="%Cmd_AddValue_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_AddAttribute_description"
+        id="%Cmd_AddAttribute_id"
+        name="%Cmd_AddAttribute_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_EditAttributeDescription_description"
+        id="%Cmd_EditAttributeDescription_id"
+        name="%Cmd_EditAttributeDescription_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_EditValue_description"
+        id="%Cmd_EditValue_id"
+        name="%Cmd_EditValue_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_EditRecord_description"
+        id="%Cmd_EditRecord_id"
+        name="%Cmd_EditRecord_name"/>
+
     <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_AddValue_description"
-          id="%Cmd_AddValue_id"
-          name="%Cmd_AddValue_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_AddAttribute_description"
-          id="%Cmd_AddAttribute_id"
-          name="%Cmd_AddAttribute_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_EditAttributeDescription_description"
-          id="%Cmd_EditAttributeDescription_id"
-          name="%Cmd_EditAttributeDescription_name"/>          
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_EditValue_description"
-          id="%Cmd_EditValue_id"
-          name="%Cmd_EditValue_name"/>          
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_EditRecord_description"
-          id="%Cmd_EditRecord_id"
-          name="%Cmd_EditRecord_name"/>          
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_Delete_description"
-          id="%Cmd_Delete_id"
-          name="%Cmd_Delete_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_Copy_description"
-          id="%Cmd_Copy_id"
-          name="%Cmd_Copy_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_Paste_description"
-          id="%Cmd_Paste_id"
-          name="%Cmd_Paste_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_Find_description"
-          id="%Cmd_Find_id"
-          name="%Cmd_Find_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_Properties_description"
-          id="%Cmd_Properties_id"
-          name="%Cmd_Properties_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_LocateInDit_description"
-          id="%Cmd_LocateInDit_id"
-          name="%Cmd_LocateInDit_name"/>
-    <command
-          categoryId="%Cmd_Category_id"
-          description="%Cmd_OpenSearchResult_description"
-          id="%Cmd_OpenSearchResult_id"
-          name="%Cmd_OpenSearchResult_name"/>
- </extension>
-
-
- <extension
-       point="org.eclipse.ui.contexts">
-       <context
-             description="%Ctx_LdapBrowserWindows_description"
-             id="%Ctx_LdapBrowserWindows_id"
-             name="%Ctx_LdapBrowserWindows_name"
-             parentId="org.eclipse.ui.contexts.window">
-	</context>
-       <context
-             description="%Ctx_LdapBrowserDialogs_description"
-             id="%Ctx_LdapBrowserDialogs_id"
-             name="%Ctx_LdapBrowserDialogs_name"
-             parentId="org.eclipse.ui.contexts.dialog"/>
- </extension>
- <extension
-       point="org.apache.directory.studio.connectionparameterpages">
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_Delete_description"
+        id="%Cmd_Delete_id"
+        name="%Cmd_Delete_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_Copy_description"
+        id="%Cmd_Copy_id"
+        name="%Cmd_Copy_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_Paste_description"
+        id="%Cmd_Paste_id"
+        name="%Cmd_Paste_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_Find_description"
+        id="%Cmd_Find_id"
+        name="%Cmd_Find_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_Properties_description"
+        id="%Cmd_Properties_id"
+        name="%Cmd_Properties_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_LocateInDit_description"
+        id="%Cmd_LocateInDit_id"
+        name="%Cmd_LocateInDit_name"/>
+
+    <command
+        categoryId="%Cmd_Category_id"
+        description="%Cmd_OpenSearchResult_description"
+        id="%Cmd_OpenSearchResult_id"
+        name="%Cmd_OpenSearchResult_name"/>
+  </extension>
+
+
+  <extension
+      point="org.eclipse.ui.contexts">
+    <context
+        description="%Ctx_LdapBrowserWindows_description"
+        id="%Ctx_LdapBrowserWindows_id"
+        name="%Ctx_LdapBrowserWindows_name"
+        parentId="org.eclipse.ui.contexts.window"/>
+
+    <context
+        description="%Ctx_LdapBrowserDialogs_description"
+        id="%Ctx_LdapBrowserDialogs_id"
+        name="%Ctx_LdapBrowserDialogs_name"
+        parentId="org.eclipse.ui.contexts.dialog"/>
+  </extension>
+
+  <extension
+      point="org.apache.directory.studio.connectionparameterpages">
     <connectionParameterPage
-          class="org.apache.directory.studio.ldapbrowser.common.widgets.connection.BrowserParameterPage"
-          dependsOnId="%ConnectionParameterPage_AuthenticationParameterPage_id"
-          description="%ConnectionParameterPage_BrowserParameterPage_description"
-          id="%ConnectionParameterPage_BrowserParameterPage_id"
-          name="%ConnectionParameterPage_BrowserParameterPage_name"/>
+        class="org.apache.directory.studio.ldapbrowser.common.widgets.connection.BrowserParameterPage"
+        dependsOnId="org.apache.directory.studio.connection.ui.widgets.AuthenticationParameterPage"
+        description="%ConnectionParameterPage_BrowserParameterPage_description"
+        id="%ConnectionParameterPage_BrowserParameterPage_id"
+        name="%ConnectionParameterPage_BrowserParameterPage_name"/>
+        
     <connectionParameterPage
-          class="org.apache.directory.studio.ldapbrowser.common.widgets.connection.EditorParameterPage"
-          dependsOnId="%ConnectionParameterPage_BrowserParameterPage_id"
-          description="%ConnectionParameterPage_EditorParameterPage_description"
-          id="%ConnectionParameterPage_EditorParameterPage_id"
-          name="%ConnectionParameterPage_EditorParameterPage_name"/>
- </extension>
- 
+        class="org.apache.directory.studio.ldapbrowser.common.widgets.connection.EditorParameterPage"
+        dependsOnId="%ConnectionParameterPage_BrowserParameterPage_id"
+        description="%ConnectionParameterPage_EditorParameterPage_description"
+        id="org.apache.directory.studio.ldapbrowser.common.widgets.connection.EditorParameterPage"
+        name="%ConnectionParameterPage_EditorParameterPage_name"/>
+  </extension>
 </plugin>

Modified: directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java?rev=1806446&r1=1806445&r2=1806446&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
(original)
+++ directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java
Mon Aug 28 12:39:41 2017
@@ -38,8 +38,7 @@ public final class BrowserCommonConstant
     }
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "Plugin_id" ); //$NON-NLS-1$
+    public static final String PLUGIN_ID = BrowserCommonConstants.class.getPackage().getName();
 
     public static final String CONTEXT_WINDOWS = BrowserCommonActivator.getDefault().getPluginProperties()
         .getString( "Ctx_LdapBrowserWindows_id" ); //$NON-NLS-1$
@@ -64,8 +63,7 @@ public final class BrowserCommonConstant
     public static final String FILTER_TEMPLATE_ID = BrowserCommonActivator.getDefault().getPluginProperties()
         .getString( "CtxType_LdapFilter_Template_id" ); //$NON-NLS-1$
 
-    public static final String EXTENSION_POINT_VALUE_EDITORS = BrowserCommonActivator.getDefault()
-        .getPluginProperties().getString( "ExtensionPoint_ValueEditors_id" ); //$NON-NLS-1$
+    public static final String EXTENSION_POINT_VALUE_EDITORS = "org.apache.directory.studio.valueeditors";
//$NON-NLS-1$
 
     public static final String PREFERENCE_TIME_LIMIT = "timeLimit"; //$NON-NLS-1$
     public static final String PREFERENCE_COUNT_LIMIT = "countLimit"; //$NON-NLS-1$
@@ -205,29 +203,19 @@ public final class BrowserCommonConstant
     public static final String CMD_FIND = BrowserCommonActivator.getDefault().getPluginProperties()
         .getString( "Cmd_Find_id" ); //$NON-NLS-1$
 
-    public static final String PROP_VALUE = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "PropPage_Value_id" ); //$NON-NLS-1$
-    public static final String PROP_ATTRIBUTE = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "PropPage_Attribute_id" ); //$NON-NLS-1$
-    public static final String PROP_SEARCH = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "PropPage_Search_id" ); //$NON-NLS-1$
-    public static final String PROP_BOOKMARK = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "PropPage_Bookmark_id" ); //$NON-NLS-1$
-    public static final String PROP_ENTRY = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "PropPage_Entry_id" ); //$NON-NLS-1$
-
-    public static final String DND_ENTRY_TRANSFER = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "DnD_EntryTransfer" ); //$NON-NLS-1$
-    public static final String DND_SEARCH_TRANSFER = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "DnD_SearchTransfer" ); //$NON-NLS-1$
-    public static final String DND_VALUES_TRANSFER = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "DnD_ValuesTransfer" ); //$NON-NLS-1$
+    public static final String PROP_VALUE = "org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.ValuePropertyPage";
//$NON-NLS-1$
+    public static final String PROP_ATTRIBUTE = "org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.AttributePropertyPage";
//$NON-NLS-1$
+    public static final String PROP_SEARCH = "org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.SearchPropertyPage";
//$NON-NLS-1$
+    public static final String PROP_BOOKMARK = "org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.BookmarkPropertyPage";
//$NON-NLS-1$
+    public static final String PROP_ENTRY = "org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.EntryPropertyPage";
//$NON-NLS-1$
+
+    public static final String DND_ENTRY_TRANSFER = "org.apache.directory.studio.ldapbrowser.entry";
//$NON-NLS-1$
+    public static final String DND_SEARCH_TRANSFER = "org.apache.directory.studio.ldapbrowser.search";
//$NON-NLS-1$
+    public static final String DND_VALUES_TRANSFER = "org.apache.directory.studio.ldapbrowser.value";
//$NON-NLS-1$
 
-    public static final String WIZARD_ATTRIBUTE_WIZARD = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "Wizard_AttributeWizard_id" ); //$NON-NLS-1$
+    public static final String WIZARD_ATTRIBUTE_WIZARD = PLUGIN_ID + ".wizards.AttributeWizard";
//$NON-NLS-1$
 
-    public static final String WIZARD_NEW_ENTRY_WIZARD = BrowserCommonActivator.getDefault().getPluginProperties()
-        .getString( "NewWizard_NewEntryWizard_id" ); //$NON-NLS-1$
+    public static final String WIZARD_NEW_ENTRY_WIZARD = PLUGIN_ID + ".wizards.NewEntryWizard";
//$NON-NLS-1$
     public static final String WIZARD_NEW_CONTEXT_ENTRY_WIZARD = BrowserCommonActivator.getDefault()
         .getPluginProperties().getString( "NewWizard_NewContextEntryWizard_id" ); //$NON-NLS-1$
 }



Mime
View raw message