deduplicate the nomenclatural code preference page in preferences menu

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 125c8ddfedf9462564195a9eba3ee98c5260a18f..78c18fd13f021dd05d1a3610888b05450a90995a 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -14,13 +14,13 @@
             class="eu.etaxonomy.taxeditor.preference.AdminGeneralPreferences"
             id="eu.etaxonomy.taxeditor.preferences.adminGeneral"
             name="%page.name.38">
-      </page>-->
+      </page>
        <page
             category="eu.etaxonomy.taxeditor.preferences.admin"
             class="eu.etaxonomy.taxeditor.databasePreferences.AdminNomenclaturalCode"
             id="eu.etaxonomy.taxeditor.preferences.adminNomenclaturalCode"
             name="%page.name.39">
-      </page>
+      </page>-->
       <page
                        category="eu.etaxonomy.taxeditor.preferences.general"
             class="eu.etaxonomy.taxeditor.preference.NameDetailsViewConfiguration"
@@ -53,7 +53,7 @@
       </page>
       <page
             category="eu.etaxonomy.taxeditor.preferences.taxonomic"
-            class="eu.etaxonomy.taxeditor.preference.NomenclaturalCodePreferences"
+            class="eu.etaxonomy.taxeditor.preference.menu.NomenclaturalCodePreferences"
             id="eu.etaxonomy.taxeditor.preferences.nomenclatural"
             name="%page.name.4">
       </page>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
index 451645ae84ec6e01594188122b02b93a330c1ed1..1bb99604f019f1911cb1cf73ed39b24e8a4e9f42 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
@@ -6,7 +6,7 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-package eu.etaxonomy.taxeditor.preference;
+package eu.etaxonomy.taxeditor.preference.menu;
 
 import java.util.List;
 
@@ -24,6 +24,8 @@ import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
+import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;