ref #8562: add admin preference page for multilanguage support
authorKatja Luther <k.luther@bgbm.org>
Wed, 5 Feb 2020 13:18:19 +0000 (14:18 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 11 Feb 2020 08:50:12 +0000 (09:50 +0100)
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/LanguageAdminMenuPreference.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbstractGeneralTermPreference.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractAdminTermSelectionWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RepresentationElement.java

index 879d938f93ce5a7c62f08e75aaea57c1bf5c98a5..f1fc9ff9360a14f907bd8eaa8cff34311bd1ae2d 100755 (executable)
 </extension>
 <extension
       point="eu.etaxonomy.taxeditor.store.adminPreferencePage">
-   <!-- <page
-         class="eu.etaxonomy.taxeditor.preference.TaxonomicEditorGeneralAdminPreferences"
-         id="eu.etaxonomy.taxeditor.preferences.general"
-         name="%page.name">
-   </page>  -->
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.GeneralAdminPreferencePage"
-         id="eu.etaxonomy.taxeditor.preferences.generalPreferences"
-         name="%page.name.50">
-   </page>
-   <!--<page 
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.DistributionAdminPreferences"
-         id="eu.etaxonomy.taxeditor.store.distribution"
-         name="%page.name.100">
-   </page>-->
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.GeneralAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.preferences.generalPreferences"
+            name="%page.name.50">
+      </page>
       <page
             category="eu.etaxonomy.taxeditor.preferences.general"
             class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.FactualDataAdminPreferencePage"
             id="eu.etaxonomy.taxeditor.preferences.description"
             name="%page.name.0">
       </page>
-      
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.EmptyAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.preference.EmptyLanguagePage"
+            name="%page.name.30">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preference.EmptyLanguagePage"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.LanguageAdminMenuPreference"
+            id="eu.etaxonomy.taxeditor.preferences.languages"
+            name="%page.name.10">
+      </page>
       <page
             category="eu.etaxonomy.taxeditor.preferences.description"
             class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NameFeatureAdminMenuPreference"
             id="eu.etaxonomy.taxeditor.preferences.nameAdminFeature"
             name="%page.name.59">
       </page>
-       <page
+      <page
             category="eu.etaxonomy.taxeditor.preferences.description"
             class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.FeatureAdminMenuPreference"
             id="eu.etaxonomy.taxeditor.preferences.adminFeature"
             id="eu.etaxonomy.taxeditor.preferences.defaultFeatureTreePreferenecs"
             name="%page.name.22">
       </page>
-    <page 
-          category="eu.etaxonomy.taxeditor.store.UIAdminPreference"
-         class="eu.etaxonomy.taxeditor.preference.DistributionGeneralPreference"
-         id="eu.etaxonomy.taxeditor.store.Distribution"
-         name="%page.name.104">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.preference.SearchPreferences"
-         id="eu.etaxonomy.taxeditor.preference.searchPreferences"
-         name="%page.name.56">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preference.searchPreferences"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SearchDialogAdminPreferences"
-         id="eu.etaxonomy.taxeditor.preferences.searchDialog"
-         name="%page.name.48">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.preference.NamePreferences"
-         id="eu.etaxonomy.taxeditor.preferences.namePreferences"
-         name="%page.name.51">
-   </page>
-   <page 
-         category="eu.etaxonomy.taxeditor.store.Distribution"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.ChecklistEditorGeneralAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.checklist"
-         name="%page.name.21">
-   </page>
-   <page 
-         category="eu.etaxonomy.taxeditor.store.Distribution"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.DistributionStatusAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.distributionVocabulariesAndStatus"
-         name="%page.name.105">
-   </page>
-   <page 
-         category="eu.etaxonomy.taxeditor.store.Distribution"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NamedAreaVocabularyAdminPreferencePage"
-         id="eu.etaxonomy.taxeditor.store.distributionNamedAreaVocabularies"
-         name="%page.name.106">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.store.abcdImportPreference"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportProviderAdminPreferencePage"
-         id="eu.etaxonomy.taxeditor.store.abcdImportProvider"
-         name="%page.name.41">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.description"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.CommonNameVocabularyAdminPreferencePage"
-         id="eu.etaxonomy.taxeditor.store.vocabularyAdminPreference"
-         name="%page.name.47">
-   </page>
-    <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SpecimenAdminPreferences"
-         id="eu.etaxonomy.taxeditor.store.specimenAdminPreferences"
-         name="%page.name.26">
-   </page>
-   <page
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.EmptyAdminPreferencePage"
-         id="eu.etaxonomy.taxeditor.preferences.general"
-         name="%page.name.42">
-   </page>
-    <page
-        category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.PublishFlagPreference"
-         id="eu.etaxonomy.taxeditor.preferences.publishFlagPreference"
-         name="%page.name.46">
-   </page>
-    <page
-          category="eu.etaxonomy.taxeditor.preferences.namePreferences"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.RankAdminPreference"
-         id="eu.etaxonomy.taxeditor.preferences.adminRankPreference"
-         name="%page.name.5">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.namePreferences"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NomenclaturalStatusTypeAdminPreference"
-         id="eu.etaxonomy.taxeditor.preferences.adminNomenclaturalStatusTypePreference"
-         name="%page.name.6">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.namePreferences"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NomenclaturalCodeAdminPreferencePage"
-         id="eu.etaxonomy.taxeditor.store.page2"
-         name="%page.name.43">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.abcdImportPreference"
-         name="%page.name.40">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.namePreferences"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NameDetailsViewAdminConfiguration"
-         id="eu.etaxonomy.taxeditor.store.scientificNameDetails"
-         name="%page.name.61">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SupplementalDataAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.supplementalDataPreferences"
-         name="%page.name.55">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.store.supplementalDataPreferences"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SupplementalDataSourceAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.supplementalDataSourcePreferences"
-         name="%page.name.sources">
-   </page>
-   <page
-         category="eu.etaxonomy.taxeditor.preferences.general"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.UIAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.UIAdminPreference"
-         name="%page.name.53">
-   </page>
-     <page
-         category="eu.etaxonomy.taxeditor.store.UIAdminPreference"
-         class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.TaxonNodeOrderAdminPreference"
-         id="eu.etaxonomy.taxeditor.store.TaxonNavigator"
-         name="%page.name.32">
-   </page>
+      <page 
+            category="eu.etaxonomy.taxeditor.store.UIAdminPreference"
+            class="eu.etaxonomy.taxeditor.preference.DistributionGeneralPreference"
+            id="eu.etaxonomy.taxeditor.store.Distribution"
+            name="%page.name.104">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.preference.SearchPreferences"
+            id="eu.etaxonomy.taxeditor.preference.searchPreferences"
+            name="%page.name.56">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preference.searchPreferences"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SearchDialogAdminPreferences"
+            id="eu.etaxonomy.taxeditor.preferences.searchDialog"
+            name="%page.name.48">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.preference.NamePreferences"
+            id="eu.etaxonomy.taxeditor.preferences.namePreferences"
+            name="%page.name.51">
+      </page>
+      <page 
+            category="eu.etaxonomy.taxeditor.store.Distribution"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.ChecklistEditorGeneralAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.checklist"
+            name="%page.name.21">
+      </page>
+      <page 
+            category="eu.etaxonomy.taxeditor.store.Distribution"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.DistributionStatusAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.distributionVocabulariesAndStatus"
+            name="%page.name.105">
+      </page>
+      <page 
+            category="eu.etaxonomy.taxeditor.store.Distribution"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NamedAreaVocabularyAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.store.distributionNamedAreaVocabularies"
+            name="%page.name.106">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.store.abcdImportPreference"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportProviderAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.store.abcdImportProvider"
+            name="%page.name.41">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.description"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.CommonNameVocabularyAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.store.vocabularyAdminPreference"
+            name="%page.name.47">
+      </page>
+       <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SpecimenAdminPreferences"
+            id="eu.etaxonomy.taxeditor.store.specimenAdminPreferences"
+            name="%page.name.26">
+      </page>
+      <page
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.EmptyAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.preferences.general"
+            name="%page.name.42">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.PublishFlagPreference"
+            id="eu.etaxonomy.taxeditor.preferences.publishFlagPreference"
+            name="%page.name.46">
+      </page>
+      <page
+           category="eu.etaxonomy.taxeditor.preferences.namePreferences"
+           class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.RankAdminPreference"
+           id="eu.etaxonomy.taxeditor.preferences.adminRankPreference"
+           name="%page.name.5">
+     </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.namePreferences"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NomenclaturalStatusTypeAdminPreference"
+            id="eu.etaxonomy.taxeditor.preferences.adminNomenclaturalStatusTypePreference"
+            name="%page.name.6">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.namePreferences"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NomenclaturalCodeAdminPreferencePage"
+            id="eu.etaxonomy.taxeditor.store.page2"
+            name="%page.name.43">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.abcdImportPreference"
+            name="%page.name.40">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.namePreferences"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NameDetailsViewAdminConfiguration"
+            id="eu.etaxonomy.taxeditor.store.scientificNameDetails"
+            name="%page.name.61">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SupplementalDataAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.supplementalDataPreferences"
+            name="%page.name.55">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.store.supplementalDataPreferences"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.SupplementalDataSourceAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.supplementalDataSourcePreferences"
+            name="%page.name.sources">
+      </page>
+      <page
+            category="eu.etaxonomy.taxeditor.preferences.general"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.UIAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.UIAdminPreference"
+            name="%page.name.53">
+       </page>
+       <page
+            category="eu.etaxonomy.taxeditor.store.UIAdminPreference"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.TaxonNodeOrderAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.TaxonNavigator"
+            name="%page.name.32">
+      </page>
 </extension>
 </plugin>
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/LanguageAdminMenuPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/LanguageAdminMenuPreference.java
new file mode 100755 (executable)
index 0000000..9172061
--- /dev/null
@@ -0,0 +1,67 @@
+/**
+* Copyright (C) 2020 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* 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.databaseAdmin.preferencePage;
+
+import eu.etaxonomy.cdm.model.metadata.CdmPreference;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.preference.LocalOrDefaultEnum;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.preference.menu.LanguageMenuPreferences;
+
+/**
+ * @author k.luther
+ * @since 04.02.2020
+ */
+public class LanguageAdminMenuPreference extends LanguageMenuPreferences {
+
+    public LanguageAdminMenuPreference() {
+        super();
+        isAdminPreference = true;
+        setPredicate(PreferencePredicate.AvailableLanguages);
+        type = TermType.Language;
+    }
+
+    @Override
+    public boolean performOk() {
+        if (!isApply()){
+            return true;
+        }
+
+        boolean result = performOkAdmin();
+        if (isMultilanguageTextEditingCapability == null && multiLangugeActivatedPref.isAllowOverride()){
+            CdmPreference savePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.MultiLanguageTextEditing, null);
+            PreferencesUtil.removeFromDB(savePref);
+        }else{
+            CdmPreference savePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.MultiLanguageTextEditing, isMultilanguageTextEditingCapability != null? Boolean.toString(isMultilanguageTextEditingCapability): null);
+            String text = this.useLocalOrAdmin.getText();
+            if (text.equals(LocalOrDefaultEnum.Database.getLabel()) ){
+                savePref.setAllowOverride(false);
+            }else if (text.equals(LocalOrDefaultEnum.AllowOverride.getLabel())){
+                savePref.setAllowOverride(true);
+            }
+
+            PreferencesUtil.setPreferenceToDB(savePref);
+        }
+        PreferencesUtil.updateDBPreferences();
+        PreferencesUtil.firePreferencesChanged(this.getClass());
+        return result;
+    }
+
+    @Override
+    public void getValues() {
+           isAdminPreference = true;
+           setPreferenceStore(PreferencesUtil.getPreferenceStore());
+           multiLangugeActivatedPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.MultiLanguageTextEditing);
+           isMultilanguageTextEditingCapability = multiLangugeActivatedPref == null? null: multiLangugeActivatedPref.getValue()!= null?Boolean.parseBoolean(multiLangugeActivatedPref.getValue()): null;
+
+
+    }
+
+}
index 65d4b92102a49bb1ae542c9b951b5c81de75a4a5..7e06b2d0cbb9a2a07394d7a07ea8536240122a2c 100755 (executable)
@@ -51,6 +51,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  */
 abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> extends CdmPreferencePage implements ISelectionChangedListener, SelectionListener{
+
     protected CheckBoxTreeComposite treeComposite;
     protected List<TermVocabularyDto> vocabularies = new ArrayList<>();
     protected Combo useLocalOrAdmin ;
@@ -89,6 +90,10 @@ abstract public class AbstractGeneralTermPreference<T extends AbstractTermDto> e
         this.predicate = predicate;
     }
 
+    public CheckBoxTreeComposite getTreeComposite() {
+        return treeComposite;
+    }
+
     /**
      * {@inheritDoc}
      */
index 161bc1273addf3a4eddc0a32648a36faff27e800..5a1c6f15aa0ad49f64c9a6f55c02e264f4695dac 100644 (file)
@@ -70,10 +70,7 @@ public interface IPreferenceKeys {
         */
        public static final String MATCH_STRATEGY_PREFIX = "matchStrategy.";
 
-       /**
-        * Access point to the EDIT Map Service that should be used.
-        */
-       public static final String EDIT_MAP_SERVICE_ACCES_POINT = "eu.etaxonomy.taxeditor.editMapServiceAccessPoint";
+
 
        /**
         * Whether the editor should connect to a database immediately after starting.
@@ -92,17 +89,11 @@ public interface IPreferenceKeys {
        /** Constant <code>FEATURE_TREE_DEFAULT_STRUCTURE="eu.etaxonomy.taxeditor.featureTree.defa"{trunked}</code> */
        public static final String FEATURE_TREE_DEFAULT_STRUCTURE = "eu.etaxonomy.taxeditor.featureTree.default.structuralData";
 
-       /** Constant <code>SORT_RANKS_HIERARCHICHALLY="eu.etaxonomy.taxeditor.menus.sortRanksH"{trunked}</code> */
-       public static final String SORT_RANKS_HIERARCHICHALLY = "eu.etaxonomy.taxeditor.menus.sortRanksHierarchichally";
-       /** Constant <code>SORT_NODES_NATURALL="eu.etaxonomy.taxeditor.menus.sortNodesN"{trunked}</code> */
-       //public static final String SORT_NODES = "eu.etaxonomy.taxeditor.menus.sortNodes";
+
 
        /** Constant <code>RESTORE_NAVIGATOR_STATE="eu.etaxonomy.taxeditor.taxonnavigator.restoreState"{trunked}</code> */
        public static final String RESTORE_NAVIGATOR_STATE = "eu.etaxonomy.taxeditor.taxonnavigator.restoreState";
-       /**
-        * Whether multilanguage text fields should be editable in multiple languages.
-        */
-       public static final String MULTILANGUAGE_TEXT_EDITING_CAPABILITY = "eu.etaxonomy.taxeditor.capability.edit.mulitlanugageText";
+
 
        /**
         * The language to be used for all things multilanguage
@@ -111,12 +102,6 @@ public interface IPreferenceKeys {
 
        public static final String SHOW_EXPERIMENTAL_FEATURES = "eu.etaxonomy.taxeditor.showExperimentalFeatures";
 
-       //public static final String OPENURL_ACCESS_POINT = "eu.etaxonomy.taxeditor.openUrlAccessPoint";
-
-       //public static final String OPENURL_IMAGE_MAX_WIDTH = "eu.etaxonomy.taxeditor.openUrlImageMaxWidth";
-
-       //public static final String OPENURL_IMAGE_MAX_HEIGHT = "eu.etaxonomy.taxeditor.openUrlImageMaxHeight";
-
        /**
         * Whether the occurrence bulk editor should show {@link FieldUnit} objects
         */
@@ -124,36 +109,9 @@ public interface IPreferenceKeys {
        public static final String SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS = "eu.etaxonomy.taxeditor.navigation.search.openResultInSeparateWindows";
        public static final String DISABLE_SERVICES_API_TIMESTAMP_CHECK = "eu.etaxonomy.taxeditor.cdmlib.remoting.disableServicesApiTimestampCheck";
        public static final String ADD_TYPES_TO_ALL_NAMES = "eu.etaxonomy.taxeditor.store.addTypeToAllNames";
-   // public static final String DETERMINATION_ONLY_FOR_FIELD_UNITS = "eu.etaxonomy.taxeditor.specimen.determinationOnlyOnFieldUnitLevel";
-   // public static final String SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION = "eu.etaxonomy.taxeditor.specimen.showCollectingAreasInGeneralSection";
-   // public static final String SHOW_TAXON_ASSOCIATIONS = "eu.etaxonomy.taxeditor.specimen.showTaxonAssociations";
-    //public static final String SHOW_LIFE_FORM = "eu.etaxonomy.taxeditor.specimen.showLifeForm";
-   // public static final String COMMON_NAME_AREA_VOCABULARIES = "eu.etaxonomy.taxeditor.commonNames.areaVocabularies";
-
-//Taxon Details View
-//    public static final String SHOW_SEC_DETAILS = "eu.etaxonomy.taxeditor.taxon.showSecDetails";
-//    public static final String DISABLE_SEC = "eu.etaxonomy.taxeditor.taxon.disableSec";
-    //Name details view
-//    public static final String SHOW_SIMPLE_NAME_DETAILS_SECTION = "eu.etaxonomy.taxeditor.name.showSimpleName";
-//    public static final String SHOW_SIMPLE_NAME_DETAILS_TAXON = "eu.etaxonomy.taxeditor.name.showNameTaxon";
-//    public static final String SHOW_NAME_DETAILS_SECTION_LSID = "eu.etaxonomy.taxeditor.name.showNameLsid";
-//    public static final String SHOW_NAME_DETAILS_SECTION_NAME_APPROBATION = "eu.etaxonomy.taxeditor.name.showNameNameApprobiation";
-//    public static final String SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_CODE = "eu.etaxonomy.taxeditor.name.showNameNomenclaturalCode";
-//    public static final String SHOW_NAME_DETAILS_SECTION_RANK = "eu.etaxonomy.taxeditor.name.showNameRank";
-//    public static final String SHOW_NAME_DETAILS_SECTION_NAMECACHE = "eu.etaxonomy.taxeditor.name.showNameNameCache";
-//    public static final String SHOW_NAME_DETAILS_SECTION_ATOMISED_EPITHETS = "eu.etaxonomy.taxeditor.name.showNameAtomisedEpithets";
-//    public static final String SHOW_NAME_DETAILS_SECTION_AUTHORSHIP = "eu.etaxonomy.taxeditor.name.showNameAuthorship";
-//    public static final String SHOW_NAME_DETAILS_SECTION_HYBRID = "eu.etaxonomy.taxeditor.name.showNameHybrid";
-//    public static final String SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_REFERENCE = "eu.etaxonomy.taxeditor.name.showNameNomenclaturalReference";
-//    public static final String SHOW_NAME_DETAILS_SECTION_NOMENCLATURAL_STATUS = "eu.etaxonomy.taxeditor.name.showNameNomenclaturalStatus";
-//    public static final String SHOW_NAME_DETAILS_SECTION_PROTOLOGUE = "eu.etaxonomy.taxeditor.name.showNameProtologue";
-//    public static final String SHOW_NAME_DETAILS_SECTION_TYPE_DESIGNATION = "eu.etaxonomy.taxeditor.name.showNameTypeDesignation";
-//    public static final String SHOW_NAME_DETAILS_SECTION_NAME_RELATIONSHIP = "eu.etaxonomy.taxeditor.name.showNameNameRelationship";
-//     public static final String SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE = "eu.etaxonomy.taxeditor.name.showNameAppendedPhrase";
-//     public static final String SHOW_NAME_DETAILS_SECTION_CACHE = "eu.etaxonomy.taxeditor.name.showNameCache";
-//    public static final String SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE = "eu.etaxonomy.taxeditor.name.showAuthorCache";
-   // public static final String ALLOW_OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.allowOverride";
-  //  public static final String OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.override";
+
+
+
 
     public static final String PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR = "eu.etaxonomy.taxeditor.specimen.promptForOpenSpecimenInEditor";
 
@@ -171,28 +129,12 @@ public interface IPreferenceKeys {
 
     public static final String SHOW_ADVANCED_MEDIA_SECTION = "eu.etaxonomy.taxeditor.media.showAdvancedMedia" + CdmStore.getActiveCdmSource().getName();
     public static final String SHOW_MEDIA_PREVIEW = "eu.etaxonomy.taxeditor.media.showMediaPreview"+ CdmStore.getActiveCdmSource().getName();
-//    public static final String SORT_TAXA_BY_RANK_AND_NAME = "eu.etaxonomy.taxeditor.selection.taxa.sortByRankAndName"+ CdmStore.getActiveCdmSource().getName();
-
 
     public static final String LAST_SELECTED_REFERENCES = "eu.etaxonomy.taxeditor.references.selection.lastSelected";
     public static final String LAST_USED_ABCD_CONFIG = "eu.etaxonomy.taxeditor.io.abcd.lastUsedConfig";
     public static final String LAST_USED_BIOCASE_PROVIDER = "eu.etaxonomy.taxeditor.io.abcd.lastUsedBiocaseProvider";
 
-//    public static final String DO_NOT_PUBLISH = "DO NOT PUBLISH";
-//    public static final String INHERIT_FROM_PARENT = "PARENT";
-//    public static final String PUBLISH = "PUBLISH";
-
     public static final String FILTER_COMMON_NAME_REFERENCES = "eu.etaxonomy.taxeditor.references.selection.filterCommonNameReferences";
 
 
-
-//    public static final String IS_SEARCH_FOR_IDENTIFIER_AS_DEFAULT = "eu.etaxonomy.taxeditor.search.reference.defaultIdentifier"+ CdmStore.getActiveCdmSource().getName();
-//    public static final String SEARCH_FOR_IDENTIFIER_AND_TITLECACHE = "eu.etaxonomy.taxeditor.search.reference.identifierAndTitleCache" + CdmStore.getActiveCdmSource().getName();
-
-
-
-
-
-
-
 }
index 4d16bdcd863a77698c6e82fb771a2f3170e86beb..866e88556db4d5d48d4e43f676249806c4fbf786 100644 (file)
@@ -16,7 +16,6 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.layout.GridLayout;\r
 import org.eclipse.swt.layout.RowLayout;\r
-import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Combo;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
@@ -34,7 +33,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */\r
 public class LanguageRepresentationPreferencePage extends CdmPreferencePage{\r
 \r
-       private boolean isMultilanguageTextEditingCapability;\r
+\r
        private Language globalLanguage;\r
 \r
 //     private Composite createComposite(Composite parent){\r
@@ -52,7 +51,7 @@ public class LanguageRepresentationPreferencePage extends CdmPreferencePage{
 \r
                createSetDefaultLanguage(container);\r
 \r
-               createSetMultiLanguageTextEditingCapability(container);\r
+//             createSetMultiLanguageTextEditingCapability(container);\r
 \r
                return container;\r
 \r
@@ -102,39 +101,37 @@ public class LanguageRepresentationPreferencePage extends CdmPreferencePage{
                });\r
        }\r
 \r
-       private void createSetMultiLanguageTextEditingCapability(Composite parent) {\r
-               isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY);\r
-\r
-               final Composite composite = createComposite(parent);\r
-\r
-               final Button button_toggle = new Button(composite, SWT.CHECK);\r
-\r
-\r
-               button_toggle.setText(Messages.LanguageRepresentationPreferencePage_enable);\r
-\r
-               button_toggle.setSelection(isMultilanguageTextEditingCapability);\r
-\r
-\r
-               button_toggle.addSelectionListener(new SelectionAdapter(){\r
-                       /* (non-Javadoc)\r
-                        * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\r
-                        */\r
-                       @Override\r
-                       public void widgetSelected(SelectionEvent e) {\r
-                           setApply(true);\r
-                               isMultilanguageTextEditingCapability = button_toggle.getSelection();\r
-                       }\r
-               });\r
-       }\r
+//     private void createSetMultiLanguageTextEditingCapability(Composite parent) {\r
+//             isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY);\r
+//\r
+//             final Composite composite = createComposite(parent);\r
+//\r
+//             final Button button_toggle = new Button(composite, SWT.CHECK);\r
+//\r
+//\r
+//             button_toggle.setText(Messages.LanguageRepresentationPreferencePage_enable);\r
+//\r
+//             button_toggle.setSelection(isMultilanguageTextEditingCapability);\r
+//\r
+//\r
+//             button_toggle.addSelectionListener(new SelectionAdapter(){\r
+//                     /* (non-Javadoc)\r
+//                      * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)\r
+//                      */\r
+//                     @Override\r
+//                     public void widgetSelected(SelectionEvent e) {\r
+//                         setApply(true);\r
+//                             isMultilanguageTextEditingCapability = button_toggle.getSelection();\r
+//                     }\r
+//             });\r
+//     }\r
 \r
        @Override\r
        public boolean performOk() {\r
            if (!isApply()){\r
                return true;\r
            }\r
-           PreferencesUtil.setBooleanValue(IPreferenceKeys.MULTILANGUAGE_TEXT_EDITING_CAPABILITY, isMultilanguageTextEditingCapability);\r
            PreferencesUtil.setGlobalLanguage(globalLanguage);\r
-\r
                return super.performOk();\r
        }\r
 }\r
index 11fd7d2da9fac772d2fba93b89469667fc787a3c..acdf255cfed4f45d0e967eca7c62fd97ea0e2fd4 100644 (file)
@@ -429,7 +429,9 @@ public class PreferencesUtil implements IPreferenceKeys {
         }
         Float result = null;
         try{
-            result = Float.parseFloat(prefValue);
+            if (prefValue != null){
+                result = Float.parseFloat(prefValue);
+            }
         }catch(NumberFormatException e){
             logger.debug("Preference value of " + name + " is not a number");
         }
@@ -943,7 +945,7 @@ public class PreferencesUtil implements IPreferenceKeys {
      */
     public static void setDefaults() {
 
-        getPreferenceStore().setDefault(createPreferenceString(EDIT_MAP_SERVICE_ACCES_POINT),
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.EditMapServiceAccessPoint.getKey()),
                 "http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php");
         //FIXME : changed default for SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
         getPreferenceStore().setDefault(createPreferenceString(SHOULD_CONNECT_AT_STARTUP), false);
@@ -1035,7 +1037,7 @@ public class PreferencesUtil implements IPreferenceKeys {
     }
 
     public static String getMapServiceAccessPoint() {
-        return getStringValue(EDIT_MAP_SERVICE_ACCES_POINT);
+        return getStringValue(PreferencePredicate.EditMapServiceAccessPoint.getKey());
     }
 
     public static boolean shouldConnectAtStartUp() {
@@ -1067,16 +1069,16 @@ public class PreferencesUtil implements IPreferenceKeys {
     }
 
     public static void setSortRanksHierarchichally(boolean selection) {
-        setBooleanValue(SORT_RANKS_HIERARCHICHALLY, selection);
+        setBooleanValue(PreferencePredicate.SortRanksHierarchichally.getKey(), selection);
     }
 
     public static boolean getSortRanksHierarchichally() {
-        return getBooleanValue(SORT_RANKS_HIERARCHICHALLY);
+        return getBooleanValue(PreferencePredicate.SortRanksHierarchichally.getKey());
     }
 
     public static boolean isMultilanguageTextEditingCapability() {
         return getBooleanValue(
-                MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
+                PreferencePredicate.MultiLanguageTextEditing.getKey());
     }
 
     public static Language getGlobalLanguage() {
@@ -1880,6 +1882,18 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
+
+    public static void removeFromDB(CdmPreference prefToDelete) {
+        ICdmRepository controller;
+
+        if(CdmStore.isActive()){
+            controller = CdmStore.getCurrentApplicationConfiguration();
+            controller.getPreferenceService().remove(prefToDelete.getKey());
+
+            CdmPreferenceCache.instance().getAllTaxEditorDBPreferences();
+        }
+
+    }
     /**
      * @return
      */
index f0d7e9a83bed70978a31fa4300e6d2cb604839c1..525f20fc7435d2b4bd0aba3826ff38f272514ffc 100644 (file)
@@ -227,10 +227,12 @@ public abstract class CdmPreferencePage extends PreferencePage implements IE4Pre
 
         }
 
-        booleanCombo.add(Messages.Preference_Use_Default + " ("+defaultValue+")");;
-        for (IKeyLabel value: enumValues){
-            booleanCombo.add(value.getLabel());
-            booleanCombo.setData(value.getLabel(), value);
+        booleanCombo.add(Messages.Preference_Use_Default + " ("+defaultValue+")");
+        if (enumValues != null){
+            for (IKeyLabel value: enumValues){
+                booleanCombo.add(value.getLabel());
+                booleanCombo.setData(value.getLabel(), value);
+            }
         }
 
         return booleanCombo;
index ebc4e2b0335f1d30c75902476fe68658fad9bb60..1b60ac2941baa1fe0a8c940e60b3950bb66d9c2d 100644 (file)
@@ -9,9 +9,20 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.GeneralTermPreferencePage;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
  * <p>LanguageMenuPreferences class.</p>
@@ -24,6 +35,13 @@ public class LanguageMenuPreferences extends GeneralTermPreferencePage {
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.preferences.lang"{trunked}</code> */
        public final static String ID = "eu.etaxonomy.taxeditor.preferences.languages"; //$NON-NLS-1$
+    protected Boolean isMultilanguageTextEditingCapability;
+    protected CdmPreference multiLangugeActivatedPref =null;
+    private boolean overrideActivated;
+
+    Combo multiLanguageEditing;
+
+    Button allowOverrideOrderButton;
 
        /**
         * <p>Constructor for LanguageMenuPreferences.</p>
@@ -32,7 +50,132 @@ public class LanguageMenuPreferences extends GeneralTermPreferencePage {
            super();
         setPredicate(PreferencePredicate.AvailableLanguages);
         type = TermType.Language;
+
        }
 
+       @Override
+    protected Control createContents(Composite parent) {
+           createSetMultiLanguageTextEditingCapability(parent);
+           Composite result = (Composite) super.createContents(parent);
+           return result;
+       }
+
+       private void createSetMultiLanguageTextEditingCapability(Composite parent) {
+        //isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(PreferencePredicate.MultiLanguageTextEditing.getKey());
+           getValues();
+        final Composite composite = createComposite(parent);
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 2;
+
+        composite.setLayout(layout);
+
+        multiLanguageEditing = createBooleanCombo(composite, Messages.GeneralPreference_yes, Messages.GeneralPreference_no, PreferencePredicate.MultiLanguageTextEditing, "Allow multi language editing", isAdminPreference);
+        int index = 0;
+        for (String itemLabel : multiLanguageEditing.getItems()) {
+            if (isMultilanguageTextEditingCapability == null && itemLabel.startsWith(Messages.Preference_Use_Default)) {
+                multiLanguageEditing.select(index);
+                break;
+            }
+            if (isMultilanguageTextEditingCapability != null && itemLabel.equals(Messages.GeneralPreference_yes) && isMultilanguageTextEditingCapability){
+                multiLanguageEditing.select(index);
+                break;
+            }
+            if (isMultilanguageTextEditingCapability != null && itemLabel.equals(Messages.GeneralPreference_no) && !isMultilanguageTextEditingCapability){
+                multiLanguageEditing.select(index);
+                break;
+            }
+            index++;
+        }
+        if (!isAdminPreference && multiLangugeActivatedPref != null){
+            multiLanguageEditing.setEnabled(multiLangugeActivatedPref.isAllowOverride());
+        }
+        multiLanguageEditing.addSelectionListener(this);
+
+        if (isAdminPreference) {
+            allowOverrideOrderButton = createAllowOverrideButton(composite);
+            allowOverrideOrderButton.setSelection(multiLangugeActivatedPref != null? multiLangugeActivatedPref.isAllowOverride(): true);
+            //allowOverrideOrderAreasButton.setEnabled(prefAreaSort != null);
+            allowOverrideOrderButton.addSelectionListener(new SelectionAdapter() {
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    setApply(true);
+                    if (multiLangugeActivatedPref == null){
+                        multiLangugeActivatedPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.MultiLanguageTextEditing, PreferencePredicate.MultiLanguageTextEditing.getDefaultValue() != null ?  PreferencePredicate.MultiLanguageTextEditing.getDefaultValue().toString(): null);
+                    }
+                    multiLangugeActivatedPref.setAllowOverride(allowOverrideOrderButton.getSelection());
+                }
+            });
+        }
+    }
+
+        @Override
+        public void getValues() {
+               isAdminPreference = false;
+               setPreferenceStore(PreferencesUtil.getPreferenceStore());
+               multiLangugeActivatedPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.MultiLanguageTextEditing);
+               overrideActivated = PreferencesUtil.getBooleanValue(
+                       PreferencesUtil.prefOverrideKey(PreferencePredicate.MultiLanguageTextEditing.getKey()), true) != null? PreferencesUtil.getBooleanValue(
+                               PreferencesUtil.prefOverrideKey(PreferencePredicate.MultiLanguageTextEditing.getKey()), true):false;
+            if (multiLangugeActivatedPref != null) {
+                if (multiLangugeActivatedPref.isAllowOverride() ) {
+                    if (overrideActivated){
+                        isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(PreferencePredicate.MultiLanguageTextEditing.getKey(), true);
+                    }
+
+                } else {
+                    isMultilanguageTextEditingCapability = multiLangugeActivatedPref.getValue() != null? Boolean.valueOf(multiLangugeActivatedPref.getValue()): null;
+                }
+
+            } else {
+                if(!overrideActivated){
+                    isMultilanguageTextEditingCapability = null;
+                }else{
+                    isMultilanguageTextEditingCapability = PreferencesUtil.getBooleanValue(PreferencePredicate.MultiLanguageTextEditing.getKey(), true);
+                }
+                multiLangugeActivatedPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.MultiLanguageTextEditing, PreferencePredicate.MultiLanguageTextEditing.getDefaultValue() != null ?  PreferencePredicate.MultiLanguageTextEditing.getDefaultValue().toString(): null);
+            }
+        }
+        @Override
+        public void widgetSelected(SelectionEvent e) {
+        setApply(true);
+        if (e.getSource().equals(multiLanguageEditing)) {
+            String text = multiLanguageEditing.getText();
+            if(text.startsWith(Messages.Preference_Use_Default)){
+                isMultilanguageTextEditingCapability = null;
+                treeComposite.setEnabled(multiLangugeActivatedPref == null? true: multiLangugeActivatedPref.getValue() != null?Boolean.parseBoolean(multiLangugeActivatedPref.getValue().toString()): true);
+                if (!isAdminPreference) {
+                    overrideActivated = false;
+                }
+                return;
+            }
+            overrideActivated = true;
+
+            if (text.equals(Messages.GeneralPreference_yes)){
+                isMultilanguageTextEditingCapability = true;
+            }else{
+                isMultilanguageTextEditingCapability = false;
+            }
+
+            if (isMultilanguageTextEditingCapability != null){
+                treeComposite.setEnabled(isMultilanguageTextEditingCapability);
+            }else{
+                treeComposite.setEnabled(multiLangugeActivatedPref == null? true: multiLangugeActivatedPref.getValue() != null?Boolean.parseBoolean(multiLangugeActivatedPref.getValue().toString()): true);
+            }
+
+        }
+     }
 
+       @Override
+    public boolean performOk() {
+        if (!isApply()){
+            return true;
+        }
+        if (isMultilanguageTextEditingCapability!= null){
+            PreferencesUtil.setBooleanValue(PreferencePredicate.MultiLanguageTextEditing.getKey(), isMultilanguageTextEditingCapability);
+        }
+        PreferencesUtil.setBooleanValue(
+                PreferencesUtil.prefOverrideKey(PreferencePredicate.MultiLanguageTextEditing.getKey()),
+                overrideActivated);
+        return super.performOk();
+    }
 }
index b5eada858e80d10f2388758ff8d7860ad5fecfe7..b7000616439ffc736f018ee5dcd4b827f3635c72 100755 (executable)
@@ -43,8 +43,8 @@ public abstract class AbstractAdminTermSelectionWizardPage<T extends AbstractTer
 
     }
 
-    CdmPreference pref;
-    boolean override;
+//    CdmPreference pref;
//   boolean override;
 
     /**
      * {@inheritDoc}
index bd157c6860628310d04c29e8e0b6c71d4048ac95..370189e3f65212e5014c27f5aa23fdcce71d92b0 100755 (executable)
@@ -79,6 +79,7 @@ public abstract class AbstractTermSelectionWizardPage<T extends AbstractTermDto>
     }
 
     protected void setVocabularies(List<TermVocabularyDto> vocs) {
+
         vocabularies = vocs;
     }
 
index a24aaf785844f8d728dc26cd006cc1ab73aa161b..c990a1c538144ee2ee54fd5b7e9a4ec3f2dd4a0e 100644 (file)
@@ -139,10 +139,10 @@ public class RepresentationElement extends AbstractCdmFormElement {
             Representation preferredRepresentation = term
                     .getPreferredRepresentation(PreferencesUtil.getGlobalLanguage() );
 
-            element_Label.setText(preferredRepresentation.getLabel());
-            element_abbrevLabel.setText(preferredRepresentation.getAbbreviatedLabel());
-            element_plural.setText(preferredRepresentation.getPlural());
-            element_text.setText(preferredRepresentation.getDescription());
+            element_Label.setText(preferredRepresentation != null? preferredRepresentation.getLabel(): null);
+            element_abbrevLabel.setText(preferredRepresentation != null? preferredRepresentation.getAbbreviatedLabel(): null);
+            element_plural.setText(preferredRepresentation != null? preferredRepresentation.getPlural(): null);
+            element_text.setText(preferredRepresentation != null? preferredRepresentation.getDescription(): null);
             selectedRepresentation = preferredRepresentation;
             if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                 combo_language.setSelection(preferredRepresentation == null?CdmStore.getDefaultLanguage():preferredRepresentation.getLanguage());