directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1806622 - in /directory/studio/branches/studio-value/plugins/templateeditor: plugin.properties plugin.xml src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java
Date Tue, 29 Aug 2017 17:06:36 GMT
Author: elecharny
Date: Tue Aug 29 17:06:35 2017
New Revision: 1806622

URL: http://svn.apache.org/viewvc?rev=1806622&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/templateeditor/plugin.properties
    directory/studio/branches/studio-value/plugins/templateeditor/plugin.xml
    directory/studio/branches/studio-value/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java

Modified: directory/studio/branches/studio-value/plugins/templateeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/templateeditor/plugin.properties?rev=1806622&r1=1806621&r2=1806622&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/templateeditor/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/templateeditor/plugin.properties Tue Aug
29 17:06:35 2017
@@ -14,19 +14,21 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-Plugin_id=org.apache.directory.studio.templateeditor
-
-PrefPage_EntryEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage
+#---------------------------------------------------------------------------------------------------
+# The IDs used more than once
+#---------------------------------------------------------------------------------------------------
+Editor_SingleTabTemplateEntryEditor_id=org.apache.directory.studio.entrytemplate.editor.SingleTabEditor
+Editor_MultiTabTemplateEntryEditor_id=org.apache.directory.studio.entrytemplate.editor.MultiTabEditor
 
-PrefPage_TemplateEntryEditorPreferencePage_id=org.apache.directory.studio.templateeditor.view.preferences.TemplateEntryEditorPreferencePage
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
 PrefPage_TemplateEntryEditorPreferencePage_name=Template Entry Editor
 
-Editor_SingleTabTemplateEntryEditor_id=org.apache.directory.studio.entrytemplate.editor.SingleTabEditor
 Editor_SingleTabTemplateEntryEditor_shortname=Template Entry Editor
 Editor_SingleTabTemplateEntryEditor_fullname=Template Entry Editor (single-tab)
 Editor_SingleTabTemplateEntryEditor_description=Opens each entry in the same single editor
tab.
 
-Editor_MultiTabTemplateEntryEditor_id=org.apache.directory.studio.entrytemplate.editor.MultiTabEditor
 Editor_MultiTabTemplateEntryEditor_shortname=Template Entry Editor
 Editor_MultiTabTemplateEntryEditor_fullname=Template Entry Editor (multi-tab)
 Editor_MultiTabTemplateEntryEditor_description=Opens each entry in a separate editor tab.
\ No newline at end of file

Modified: directory/studio/branches/studio-value/plugins/templateeditor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/templateeditor/plugin.xml?rev=1806622&r1=1806621&r2=1806622&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/templateeditor/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/templateeditor/plugin.xml Tue Aug 29 17:06:35
2017
@@ -48,61 +48,61 @@
     <template file="resources/templates/organizationalUnit-view.xml"/>
     <template file="resources/templates/organizationalUnit-edit.xml"/>
   </extension>
-    
+
   <extension point="org.eclipse.ui.preferencePages">
     <page
-      class="org.apache.directory.studio.templateeditor.view.preferences.TemplateEntryEditorPreferencePage"
-      id="%PrefPage_TemplateEntryEditorPreferencePage_id"
-      category="%PrefPage_EntryEditorsPreferencePage_id"
-      name="%PrefPage_TemplateEntryEditorPreferencePage_name">
+        class="org.apache.directory.studio.templateeditor.view.preferences.TemplateEntryEditorPreferencePage"
+        id="org.apache.directory.studio.templateeditor.view.preferences.TemplateEntryEditorPreferencePage"
+        category="org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage"
+        name="%PrefPage_TemplateEntryEditorPreferencePage_name">
     </page>
   </extension>
-    
+
   <extension point="org.eclipse.equinox.preferences.preferences">
     <initializer class="org.apache.directory.studio.templateeditor.PreferenceInitializer"/>
   </extension>
-   
+
   <extension point="org.eclipse.ui.editors">
     <editor
-      class="org.apache.directory.studio.templateeditor.editor.SingleTabTemplateEntryEditor"
-      default="false"
-      icon="resources/icons/editor_single_tab.gif"
-      id="%Editor_SingleTabTemplateEntryEditor_id"
-      matchingStrategy="org.apache.directory.studio.entryeditors.SingleTabEntryEditorMatchingStrategy"
-      name="%Editor_SingleTabTemplateEntryEditor_shortname">
+        class="org.apache.directory.studio.templateeditor.editor.SingleTabTemplateEntryEditor"
+        default="false"
+        icon="resources/icons/editor_single_tab.gif"
+        id="%Editor_SingleTabTemplateEntryEditor_id"
+        matchingStrategy="org.apache.directory.studio.entryeditors.SingleTabEntryEditorMatchingStrategy"
+        name="%Editor_SingleTabTemplateEntryEditor_shortname">
     </editor>
-	  
+
     <editor
-      class="org.apache.directory.studio.templateeditor.editor.MultiTabTemplateEntryEditor"
-      default="false"
-      icon="resources/icons/editor_multi_tab.gif"
-      id="%Editor_MultiTabTemplateEntryEditor_id"
-      matchingStrategy="org.apache.directory.studio.entryeditors.MultiTabEntryEditorMatchingStrategy"
-      name="%Editor_MultiTabTemplateEntryEditor_shortname">
+        class="org.apache.directory.studio.templateeditor.editor.MultiTabTemplateEntryEditor"
+        default="false"
+        icon="resources/icons/editor_multi_tab.gif"
+        id="%Editor_MultiTabTemplateEntryEditor_id"
+        matchingStrategy="org.apache.directory.studio.entryeditors.MultiTabEntryEditorMatchingStrategy"
+        name="%Editor_MultiTabTemplateEntryEditor_shortname">
     </editor>
   </extension>
    
   <extension point="org.apache.directory.studio.entryeditors">
     <entryEditor
-	  class="org.apache.directory.studio.templateeditor.editor.SingleTabTemplateEntryEditor"
-      description="%Editor_SingleTabTemplateEntryEditor_description"
-      editorId="%Editor_SingleTabTemplateEntryEditor_id"
-      icon="resources/icons/editor_single_tab.gif"
-      id="%Editor_SingleTabTemplateEntryEditor_id"
-      name="%Editor_SingleTabTemplateEntryEditor_fullname"
-      priority="32"
-      multiWindow="false">
+        class="org.apache.directory.studio.templateeditor.editor.SingleTabTemplateEntryEditor"
+        description="%Editor_SingleTabTemplateEntryEditor_description"
+        editorId="%Editor_SingleTabTemplateEntryEditor_id"
+        icon="resources/icons/editor_single_tab.gif"
+        id="%Editor_SingleTabTemplateEntryEditor_id"
+        name="%Editor_SingleTabTemplateEntryEditor_fullname"
+        priority="32"
+        multiWindow="false">
     </entryEditor>
-		
+
     <entryEditor
-      class="org.apache.directory.studio.templateeditor.editor.MultiTabTemplateEntryEditor"
-      description="%Editor_MultiTabTemplateEntryEditor_description"
-      editorId="%Editor_MultiTabTemplateEntryEditor_id"
-      icon="resources/icons/editor_multi_tab.gif"
-      id="%Editor_MultiTabTemplateEntryEditor_id"
-      name="%Editor_MultiTabTemplateEntryEditor_fullname"
-      priority="31"
-      multiWindow="true">
+        class="org.apache.directory.studio.templateeditor.editor.MultiTabTemplateEntryEditor"
+        description="%Editor_MultiTabTemplateEntryEditor_description"
+        editorId="%Editor_MultiTabTemplateEntryEditor_id"
+        icon="resources/icons/editor_multi_tab.gif"
+        id="%Editor_MultiTabTemplateEntryEditor_id"
+        name="%Editor_MultiTabTemplateEntryEditor_fullname"
+        priority="31"
+        multiWindow="true">
     </entryEditor>
   </extension>
 </plugin>

Modified: directory/studio/branches/studio-value/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java?rev=1806622&r1=1806621&r2=1806622&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java
(original)
+++ directory/studio/branches/studio-value/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/EntryTemplatePluginConstants.java
Tue Aug 29 17:06:35 2017
@@ -28,8 +28,7 @@ package org.apache.directory.studio.temp
 public interface EntryTemplatePluginConstants
 {
     /** The plug-in ID */
-    String PLUGIN_ID = EntryTemplatePlugin.getDefault().getPluginProperties().getString(
-        "Plugin_id" ); //$NON-NLS-1$
+    String PLUGIN_ID = EntryTemplatePluginConstants.class.getPackage().getName();
 
     // Images
     String IMG_EXPORT_TEMPLATES_WIZARD = "resources/icons/export_templates_wizard.gif"; //$NON-NLS-1$



Mime
View raw message