You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/08/27 13:23:17 UTC

svn commit: r1806363 - in /directory/studio/branches/studio-value/plugins/combinededitor: plugin.properties plugin.xml src/main/java/org/apache/directory/studio/combinededitor/CombinedEditorPluginConstants.java

Author: elecharny
Date: Sun Aug 27 13:23:17 2017
New Revision: 1806363

URL: http://svn.apache.org/viewvc?rev=1806363&view=rev
Log:
o Re-established the IDs used more than one
o Created two blocks in the plgin.properties files, one for IDs, one for i18ned strings

Modified:
    directory/studio/branches/studio-value/plugins/combinededitor/plugin.properties
    directory/studio/branches/studio-value/plugins/combinededitor/plugin.xml
    directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/CombinedEditorPluginConstants.java

Modified: directory/studio/branches/studio-value/plugins/combinededitor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/combinededitor/plugin.properties?rev=1806363&r1=1806362&r2=1806363&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/combinededitor/plugin.properties (original)
+++ directory/studio/branches/studio-value/plugins/combinededitor/plugin.properties Sun Aug 27 13:23:17 2017
@@ -14,20 +14,21 @@
 # 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
+#---------------------------------------------------------------------------------------------------
+Editor_SingleTabCombinedEntryEditor_id=org.apache.directory.studio.combinededitor.editor.SingleTabCombinedEntryEditor
+Editor_MultiTabCombinedEntryEditor_id=org.apache.directory.studio.combinededitor.editor.MultiTabCombinedEntryEditor
 
-Plugin_id=org.apache.directory.studio.combinededitor
-
-PrefPage_EntryEditorsPreferencePage_id=org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage
-
-PrefPage_CombinedEntryEditorPreferencePage_id=org.apache.directory.studio.combinededitor.preferences.CombinedEntryEditorPreferencePage
+#---------------------------------------------------------------------------------------------------
+# The I18n Strings
+#---------------------------------------------------------------------------------------------------
 PrefPage_CombinedEntryEditorPreferencePage_name=Combined Entry Editor
 
-Editor_SingleTabCombinedEntryEditor_id=org.apache.directory.studio.combinededitor.editor.SingleTabCombinedEntryEditor
 Editor_SingleTabCombinedEntryEditor_shortname=Combined Entry Editor
 Editor_SingleTabCombinedEntryEditor_fullname=Combined Entry Editor (single-tab)
 Editor_SingleTabCombinedEntryEditor_description=Opens each entry in the same single editor tab.
 
-Editor_MultiTabCombinedEntryEditor_id=org.apache.directory.studio.combinededitor.editor.MultiTabCombinedEntryEditor
 Editor_MultiTabCombinedEntryEditor_shortname=Combined Entry Editor
 Editor_MultiTabCombinedEntryEditor_fullname=Combined Entry Editor (multi-tab)
 Editor_MultiTabCombinedEntryEditor_description=Opens each entry in a separate editor tab.

Modified: directory/studio/branches/studio-value/plugins/combinededitor/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/combinededitor/plugin.xml?rev=1806363&r1=1806362&r2=1806363&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/combinededitor/plugin.xml (original)
+++ directory/studio/branches/studio-value/plugins/combinededitor/plugin.xml Sun Aug 27 13:23:17 2017
@@ -23,8 +23,8 @@
   <extension point="org.eclipse.ui.preferencePages">
     <page
       class="org.apache.directory.studio.combinededitor.preferences.CombinedEntryEditorPreferencePage"
-      id="%PrefPage_CombinedEntryEditorPreferencePage_id"
-      category="%PrefPage_EntryEditorsPreferencePage_id"
+      id="org.apache.directory.studio.combinededitor.preferences.CombinedEntryEditorPreferencePage"
+      category="org.apache.directory.studio.ldapbrowser.preferences.EntryEditorsPreferencePage"
       name="%PrefPage_CombinedEntryEditorPreferencePage_name">
     </page>
   </extension>

Modified: directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/CombinedEditorPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/CombinedEditorPluginConstants.java?rev=1806363&r1=1806362&r2=1806363&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/CombinedEditorPluginConstants.java (original)
+++ directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/CombinedEditorPluginConstants.java Sun Aug 27 13:23:17 2017
@@ -28,8 +28,7 @@ package org.apache.directory.studio.comb
 public interface CombinedEditorPluginConstants
 {
     /** The plug-in ID */
-    String PLUGIN_ID = CombinedEditorPlugin.getDefault().getPluginProperties().getString(
-        "Plugin_id" ); //$NON-NLS-1$
+    String PLUGIN_ID = CombinedEditorPluginConstants.class.getPackage().getName();
 
     // Preferences
     String PREF_DEFAULT_EDITOR = PLUGIN_ID + ".prefs.DefaultEditor"; //$NON-NLS-1$