Committing changes to definedtermeditor after merge from branch

diff --git a/.gitattributes b/.gitattributes
index cae0e78b90581fbecd318fbefa89bfb1afab24fa..c5a8995a2a82089c2dc8c7ed8a207767fc88aaa3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -847,6 +847,29 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wiz
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceSQLServerWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceSQLServerWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java -text

+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDragListener.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDropAdapter.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTransfer.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java -text


@@ -990,6 +1013,9 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermMana
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java -text

+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EmptyComboElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java -text


@@ -1224,6 +1250,14 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/use
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java -text

+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java -text


@@ -1248,34 +1282,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/T
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/UserSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/UserSelectionElement.java -text

-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/TaxonRelationshipTypeComboElement.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java -text

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
index 982c8fd988fe19bca2100c5397953a4541c453b0..105f62e2de1d786e91b4c4cded4ba473b8da8790 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationUtil.java
@@ -26,7 +26,7 @@ public class ApplicationUtil extends AbstractUtility {
         *
         * @return a {@link java.lang.String} object.
         */
         *
         * @return a {@link java.lang.String} object.
         */

-       protected static String getPluginId(){
+       public static String getPluginId(){

                return TaxonomicEditorPlugin.PLUGIN_ID;
        }
        
                return TaxonomicEditorPlugin.PLUGIN_ID;
        }
        

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java
index e6bc27539d7a4f49147ea7a64977c87474ded4e1..77e70cad0ca9de8c9e46bf0f2389d7ffa915486a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java
@@ -73,7 +73,7 @@ public class BulkEditorUtil extends AbstractUtility{
         *
         * @return a {@link java.lang.String} object.
         */
         *
         * @return a {@link java.lang.String} object.
         */

-       protected static String getPluginId(){
+       public static String getPluginId(){

                return TaxeditorBulkeditorPlugin.PLUGIN_ID;
        }
        
                return TaxeditorBulkeditorPlugin.PLUGIN_ID;
        }
        

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java
index 117f32e43a878b9c2369ef2e3cb529d7ede50d59..d244ab961a840973aef747cc764d0413e0585514 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java
@@ -49,7 +49,7 @@ public class DynamicMarkerTypeEditingMenu extends CompoundContributionItem {
                return new IContributionItem[] {
                                new ContributionItem() {
                                        public void fill(Menu menu, int index){
                return new IContributionItem[] {
                                new ContributionItem() {
                                        public void fill(Menu menu, int index){

-                                               for(MarkerType markerType : CdmStore.getTermManager().getPreferredMarkerTypes()){
+                                               for(MarkerType markerType : CdmStore.getTermManager().getPreferredTerms(MarkerType.class)){

                                                        createMenuItem(menu, markerType);
                                                }
                                        }
                                                        createMenuItem(menu, markerType);
                                                }
                                        }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
index b999d4e385eace55026bdecb0c8db139e732b8e1..12fe3a4e3ae52e6c3e42100870410ae1a58512d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
@@ -57,7 +57,7 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
         */
        public Map<Object, String> getKeyLabelPairs() {
                Map<Object, String> result = new HashMap<Object, String>();
         */
        public Map<Object, String> getKeyLabelPairs() {
                Map<Object, String> result = new HashMap<Object, String>();

-               for (Rank rank : CdmStore.getTermManager().getPreferredRanks()) {
+               for (Rank rank : CdmStore.getTermManager().getPreferredTerms(Rank.class)) {

                        result.put(rank, rank.getLabel());
                }
                return result;
                        result.put(rank, rank.getLabel());
                }
                return result;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
index e677b4d333027dcbd134994dee1913d3b20e61e8..b2fdb3cfb9934c5b7bcb863739e5a36dbf1d87d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
@@ -56,7 +56,7 @@ public class BulkEditorMarkerPreferencePage extends PreferencePage implements IW
                Composite container = new Composite(parent, SWT.NULL);
                container.setLayout(new GridLayout());
 
                Composite container = new Composite(parent, SWT.NULL);
                container.setLayout(new GridLayout());
 

-               for (final MarkerType markerType : TermStore.getNonTechnicalMarkerTypes()) {
+               for (final MarkerType markerType : TermStore.getTerms(MarkerType.class)) {

                        final Button button = new Button(container, SWT.CHECK);
                        button.setText(String.format("Edit '%s' markers", markerType.getLabel()));
                
                        final Button button = new Button(container, SWT.CHECK);
                        button.setText(String.format("Edit '%s' markers", markerType.getLabel()));
                

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index a0ff574b1bc03f0d4ce0c1a943c9572216f1cfcd..6b053d5451713236225db7dd0ec31b3366334700 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.asm-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.beans-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.expression-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar" sourcepath="/Users/nph/.m2/repository/eu/etaxonomy/cdmlib-model/3.0.9-SNAPSHOT/cdmlib-model-3.0.9-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar" sourcepath="/Users/nph/.m2/repository/eu/etaxonomy/cdmlib-persistence/3.0.9-SNAPSHOT/cdmlib-persistence-3.0.9-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>
-       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/asm.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar" sourcepath="lib/c3p0-0.9.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar" sourcepath="lib/commons-beanutils-1.7.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar" sourcepath="lib/commons-dbcp-1.2.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar" sourcepath="lib/commons-io-1.4src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar" sourcepath="lib/commons-pool-1.3src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar" sourcepath="lib/dozer-5.3.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar" sourcepath="lib/ehcache-1.2.3src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/ejb3-persistence.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.4.jar" sourcepath="lib/ezmorph-1.0.4src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/fop.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-core-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-core-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-search-3.1.0.GA.jar" sourcepath="lib/hibernate-search-3.1.0.GAsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.0.0.CR1.jar" sourcepath="lib/hibernate-validator-4.0.0.CR1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/httpclient-4.0.1.jar" sourcepath="lib/httpclient-4.0.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar" sourcepath="lib/httpcore-4.0.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar" sourcepath="lib/jaxb-impl-2.1.6src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar" sourcepath="lib/joda-time-1.5src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar" sourcepath="lib/json-lib-2.2.3-jdk15src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar" sourcepath="lib/jsr250-api-1.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jta.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/jtds-1.2.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar" sourcepath="lib/junit-4.8.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar" sourcepath="lib/log4j-1.2.14src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lucene-core-2.4.0.jar" sourcepath="lib/lucene-core-2.4.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-2.4.0.jar" sourcepath="lib/lucene-spellchecker-2.4.0src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar" sourcepath="lib/mail-1.4src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/msbase-2000.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/mssqlserver-2000.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/msutil-2000.3.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20100503.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.asm-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aspects-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.beans-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.context.support-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.expression-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.oxm-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/poi-3.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar" sourcepath="lib/servlet-api-2.5src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar" sourcepath="lib/slf4j-api-1.5.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar" sourcepath="lib/slf4j-log4j12-1.5.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar" sourcepath="lib/spring-modules-cache-0.7src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar" sourcepath="lib/spring-modules-lucene-0.8asrc.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.0.5.RELEASE.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.0.5.RELEASE.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.1.jar" sourcepath="lib/wsdl4j-1.6.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar" sourcepath="lib/xml-resolver-1.2src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar" sourcepath="lib/xstream-1.3.1src.zip"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.9-SNAPSHOT.jar" sourcepath="C:/Users/l.morris/.m2/repository/eu/etaxonomy/cdmlib-model/3.0.9-SNAPSHOT/cdmlib-model-3.0.9-SNAPSHOT-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.9-SNAPSHOT.jar" sourcepath="C:/Users/l.morris/.m2/repository/eu/etaxonomy/cdmlib-persistence/3.0.9-SNAPSHOT/cdmlib-persistence-3.0.9-SNAPSHOT-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.9-SNAPSHOT.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.9-SNAPSHOT.jar" sourcepath="/cdmlib-services"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-3.4.0-SNAPSHOT.jar" sourcepath="lib/hibernate-envers-3.4.0-SNAPSHOTsrc.zip"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 2fcf7ad76592820c07cddfabb8c949a43f4682f1..f1758c8214856224cfac3634a61e5438f5091780 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -306,7 +306,7 @@ public class EditorUtil extends AbstractUtility {
         * 
         * @return a {@link java.lang.String} object.
         */
         * 
         * @return a {@link java.lang.String} object.
         */

-       protected static String getPluginId() {
+       public static String getPluginId() {

                return TaxeditorEditorPlugin.PLUGIN_ID;
        }
 
                return TaxeditorEditorPlugin.PLUGIN_ID;
        }
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java
index 6c024a2075eae4f17c5d030f5a510d8eade5ccb9..a651461cf2ebaa5c04eface5045fa6efea83f119 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java
@@ -34,7 +34,7 @@ public abstract class AbstractDynamicConceptRelationMenu extends ContributionIte
        public void fill(Menu menu, int index){
                final IHandlerService handlerService = (IHandlerService) TaxeditorEditorPlugin.getDefault().getWorkbench().getService(IHandlerService.class);
                
        public void fill(Menu menu, int index){
                final IHandlerService handlerService = (IHandlerService) TaxeditorEditorPlugin.getDefault().getWorkbench().getService(IHandlerService.class);
                

-               for(final TaxonRelationshipTypeInverseContainer container : CdmStore.getTermManager().getRelationshipTypesWithInverses()){
+               for(final TaxonRelationshipTypeInverseContainer container : CdmStore.getTermManager().getPreferredTerms(TaxonRelationshipTypeInverseContainer.class)){

                        MenuItem menuItem = new MenuItem(menu, -1);
                        menuItem.setText(container.getTitleCache());
                        menuItem.setData(container);
                        MenuItem menuItem = new MenuItem(menu, -1);
                        menuItem.setText(container.getTitleCache());
                        menuItem.setData(container);

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
index 568c914fd3587d8785ce6046b3267381afc9bde0..d76d6e575911d8b785ae05123c96e5b6274f10af 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
@@ -11,6 +11,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import org.eclipse.jface.viewers.Viewer;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;

+import eu.etaxonomy.cdm.model.description.Feature;

 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.taxon.Taxon;


@@ -112,7 +113,7 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
                
                // create a transient tree with all features if none was selected
                if(featureTree == null){
                
                // create a transient tree with all features if none was selected
                if(featureTree == null){

-                       featureTree = FeatureTree.NewInstance(TermStore.getFeatures());
+                       featureTree = FeatureTree.NewInstance(TermStore.getTerms(Feature.class));

                }
                
                return featureTree;
                }
                
                return featureTree;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
index b3799a0c3726771848b7df051ff53e77931fb27c..9b1a7380c1bae04a7737d008a30c7bb49d7ec44f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
@@ -42,6 +42,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;

+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;

 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;


@@ -165,6 +166,11 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
                        return;
                }
                
                        return;
                }
                

+               if(part instanceof DefinedTermEditor){
+                       showEmptyPage();
+                       return;
+               }
+               

                if(part instanceof MultiPageTaxonEditor){
                        if(! part.equals(this.part)){
                                IEditorInput input = ((IEditorPart) part).getEditorInput();
                if(part instanceof MultiPageTaxonEditor){
                        if(! part.equals(this.part)){
                                IEditorInput input = ((IEditorPart) part).getEditorInput();

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
index f2374a56db6e84484e5ce1fb613c8d1085506296..f1194d7857892d60ff4ca42c491bfe19ebb9a8ab 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
@@ -134,7 +134,7 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
                }
                
                if(featureTree == null){
                }
                
                if(featureTree == null){

-                       featureTree = FeatureTree.NewInstance(CdmStore.getTermManager().getPreferredFeatures());
+                       featureTree = FeatureTree.NewInstance(CdmStore.getTermManager().getPreferredTerms(Feature.class));

                }
                
                return featureTree;
                }
                
                return featureTree;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
index 5a76457d792e5541d54782cc2a43a5fc849c2e9e..5925be91e873ab2ed6bc4acddf15898b199cac96 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
@@ -317,7 +317,7 @@ public class NavigationUtil extends AbstractUtility{
         *
         * @return a {@link java.lang.String} object.
         */
         *
         * @return a {@link java.lang.String} object.
         */

-       protected static String getPluginId(){
+       public static String getPluginId(){

                return TaxeditorNavigationPlugin.PLUGIN_ID;
        }
 
                return TaxeditorNavigationPlugin.PLUGIN_ID;
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 77d98881b0cb63c09845cb1be2eff17bad5717c9..15bcf0edd6cea9d4672fa9a5ec24fb0e111239a2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.database,
  eu.etaxonomy.taxeditor.datasource,
  eu.etaxonomy.taxeditor.datasource.wizard,
  eu.etaxonomy.cdm.database,
  eu.etaxonomy.taxeditor.datasource,
  eu.etaxonomy.taxeditor.datasource.wizard,

+ eu.etaxonomy.taxeditor.editor.definedterm,

  eu.etaxonomy.taxeditor.featuretree,
  eu.etaxonomy.taxeditor.handler,
  eu.etaxonomy.taxeditor.io,
  eu.etaxonomy.taxeditor.featuretree,
  eu.etaxonomy.taxeditor.handler,
  eu.etaxonomy.taxeditor.io,


@@ -26,6 +27,7 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.store.internal,
  eu.etaxonomy.taxeditor.store.operations,
  eu.etaxonomy.taxeditor.ui.bar,
  eu.etaxonomy.taxeditor.store.internal,
  eu.etaxonomy.taxeditor.store.operations,
  eu.etaxonomy.taxeditor.ui.bar,

+ eu.etaxonomy.taxeditor.ui.combo,

  eu.etaxonomy.taxeditor.ui.dialogs,
  eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection,
  eu.etaxonomy.taxeditor.ui.forms,
  eu.etaxonomy.taxeditor.ui.dialogs,
  eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection,
  eu.etaxonomy.taxeditor.ui.forms,


@@ -40,7 +42,6 @@ Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.ui.section.supplemental,
  eu.etaxonomy.taxeditor.ui.section.taxon,
  eu.etaxonomy.taxeditor.ui.selection,
  eu.etaxonomy.taxeditor.ui.section.supplemental,
  eu.etaxonomy.taxeditor.ui.section.taxon,
  eu.etaxonomy.taxeditor.ui.selection,

- eu.etaxonomy.taxeditor.ui.term,

  eu.etaxonomy.taxeditor.view,
  eu.etaxonomy.taxeditor.view.datasource,
  eu.etaxonomy.taxeditor.view.datasource.handler,
  eu.etaxonomy.taxeditor.view,
  eu.etaxonomy.taxeditor.view.datasource,
  eu.etaxonomy.taxeditor.view.datasource.handler,

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index dbcc37fbf03ffc0bbee7f228cec0f332fd9ea508..33e09770c35a59bf7b92bb813d5a657fb71110f3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -221,6 +221,15 @@
         restorable="true">
   </view>
    </extension>
         restorable="true">
   </view>
    </extension>

+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor"
+            default="false"
+            id="eu.etaxonomy.taxeditor.editor.definedTerm"
+            name="Defined Term Editor">
+      </editor>
+   </extension>

    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution


@@ -288,6 +297,63 @@
                </visibleWhen>
             </command>
          </menu>
                </visibleWhen>
             </command>
          </menu>

+         <menu
+               id="eu.etaxonomy.taxeditor.store.definedTermEditorMenu"
+               label="Term Editor">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
+                  label="Named Area"
+                  style="push">
+               <parameter
+                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
+                     value="eu.etaxonomy.cdm.model.location.NamedArea">
+               </parameter>
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
+                  label="Named Area Level"
+                  style="push">
+               <parameter
+                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
+                     value="eu.etaxonomy.cdm.model.location.NamedAreaLevel">
+               </parameter>
+            </command>
+            <separator
+                  name="eu.etaxonomy.taxeditor.store.definedTermEditorMenu.separator2"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
+                  label="Extension Type"
+                  style="push">
+               <parameter
+                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
+                     value="eu.etaxonomy.cdm.model.common.ExtensionType">
+               </parameter>
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
+                  label="Marker Type"
+                  style="push">
+               <parameter
+                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
+                     value="eu.etaxonomy.cdm.model.description.Feature">
+               </parameter>
+            </command>
+            <separator
+                  name="eu.etaxonomy.taxeditor.store.definedTermEditorMenu.separator3"
+                  visible="true">
+            </separator>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
+                  label="Feature"
+                  style="push">
+               <parameter
+                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
+                     value="eu.etaxonomy.cdm.model.description.Feature">
+               </parameter>
+            </command>
+         </menu>

       </menuContribution>
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
       </menuContribution>
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">


@@ -359,10 +425,57 @@
             </control>
          </toolbar>
       </menuContribution>
             </control>
          </toolbar>
       </menuContribution>

+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.definedTerm">
+         <menu
+               label="New">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.definedTerms.newTermVocabulary"
+                  label="Vocabulary"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.definedTerms.newDefinedTerm"
+                  label="Defined Term"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+                  <reference
+                        definitionId="isModifiable">
+                  </reference>
+               </visibleWhen>
+            </command>
+         </menu>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
+               label="Delete"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isModifiable">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>

    </extension>
    <extension
          name="Window Menu Commands"
          point="org.eclipse.ui.commands">
    </extension>
    <extension
          name="Window Menu Commands"
          point="org.eclipse.ui.commands">

+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.definedterm.handler.OpenDefinedTermEditorHandler"
+            id="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
+            name="Open Defined Term Editor">
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
+               name="inputType"
+               optional="true">
+         </commandParameter>
+      </command>
+   </extension>
+   <extension
+         name="File Menu Commands"
+         point="org.eclipse.ui.commands">

       <command
             defaultHandler="eu.etaxonomy.taxeditor.handler.ShowLoginWindowHandler"
             id="eu.etaxonomy.taxeditor.store.operations.showLoginWindow"
       <command
             defaultHandler="eu.etaxonomy.taxeditor.handler.ShowLoginWindowHandler"
             id="eu.etaxonomy.taxeditor.store.operations.showLoginWindow"


@@ -383,6 +496,18 @@
             </with>
          </activeWhen>
       </handler>
             </with>
          </activeWhen>
       </handler>

+      <handler
+            class="eu.etaxonomy.taxeditor.editor.definedterm.handler.DeleteTermBaseHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.definedTerm">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>

    </extension>
    <extension
          name="Popup Menu Commands"
    </extension>
    <extension
          name="Popup Menu Commands"


@@ -413,6 +538,19 @@
             name="Update Datasource">
       </command>
    </extension>
             name="Update Datasource">
       </command>
    </extension>

+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.definedterm.handler.CreateDefinedTermHandler"
+            id="eu.etaxonomy.taxeditor.editor.definedTerms.newDefinedTerm"
+            name="New Defined Term">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.definedterm.handler.CreateTermVocabularyHandler"
+            id="eu.etaxonomy.taxeditor.editor.definedTerms.newTermVocabulary"
+            name="New Term Vocabulary">
+      </command>
+   </extension>

    <extension
          point="org.eclipse.ui.importWizards">
       <category
    <extension
          point="org.eclipse.ui.importWizards">
       <category


@@ -773,6 +911,13 @@
          properties="isShowExperimentalFeatures"
          type="org.eclipse.jface.viewers.IStructuredSelection">
    </propertyTester>
          properties="isShowExperimentalFeatures"
          type="org.eclipse.jface.viewers.IStructuredSelection">
    </propertyTester>

+   <propertyTester
+         class="eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester"
+         id="eu.etaxonomy.taxeditor.store.termEditor.propertyTester"
+         namespace="eu.etaxonomy.taxeditor.store.termEditor.propertyTester"
+         properties="isModifiable"
+         type="org.eclipse.jface.viewers.IStructuredSelection">
+   </propertyTester>

 </extension>
 <extension
       point="org.eclipse.core.expressions.definitions">
 </extension>
 <extension
       point="org.eclipse.core.expressions.definitions">


@@ -794,6 +939,15 @@
          </test>
       </with>
    </definition>
          </test>
       </with>
    </definition>

+   <definition
+         id="isModifiable">
+      <with
+            variable="activeMenuSelection">
+         <test
+               property="eu.etaxonomy.taxeditor.store.termEditor.propertyTester.isModifiable">
+         </test>
+      </with>
+   </definition>

 </extension>
        
 </plugin>
 </extension>
        
 </plugin>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDragListener.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDragListener.java
new file mode 100644 (file)
index 0000000..42ead93
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDragListener.java
@@ -0,0 +1,77 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import org.eclipse.jface.viewers.IStructuredSelection;\r
+import org.eclipse.jface.viewers.Viewer;\r
+import org.eclipse.swt.dnd.DragSourceAdapter;\r
+import org.eclipse.swt.dnd.DragSourceEvent;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 10 Jan 2012\r
+ *\r
+ */\r
+public class DefinedTermDragListener extends DragSourceAdapter {\r
+       \r
+       private Viewer viewer;\r
+\r
+       /**\r
+        * \r
+        */\r
+       public DefinedTermDragListener(Viewer viewer) {\r
+               this.viewer = viewer;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.swt.dnd.DragSourceAdapter#dragStart(org.eclipse.swt.dnd.DragSourceEvent)\r
+        */\r
+       @Override\r
+       public void dragStart(DragSourceEvent event) {\r
+               \r
+               event.doit = true;// set to false if needed - default is true\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.swt.dnd.DragSourceAdapter#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)\r
+        */\r
+       @Override\r
+       public void dragFinished(DragSourceEvent event) {\r
+               // TODO Auto-generated method stub\r
+               super.dragFinished(event);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.swt.dnd.DragSourceAdapter#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)\r
+        */\r
+       @Override\r
+       public void dragSetData(DragSourceEvent event) {\r
+               \r
+               IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();\r
+               List<DefinedTermBase> definedTerms = new ArrayList<DefinedTermBase>();\r
+               \r
+               for (Object object : selection.toList()){\r
+                               definedTerms.add((DefinedTermBase)object);\r
+                       }\r
+                       \r
+               if (TermTransfer.getInstance().isSupportedType(\r
+                               event.dataType)) {\r
+                       event.data = definedTerms.toArray(new DefinedTermBase[definedTerms.size()]);\r
+               }\r
+       }\r
+       \r
+       \r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDropAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDropAdapter.java
new file mode 100644 (file)
index 0000000..8744410
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDropAdapter.java
@@ -0,0 +1,77 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import java.util.ArrayList;\r
+import java.util.Collection;\r
+\r
+import org.eclipse.jface.viewers.ViewerDropAdapter;\r
+import org.eclipse.swt.dnd.TransferData;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.operation.MoveDefinedTermOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 10 Jan 2012\r
+ *\r
+ */\r
+public class DefinedTermDropAdapter extends ViewerDropAdapter {\r
+\r
+       private DefinedTermEditor editor;\r
+       /**\r
+        * @param viewer\r
+        */\r
+       protected DefinedTermDropAdapter(DefinedTermEditor editor) {\r
+               super(editor.getViewer());\r
+               this.editor = editor;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object)\r
+        */\r
+       @Override\r
+       public boolean performDrop(Object data) {\r
+               \r
+               TermBase target = (TermBase) getCurrentTarget();//can be vocab\r
+               //DefinedTermBase[] droppedElements = (DefinedTermBase[]) data;\r
+               Object[] droppedTerms = (Object[]) data;\r
+               Collection<DefinedTermBase> sourceTerms = new ArrayList<DefinedTermBase>(); //Arrays.asList(droppedElements)\r
+               \r
+               for (Object droppedTerm : droppedTerms) {\r
+                       \r
+                       DefinedTermBase term = (DefinedTermBase) droppedTerm;\r
+                       sourceTerms.add(term);\r
+                       \r
+               }\r
+               \r
+               AbstractPostOperation operation = new MoveDefinedTermOperation("Move Descriptions", StoreUtil.getUndoContext(), target, sourceTerms, editor);\r
+               //TODO: implement execute\r
+               StoreUtil.executeOperation(operation);\r
+               \r
+               return true;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.ViewerDropAdapter#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData)\r
+        */\r
+       @Override\r
+       public boolean validateDrop(Object target, int operation,\r
+                       TransferData transferType) {\r
+               boolean transferDataIsSupported = TermTransfer.getInstance().isSupportedType(transferType);\r
+               System.out.println(target);\r
+               // maybe don't need this - they will be all TermBase anyway\r
+               return target instanceof TermBase && transferDataIsSupported; \r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
new file mode 100644 (file)
index 0000000..6ff74b9
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
@@ -0,0 +1,270 @@
+// $Id$\r
+/**\r
+ * Copyright (C) 2009 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import java.util.HashSet;\r
+import java.util.List;\r
+import java.util.Set;\r
+\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.jface.action.GroupMarker;\r
+import org.eclipse.jface.action.MenuManager;\r
+import org.eclipse.jface.viewers.ISelection;\r
+import org.eclipse.jface.viewers.StructuredSelection;\r
+import org.eclipse.jface.viewers.TreeViewer;\r
+import org.eclipse.jface.viewers.ViewerSorter;\r
+import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.dnd.DND;\r
+import org.eclipse.swt.dnd.Transfer;\r
+import org.eclipse.swt.layout.FillLayout;\r
+import org.eclipse.swt.widgets.Composite;\r
+import org.eclipse.swt.widgets.Control;\r
+import org.eclipse.swt.widgets.Menu;\r
+import org.eclipse.ui.IEditorInput;\r
+import org.eclipse.ui.IEditorSite;\r
+import org.eclipse.ui.ISelectionListener;\r
+import org.eclipse.ui.ISelectionService;\r
+import org.eclipse.ui.IWorkbenchActionConstants;\r
+import org.eclipse.ui.IWorkbenchPart;\r
+import org.eclipse.ui.PartInitException;\r
+import org.eclipse.ui.part.EditorPart;\r
+\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;\r
+import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
+import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput;\r
+import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;\r
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 3 Jan 2012\r
+ *\r
+ */\r
+public class DefinedTermEditor extends EditorPart implements IConversationEnabled, ISelectionListener, IDirtyMarkableSelectionProvider, IPostOperationEnabled {\r
+\r
+       public static final String ID = "eu.etaxonomy.taxeditor.editor.definedTerm";\r
+\r
+       public static final String OPEN_COMMAND_ID = "eu.etaxonomy.taxeditor.store.openDefinedTermEditor";\r
+       \r
+       protected TreeViewer viewer;\r
+       protected ConversationHolder conversation;\r
+       private ISelectionService selectionService;\r
+       private boolean dirty;\r
+       Set<TermVocabulary<? extends DefinedTermBase>> inMemoryVocabularies = new HashSet<TermVocabulary<? extends DefinedTermBase>>();\r
+\r
+       private int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;\r
+       /**\r
+        * \r
+        */\r
+       public DefinedTermEditor() {\r
+               super();\r
+               conversation = CdmStore.createConversation();\r
+       }\r
+\r
+       @Override\r
+       public void createPartControl(Composite parent) {\r
+                       \r
+       //              parent.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLUE));\r
+                       \r
+                       FillLayout layout = new FillLayout();\r
+                       layout.marginHeight = 0;\r
+                       layout.marginWidth = 0;\r
+                       layout.type = SWT.VERTICAL;\r
+                       \r
+                       parent.setLayout(layout);\r
+                       viewer = new TreeViewer(parent);\r
+                       viewer.getControl().setLayoutData(CdmFormFactory.FILL());\r
+                       viewer.setContentProvider(new TermContentProvider());\r
+                       viewer.setLabelProvider(new TermLabelProvider());\r
+                       viewer.setSorter(new ViewerSorter());\r
+                       \r
+                       Transfer[] transfers = new Transfer[] { TermTransfer.getInstance() };\r
+                       viewer.addDragSupport(dndOperations, transfers, new DefinedTermDragListener(viewer));\r
+                       viewer.addDropSupport(dndOperations, transfers, new DefinedTermDropAdapter(this));\r
+\r
+                                       \r
+                       initialiseVocabularies();               \r
+                       viewer.setInput(inMemoryVocabularies);\r
+                                               \r
+                       getSite().setSelectionProvider(viewer);\r
+                       \r
+                       selectionService = getSite().getWorkbenchWindow().getSelectionService();\r
+                       selectionService.addSelectionListener(this);\r
+       \r
+                       setPartName(getEditorInput().getName());\r
+                       createMenu();\r
+               }\r
+       \r
+       \r
+       protected void initialiseVocabularies() {\r
+               inMemoryVocabularies.clear();\r
+               //List<TermVocabulary> vocabularies = CdmStore.getService(IVocabularyService.class).list(null, null, null, null, null);\r
+\r
+//             for (TermVocabulary vocabulary : vocabularies){\r
+//                     if(vocabulary.getTerms().isEmpty()){\r
+//                             inMemoryVocabularies.add(vocabulary);\r
+//                     }\r
+//             }\r
+\r
+               \r
+               List<TermVocabulary<? extends DefinedTermBase>> termVocabularies = CdmStore.getService(IVocabularyService.class).listByTermClass(getDefinedTermEditorInput().getTermClass(), true, true, null, null, null, null);\r
+               \r
+               \r
+               inMemoryVocabularies.addAll(termVocabularies);\r
+       }\r
+       \r
+       /**\r
+        * \r
+        */\r
+       public AbstractDefinedTermEditorInput getDefinedTermEditorInput() {\r
+               return (AbstractDefinedTermEditorInput) getEditorInput();\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.operation.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)\r
+        */\r
+       @Override\r
+       public boolean postOperation(CdmBase objectAffectedByOperation) {\r
+\r
+               if(objectAffectedByOperation instanceof DefinedTermBase){\r
+                       viewer.refresh();\r
+               } else if (objectAffectedByOperation instanceof TermVocabulary){\r
+//                     if (inMemoryVocabularies.contains(objectAffectedByOperation)){\r
+//                             inMemoryVocabularies.remove((TermVocabulary) objectAffectedByOperation);\r
+//                     }else{\r
+//                             inMemoryVocabularies.add((TermVocabulary) objectAffectedByOperation);\r
+//                             DetailsViewPart view = (DetailsViewPart) StoreUtil.getView(DetailsViewPart.ID, true);\r
+//                             view.setFocus();\r
+//                     }\r
+                       \r
+//                     viewer.setInput(inMemoryVocabularies);\r
+                       viewer.refresh();\r
+                       \r
+               }\r
+               \r
+               \r
+               \r
+               if(objectAffectedByOperation != null){\r
+                       viewer.setSelection(new StructuredSelection(objectAffectedByOperation));\r
+               }\r
+               setDirty(true);\r
+\r
+               return true;\r
+       } \r
+\r
+       private void createMenu() {\r
+               // register context menu\r
+               MenuManager menuManager = new MenuManager();\r
+               menuManager\r
+                               .add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));\r
+               getSite().registerContextMenu(ID, menuManager, viewer);\r
+       \r
+               Control control = viewer.getControl();\r
+               Menu menu = menuManager.createContextMenu(control);\r
+               control.setMenu(menu);\r
+       }\r
+       \r
+\r
+               \r
+\r
+       @Override\r
+       public void doSave(IProgressMonitor monitor) {\r
+               getConversationHolder().commit();\r
+               setDirty(false);\r
+               initialiseVocabularies();\r
+       }\r
+       \r
+\r
+       @Override\r
+       public void doSaveAs() {}\r
+\r
+       @Override\r
+       public void init(IEditorSite site, IEditorInput input) throws PartInitException {\r
+               setSite(site);\r
+               setInput(input);\r
+               \r
+       }\r
+\r
+       @Override\r
+       public boolean isDirty() {\r
+               return dirty;\r
+       }\r
+\r
+       @Override\r
+       public boolean isSaveAsAllowed() {\r
+               return false;\r
+       }\r
+\r
+       @Override\r
+       public void setFocus() {\r
+               getConversationHolder().bind();\r
+       }\r
+\r
+       @Override\r
+       public void update(CdmDataChangeMap changeEvents) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       @Override\r
+       public ConversationHolder getConversationHolder() {\r
+               return conversation;\r
+       }\r
+\r
+       @Override\r
+       public void selectionChanged(IWorkbenchPart part, ISelection selection) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       @Override\r
+       public void changed(Object element) {\r
+               dirty = true;\r
+               setDirty(true);\r
+               viewer.update(element, null);\r
+       }\r
+\r
+       /**\r
+        * @param dirty the dirty to set\r
+        */\r
+       public void setDirty(boolean dirty) {\r
+               this.dirty = dirty;\r
+               firePropertyChange(PROP_DIRTY);\r
+       }\r
+\r
+       @Override\r
+       public boolean onComplete() {\r
+               // TODO Auto-generated method stub\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * \r
+        */\r
+       public TreeViewer getViewer() {\r
+               return viewer;\r
+       }\r
+\r
+       /**\r
+        * @return \r
+        * \r
+        */\r
+       public Set<TermVocabulary<? extends DefinedTermBase>> getInMemoryVocabularies() {\r
+               return inMemoryVocabularies;\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
new file mode 100644 (file)
index 0000000..6c9e0f4
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
@@ -0,0 +1,84 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import java.util.HashSet;\r
+import java.util.Set;\r
+\r
+import org.eclipse.core.expressions.PropertyTester;\r
+import org.eclipse.jface.viewers.IStructuredSelection;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.Marker;\r
+import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 9 Jan 2012\r
+ *\r
+ */\r
+public class TermBasePropertyTester extends PropertyTester {\r
+\r
+       private static final String IS_MODIFIABLE = "isModifiable";\r
+       \r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)\r
+        */\r
+       @Override\r
+       public boolean test(Object receiver, String property, Object[] args,\r
+                       Object expectedValue) {\r
+               \r
+               IStructuredSelection selection = (IStructuredSelection) receiver;\r
+               TermBase selectedElement = (TermBase) selection.getFirstElement();\r
+               \r
+               if(IS_MODIFIABLE.equals(property)){\r
+                       return isModifiable(selectedElement);\r
+               }\r
+               \r
+               return false;\r
+       }\r
+\r
+\r
+       /**\r
+        * Checks whether there is a {@link Marker} with the type {@link MarkerType#MODIFIABLE()} and if there is then return its value.\r
+        * \r
+        * @return The markers value if it exists \r
+        */\r
+       public static boolean isModifiable(TermBase termBase) {\r
+               if (termBase == null){\r
+                       return true;\r
+               }\r
+               \r
+               TermVocabulary vocabulary = null;\r
+               \r
+               if(termBase instanceof DefinedTermBase){\r
+                       vocabulary = ((DefinedTermBase) termBase).getVocabulary();\r
+               }else if(termBase instanceof TermVocabulary){\r
+                       vocabulary = (TermVocabulary) termBase;\r
+               }\r
+               \r
+               if(vocabulary == null){\r
+                       return true;\r
+               }\r
+               \r
+               for(Marker vocabularyMarker : vocabulary.getMarkers()){\r
+                       if(vocabularyMarker.getMarkerType().equals(MarkerType.MODIFIABLE())){\r
+                               return vocabularyMarker.getValue();                     \r
+                       }\r
+               }\r
+                               \r
+               return true;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
new file mode 100644 (file)
index 0000000..3b6241a
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
@@ -0,0 +1,127 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import java.util.Collection;\r
+import java.util.HashSet;\r
+import java.util.Set;\r
+import java.util.SortedSet;\r
+\r
+import org.eclipse.jface.viewers.ITreeContentProvider;\r
+import org.eclipse.jface.viewers.Viewer;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 8 Dec 2011\r
+ *\r
+ */\r
+public class TermContentProvider implements ITreeContentProvider {\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.IContentProvider#dispose()\r
+        */\r
+       @Override\r
+       public void dispose() {\r
+               // TODO Auto-generated method stub\r
+\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)\r
+        */\r
+       @Override\r
+       public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {\r
+               // TODO Auto-generated method stub\r
+\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)\r
+        */\r
+       @Override\r
+       public Object[] getElements(Object inputElement) {\r
+       \r
+               Collection<TermVocabulary> inputElements = (Collection<TermVocabulary>) inputElement;\r
+               return inputElements.toArray();\r
+               //return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)\r
+        */\r
+       @Override\r
+       public Object[] getChildren(Object parentElement) {\r
+               \r
+               if(parentElement instanceof TermVocabulary){\r
+                       return getTopLevelElements((TermVocabulary) parentElement);\r
+               } else if (parentElement instanceof DefinedTermBase) {\r
+                       return ((DefinedTermBase) parentElement).getIncludes().toArray();\r
+               }\r
+               return null;\r
+       }\r
+       \r
+       /**\r
+        *  \r
+        * @param vocabulary\r
+        * @return An array of DefinedTermBase objects that do not have parents\r
+        * \r
+        * TODO: Needs to be implemented in cdmlib\r
+        */\r
+       private Object[] getTopLevelElements(TermVocabulary vocabulary) {\r
+               \r
+               SortedSet<DefinedTermBase> terms = vocabulary.getTermsOrderedByLabels(CdmStore.getDefaultLanguage());\r
+               Set<DefinedTermBase> topLevelTerms = new HashSet<DefinedTermBase>(); \r
+        \r
+               for (DefinedTermBase term : terms){\r
+                        if (term.getPartOf() == null){\r
+                                topLevelTerms.add(term);\r
+                        }\r
+                               \r
+               }\r
+        \r
+               return topLevelTerms.toArray();\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)\r
+        */\r
+       @Override\r
+       public Object getParent(Object element) {\r
+               \r
+               if(element instanceof DefinedTermBase){\r
+                       \r
+                       DefinedTermBase definedTerm = (DefinedTermBase)element;\r
+                       if (definedTerm.getPartOf() == null) {\r
+                               return definedTerm.getVocabulary();\r
+                       } else {\r
+                               return definedTerm.getPartOf();\r
+                       }\r
+               }       \r
+               return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)\r
+        */\r
+       @Override\r
+       public boolean hasChildren(Object element) {\r
+               \r
+               if (getChildren(element) != null){\r
+                       \r
+                       return getChildren(element).length > 0;\r
+               }\r
+               return false;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
new file mode 100644 (file)
index 0000000..ea647af
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
@@ -0,0 +1,48 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;\r
+import org.eclipse.jface.viewers.LabelProvider;\r
+import org.eclipse.jface.viewers.StyledString;\r
+\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 9 Dec 2011\r
+ *\r
+ */\r
+public class TermLabelProvider extends LabelProvider implements\r
+               IStyledLabelProvider {\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)\r
+        */\r
+       @Override\r
+       public StyledString getStyledText(Object element) {\r
+               \r
+               return  new StyledString(getText(element), StyledString.QUALIFIER_STYLER);\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)\r
+        */\r
+       @Override\r
+       public String getText(Object element) {\r
+               \r
+               if (element instanceof TermBase){\r
+                       return ((TermBase)element).getLabel();\r
+               } \r
+               return super.getText(element);\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTransfer.java
new file mode 100644 (file)
index 0000000..c8623b0
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTransfer.java
@@ -0,0 +1,60 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm;\r
+\r
+import java.util.UUID;\r
+\r
+import eu.etaxonomy.cdm.api.service.ITermService;\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.taxeditor.model.CdmObjectTransfer;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 10 Jan 2012\r
+ *\r
+ */\r
+public class TermTransfer extends CdmObjectTransfer<DefinedTermBase> {\r
+       \r
+       private static TermTransfer instance = new TermTransfer();\r
+       private static final String TYPE_NAME = "termElement-transfer-format";\r
+       private static final int TYPEID = registerType(TYPE_NAME);\r
+       \r
+       public static synchronized TermTransfer getInstance(){\r
+               return instance;\r
+       }\r
+       \r
+       private TermTransfer() {}\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.model.CdmObjectTransfer#loadElement(java.util.UUID)\r
+        */\r
+       @Override\r
+       public DefinedTermBase loadElement(UUID uuid) {\r
+               return CdmStore.getService(ITermService.class).load(uuid);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.swt.dnd.Transfer#getTypeIds()\r
+        */\r
+       @Override\r
+       protected int[] getTypeIds() {\r
+               return new int[] { TYPEID };\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.swt.dnd.Transfer#getTypeNames()\r
+        */\r
+       @Override\r
+       protected String[] getTypeNames() {\r
+               return new String[] { TYPE_NAME };\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java
new file mode 100644 (file)
index 0000000..24a8462
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java
@@ -0,0 +1,64 @@
+// $Id$\r
+/**\r
+ * Copyright (C) 2009 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r
+package eu.etaxonomy.taxeditor.editor.definedterm.handler;\r
+\r
+import org.eclipse.core.commands.AbstractHandler;\r
+import org.eclipse.core.commands.ExecutionEvent;\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.IHandler;\r
+import org.eclipse.core.commands.common.NotDefinedException;\r
+import org.eclipse.jface.viewers.IStructuredSelection;\r
+import org.eclipse.ui.handlers.HandlerUtil;\r
+\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateDefinedTermOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 21 Dec 2011\r
+ * \r
+ */\r
+public class CreateDefinedTermHandler extends AbstractHandler implements IHandler {\r
+\r
+       /*\r
+        * (non-Javadoc)\r
+        * \r
+        * @see\r
+        * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.\r
+        * ExecutionEvent)\r
+        */\r
+       @Override\r
+       public Object execute(ExecutionEvent event) throws ExecutionException {\r
+               IPostOperationEnabled editor = (IPostOperationEnabled) HandlerUtil\r
+                               .getActiveEditor(event);\r
+\r
+               IStructuredSelection selection = (IStructuredSelection) HandlerUtil\r
+                               .getCurrentSelection(event);\r
+\r
+               TermBase selectedElement = (TermBase) selection.getFirstElement();\r
+\r
+               try {\r
+                       AbstractPostOperation operation = new CreateDefinedTermOperation(\r
+                                       event.getCommand().getName(), StoreUtil.getUndoContext(),\r
+                                       selectedElement, editor);\r
+                       StoreUtil.executeOperation(operation);\r
+\r
+               } catch (NotDefinedException e) {\r
+                       StoreUtil.error(getClass(), e);\r
+               }\r
+\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java
new file mode 100644 (file)
index 0000000..3ad89be
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java
@@ -0,0 +1,60 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.handler;\r
+\r
+import org.eclipse.core.commands.AbstractHandler;\r
+import org.eclipse.core.commands.ExecutionEvent;\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.IHandler;\r
+import org.eclipse.core.commands.common.NotDefinedException;\r
+import org.eclipse.jface.viewers.IStructuredSelection;\r
+import org.eclipse.ui.handlers.HandlerUtil;\r
+\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateDefinedTermOperation;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateTermVocabularyOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 21 Dec 2011\r
+ *\r
+ */\r
+public class CreateTermVocabularyHandler extends AbstractHandler implements\r
+               IHandler {\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)\r
+        */\r
+       @Override\r
+       public Object execute(ExecutionEvent event) throws ExecutionException {\r
+               IPostOperationEnabled editor = (IPostOperationEnabled) HandlerUtil\r
+                               .getActiveEditor(event);\r
+\r
+               if (! (editor instanceof DefinedTermEditor)){\r
+                       return null;\r
+               }\r
+               \r
+               try {\r
+                       AbstractPostOperation operation = new CreateTermVocabularyOperation(\r
+                                       event.getCommand().getName(), StoreUtil.getUndoContext(), (DefinedTermEditor) editor);\r
+                       StoreUtil.executeOperation(operation);\r
+\r
+               } catch (NotDefinedException e) {\r
+                       StoreUtil.error(getClass(), e);\r
+               }\r
+\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java
new file mode 100644 (file)
index 0000000..ec008ea
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java
@@ -0,0 +1,67 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.handler;\r
+\r
+import java.util.Iterator;\r
+\r
+import org.eclipse.core.commands.AbstractHandler;\r
+import org.eclipse.core.commands.ExecutionEvent;\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.common.NotDefinedException;\r
+import org.eclipse.jface.viewers.IStructuredSelection;\r
+import org.eclipse.ui.handlers.HandlerUtil;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.operation.DeleteTermBaseOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 22 Dec 2011\r
+ *\r
+ */\r
+public class DeleteTermBaseHandler extends AbstractHandler {\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)\r
+        */\r
+       @Override\r
+       public Object execute(ExecutionEvent event) throws ExecutionException {\r
+               DefinedTermEditor editor = (DefinedTermEditor) HandlerUtil\r
+                               .getActiveEditor(event);\r
+\r
+               IStructuredSelection selection = (IStructuredSelection) HandlerUtil\r
+                               .getCurrentSelection(event);\r
+\r
+               Iterator<TermBase> selectionIterator = selection.iterator();\r
+\r
+               while (selectionIterator.hasNext()){\r
+                       \r
+                       TermBase term = selectionIterator.next();\r
+                       \r
+                       try {\r
+                               AbstractPostOperation operation = new DeleteTermBaseOperation(\r
+                                               event.getCommand().getName(), StoreUtil.getUndoContext(),\r
+                                               term, editor);\r
+                               StoreUtil.executeOperation(operation);\r
+       \r
+                       } catch (NotDefinedException e) {\r
+                               StoreUtil.error(getClass(), e);\r
+                       }\r
+               }\r
+\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java
new file mode 100644 (file)
index 0000000..393a3e6
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java
@@ -0,0 +1,59 @@
+package eu.etaxonomy.taxeditor.editor.definedterm.handler;\r
+import org.eclipse.core.commands.AbstractHandler;\r
+import org.eclipse.core.commands.ExecutionEvent;\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.IHandler;\r
+import org.eclipse.core.commands.IParameter;\r
+import org.eclipse.core.commands.common.NotDefinedException;\r
+import org.eclipse.ui.IWorkbenchPage;\r
+import org.eclipse.ui.PartInitException;\r
+import org.eclipse.ui.handlers.HandlerUtil;\r
+import org.eclipse.ui.handlers.ShowViewHandler;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.input.DefinedTermEditorInputFactory;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+// $Id$\r
+/**\r
+ * Copyright (C) 2009 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 8 Dec 2011\r
+ *\r
+ */\r
+public class OpenDefinedTermEditorHandler extends AbstractHandler implements\r
+               IHandler {\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)\r
+        */\r
+       @Override\r
+       public Object execute(ExecutionEvent event) throws ExecutionException {\r
+               \r
+               try {\r
+                       String parameter = event.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter");\r
+                       Class<? extends DefinedTermBase> clazz = (Class<? extends DefinedTermBase>) Class.forName(parameter);\r
+               \r
+                       IWorkbenchPage activePage = StoreUtil.getActivePage();\r
+                       try {\r
+                               activePage.openEditor(DefinedTermEditorInputFactory.NewInstance(clazz), DefinedTermEditor.ID);\r
+                       } catch (PartInitException e) {\r
+                               StoreUtil.error(getClass(), e);\r
+                       }\r
+               } catch (ClassNotFoundException e) {\r
+                       StoreUtil.error(getClass(), e);\r
+               }\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java
new file mode 100644 (file)
index 0000000..5d6e797
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java
@@ -0,0 +1,73 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.handler;\r
+\r
+import java.util.HashMap;\r
+import java.util.Map;\r
+\r
+import org.eclipse.jface.action.IContributionItem;\r
+import org.eclipse.swt.SWT;\r
+import org.eclipse.ui.PlatformUI;\r
+import org.eclipse.ui.actions.CompoundContributionItem;\r
+import org.eclipse.ui.menus.CommandContributionItem;\r
+import org.eclipse.ui.menus.CommandContributionItemParameter;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 4 Jan 2012\r
+ *\r
+ */\r
+public class OpenDefinedTermMenu extends CompoundContributionItem {\r
+\r
+       /**\r
+        * \r
+        */\r
+       public OpenDefinedTermMenu() {\r
+               // TODO Auto-generated constructor stub\r
+       }\r
+\r
+       /**\r
+        * @param id\r
+        */\r
+       public OpenDefinedTermMenu(String id) {\r
+               super(id);\r
+               // TODO Auto-generated constructor stub\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()\r
+        */\r
+       @Override\r
+       protected IContributionItem[] getContributionItems() {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+       \r
+       /**\r
+        * @param key\r
+        * @param object\r
+        * @return\r
+        */\r
+       private IContributionItem createContributionItem(String label,\r
+                       String inputType) {\r
+               CommandContributionItemParameter parameter = new CommandContributionItemParameter(\r
+                               PlatformUI.getWorkbench().getActiveWorkbenchWindow(), null,\r
+                               "eu.etaxonomy.taxeditor.store.definedterm.menu.open", SWT.NONE);\r
+\r
+               parameter.label = label;\r
+\r
+               Map parameters = new HashMap();\r
+               parameters.put("eu.etaxonomy.taxeditor.store.definedterm.menu.open", inputType);\r
+               parameter.parameters = parameters;\r
+\r
+               return new CommandContributionItem(parameter);\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java
new file mode 100644 (file)
index 0000000..49cc3d4
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java
@@ -0,0 +1,71 @@
+// $Id$\r
+/**\r
+ * Copyright (C) 2009 EDIT\r
+ * European Distributed Institute of Taxonomy \r
+ * http://www.e-taxonomy.eu\r
+ * \r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
+ */\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import java.util.List;\r
+\r
+import org.eclipse.jface.resource.ImageDescriptor;\r
+import org.eclipse.ui.IEditorInput;\r
+import org.eclipse.ui.IPersistableElement;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 3 Jan 2012\r
+ *\r
+ */\r
+public abstract class AbstractDefinedTermEditorInput<T extends DefinedTermBase> implements IEditorInput {\r
+\r
+       /**\r
+        * \r
+        */\r
+       public AbstractDefinedTermEditorInput() {\r
+               super();\r
+       }\r
+\r
+       @Override\r
+       public Object getAdapter(Class adapter) {\r
+               return null;\r
+       }\r
+\r
+       @Override\r
+       public boolean exists() {\r
+               return false;\r
+       }\r
+\r
+       @Override\r
+       public ImageDescriptor getImageDescriptor() {\r
+               return null;\r
+       }\r
+\r
+       @Override\r
+       public IPersistableElement getPersistable() {\r
+               return null;\r
+       }\r
+\r
+       @Override\r
+       public String getToolTipText() {\r
+               return getName();\r
+       }\r
+\r
+       /**\r
+        * @return\r
+        */\r
+       public abstract List<String> getTermClasses();\r
+       \r
+       public abstract T createTermInstance();\r
+       \r
+       public Class<? extends DefinedTermBase> getTermClass() {\r
+               \r
+               return createTermInstance().getClass();\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java
new file mode 100644 (file)
index 0000000..efbfa0e
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java
@@ -0,0 +1,54 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import org.eclipse.ui.IEditorInput;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.ExtensionType;\r
+import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.description.Feature;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 3 Jan 2012\r
+ *\r
+ */\r
+public class DefinedTermEditorInputFactory {\r
+\r
+//     public static final String NamedArea = "eu.etaxonomy.taxeditor.editor.namedArea";\r
+\r
+       /**\r
+        * @param clazz\r
+        * @return\r
+        */\r
+       public static IEditorInput NewInstance(Class<? extends DefinedTermBase> clazz) {\r
+               if(clazz == NamedArea.class){\r
+                       return new NamedAreaEditorInput();\r
+               } \r
+               if (clazz == NamedAreaLevel.class){\r
+                       return new NamedAreaLevelEditorInput();\r
+               }\r
+               if (clazz == ExtensionType.class){\r
+                       return new ExtensionTypeEditorInput();\r
+               }\r
+               if (clazz == MarkerType.class){\r
+                       return new MarkerTypeEditorInput();\r
+               }\r
+               if (clazz == Feature.class){\r
+                       return new FeatureEditorInput();\r
+               }\r
+               \r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java
new file mode 100644 (file)
index 0000000..49d597a
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java
@@ -0,0 +1,52 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import java.util.Arrays;\r
+import java.util.List;\r
+\r
+import eu.etaxonomy.cdm.model.common.ExtensionType;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 6 Jan 2012\r
+ *\r
+ */\r
+public class ExtensionTypeEditorInput extends AbstractDefinedTermEditorInput<ExtensionType> {\r
+       \r
+       private List<String> termClasses = Arrays.asList(new String[]{\r
+                       ExtensionType.class.getName()\r
+       });\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.IEditorInput#getName()\r
+        */\r
+       @Override\r
+       public String getName() {\r
+               return "Extension Type";\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()\r
+        */\r
+       @Override\r
+       public List<String> getTermClasses() {\r
+               return termClasses;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()\r
+        */\r
+       @Override\r
+       public ExtensionType createTermInstance() {\r
+               return ExtensionType.NewInstance();\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java
new file mode 100644 (file)
index 0000000..da4c4d8
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java
@@ -0,0 +1,50 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import java.util.Arrays;\r
+import java.util.List;\r
+\r
+import eu.etaxonomy.cdm.model.description.Feature;\r
+/**\r
+ * @author l.morris\r
+ * @date 11 Jan 2012\r
+ *\r
+ */\r
+public class FeatureEditorInput extends AbstractDefinedTermEditorInput<Feature> {\r
+\r
+       private List<String> termClasses = Arrays.asList(new String[]{\r
+                       Feature.class.getName()\r
+       });\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.IEditorInput#getName()\r
+        */\r
+       @Override\r
+       public String getName() {\r
+               return "Feature";\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()\r
+        */\r
+       @Override\r
+       public List<String> getTermClasses() {\r
+               return termClasses;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#createTermInstance()\r
+        */\r
+       @Override\r
+       public Feature createTermInstance() {\r
+               return Feature.NewInstance();\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java
new file mode 100644 (file)
index 0000000..5bc6cb5
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java
@@ -0,0 +1,54 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import java.util.Arrays;\r
+import java.util.List;\r
+\r
+import eu.etaxonomy.cdm.model.common.MarkerType;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 6 Jan 2012\r
+ *\r
+ */\r
+public class MarkerTypeEditorInput extends AbstractDefinedTermEditorInput<MarkerType> {\r
+       \r
+       private List<String> termClasses = Arrays.asList(new String[]{\r
+                       MarkerType.class.getName()\r
+       });\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.IEditorInput#getName()\r
+        */\r
+       @Override\r
+       public String getName() {\r
+               return "Marker Type";\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()\r
+        */\r
+       @Override\r
+       public List<String> getTermClasses() {\r
+               return termClasses;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()\r
+        */\r
+       @Override\r
+       public MarkerType createTermInstance() {\r
+               return new MarkerType();\r
+       }\r
+       \r
+       \r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
new file mode 100644 (file)
index 0000000..5ce6ae3
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
@@ -0,0 +1,63 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import java.util.Arrays;\r
+import java.util.List;\r
+\r
+import org.eclipse.ui.IEditorInput;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.location.Continent;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.cdm.model.location.TdwgArea;\r
+import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 8 Dec 2011\r
+ *\r
+ */\r
+public class NamedAreaEditorInput extends AbstractDefinedTermEditorInput<NamedArea> {\r
+\r
+       private List<String> termClasses = Arrays.asList(new String[]{\r
+                       NamedArea.class.getName(), \r
+                       TdwgArea.class.getName(),\r
+                       WaterbodyOrCountry.class.getName(),\r
+                       Continent.class.getName()\r
+       });\r
+       \r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.IEditorInput#getName()\r
+        */\r
+       @Override\r
+       public String getName() {\r
+               return "Named Area";\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()\r
+        */\r
+       @Override\r
+       public List<String> getTermClasses() {\r
+               return termClasses;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()\r
+        */\r
+       @Override\r
+       public NamedArea createTermInstance() {\r
+                return NamedArea.NewInstance();\r
+       }\r
+       \r
+               \r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java
new file mode 100644 (file)
index 0000000..a379239
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java
@@ -0,0 +1,53 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.input;\r
+\r
+import java.util.Arrays;\r
+import java.util.List;\r
+\r
+import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 4 Jan 2012\r
+ *\r
+ */\r
+public class NamedAreaLevelEditorInput extends AbstractDefinedTermEditorInput<NamedAreaLevel> {\r
+\r
+       \r
+       private List<String> termClasses = Arrays.asList(new String[]{\r
+                       NamedAreaLevel.class.getName()\r
+       });\r
+       \r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.ui.IEditorInput#getName()\r
+        */\r
+       @Override\r
+       public String getName() {\r
+               return "Named Area Level";\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()\r
+        */\r
+       @Override\r
+       public List<String> getTermClasses() {\r
+               return termClasses;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()\r
+        */\r
+       @Override\r
+       public NamedAreaLevel createTermInstance() {\r
+               return NamedAreaLevel.NewInstance();\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
new file mode 100644 (file)
index 0000000..cc2512f
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
@@ -0,0 +1,97 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.operation;\r
+\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.operations.IUndoContext;\r
+import org.eclipse.core.runtime.IAdaptable;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.ui.IEditorInput;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.input.NamedAreaEditorInput;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 21 Dec 2011\r
+ *\r
+ */\r
+public class CreateDefinedTermOperation extends AbstractPostOperation {\r
+\r
+       \r
+\r
+       private TermBase parentTermBase;\r
+       private AbstractDefinedTermEditorInput editorInput; \r
+\r
+       /**\r
+        * @param label\r
+        * @param undoContext\r
+        * @param postOperationEnabled\r
+        */\r
+       public CreateDefinedTermOperation(String label,\r
+                       IUndoContext undoContext, TermBase termBase, IPostOperationEnabled postOperationEnabled) {\r
+               super(label, undoContext, postOperationEnabled);\r
+               this.parentTermBase = termBase;\r
+               editorInput = ((DefinedTermEditor)postOperationEnabled).getDefinedTermEditorInput();\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               \r
+               DefinedTermBase newTerm = editorInput.createTermInstance();                             \r
+               \r
+               newTerm.setLabel("Untitled");\r
+               \r
+               if (parentTermBase instanceof TermVocabulary){\r
+                       TermVocabulary vocabulary = (TermVocabulary) parentTermBase;\r
+                       vocabulary.addTerm(newTerm);\r
+               } else if (parentTermBase instanceof DefinedTermBase) {\r
+                       DefinedTermBase parent = (DefinedTermBase) parentTermBase;\r
+                       parent.addIncludes(newTerm);\r
+                       TermVocabulary vocabulary = parent.getVocabulary();\r
+                       vocabulary.addTerm(newTerm);\r
+               }\r
+               \r
+               return postExecute(newTerm);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
new file mode 100644 (file)
index 0000000..a8950ee
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
@@ -0,0 +1,79 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.operation;\r
+\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.operations.IUndoContext;\r
+import org.eclipse.core.runtime.IAdaptable;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+\r
+import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
+import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 21 Dec 2011\r
+ *\r
+ */\r
+public class CreateTermVocabularyOperation extends AbstractPostOperation {\r
+\r
+       private DefinedTermEditor definedTermEditor;\r
+\r
+       /**\r
+        * @param label\r
+        * @param undoContext\r
+        * @param postOperationEnabled\r
+        */\r
+       public CreateTermVocabularyOperation(String label,\r
+                       IUndoContext undoContext, DefinedTermEditor definedTermEditor) {\r
+               super(label, undoContext, definedTermEditor);\r
+               this.definedTermEditor = definedTermEditor;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+\r
+               TermVocabulary termVocabulary = OrderedTermVocabulary.NewInstance(null, "Untitled", null, null);\r
+               CdmStore.getService(IVocabularyService.class).save(termVocabulary);\r
+               definedTermEditor.getInMemoryVocabularies().add(termVocabulary);\r
+               \r
+               return postExecute(termVocabulary);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
new file mode 100644 (file)
index 0000000..11ced84
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
@@ -0,0 +1,120 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.operation;\r
+\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.operations.IUndoContext;\r
+import org.eclipse.core.runtime.IAdaptable;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Status;\r
+\r
+import eu.etaxonomy.cdm.api.service.ITermService;\r
+import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 22 Dec 2011\r
+ *\r
+ */\r
+public class DeleteTermBaseOperation extends AbstractPostOperation {\r
+\r
+       private TermBase termBase;\r
+       private DefinedTermEditor definedTermEditor;\r
+       /**\r
+        * @param label\r
+        * @param undoContext\r
+        * @param postOperationEnabled\r
+        */\r
+       public DeleteTermBaseOperation(String label, IUndoContext undoContext, TermBase termBase,\r
+                       DefinedTermEditor definedTermEditor) {\r
+               super(label, undoContext, definedTermEditor);\r
+               this.termBase = termBase;\r
+               this.definedTermEditor = definedTermEditor;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               \r
+               \r
+               \r
+               if (termBase instanceof TermVocabulary) {\r
+                       \r
+                       if (!((TermVocabulary)termBase).getTerms().isEmpty()) {\r
+                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Delete all terms from this vocaulary before deleting the vocabulary.");\r
+                               StoreUtil.warningDialog("Vocabulary not empty", termBase, status);\r
+                               return status;\r
+                       }\r
+                       definedTermEditor.getInMemoryVocabularies().remove(termBase);\r
+                       CdmStore.getService(IVocabularyService.class).delete((TermVocabulary)termBase);\r
+                       \r
+               } else if (termBase instanceof DefinedTermBase) {\r
+                       \r
+                       \r
+                       DefinedTermBase definedTermBase = (DefinedTermBase) termBase;\r
+                       if(!definedTermBase.getIncludes().isEmpty()){\r
+                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This term includes other terms. Please delete the included terms before deleting this term.");                            \r
+                               StoreUtil.warningDialog("Term has included terms", termBase, status);\r
+                               return status;\r
+                       } \r
+                                               \r
+                       DefinedTermBase partOf = definedTermBase.getPartOf();\r
+                       if(partOf != null){\r
+                               partOf.removeIncludes(definedTermBase);\r
+                       }\r
+                       \r
+                       DefinedTermBase kindOf = definedTermBase.getKindOf();\r
+                       if(kindOf != null){\r
+                               definedTermBase.removeGeneralization(kindOf);\r
+                       }\r
+                       \r
+                       TermVocabulary vocabulary = definedTermBase.getVocabulary();\r
+                       if(vocabulary != null){\r
+                               vocabulary.removeTerm(definedTermBase);\r
+                       }\r
+                       CdmStore.getService(ITermService.class).delete((DefinedTermBase)termBase);\r
+                       \r
+               }\r
+               \r
+               return postExecute(termBase);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
new file mode 100644 (file)
index 0000000..b68a850
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
@@ -0,0 +1,135 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.editor.definedterm.operation;\r
+\r
+import java.util.Collection;\r
+\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.commands.operations.IUndoContext;\r
+import org.eclipse.core.runtime.IAdaptable;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Status;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
+import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.store.StoreUtil;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 10 Jan 2012\r
+ *\r
+ */\r
+public class MoveDefinedTermOperation extends AbstractPostOperation {\r
+       \r
+       private Collection<DefinedTermBase> sourceTerms;// the actual DefinedTermBase(s) we are moving\r
+       private TermBase targetTermOrVocabulary;// the target VOCABULARY or DefinedTerm we are moving these to\r
+\r
+       /**\r
+        * @param label\r
+        * @param undoContext\r
+        * @param postOperationEnabled\r
+        */\r
+       public MoveDefinedTermOperation(String label, IUndoContext undoContext, TermBase target, Collection<DefinedTermBase> sourceTerms,\r
+                       IPostOperationEnabled postOperationEnabled) {\r
+               super(label, undoContext, postOperationEnabled);\r
+               \r
+               this.targetTermOrVocabulary = target;\r
+               this.sourceTerms = sourceTerms;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               \r
+               // need to make the moved DefinedTerm part of another DefinedTerm or Vocabulary (target)\r
+               // and remove it from old associations\r
+               \r
+               //TODO move to ITermService\r
+               \r
+               for (DefinedTermBase term : sourceTerms){\r
+                       // do nothing when moving it on itself\r
+                       if(targetTermOrVocabulary.equals(term)){\r
+                               Status status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Term can not be added to itself");\r
+                               StoreUtil.informationDialog("", status);\r
+                               return status;\r
+                       }\r
+                       \r
+                       if (targetTermOrVocabulary instanceof TermVocabulary) {\r
+                               TermVocabulary termVocabulary = (TermVocabulary)targetTermOrVocabulary;\r
+                               \r
+                               // do nothing when term is top level and gets added to the same vocabulary\r
+                               if(term.getPartOf() == null && termVocabulary.equals(term.getVocabulary())){\r
+                                       Status status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Term is already in this vocabulary");\r
+                                       StoreUtil.informationDialog("", status);\r
+                                       return status;\r
+                               }\r
+                               \r
+                               cleanTerm(term);\r
+                               termVocabulary.addTerm(term);\r
+                               \r
+                       } else if (targetTermOrVocabulary instanceof DefinedTermBase) {\r
+                               cleanTerm(term);\r
+                               DefinedTermBase targetDefinedTerm = (DefinedTermBase) targetTermOrVocabulary;\r
+                               targetDefinedTerm.addIncludes(term);\r
+                               targetDefinedTerm.getVocabulary().addTerm(term);                                \r
+                       }\r
+\r
+               }\r
+               //return null;\r
+               return postExecute(targetTermOrVocabulary);                     \r
+       }\r
+       \r
+       private DefinedTermBase cleanTerm(DefinedTermBase term){\r
+\r
+               DefinedTermBase partOf = term.getPartOf();\r
+               if(partOf != null){\r
+                       partOf.removeIncludes(term);\r
+               }\r
+       \r
+               \r
+               TermVocabulary vocabulary = term.getVocabulary();\r
+               if(vocabulary != null){\r
+                       vocabulary.removeTerm(term);\r
+               }\r
+               \r
+               return term;\r
+       }\r
+       \r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
+        */\r
+       @Override\r
+       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
+                       throws ExecutionException {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
index adac91b5195aa0396018173e6c4a776eac2e1b16..bd2a64f69a03cf292df153296008932969b7091c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
@@ -97,7 +97,7 @@ public class AvailableFeaturesWizardPage extends WizardPage {
         */
        private List<Feature> getAvailableFeatures(){
                
         */
        private List<Feature> getAvailableFeatures(){
                

-               List<Feature> preferredFeatures = CdmStore.getTermManager().getPreferredFeatures();
+               List<Feature> preferredFeatures = CdmStore.getTermManager().getPreferredTerms(Feature.class);

                
                for(Feature featureAlreadyInTree : featureTree.getDistinctFeatures()){
                        preferredFeatures.remove(featureAlreadyInTree);
                
                for(Feature featureAlreadyInTree : featureTree.getDistinctFeatures()){
                        preferredFeatures.remove(featureAlreadyInTree);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
index d90f953b34c5ca8d034af13b1cee76769068f935..60e2e4084303a197478f7d10be7d8f95b4760345 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.handler;
 
 
 package eu.etaxonomy.taxeditor.handler;
 

-import org.apache.log4j.Logger;

 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
index 4bf709a117199affb57cf7925904861132362b28..8ce48d376d7876e5480bf411bf1dc143a3e86997 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
@@ -25,7 +25,7 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
        /** {@inheritDoc} */
        public String getNameRelationTypeLabel(NameRelationshipType type) {
                List<NameRelationshipType> vocab = 
        /** {@inheritDoc} */
        public String getNameRelationTypeLabel(NameRelationshipType type) {
                List<NameRelationshipType> vocab = 

-                       TermStore.getNameRelationshipTypes();
+                       TermStore.getTerms(NameRelationshipType.class);

        
                for (NameRelationshipType type1 : vocab) {
                        if (type1.equals(type)) {
        
                for (NameRelationshipType type1 : vocab) {
                        if (type1.equals(type)) {


@@ -42,7 +42,7 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
        public String getNameRelationTypeInverseLabel(NameRelationshipType type) {
                
                List<NameRelationshipType> vocab = 
        public String getNameRelationTypeInverseLabel(NameRelationshipType type) {
                
                List<NameRelationshipType> vocab = 

-                       TermStore.getNameRelationshipTypes();
+                       TermStore.getTerms(NameRelationshipType.class);

 
                for (NameRelationshipType type1 : vocab) {
                        if (type1.equals(type)) {
 
                for (NameRelationshipType type1 : vocab) {
                        if (type1.equals(type)) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 6a18fa134f3c9f0d934a5ad68a6e9c61febf63f0..835ca848861e3ca54cf337cd585e213e8608ccf4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -49,6 +49,7 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
 import org.eclipse.ui.themes.ITheme;
 import org.eclipse.ui.themes.IThemeManager;
 
 import org.eclipse.ui.themes.ITheme;
 import org.eclipse.ui.themes.IThemeManager;
 

+import eu.etaxonomy.cdm.model.common.TermBase;

 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;


@@ -308,6 +309,11 @@ public abstract class AbstractUtility {
                });
        }
 
                });
        }
 

+       public static void informationDialog(final String title,
+                       final IStatus status) {
+               informationDialog(title, status.getMessage());
+       }
+       

        /**
         * <p>
         * warningDialog
        /**
         * <p>
         * warningDialog


@@ -332,6 +338,16 @@ public abstract class AbstractUtility {
                        }
                });
        }
                        }
                });
        }

+       
+       /**
+        * @param title
+        * @param termBase
+        * @param status
+        */
+       public static void warningDialog(String title, Object source,
+                       IStatus status) {
+               warningDialog(title, source, status.getMessage());
+       }

 
        /**
         * <p>
 
        /**
         * <p>


@@ -745,6 +761,11 @@ public abstract class AbstractUtility {
                log(status);
        }
        
                log(status);
        }
        

+       public static void warn(Class source, IStatus status) {
+               getLog4JLogger(source).warn(status.getMessage(), status.getException());
+               log(status);
+       }
+       

        public static void warn(Class source, Throwable t) {
                IStatus status = new Status(IStatus.WARNING, getPluginId(), t.getMessage(), t);
                getLog4JLogger(source).warn(t);
        public static void warn(Class source, Throwable t) {
                IStatus status = new Status(IStatus.WARNING, getPluginId(), t.getMessage(), t);
                getLog4JLogger(source).warn(t);


@@ -827,7 +848,7 @@ public abstract class AbstractUtility {
         * 
         * @return a {@link java.lang.String} object.
         */
         * 
         * @return a {@link java.lang.String} object.
         */

-       protected static String getPluginId() {
+       public static String getPluginId() {

                return "eu.taxeditor";
        }
 
                return "eu.taxeditor";
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
index 08dc15b31bfcc51fbee66b146c4898f38b058de2..a194b8fb92047a5ec2b80aac7e0c6a1bb3c40c69 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonRelationshipTypeInverseContainer.java
@@ -22,6 +22,10 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<DefinedTermBase> {
        
  */
 public class TaxonRelationshipTypeInverseContainer extends DefinedTermBase<DefinedTermBase> {
        

+       /**
+        * 
+        */
+       private static final long serialVersionUID = 7225140304186547675L;

        private boolean inverse;
        private TaxonRelationshipType type;
        
        private boolean inverse;
        private TaxonRelationshipType type;
        

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java
index 8380858886ed36e586cd4c07fa0cc8ed23cfd6b3..e1a6b959c7b3b4c3ac3071c24029aa81900c0f59 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java
@@ -81,7 +81,7 @@ public class LanguagePreferencePage extends PreferencePage implements IWorkbench
                
                final Combo combo_globalLanguage = new Combo(composite, SWT.NONE); 
                
                
                final Combo combo_globalLanguage = new Combo(composite, SWT.NONE); 
                

-               List<Language> preferredLanguages = CdmStore.getTermManager().getPreferredLanguages();
+               List<Language> preferredLanguages = CdmStore.getTermManager().getPreferredTerms(Language.class);

                
                for(int i = 0; i < preferredLanguages.size(); i++){
                        Language language = preferredLanguages.get(i);
                
                for(int i = 0; i < preferredLanguages.size(); i++){
                        Language language = preferredLanguages.get(i);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 4035427827ecf26aa797c1996c42799a29307631..ca321d13724370020c073fcd6f54f377d53efff7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -483,7 +483,7 @@ public class PreferencesUtil implements IPreferenceKeys {
         */
        public static Map<MarkerType, Boolean> getEditMarkerTypePreferences() {
                List<MarkerType> markerTypes = CdmStore.getTermManager()
         */
        public static Map<MarkerType, Boolean> getEditMarkerTypePreferences() {
                List<MarkerType> markerTypes = CdmStore.getTermManager()

-                               .getPreferredMarkerTypes();
+                               .getPreferredTerms(MarkerType.class);

 
                Map<MarkerType, Boolean> result = new HashMap<MarkerType, Boolean>();
 
 
                Map<MarkerType, Boolean> result = new HashMap<MarkerType, Boolean>();
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
index 75e164d7352187a75bcbb33c31cdefefba1348fd..f78483bd64ade4007c5559700ee8bb91f2b0d4d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java
@@ -15,13 +15,17 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
 import java.util.Iterator;
 import java.util.List;
 

+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.IParameter;
+import org.eclipse.core.commands.Parameterization;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;

 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;


@@ -33,16 +37,21 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;

+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+import org.eclipse.ui.internal.commands.Parameter;

 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;

+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;

 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.wizard.VocabularyTermWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.wizard.VocabularyTermWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>Abstract AbstractMenuPreferences class.</p>
 
 /**
  * <p>Abstract AbstractMenuPreferences class.</p>


@@ -87,7 +96,9 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                setDescription(description);
        }
        
                setDescription(description);
        }
        

-       protected abstract List<T> getTerms();
+       protected List<T> getTerms(){
+               return TermStore.getTerms(getTermClass());
+       }

 
        /**
         * {@inheritDoc}
 
        /**
         * {@inheritDoc}


@@ -178,24 +189,12 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
         * @param buttonContainer a {@link org.eclipse.swt.widgets.Composite} object.
         */
        protected void createEditButtons(Composite buttonContainer) {
         * @param buttonContainer a {@link org.eclipse.swt.widgets.Composite} object.
         */
        protected void createEditButtons(Composite buttonContainer) {

-               newButton = new Button(buttonContainer, SWT.PUSH);
-               newButton.setText("New");
-               newButton.setLayoutData(new GridData(SWT.FILL));

 
 

-               

                editButton = new Button(buttonContainer, SWT.PUSH);
                editButton = new Button(buttonContainer, SWT.PUSH);

-               editButton.setText("Edit");
+               editButton.setText("Open Term Editor");

                editButton.setLayoutData(new GridData(SWT.FILL));
 
                editButton.setLayoutData(new GridData(SWT.FILL));
 

-               
-               removeButton = new Button(buttonContainer, SWT.PUSH);
-               removeButton.setText("Remove");
-               removeButton.setLayoutData(new GridData(SWT.FILL));
-
-               
-               addNewButtonListeners();

                addEditButtonListeners();
                addEditButtonListeners();

-               addDeleteButtonListeners();

        }
 
        /**
        }
 
        /**


@@ -231,59 +230,43 @@ public abstract class AbstractMenuPreferences<T extends DefinedTermBase> extends
                         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
                         */
                        @Override
                         * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
                         */
                        @Override

-                       public void widgetSelected(SelectionEvent e) {
-                               T selection = (T) ((StructuredSelection) tableViewer.getSelection()).getFirstElement();
+                       public void widgetSelected(SelectionEvent event) {

                                
                                

-                               if(selection == null){
-                                       StoreUtil.informationDialog("Nothing selected", "Please select a term to edit.");
-                                       return;
-                               }
+                               ICommandService commandService = (ICommandService)  StoreUtil.getService(ICommandService.class);
+
+                               Command command = commandService.getCommand(DefinedTermEditor.OPEN_COMMAND_ID);

                                
                                

-                               VocabularyTermWizard<T> wizard = new VocabularyTermWizard<T>(getTermClass(), selection, getConversationHolder()); 
+                               IParameter parameter;
+                               try {
+                                       parameter = command.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter");

                                
                                

-                               WizardDialog dialog = new WizardDialog(StoreUtil.getShell(), wizard);
-                           
-                               if(dialog.open() == IStatus.OK){                            
-                                   tableViewer.setInput(getTerms());
-                                   tableViewer.reveal(selection);
-                           }
-                       }
-               });
-       }
-       
-       /**
-        * Implement this method in MenuPreference Pages where the vocabulary should be editable, editable flag
-        * is set.
-        */
-       protected void addDeleteButtonListeners() {
-               removeButton.addSelectionListener(new SelectionAdapter(){
-                       /* (non-Javadoc)
-                        * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-                        */
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               boolean confirmation = StoreUtil.confirmDialog("Confirm deletion", "Do you really want to delete the selected terms?");
-                               
-                               if(confirmation){
-                                       IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
+                                       Parameterization[] parameterizations = new Parameterization[]{
+                                                       new Parameterization(parameter, getTermClass().getName())
+                                       };

                                        
                                        

-                                       Iterator<T> selectionIterator = selection.iterator();
+                                       ParameterizedCommand pCommand = new ParameterizedCommand(command, parameterizations);

                                        
                                        

-                                       while(selectionIterator.hasNext()){
-                                               T term = selectionIterator.next();
-
-                                               tableViewer.remove(term);
-                                               
-                                               if(getConversationHolder().getSessionHolder().getSession().contains(term)){
-                                                       ITermService service = CdmStore.getService(ITermService.class);
-                                                       DefinedTermBase theTerm = service.load(term.getUuid());
-                                                       
-                                                       service.delete(theTerm);
+                                       if (command.isEnabled()) {
+                                               IHandlerService handlerService = (IHandlerService) StoreUtil.getService(IHandlerService.class);
+                                               try {
+                                                       handlerService.executeCommand(pCommand, null);
+                                               } catch (NotDefinedException e) {
+                                                       throw new RuntimeException("Could not find open command: "
+                                                                       + DefinedTermEditor.OPEN_COMMAND_ID);
+                                               } catch (Exception e) {
+                                                       StoreUtil
+                                                                       .error(getClass(),
+                                                                                       "An exception occured while trying to open a selection",
+                                                                                       e);

                                                }
                                        }
                                                }
                                        }

-                                       
-//                                     tableViewer.refresh();
+                               } catch (NotDefinedException e) {
+                                       StoreUtil
+                                       .error(getClass(),
+                                                       "An exception occured while trying to open the Term Editor",
+                                                       e);

                                }
                                }

+                               

                        }
                });
        }
                        }
                });
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/ExtensionTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/ExtensionTypeMenuPreferences.java
index 0c00d5540414d25c9c8065dbcac0dd5c14702a8b..3f752f5368609e55d3d7ce0e13f1e283c804fec4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/ExtensionTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/ExtensionTypeMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.model.common.ExtensionType;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>ExtensionTypeMenuPreferences class.</p>
 
 /**
  * <p>ExtensionTypeMenuPreferences class.</p>


@@ -30,7 +27,7 @@ public class ExtensionTypeMenuPreferences extends AbstractMenuPreferences<Extens
        public ExtensionTypeMenuPreferences() {
                super("Extension Type Preferences" , 
                                "Choose which extension types to display",
        public ExtensionTypeMenuPreferences() {
                super("Extension Type Preferences" , 
                                "Choose which extension types to display",

-                               true);
+                               false);

        }
 
        /* (non-Javadoc)
        }
 
        /* (non-Javadoc)


@@ -41,12 +38,4 @@ public class ExtensionTypeMenuPreferences extends AbstractMenuPreferences<Extens
        protected Class<ExtensionType> getTermClass() {
                return ExtensionType.class;
        }
        protected Class<ExtensionType> getTermClass() {
                return ExtensionType.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<ExtensionType> getTerms() {
-               return TermStore.getExtensionTypes();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java
index 0375bf2a8f692c236cbcbaf1f02b8f9ba774d0d7..a228ef6a698d70d4019644ac8a69eb4904332d3a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/FeatureMenuPreferences.java
@@ -8,10 +8,7 @@
 */
 package eu.etaxonomy.taxeditor.preference.menu;
 
 */
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.Feature;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>FeatureMenuPreferences class.</p>
 
 /**
  * <p>FeatureMenuPreferences class.</p>


@@ -32,7 +29,7 @@ public class FeatureMenuPreferences extends AbstractMenuPreferences<Feature> {
        public FeatureMenuPreferences() {
                super("Feature Preferences", 
                                "Choose which features you would like to use for descriptive elements.", 
        public FeatureMenuPreferences() {
                super("Feature Preferences", 
                                "Choose which features you would like to use for descriptive elements.", 

-                               true);
+                               false);

        }
 
        /* (non-Javadoc)
        }
 
        /* (non-Javadoc)


@@ -43,12 +40,4 @@ public class FeatureMenuPreferences extends AbstractMenuPreferences<Feature> {
        protected Class<Feature> getTermClass() {
                return Feature.class;
        }
        protected Class<Feature> getTermClass() {
                return Feature.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<Feature> getTerms() {
-               return TermStore.getFeatures();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java
index e630441c997dc066a83fa3bf381f043a8887528f..b355fc4fa338148f8fcc73eebbc56b78436427be 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.ViewerComparator;


@@ -20,7 +18,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.cdm.model.common.Language;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>LanguageMenuPreferences class.</p>
 
 /**
  * <p>LanguageMenuPreferences class.</p>


@@ -87,12 +84,4 @@ public class LanguageMenuPreferences extends AbstractMenuPreferences<Language> {
        protected Class<Language> getTermClass() {
                return Language.class;
        }
        protected Class<Language> getTermClass() {
                return Language.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<Language> getTerms() {
-               return TermStore.getLanguages();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
index 406ae6162621c21459ccfe5df1b5b40a568d89f7..0fc47e1a93f2f29f3bee31e920dff19bed229fa0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.MarkerType;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>MarkerTypeMenuPreferences class.</p>
 
 /**
  * <p>MarkerTypeMenuPreferences class.</p>


@@ -41,12 +38,4 @@ public class MarkerTypeMenuPreferences extends AbstractMenuPreferences<MarkerTyp
        protected Class<MarkerType> getTermClass() {
                return MarkerType.class;
        }
        protected Class<MarkerType> getTermClass() {
                return MarkerType.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<MarkerType> getTerms() {
-               return TermStore.getNonTechnicalMarkerTypes();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
index 545fe62f96a3a78083d786e042499cb25a3b6009..f664e5f5f0c3591e49a942d48002b228f18624dc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
@@ -3,10 +3,7 @@
  */
 package eu.etaxonomy.taxeditor.preference.menu;
 
  */
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>MeasurementUnitMenuPreferences class.</p>
 
 /**
  * <p>MeasurementUnitMenuPreferences class.</p>


@@ -34,12 +31,4 @@ public class MeasurementUnitMenuPreferences extends AbstractMenuPreferences<Meas
                return MeasurementUnit.class;
        }
 
                return MeasurementUnit.class;
        }
 

-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<MeasurementUnit> getTerms() {
-               return TermStore.getMeasurementUnits();
-       }
-

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java
index 5cb22dc4e90e3bb654b6dd72a0b27398b228fad4..0e8184895184c89d942ba288e3828f50c47893b6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java
@@ -10,8 +10,6 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;


@@ -20,7 +18,6 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.taxeditor.labels.ILabelImageStrategy;
 import eu.etaxonomy.taxeditor.labels.LabelImageProvider;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.labels.ILabelImageStrategy;
 import eu.etaxonomy.taxeditor.labels.LabelImageProvider;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>NameRelationshipTypeMenuPreferences class.</p>
 
 /**
  * <p>NameRelationshipTypeMenuPreferences class.</p>


@@ -97,12 +94,4 @@ public class NameRelationshipTypeMenuPreferences extends
        protected Class<NameRelationshipType> getTermClass() {
                return NameRelationshipType.class;
        }
        protected Class<NameRelationshipType> getTermClass() {
                return NameRelationshipType.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<NameRelationshipType> getTerms() {
-               return TermStore.getNameRelationshipTypes();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java
index bfdd50f744dfd2f1d1a960aed24aad83c42841d9..715258774a5dbcf2343d6f45386919e762e4ff8e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameTypeDesignationStatusMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>NameTypeDesignationStatusMenuPreferences class.</p>
 
 /**
  * <p>NameTypeDesignationStatusMenuPreferences class.</p>


@@ -42,12 +39,4 @@ public class NameTypeDesignationStatusMenuPreferences extends
                return NameTypeDesignationStatus.class;
        }
 
                return NameTypeDesignationStatus.class;
        }
 

-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<NameTypeDesignationStatus> getTerms() {
-               return TermStore.getNameTypeDesignationStatus();
-       }
-

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java
index 335e293d7f98cc97f6009800110f3b341a62cf19..b24c6d941931c37e363029efeee6b060e6c39a0f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.location.NamedAreaType;
 import eu.etaxonomy.cdm.model.location.NamedAreaType;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>NamedAreaTypeMenuPreferences class.</p>
 
 /**
  * <p>NamedAreaTypeMenuPreferences class.</p>


@@ -30,7 +27,7 @@ public class NamedAreaTypeMenuPreferences extends AbstractMenuPreferences<NamedA
        public NamedAreaTypeMenuPreferences() {
                super("Named Area Types", 
                                "Edit displayed named area types", 
        public NamedAreaTypeMenuPreferences() {
                super("Named Area Types", 
                                "Edit displayed named area types", 

-                               true);
+                               false);

        }
 
        /* (non-Javadoc)
        }
 
        /* (non-Javadoc)


@@ -41,12 +38,4 @@ public class NamedAreaTypeMenuPreferences extends AbstractMenuPreferences<NamedA
        protected Class<NamedAreaType> getTermClass() {
                return NamedAreaType.class;
        }
        protected Class<NamedAreaType> getTermClass() {
                return NamedAreaType.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<NamedAreaType> getTerms() {
-               return TermStore.getNamedAreaTypes();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalStatusTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalStatusTypeMenuPreferences.java
index 4ec3a86fc11697249268bf85ecce1f5f344950ad..e947a269c95213b9f85187cc6118fd37efe1b5fe 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalStatusTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalStatusTypeMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>NomenclaturalStatusTypeMenuPreferences class.</p>
 
 /**
  * <p>NomenclaturalStatusTypeMenuPreferences class.</p>


@@ -42,13 +39,5 @@ public class NomenclaturalStatusTypeMenuPreferences extends
        protected Class<NomenclaturalStatusType> getTermClass() {
                return NomenclaturalStatusType.class;
        }
        protected Class<NomenclaturalStatusType> getTermClass() {
                return NomenclaturalStatusType.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<NomenclaturalStatusType> getTerms() {
-               return TermStore.getNomenclaturalStatusTypes();
-       }

        
 }
        
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PresenceAbsenceMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PresenceAbsenceMenuPreferences.java
index 8a5c7b669219f5f5f4e9499a229c8c8ab88180d8..d71ae560b7b652cb2b530914da241c97ce31c930 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PresenceAbsenceMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PresenceAbsenceMenuPreferences.java
@@ -10,12 +10,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import org.eclipse.ui.IWorkbenchPreferencePage;
 
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>PresenceAbsenceMenuPreferences class.</p>
 
 /**
  * <p>PresenceAbsenceMenuPreferences class.</p>


@@ -44,13 +41,5 @@ public class PresenceAbsenceMenuPreferences extends AbstractMenuPreferences<Pres
        protected Class<PresenceAbsenceTermBase> getTermClass() {
                return PresenceAbsenceTermBase.class;
        }
        protected Class<PresenceAbsenceTermBase> getTermClass() {
                return PresenceAbsenceTermBase.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<PresenceAbsenceTermBase> getTerms() {
-               return TermStore.getPresenceAbsenceTerms();
-       }

        
 }
        
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
index 40486bfe3444b96fc995e1ef1f50bc11c5128e49..9459ed7a60884e0cdb6b8ab32e7dc99506b08b49 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>PreservationMethodMenuPreferences class.</p>
 
 /**
  * <p>PreservationMethodMenuPreferences class.</p>


@@ -41,12 +38,4 @@ public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<P
        protected Class<PreservationMethod> getTermClass() {
                return PreservationMethod.class;
        }
        protected Class<PreservationMethod> getTermClass() {
                return PreservationMethod.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<PreservationMethod> getTerms() {
-               return TermStore.getPreservationMethods();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java
index 78a40b855648a5e44b23f21a22aac194e838fe19..9c16f51bc247eae4ffd2951c40f0dccf067db178 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/RankMenuPreferences.java
@@ -8,8 +8,6 @@
 */
 package eu.etaxonomy.taxeditor.preference.menu;
 
 */
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;


@@ -19,7 +17,6 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
 
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * Allows the user to choose which <code>Rank</code>s to display in the
 
 /**
  * Allows the user to choose which <code>Rank</code>s to display in the


@@ -52,8 +49,6 @@ public class RankMenuPreferences extends AbstractMenuPreferences<Rank> implement
        @Override
        protected void createAdditionalContent(Composite container) {
                
        @Override
        protected void createAdditionalContent(Composite container) {
                

-               // TODO create option to sort ranks either alphabetically or hierarchically (asc- or descending)
-               

                final Button checkbox = new Button(container, SWT.CHECK);
                checkbox.setText("Sort ranks hierarchically (default is alphabetically)");
                
                final Button checkbox = new Button(container, SWT.CHECK);
                checkbox.setText("Sort ranks hierarchically (default is alphabetically)");
                


@@ -66,7 +61,7 @@ public class RankMenuPreferences extends AbstractMenuPreferences<Rank> implement
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                PreferencesUtil.setSortRanksHierarchichally(checkbox.getSelection());
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                PreferencesUtil.setSortRanksHierarchichally(checkbox.getSelection());

-                               refresh(TermStore.getRanks());
+                               refresh(getTerms());

                        }
                });
                
                        }
                });
                


@@ -81,12 +76,4 @@ public class RankMenuPreferences extends AbstractMenuPreferences<Rank> implement
                return Rank.class;
        }
 
                return Rank.class;
        }
 

-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<Rank> getTerms() {
-               return TermStore.getRanks();
-       }
-

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java
index aa132d05146d9851a91ce9219c8151b0429644f7..5291ae7a3f199a65b943ff8e03d29a5dfedf4445 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/SpecimenTypeDesignationStatusMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>SpecimenTypeDesignationStatusMenuPreferences class.</p>
 
 /**
  * <p>SpecimenTypeDesignationStatusMenuPreferences class.</p>


@@ -42,12 +39,4 @@ public class SpecimenTypeDesignationStatusMenuPreferences extends
                return SpecimenTypeDesignationStatus.class;
        }
 
                return SpecimenTypeDesignationStatus.class;
        }
 

-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<SpecimenTypeDesignationStatus> getTerms() {
-               return TermStore.getSpecimenTypeDesignationStatus();
-       }
-

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
index 5185f29450c43c8385a49e41b2b4c0ec8e081ee6..82c3707254f082f19411f3fc67eae019241a9261 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.description.Stage;
 import eu.etaxonomy.cdm.model.description.Stage;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>StageMenuPreferences class.</p>
 
 /**
  * <p>StageMenuPreferences class.</p>


@@ -42,11 +39,4 @@ public class StageMenuPreferences extends AbstractMenuPreferences<Stage> {
                return Stage.class;
        }
 
                return Stage.class;
        }
 

-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<Stage> getTerms() {
-               return TermStore.getStages();
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java
index 243eb00f028ddafd7821a0f9eb34b8e8af37ed66..6bb9724a7421f04f8696e21026014720a5139254 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java
@@ -10,10 +10,7 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
 
 package eu.etaxonomy.taxeditor.preference.menu;
 

-import java.util.List;
-

 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

-import eu.etaxonomy.taxeditor.store.TermStore;

 
 /**
  * <p>TaxonRelationshipTypeMenuPreferences class.</p>
 
 /**
  * <p>TaxonRelationshipTypeMenuPreferences class.</p>


@@ -42,13 +39,5 @@ public class TaxonRelationshipTypeMenuPreferences extends
        protected Class<TaxonRelationshipType> getTermClass() {
                return TaxonRelationshipType.class;
        }
        protected Class<TaxonRelationshipType> getTermClass() {
                return TaxonRelationshipType.class;
        }

-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTerms()
-        */
-       @Override
-       protected List<TaxonRelationshipType> getTerms() {
-               return TermStore.getTaxonRelationshipTypes();
-       }

        
 }
        
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
index 55fdc632fdccb09e4a5d214b4771e7c128186fca..f5c4c7d318672bd210212775e8044d94e23d3522 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
@@ -14,10 +14,12 @@ import java.util.UUID;
 
 import org.eclipse.core.commands.operations.IOperationHistory;
 import org.eclipse.core.commands.operations.IUndoContext;
 
 import org.eclipse.core.commands.operations.IOperationHistory;
 import org.eclipse.core.commands.operations.IUndoContext;

+import org.eclipse.core.runtime.IStatus;

 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 

+import eu.etaxonomy.cdm.model.common.TermBase;

 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 


@@ -76,7 +78,7 @@ public class StoreUtil extends AbstractUtility {
         *
         * @return a {@link java.lang.String} object.
         */
         *
         * @return a {@link java.lang.String} object.
         */

-       protected static String getPluginId(){
+       public static String getPluginId(){

                return TaxeditorStorePlugin.PLUGIN_ID;
        }
 
                return TaxeditorStorePlugin.PLUGIN_ID;
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
index 87322c4710f20869b228b7e6e1e26f1579e2a4f6..9290201b4d889399ae512e6a9790fcfede76d671 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
@@ -11,7 +11,6 @@
 package eu.etaxonomy.taxeditor.store;
 
 import java.util.ArrayList;
 package eu.etaxonomy.taxeditor.store;
 
 import java.util.ArrayList;

-import java.util.Arrays;

 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;


@@ -21,32 +20,9 @@ import java.util.UUID;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IMemento;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IMemento;
 

-import eu.etaxonomy.cdm.model.common.AnnotationType;

 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;

-import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.MarkerType;

 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;

-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.MeasurementUnit;
-import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
-import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.cdm.model.description.Stage;
-import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
-import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.cdm.model.media.RightsTerm;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;

-import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann


@@ -68,6 +44,15 @@ public class TermManager extends ContextListenerAdapter{
                CdmStore.getContextManager().addContextListener(this);
        }
        
                CdmStore.getContextManager().addContextListener(this);
        }
        

+       /**
+        * 
+        * @param clazz
+        * @return
+        */
+       public <T extends DefinedTermBase> List<T> getPreferredTerms(Class<T> clazz){
+               return getFilteredTerms(TermStore.getTerms(clazz));
+       }
+       

        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.ContextListenerAdapter#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
         */
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.ContextListenerAdapter#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
         */


@@ -156,191 +141,202 @@ public class TermManager extends ContextListenerAdapter{
                return initialTerms.iterator().next().getClass().getName();
        }
        
                return initialTerms.iterator().next().getClass().getName();
        }
        

-       /**
-        * <p>getPreferredSpecimenTypeDesignationStatus</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<SpecimenTypeDesignationStatus> getPreferredSpecimenTypeDesignationStatus() { return getFilteredTerms(TermStore.getSpecimenTypeDesignationStatus());}
-
-       /**
-        * <p>getPreferredNameTypeDesignationStatus</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<NameTypeDesignationStatus> getPreferredNameTypeDesignationStatus() { return getFilteredTerms(TermStore.getNameTypeDesignationStatus()); }
-       
-       /**
-        * <p>getPreferredTaxonRelationshipTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<TaxonRelationshipType> getPreferredTaxonRelationshipTypes() { return getFilteredTerms(TermStore.getTaxonRelationshipTypes());}
-       
-       private static List<TaxonRelationshipType> excludeTaxonRelationshipTypes = Arrays.asList(new TaxonRelationshipType[]{
-                       TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN(),
-                       TaxonRelationshipType.MISAPPLIED_NAME_FOR(),
-                       TaxonRelationshipType.ALL_RELATIONSHIPS()
-       });
-       
-       /**
-        * Please note that the {@link TaxonRelationshipType}s TAXONOMICALLY_INCLUDED_IN, MISAPPLIED_NAME_FOR and ALL_RELATIONSHIPS
-        * are filtered out as they are most likely not needed. If you do need them please refactor this method to your needs.
-        * 
-        * @return a list of {@link TaxonRelationshipTypeInverseContainer} elements
-        */
-       public List<TaxonRelationshipTypeInverseContainer> getRelationshipTypesWithInverses(){
-               List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<TaxonRelationshipTypeInverseContainer>();
-               
-               List<TaxonRelationshipType> relationshipTypes = getPreferredTaxonRelationshipTypes();
-               
-               relationshipTypes.removeAll(excludeTaxonRelationshipTypes);
-               
-               for (TaxonRelationshipType relationshipType : relationshipTypes){
-                       if(!relationshipType.isSymmetric()){
-                               TaxonRelationshipTypeInverseContainer inverseContainer = new TaxonRelationshipTypeInverseContainer(relationshipType, true);
-                               relationshipTypeInverseContainers.add(inverseContainer);
-                       }                       
-                       TaxonRelationshipTypeInverseContainer container = new TaxonRelationshipTypeInverseContainer(relationshipType, false);
-                       relationshipTypeInverseContainers.add(container);                       
-               }               
-               
-               return relationshipTypeInverseContainers;
-       }
-       
-       /**
-        * <p>getPreferredFeatures</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<Feature> getPreferredFeatures() { return getFilteredTerms(TermStore.getFeatures());}
-
-       /**
-        * <p>getPreferredRanks</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<Rank> getPreferredRanks() { return getFilteredTerms(TermStore.getRanks());}
-       
-       /**
-        * <p>getPreferredPresenceAbsenceTerms</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<PresenceAbsenceTermBase> getPreferredPresenceAbsenceTerms(){ return getFilteredTerms(TermStore.getPresenceAbsenceTerms());}
-       
-       /**
-        * <p>getPreferredNomenclaturalStatusTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<NomenclaturalStatusType> getPreferredNomenclaturalStatusTypes(){    return getFilteredTerms(TermStore.getNomenclaturalStatusTypes());}
-       
-       /**
-        * <p>getPreferredNameRelationshipTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<NameRelationshipType> getPreferredNameRelationshipTypes(){ return getFilteredTerms(TermStore.getNameRelationshipTypes());}
-       
-       /**
-        * <p>getPreferredLanguages</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<Language> getPreferredLanguages() { return getFilteredTerms(TermStore.getLanguages()); }
-       
-       /**
-        * <p>getPreferredMarkerTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<MarkerType> getPreferredMarkerTypes() { return getFilteredTerms(TermStore.getNonTechnicalMarkerTypes()); }
-       
-       /**
-        * <p>getPreferredExtensionTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<ExtensionType> getPreferredExtensionTypes() { return getFilteredTerms(TermStore.getExtensionTypes()); }
-       
-       /**
-        * <p>getPreferredRightsTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<RightsTerm> getPreferredRightsTypes() {     return getFilteredTerms(TermStore.getRightsTypes());}
-       
-       /**
-        * <p>getPreferredNamedAreaTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<NamedAreaType> getPreferredNamedAreaTypes() { return getFilteredTerms(TermStore.getNamedAreaTypes()); } 
+//     /**
+//      * <p>getPreferredSpecimenTypeDesignationStatus</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<SpecimenTypeDesignationStatus> getPreferredSpecimenTypeDesignationStatus() { return getFilteredTerms(TermStore.getSpecimenTypeDesignationStatus());}
+//
+//     /**
+//      * <p>getPreferredNameTypeDesignationStatus</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<NameTypeDesignationStatus> getPreferredNameTypeDesignationStatus() { return getFilteredTerms(TermStore.getNameTypeDesignationStatus()); }
+//     
+//     /**
+//      * <p>getPreferredTaxonRelationshipTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<TaxonRelationshipType> getPreferredTaxonRelationshipTypes() { return getFilteredTerms(TermStore.getTaxonRelationshipTypes());}
+//     
+//     private static List<TaxonRelationshipType> excludeTaxonRelationshipTypes = Arrays.asList(new TaxonRelationshipType[]{
+//                     TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN(),
+//                     TaxonRelationshipType.MISAPPLIED_NAME_FOR(),
+//                     TaxonRelationshipType.ALL_RELATIONSHIPS()
+//     });
+//     
+//     /**
+//      * Please note that the {@link TaxonRelationshipType}s TAXONOMICALLY_INCLUDED_IN, MISAPPLIED_NAME_FOR and ALL_RELATIONSHIPS
+//      * are filtered out as they are most likely not needed. If you do need them please refactor this method to your needs.
+//      * 
+//      * @return a list of {@link TaxonRelationshipTypeInverseContainer} elements
+//      */
+//     public List<TaxonRelationshipTypeInverseContainer> getPreferredRelationshipTypesWithInverses(){
+//             List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<TaxonRelationshipTypeInverseContainer>();
+//             
+//             List<TaxonRelationshipType> relationshipTypes = getPreferredTaxonRelationshipTypes();
+//             
+//             relationshipTypes.removeAll(excludeTaxonRelationshipTypes);
+//             
+//             for (TaxonRelationshipType relationshipType : relationshipTypes){
+//                     if(!relationshipType.isSymmetric()){
+//                             TaxonRelationshipTypeInverseContainer inverseContainer = new TaxonRelationshipTypeInverseContainer(relationshipType, true);
+//                             relationshipTypeInverseContainers.add(inverseContainer);
+//                     }                       
+//                     TaxonRelationshipTypeInverseContainer container = new TaxonRelationshipTypeInverseContainer(relationshipType, false);
+//                     relationshipTypeInverseContainers.add(container);                       
+//             }               
+//             
+//             return relationshipTypeInverseContainers;
+//     }

        
        

-       /**
-        * <p>getPreferredAnnotationTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<AnnotationType> getPreferredAnnotationTypes() { return getFilteredTerms(TermStore.getAnnotationTypes()); } 

 
 

-       /**
-        * <p>getPreferredStages</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<Stage> getPreferredStages() { return getFilteredTerms(TermStore.getStages()); }

        
        

-       /**
-        * <p>getPreferredPreservationMethods</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<PreservationMethod> getPreferredPreservationMethods() { return getFilteredTerms(TermStore.getPreservationMethods()); }
-       
-       /**
-        * <p>getPreferredMeasurementUnits</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<MeasurementUnit> getPreferredMeasurementUnits() { return getFilteredTerms(TermStore.getMeasurementUnits()); }
-       
-       /**
-        * <p>getPreferredStates</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<State> getPreferredStates() { return getFilteredTerms(TermStore.getStates()); }
-       
-       /**
-        * <p>getPreferredModifiers</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<Modifier> getPreferredModifiers() { return getFilteredTerms(TermStore.getModifiers()); }
-       
-       /**
-        * <p>getPreferredStatisticalMeasures</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<StatisticalMeasure> getPreferredStatisticalMeasures() { return getFilteredTerms(TermStore.getStatisticalMeasures()); }
-       
-       /**
-        * <p>getPreferredScopes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<Scope> getPreferredScopes() { return getFilteredTerms(TermStore.getScopes()); }
-       
-       /**
-        * <p>getPreferredDeterminationModifiers</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public List<DeterminationModifier> getPreferredDeterminationModifiers() { return getFilteredTerms(TermStore.getDeterminationModifiers()); }

        
        

+//     
+//     /**
+//      * <p>getPreferredFeatures</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<Feature> getPreferredFeatures() { return getFilteredTerms(TermStore.getFeatures());}
+//
+//     /**
+//      * <p>getPreferredRanks</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<Rank> getPreferredRanks() { return getFilteredTerms(TermStore.getRanks());}
+//     
+//     /**
+//      * <p>getPreferredPresenceAbsenceTerms</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<PresenceAbsenceTermBase> getPreferredPresenceAbsenceTerms(){ return getFilteredTerms(TermStore.getPresenceAbsenceTerms());}
+//     
+//     /**
+//      * <p>getPreferredNomenclaturalStatusTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<NomenclaturalStatusType> getPreferredNomenclaturalStatusTypes(){    return getFilteredTerms(TermStore.getNomenclaturalStatusTypes());}
+//     
+//     /**
+//      * <p>getPreferredNameRelationshipTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<NameRelationshipType> getPreferredNameRelationshipTypes(){ return getFilteredTerms(TermStore.getNameRelationshipTypes());}
+//     
+//     /**
+//      * <p>getPreferredLanguages</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<Language> getPreferredLanguages() { return getFilteredTerms(TermStore.getLanguages()); }
+//     
+//     /**
+//      * <p>getPreferredMarkerTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<MarkerType> getPreferredMarkerTypes() { return getFilteredTerms(TermStore.getNonTechnicalMarkerTypes()); }
+//     
+//     /**
+//      * <p>getPreferredExtensionTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<ExtensionType> getPreferredExtensionTypes() { return getFilteredTerms(TermStore.getExtensionTypes()); }
+//     
+//     /**
+//      * <p>getPreferredRightsTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<RightsTerm> getPreferredRightsTypes() {     return getFilteredTerms(TermStore.getRightsTypes());}
+//     
+//     /**
+//      * <p>getPreferredNamedAreaTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<NamedAreaType> getPreferredNamedAreaTypes() { return getFilteredTerms(TermStore.getNamedAreaTypes()); } 
+//     
+//     /**
+//      * <p>getPreferredNamedAreaTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<NamedAreaLevel> getPreferredNamedAreaLevels() { return getFilteredTerms(TermStore.getNamedAreaLevels()); } 
+//     
+//     /**
+//      * <p>getPreferredAnnotationTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<AnnotationType> getPreferredAnnotationTypes() { return getFilteredTerms(TermStore.getAnnotationTypes()); } 
+//
+//     /**
+//      * <p>getPreferredStages</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<Stage> getPreferredStages() { return getFilteredTerms(TermStore.getStages()); }
+//     
+//     /**
+//      * <p>getPreferredPreservationMethods</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<PreservationMethod> getPreferredPreservationMethods() { return getFilteredTerms(TermStore.getPreservationMethods()); }
+//     
+//     /**
+//      * <p>getPreferredMeasurementUnits</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<MeasurementUnit> getPreferredMeasurementUnits() { return getFilteredTerms(TermStore.getMeasurementUnits()); }
+//     
+//     /**
+//      * <p>getPreferredStates</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<State> getPreferredStates() { return getFilteredTerms(TermStore.getStates()); }
+//     
+//     /**
+//      * <p>getPreferredModifiers</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<Modifier> getPreferredModifiers() { return getFilteredTerms(TermStore.getModifiers()); }
+//     
+//     /**
+//      * <p>getPreferredStatisticalMeasures</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<StatisticalMeasure> getPreferredStatisticalMeasures() { return getFilteredTerms(TermStore.getStatisticalMeasures()); }
+//     
+//     /**
+//      * <p>getPreferredScopes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<Scope> getPreferredScopes() { return getFilteredTerms(TermStore.getScopes()); }
+//     
+//     /**
+//      * <p>getPreferredDeterminationModifiers</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public List<DeterminationModifier> getPreferredDeterminationModifiers() { return getFilteredTerms(TermStore.getDeterminationModifiers()); }
+//     

        /**
         * Generic method to set term preferences
         *
        /**
         * Generic method to set term preferences
         *


@@ -361,19 +357,4 @@ public class TermManager extends ContextListenerAdapter{
                
                hiddenTermsMap.put(typeName, undesiredTermUuids);
        }
                
                hiddenTermsMap.put(typeName, undesiredTermUuids);
        }

-       
-       /**
-        * <p>addTermToPreferredTerms</p>
-        *
-        * @param term a T object.
-        * @param <T> a T object.
-        */
-       public <T extends TermBase> void addTermToPreferredTerms(T term){
-
-//             VocabularyEnum vocabulary = VocabularyEnum.getVocabularyEnum(term.getClass());
-//             
-//             getPreferenceStore().setValue(getPreferenceKey(term), VocabularyStore.getTermVocabulary(vocabulary).getTerms().contains(term));
-//             
-//             firePreferencesChanged(term.getClass());
-       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
index d462cc8ca5a464566e01b5adcb7179efd271d53d..120a1b07d9c70ad193dab662bac2c3fbc73f2cbb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
@@ -11,43 +11,23 @@
 package eu.etaxonomy.taxeditor.store;
 
 import java.util.ArrayList;
 package eu.etaxonomy.taxeditor.store;
 
 import java.util.ArrayList;

+import java.util.Arrays;

 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Collections;
 import java.util.Comparator;

+import java.util.HashSet;

 import java.util.List;
 import java.util.List;

+import java.util.Set;

 
 import eu.etaxonomy.cdm.api.service.ITermService;
 
 import eu.etaxonomy.cdm.api.service.ITermService;

-import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.common.AnnotationType;

 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;

-import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.cdm.model.common.Language;

 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.MarkerType;

-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.VocabularyEnum;

 import eu.etaxonomy.cdm.model.description.AbsenceTerm;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.AbsenceTerm;
 import eu.etaxonomy.cdm.model.description.Feature;

-import eu.etaxonomy.cdm.model.description.MeasurementUnit;
-import eu.etaxonomy.cdm.model.description.Modifier;

 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
 import eu.etaxonomy.cdm.model.description.PresenceTerm;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
 import eu.etaxonomy.cdm.model.description.PresenceTerm;

-import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.cdm.model.description.Stage;
-import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
-import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.cdm.model.location.ReferenceSystem;
-import eu.etaxonomy.cdm.model.media.RightsTerm;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;

 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.Rank;

-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;

 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

+import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;

 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**


@@ -60,257 +40,123 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  * @version 1.0
  */
 public class TermStore {
  * @version 1.0
  */
 public class TermStore {

-       
-       /**
-        * <p>getSpecimenTypeDesignationStatus</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<SpecimenTypeDesignationStatus> getSpecimenTypeDesignationStatus() {
-               return getTerms(SpecimenTypeDesignationStatus.class);
-       }
-       

 
 

-       /**
-        * <p>getNameTypeDesignationStatus</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<NameTypeDesignationStatus> getNameTypeDesignationStatus() {
-               return getTerms(NameTypeDesignationStatus.class);
-       }
-       
-       /**
-        * <p>getNamedAreaTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<NamedAreaType> getNamedAreaTypes(){
-               return getTerms(NamedAreaType.class);
-       }

        
        

-       /**
-        * <p>getAnnotationTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<AnnotationType> getAnnotationTypes(){
-               return getTerms(AnnotationType.class);
-       }

        
        

-       /**
-        * <p>getTaxonRelationshipTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<TaxonRelationshipType> getTaxonRelationshipTypes(){
-               return getTerms(TaxonRelationshipType.class);
+       public static <TERM extends DefinedTermBase> List<TERM> getTerms(Class<TERM> clazz){
+               return getTerms(clazz, null, true);

        }
        
        }
        

-       

        /**
        /**

-        * <p>getLanguages</p>
-        *
-        * @return a {@link java.util.List} object.
+        * Returns a list of terms of the given type currently available in the system. 
+        * If <code>filtered</code> is set to <code>true</code>, all terms for certain types will be
+        * gathered from edge cases.
+        * 
+        * @param clazz
+        * @param comparator
+        * @param filtered Will filter out some results
+        * @return

         */
         */

-       public static List<Language> getLanguages(){
-               return getTerms(Language.class);
-       }
-       
-       /**
-        * <p>getFeatures</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<Feature> getFeatures() {
-               List<Feature> features = getTerms(Feature.class);
-               features.remove(Feature.IMAGE());
-               return features;
-
-       }
-       
-       /**
-        * <p>getNameRelationshipTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<NameRelationshipType> getNameRelationshipTypes() {
-               return getTerms(NameRelationshipType.class);
-       }
-       
-       /**
-        * <p>getNomenclaturalStatusTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<NomenclaturalStatusType> getNomenclaturalStatusTypes(){
-               return getTerms(NomenclaturalStatusType.class);
-       }
-       
+       public static <TERM extends DefinedTermBase> List<TERM> getTerms(Class<TERM> clazz, Comparator<TERM> comparator, boolean filtered){
+               List<TERM> terms = new ArrayList<TERM>();

 
 

-       /**
-        * <p>getNonTechnicalMarkerTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<MarkerType> getNonTechnicalMarkerTypes() {
-               List<MarkerType> nonTechnicalMarkerTypes = new ArrayList<MarkerType>();
-               List<MarkerType> markerTypes = getTerms(MarkerType.class);
-               
-               for (Object type : markerTypes) {
-                       if (((MarkerType) type).isTechnical() == false) {
-                               nonTechnicalMarkerTypes.add((MarkerType) type);
-                       }
+               ITermStoreEdgeCase<TERM> edgeCase = getEdgeCase(clazz);
+               if(filtered && edgeCase != null){
+                       terms = edgeCase.getTerms();
+               }else{
+                       terms = getTermsFromService(clazz, comparator);

                }
                
                }
                

-               return nonTechnicalMarkerTypes;
-       }
-       
-
-       /**
-        * <p>getExtensionTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<ExtensionType> getExtensionTypes() {
-               return getTerms(ExtensionType.class);
-       }
-       
-       /**
-        * <p>getRightsTypes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<RightsTerm> getRightsTypes() {
-               return getTerms(RightsTerm.class);
+               return terms;
+               

        }
        
        }
        

-       
-       /**
-        * Retrieve all ranks from data store.
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<Rank> getRanks(){
-               if(PreferencesUtil.getSortRanksHierarchichally()){
-                       return getTerms(Rank.class, new Comparator<Rank>(){
-       
+       private static <T extends DefinedTermBase> List<T> getTermsFromService(Class<T> termClass, Comparator<T> comparator){
+               if (comparator == null){
+                       comparator = new Comparator<T>() {

                                @Override
                                @Override

-                               public int compare(Rank o1, Rank o2) {
-                                       return o1.compareTo(o2);
+                               public int compare(T o1, T o2) {
+                                       String label1 = o1.getLabel(CdmStore.getDefaultLanguage()) != null ? o1.getLabel(CdmStore.getDefaultLanguage()) : o1.getTitleCache();
+                                       String label2 = o2.getLabel(CdmStore.getDefaultLanguage()) != null ? o2.getLabel(CdmStore.getDefaultLanguage()) : o2.getTitleCache();
+                                       return label1.compareTo(label2);

                                }
                                }

-                               
-                       });
-               }else{
-                       return getTerms(Rank.class);
+                       };

                }
                }

+               
+               List<T> terms = CdmStore.getService(ITermService.class).listByTermClass(termClass, null, null, null, null);
+               Collections.sort(terms, comparator);
+               return terms;

        }
        
        }
        

+//     /**
+//      * <p>getFeatures</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public static List<Feature> getFeatures() {
+//             List<Feature> features = getTerms(Feature.class);
+//             features.remove(Feature.IMAGE());
+//             return features;
+//
+//     }
+//
+//
+//     /**
+//      * <p>getNonTechnicalMarkerTypes</p>
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public static List<MarkerType> getNonTechnicalMarkerTypes() {
+//             List<MarkerType> nonTechnicalMarkerTypes = new ArrayList<MarkerType>();
+//             List<MarkerType> markerTypes = getTerms(MarkerType.class);
+//             
+//             for (Object type : markerTypes) {
+//                     if (((MarkerType) type).isTechnical() == false) {
+//                             nonTechnicalMarkerTypes.add((MarkerType) type);
+//                     }
+//             }
+//             
+//             return nonTechnicalMarkerTypes;
+//     }
+//
+//     /**
+//      * Retrieve all ranks from data store.
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public static List<Rank> getRanks(){
+//             if(PreferencesUtil.getSortRanksHierarchichally()){
+//                     return getTerms(Rank.class, new Comparator<Rank>(){
+//     
+//                             @Override
+//                             public int compare(Rank o1, Rank o2) {
+//                                     return o1.compareTo(o2);
+//                             }
+//                             
+//                     });
+//             }else{
+//                     return getTerms(Rank.class);
+//             }
+//     }
+//     
+//     
+//     /**
+//      * Retrieve all presence and absence terms from data store.
+//      *
+//      * @return a {@link java.util.List} object.
+//      */
+//     public static List<PresenceAbsenceTermBase> getPresenceAbsenceTerms() {
+//             List presenceAbsenceTerms = getTerms(PresenceTerm.class);
+//             presenceAbsenceTerms.addAll(getTerms(AbsenceTerm.class));
+//
+//             return presenceAbsenceTerms;
+//     }

        
        /**
        
        /**

-        * Retrieve all presence and absence terms from data store.
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<PresenceAbsenceTermBase> getPresenceAbsenceTerms() {
-               List presenceAbsenceTerms = getTerms(PresenceTerm.class);
-               presenceAbsenceTerms.addAll(getTerms(AbsenceTerm.class));
-
-               return presenceAbsenceTerms;
-       }
-
-       /**
-        * Retrieve all stages from data store.
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<Stage> getStages(){
-               return getTerms(Stage.class);
-       }
-       
-       /**
-        * Retrieve all states from data store.
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<State> getStates() {
-               return getTerms(State.class);
-       }
-       
-       /**
-        * Retrieve all preservation methods from data store.
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<PreservationMethod> getPreservationMethods(){
-               return getTerms(PreservationMethod.class);
-       }
-       
-       
-
-       /**
-        * <p>getMeasurementUnits</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<MeasurementUnit> getMeasurementUnits() {
-               return getTerms(MeasurementUnit.class);
-       }
-       
-
-       /**
-        * <p>getModifiers</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<Modifier> getModifiers() {
-               return getTerms(Modifier.class);
-       }
-
-
-       /**
-        * <p>getStatisticalMeasures</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<StatisticalMeasure> getStatisticalMeasures() {
-               return getTerms(StatisticalMeasure.class);
-       }
-       
-       /**
-        * <p>getScopes</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<Scope> getScopes() {
-               return getTerms(Scope.class);
-       }
-       
-       /**
-        * <p>getDeterminationModifiers</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<DeterminationModifier> getDeterminationModifiers() {
-               return getTerms(DeterminationModifier.class);
-       }
-       
-       /**
-        * <p>getReferenceSystems</p>
-        *
-        * @return a {@link java.util.List} object.
-        */
-       public static List<ReferenceSystem> getReferenceSystems() {
-               return getTerms(ReferenceSystem.class);
-       }
-       
-       /**
-        ************* save methods *****************************
-        *

         * @param term a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void saveTerm(DefinedTermBase term){
         * @param term a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void saveTerm(DefinedTermBase term){

-               getTermService().saveOrUpdate(term);
+               CdmStore.getService(ITermService.class).saveOrUpdate(term);

        }
        
        /**
        }
        
        /**


@@ -319,7 +165,7 @@ public class TermStore {
         * @param selected a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void delete(DefinedTermBase selected) {
         * @param selected a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void delete(DefinedTermBase selected) {

-               getTermService().delete(selected);
+               CdmStore.getService(ITermService.class).delete(selected);

        }
        
        /**
        }
        
        /**


@@ -328,62 +174,139 @@ public class TermStore {
         * @param term a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void updateVocabulary(DefinedTermBase term) {
         * @param term a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         */
        public static void updateVocabulary(DefinedTermBase term) {

-               getTermService().saveOrUpdate(term);
+               CdmStore.getService(ITermService.class).saveOrUpdate(term);

        }
        
        }
        

+       private static Set<ITermStoreEdgeCase<? extends DefinedTermBase>> termStoreEdgeCases = new HashSet<ITermStoreEdgeCase<? extends DefinedTermBase>>();

        
        

-       
-       /*************** internal methods **************************/
-       
-       private static Language getDefaultLanguage(){
-               return CdmStore.getDefaultLanguage();
-       }
-       
-       private static OrderedTermVocabulary<? extends OrderedTermBase> getOrderedTermVocabulary(VocabularyEnum vocabularyType){
-               TermVocabulary<DefinedTermBase> vocabulary = getTermVocabulary(vocabularyType);         
-               return HibernateProxyHelper.deproxy(vocabulary, OrderedTermVocabulary.class);
+       static {
+               termStoreEdgeCases.add(new ITermStoreEdgeCase<Feature>() {
+
+                       @Override
+                       public Class<Feature> getTermClass() {
+                               return Feature.class;
+                       }
+
+                       @Override
+                       public List<Feature> getTerms() {
+                               List<Feature> features = TermStore.getTermsFromService(Feature.class, null);
+                               features.remove(Feature.IMAGE());
+                               return features;
+                       }
+               });
+               termStoreEdgeCases.add(new ITermStoreEdgeCase<MarkerType>(){
+
+                       @Override
+                       public Class<MarkerType> getTermClass() {
+                               return MarkerType.class;
+                       }
+
+                       @Override
+                       public List<MarkerType> getTerms() {
+                               // filter out non technical markers
+                               List<MarkerType> nonTechnicalMarkerTypes = new ArrayList<MarkerType>();
+                               List<MarkerType> markerTypes = TermStore.getTermsFromService(MarkerType.class, null);
+                               
+                               for (Object type : markerTypes) {
+                                       if (((MarkerType) type).isTechnical() == false) {
+                                               nonTechnicalMarkerTypes.add((MarkerType) type);
+                                       }
+                               }
+                               
+                               return nonTechnicalMarkerTypes;
+                       }
+                       
+               });
+               termStoreEdgeCases.add(new ITermStoreEdgeCase<Rank>() {
+
+                       @Override
+                       public Class<Rank> getTermClass() {
+                               return Rank.class;
+                       }
+
+                       @Override
+                       public List<Rank> getTerms() {
+                               if(PreferencesUtil.getSortRanksHierarchichally()){
+                                       return TermStore.getTermsFromService(Rank.class, new Comparator<Rank>(){
+                       
+                                               @Override
+                                               public int compare(Rank o1, Rank o2) {
+                                                       return o1.compareTo(o2);
+                                               }
+                                               
+                                       });
+                               }else{
+                                       return TermStore.getTermsFromService(Rank.class, null);
+                               }
+                       }
+                       
+               });
+               termStoreEdgeCases.add(new ITermStoreEdgeCase<PresenceAbsenceTermBase>() {
+
+                       @Override
+                       public Class<PresenceAbsenceTermBase> getTermClass() {
+                               return PresenceAbsenceTermBase.class;
+                       }
+
+                       @Override
+                       public List<PresenceAbsenceTermBase> getTerms() {
+                               List presenceAbsenceTerms = TermStore.getTermsFromService(PresenceTerm.class, null);
+                               presenceAbsenceTerms.addAll(TermStore.getTermsFromService(AbsenceTerm.class, null));
+
+                               return presenceAbsenceTerms;
+                       }
+               });
+               termStoreEdgeCases.add(new ITermStoreEdgeCase<TaxonRelationshipTypeInverseContainer>() {
+
+                       @Override
+                       public Class<TaxonRelationshipTypeInverseContainer> getTermClass() {
+                               return TaxonRelationshipTypeInverseContainer.class;
+                       }
+
+                       @Override
+                       public List<TaxonRelationshipTypeInverseContainer> getTerms() {
+                               List<TaxonRelationshipType> excludeTaxonRelationshipTypes = Arrays.asList(new TaxonRelationshipType[]{
+                                       TaxonRelationshipType.TAXONOMICALLY_INCLUDED_IN(),
+                                       TaxonRelationshipType.MISAPPLIED_NAME_FOR(),
+                                       TaxonRelationshipType.ALL_RELATIONSHIPS()       
+                               });
+                               
+                               List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<TaxonRelationshipTypeInverseContainer>();
+                               
+                               List<TaxonRelationshipType> relationshipTypes = TermStore.getTerms(TaxonRelationshipType.class);
+                               
+                               relationshipTypes.removeAll(excludeTaxonRelationshipTypes);
+                               
+                               for (TaxonRelationshipType relationshipType : relationshipTypes){
+                                       if(!relationshipType.isSymmetric()){
+                                               TaxonRelationshipTypeInverseContainer inverseContainer = new TaxonRelationshipTypeInverseContainer(relationshipType, true);
+                                               relationshipTypeInverseContainers.add(inverseContainer);
+                                       }                       
+                                       TaxonRelationshipTypeInverseContainer container = new TaxonRelationshipTypeInverseContainer(relationshipType, false);
+                                       relationshipTypeInverseContainers.add(container);                       
+                               }               
+                               
+                               return relationshipTypeInverseContainers;
+                       }
+               });

        }
        
        }
        

-       /**
-        * <p>getTermVocabulary</p>
-        *
-        * @param vocabularyType a {@link eu.etaxonomy.cdm.model.common.VocabularyEnum} object.
-        * @return a {@link eu.etaxonomy.cdm.model.common.TermVocabulary} object.
-        */
-       public static TermVocabulary<DefinedTermBase> getTermVocabulary(VocabularyEnum vocabularyType){
+       private static <T extends DefinedTermBase> ITermStoreEdgeCase<T> getEdgeCase(Class<T> termClass) {

                
                

-               return CdmStore.getService(IVocabularyService.class).getVocabulary(vocabularyType);
-       }
-       
-       private static <TERM extends DefinedTermBase> List<TERM> getTerms(Class<TERM> clazz){
-               Comparator<TERM> comparator = new Comparator<TERM>() {
-                       @Override
-                       public int compare(TERM o1, TERM o2) {
-                               String label1 = o1.getLabel(getDefaultLanguage()) != null ? o1.getLabel(getDefaultLanguage()) : o1.getTitleCache();
-                               String label2 = o2.getLabel(getDefaultLanguage()) != null ? o2.getLabel(getDefaultLanguage()) : o2.getTitleCache();
-                               return label1.compareTo(label2);
+               for (ITermStoreEdgeCase termStoreEdgeCase : termStoreEdgeCases){
+                       if (termStoreEdgeCase.getTermClass().equals(termClass)){
+                               return termStoreEdgeCase;

                        }
                        }

-               };
+               }

                
                

-               return getTerms(clazz, comparator);
+               return null;

        }
        
        }
        

-       
-       private static <TERM extends DefinedTermBase> List<TERM> getTerms(Class<TERM> clazz, Comparator<TERM> comparator){
+       private interface ITermStoreEdgeCase<TERM> {

 
 

+               public abstract Class<TERM> getTermClass();

                
                

-               List<TERM> terms = new ArrayList<TERM>();
-               if(getTermService() != null){
-                       terms = getTermService().listByTermClass(clazz, null, null, null, null);
+               public abstract List<TERM> getTerms();

                
                

-                       Collections.sort(terms, comparator); 
-               }
-               
-               return terms;
-               
-       }
-       
-       private static ITermService getTermService(){
-               return CdmStore.getService(ITermService.class);

        }
 }
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EmptyComboElement.java
similarity index 86%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EmptyComboElement.java
index 83647e794e9b04e2771ef19febb5f802ab4d801f..b74bbf333fc4102b894b61de773c01c9b69e568d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EmptyComboElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 

-package eu.etaxonomy.taxeditor.ui.term;
+package eu.etaxonomy.taxeditor.ui.combo;

 
 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;


@@ -27,10 +27,8 @@ import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
  * @created Sep 29, 2010
  * @version 1.0
  */
  * @created Sep 29, 2010
  * @version 1.0
  */

-public class EmptyComboElement<T extends DefinedTermBase> extends AbstractTermComboElement<T> {
+public class EmptyComboElement<T extends DefinedTermBase> extends TermComboElement<T> {

 
 

-       private static final int VISIBLE_ITEMS = 20;
-       

        private List<T> genericTerms = new ArrayList<T>();
        
        /**
        private List<T> genericTerms = new ArrayList<T>();
        
        /**


@@ -43,9 +41,9 @@ public class EmptyComboElement<T extends DefinedTermBase> extends AbstractTermCo
         * @param <T> a T object.
         */
        public EmptyComboElement(CdmFormFactory formFactory,
         * @param <T> a T object.
         */
        public EmptyComboElement(CdmFormFactory formFactory,

-                       ICdmFormElement parentElement, String labelString,
+                       ICdmFormElement parentElement, Class<T> termClass, String labelString,

                        int style) {
                        int style) {

-               super(formFactory, parentElement, labelString, null, VISIBLE_ITEMS, style);
+               super(formFactory, parentElement, termClass, labelString, null, style);

        }
 
 
        }
 
 


@@ -54,7 +52,7 @@ public class EmptyComboElement<T extends DefinedTermBase> extends AbstractTermCo
         */
        /** {@inheritDoc} */
        @Override
         */
        /** {@inheritDoc} */
        @Override

-       protected List<T> preferredTerms() {
+       protected List<T> getPreferredTerms() {

                return genericTerms != null ? genericTerms : new ArrayList<T>();
        }
 
                return genericTerms != null ? genericTerms : new ArrayList<T>();
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
similarity index 62%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index 1452ce07c9e91ceaf4c95f2b219eab54e2998513..0b3770bccf572382e68dee1eec9ce35e014f2851 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -8,9 +8,11 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 

-package eu.etaxonomy.taxeditor.ui.term;
+package eu.etaxonomy.taxeditor.ui.combo;

 
 import java.util.ArrayList;
 
 import java.util.ArrayList;

+import java.util.Arrays;
+import java.util.Collection;

 import java.util.List;
 
 import org.eclipse.swt.SWT;
 import java.util.List;
 
 import org.eclipse.swt.SWT;


@@ -20,6 +22,9 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 

+import eu.etaxonomy.cdm.model.common.IDefinedTerm;
+import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
+import eu.etaxonomy.cdm.model.reference.ReferenceType;

 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;


@@ -38,11 +43,50 @@ import eu.etaxonomy.taxeditor.ui.forms.ISelectable;
  * @created Mar 16, 2010
  * @version 1.0
  */
  * @created Mar 16, 2010
  * @version 1.0
  */

-public abstract class AbstractEnumComboElement<T extends Enum> extends
+public class EnumComboElement<T extends IDefinedTerm> extends

                AbstractCdmFormElement implements SelectionListener,
                IEnableableFormElement, ISelectable {
 
                AbstractCdmFormElement implements SelectionListener,
                IEnableableFormElement, ISelectable {
 

-       private static final int VISIBLE_ITEMS = 10;
+       private static CdmEnumDataHolder[] cdmEnumDataHolders = {
+               new CdmEnumDataHolder<NomenclaturalCode>(){
+                       
+                       @Override
+                       public String getName() {
+                               return "Nomenclatural Code";
+                       }
+
+                       @Override
+                       public Collection<NomenclaturalCode> getElements() {
+                               return  Arrays.asList(NomenclaturalCode.values());
+                       }
+
+                       @Override
+                       public Class<NomenclaturalCode> getClazz() {
+                               return NomenclaturalCode.class;
+                       }
+                       
+               },
+               new CdmEnumDataHolder<ReferenceType>(){
+
+                       @Override
+                       public String getName() {
+                               return "Reference Type";
+                       }
+
+                       @Override
+                       public Collection<ReferenceType> getElements() {
+                               return Arrays.asList(ReferenceType.values());
+                       }
+
+                       @Override
+                       public Class<ReferenceType> getClazz() {
+                               return ReferenceType.class;
+                       }
+                       
+               }
+       };
+       
+       private static final int DEFAULT_VISIBLE_ITEMS = 10;

 
        protected T selection;
 
 
        protected T selection;
 


@@ -51,6 +95,8 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends
        private Label label;
        protected Combo combo;
 
        private Label label;
        protected Combo combo;
 

+       private Class<T> enumType;
+

        /**
         * <p>
         * Constructor for AbstractEnumComboElement.
        /**
         * <p>
         * Constructor for AbstractEnumComboElement.


@@ -67,29 +113,44 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends
         * @param <T>
         *            a T object.
         */
         * @param <T>
         *            a T object.
         */

-       public AbstractEnumComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString) {
+       public EnumComboElement(CdmFormFactory formFactory,
+                       ICdmFormElement parentElement, Class<T> enumType, int style) {

                super(formFactory, parentElement);
                super(formFactory, parentElement);

-               label = formFactory.createLabel(getLayoutComposite(), labelString);
+               this.enumType = enumType;
+               label = formFactory.createLabel(getLayoutComposite(), getDefaultLabelString());

                addControl(label);
 
                // create combo
                combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
                addControl(combo);
                combo.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
                addControl(label);
 
                // create combo
                combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
                addControl(combo);
                combo.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());

-               combo.setVisibleItemCount(VISIBLE_ITEMS);
+               setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);

 
                populateTypes();
 
                combo.addSelectionListener(this);
        }
 
 
                populateTypes();
 
                combo.addSelectionListener(this);
        }
 

+       private String getDefaultLabelString() {
+               if(enumType.equals(ReferenceType.class)){
+                       return "Reference Type";
+               }else if (enumType.equals(NomenclaturalCode.class)){
+                       return "Nomenclatural Code";
+               }
+               return "No Label";
+       }
+

        /**
         * <p>
         * populateTypes
         * </p>
         */
        /**
         * <p>
         * populateTypes
         * </p>
         */

-       protected abstract void populateTypes();
+       private void populateTypes(){
+               for(T enumElement : getElementsForClass(enumType)){
+                       elementTypeList.add(enumElement);
+                       combo.add(((Enum) enumElement).name());
+               }
+       }

 
        /**
         * <p>
 
        /**
         * <p>


@@ -180,4 +241,31 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends
        /** {@inheritDoc} */
        public void widgetDefaultSelected(SelectionEvent e) {
        }
        /** {@inheritDoc} */
        public void widgetDefaultSelected(SelectionEvent e) {
        }

+       
+       public void setVisibleItemCount(int visibleItems){
+               combo.setVisibleItemCount(visibleItems);
+       }
+       
+       private Collection<T> getElementsForClass(Class<T> clazz){
+               CdmEnumDataHolder<T> dataHolder = getCdmEnumDataHolderForClass(clazz);
+               if (dataHolder != null) {
+                       return dataHolder.getElements(); 
+               }
+               return null;
+       }
+       
+       private CdmEnumDataHolder<T> getCdmEnumDataHolderForClass(Class<T> clazz){
+               for (CdmEnumDataHolder dataHolder : cdmEnumDataHolders) {
+                       if (dataHolder.getClazz().equals(clazz)){
+                               return dataHolder;
+                       }
+               }
+               return null;
+       }
+       
+       private interface CdmEnumDataHolder<T> {
+               Class<T> getClazz();
+               String getName();
+               Collection<T> getElements();
+       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
similarity index 88%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index 76c418b23e1480066dce265e4c2f22cd226eec5f..d82e6a745a735e5108eb65a289b0a4f350415dc7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
 /**
  * 
  */

-package eu.etaxonomy.taxeditor.ui.term;
+package eu.etaxonomy.taxeditor.ui.combo;

 
 import java.util.ArrayList;
 import java.util.Collections;
 
 import java.util.ArrayList;
 import java.util.Collections;


@@ -16,7 +16,6 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 


@@ -43,14 +42,16 @@ import eu.etaxonomy.taxeditor.ui.forms.ISelectable;
  * @version 1.0
  * @param <T>
  */
  * @version 1.0
  * @param <T>
  */

-public abstract class AbstractTermComboElement<T extends DefinedTermBase>
+public class TermComboElement<T extends DefinedTermBase>

                extends AbstractCdmFormElement implements SelectionListener,
                DisposeListener, IEnableableFormElement, ISelectable {
 
                extends AbstractCdmFormElement implements SelectionListener,
                DisposeListener, IEnableableFormElement, ISelectable {
 

-       T selection;
+       private static final int DEFAULT_VISIBLE_ITEMS = 10;
+       
+       private T selection;

 
 

+       private T emptyElement;

        private static String EMPTY_ELEMENT_LABEL = "";
        private static String EMPTY_ELEMENT_LABEL = "";

-       T emptyElement;

 
        protected Label label;
        private Combo combo;
 
        protected Label label;
        private Combo combo;


@@ -59,7 +60,8 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
 
        private Comparator<T> termComparator;
 
 
        private Comparator<T> termComparator;
 

-       private Composite msgComposite;
+       private Class<T> termClass;
+

 
        /**
         * <p>
 
        /**
         * <p>


@@ -83,11 +85,13 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
         * @param <T>
         *            a T object.
         */
         * @param <T>
         *            a T object.
         */

-       public AbstractTermComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, T selection,
-                       int visibleItems, int style) {
+       public TermComboElement(CdmFormFactory formFactory,
+                       ICdmFormElement parentElement, Class<T> termClass, String labelString, T selection,
+                       int style) {

                super(formFactory, parentElement);
                super(formFactory, parentElement);

-
+               
+               this.termClass = termClass;
+               

                if (labelString != null) {
                        label = formFactory.createLabel(getLayoutComposite(), labelString);
                        addControl(label);
                if (labelString != null) {
                        label = formFactory.createLabel(getLayoutComposite(), labelString);
                        addControl(label);


@@ -97,9 +101,9 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
                combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
                addControl(combo);
                combo.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
                combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
                addControl(combo);
                combo.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());

-               combo.setVisibleItemCount(visibleItems);
+               combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);

 
 

-               populateTerms(preferredTerms());
+               populateTerms(getPreferredTerms());

 
                combo.addSelectionListener(this);
                combo.addDisposeListener(this);
 
                combo.addSelectionListener(this);
                combo.addDisposeListener(this);


@@ -217,7 +221,9 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
         * 
         * @return a {@link java.util.List} object.
         */
         * 
         * @return a {@link java.util.List} object.
         */

-       protected abstract List<T> preferredTerms();
+       protected List<T> getPreferredTerms(){
+               return getTermManager().getPreferredTerms(termClass);
+       }

 
        /**
         * May be overridden by derived classes if the desired label string does not
 
        /**
         * May be overridden by derived classes if the desired label string does not


@@ -232,7 +238,7 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
        }
 
        private void createTermNotInPreferredTerms(T term) {
        }
 
        private void createTermNotInPreferredTerms(T term) {

-               List<T> preferredTerms = preferredTerms();
+               List<T> preferredTerms = getPreferredTerms();

 
                preferredTerms.add(term);
 
 
                preferredTerms.add(term);
 


@@ -288,7 +294,7 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
                if (event != null
                                && PreferencesUtil.PREFERRED_TERMS_CHANGE.equals(event
                                                .getProperty())) {
                if (event != null
                                && PreferencesUtil.PREFERRED_TERMS_CHANGE.equals(event
                                                .getProperty())) {

-                       populateTerms(preferredTerms());
+                       populateTerms(getPreferredTerms());

                }
        }
 
                }
        }
 


@@ -329,4 +335,16 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase>
        protected TermManager getTermManager() {
                return CdmStore.getTermManager();
        }
        protected TermManager getTermManager() {
                return CdmStore.getTermManager();
        }

+       
+       public int getVisibleItemCount(){
+               return combo.getVisibleItemCount();
+       }
+       
+       public void setVisibleItemCount(int count){
+               combo.setVisibleItemCount(count);
+       }
+
+       public void setTerms(List<T> terms) {
+               populateTerms(terms);
+       }

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
index 2f01add81537dc31db81029dad83a3377947f948..a6adbc41a8ae3bec652fd956b5440705b8cc0d3a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
@@ -42,93 +42,85 @@ import org.joda.time.Partial;
 import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;

+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;

 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Annotation;

-import eu.etaxonomy.cdm.model.common.AnnotationType;

 import eu.etaxonomy.cdm.model.common.Credit;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.Credit;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.common.Extension;

-import eu.etaxonomy.cdm.model.common.ExtensionType;

 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.ICdmBase;

+import eu.etaxonomy.cdm.model.common.IDefinedTerm;

 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;

-import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.common.TermVocabulary;

 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;

+import eu.etaxonomy.cdm.model.description.DescriptionBase;

 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.KeyStatement;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.KeyStatement;

-import eu.etaxonomy.cdm.model.description.MeasurementUnit;

 import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;

-import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;

 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.Scope;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.Scope;

-import eu.etaxonomy.cdm.model.description.Sex;
-import eu.etaxonomy.cdm.model.description.Stage;
-import eu.etaxonomy.cdm.model.description.State;

 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.StateData;

-import eu.etaxonomy.cdm.model.description.StatisticalMeasure;

 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.location.NamedArea;

-import eu.etaxonomy.cdm.model.location.NamedAreaType;
+import eu.etaxonomy.cdm.model.location.NamedAreaLevel;

 import eu.etaxonomy.cdm.model.location.Point;
 import eu.etaxonomy.cdm.model.location.Point;

-import eu.etaxonomy.cdm.model.location.ReferenceSystem;

 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
 import eu.etaxonomy.cdm.model.media.Rights;

-import eu.etaxonomy.cdm.model.media.RightsTerm;

 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationship;

-import eu.etaxonomy.cdm.model.name.NameRelationshipType;

 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;

-import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;

 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;

-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.name.NonViralName;

 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;

-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;

 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;

-import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;

 import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
 import eu.etaxonomy.cdm.model.occurrence.FieldObservation;

-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;

 import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;

+import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;

 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;

+import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;

 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;

-import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;

 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.password.EditPasswordElement;
 import eu.etaxonomy.taxeditor.ui.openurl.IOpenUrlEnabled;
 import eu.etaxonomy.taxeditor.ui.openurl.OpenUrlSelectorElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.forms.password.EditPasswordElement;
 import eu.etaxonomy.taxeditor.ui.openurl.IOpenUrlEnabled;
 import eu.etaxonomy.taxeditor.ui.openurl.OpenUrlSelectorElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;

+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.EmptyElement;
 import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.EmptyElement;
 import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionDetailElement;


@@ -265,6 +257,11 @@ import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailSection;

+import eu.etaxonomy.taxeditor.ui.section.vocabulary.DefinedTermDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.DefinedTermDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.TermVocabularyDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.TermVocabularyDetailSection;

 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;


@@ -288,34 +285,6 @@ import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TeamSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.UserSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TeamSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.UserSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement;
-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.ui.term.AnnotationTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
-import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
-import eu.etaxonomy.taxeditor.ui.term.ExtensionTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;
-import eu.etaxonomy.taxeditor.ui.term.MarkerTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.MeasurementUnitComboElement;
-import eu.etaxonomy.taxeditor.ui.term.ModifierComboElement;
-import eu.etaxonomy.taxeditor.ui.term.NameRelationshipTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;
-import eu.etaxonomy.taxeditor.ui.term.NamedAreaTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.NomenclaturalCodeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.NomenclaturalStatusTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.PresenceAbsenceTermComboElement;
-import eu.etaxonomy.taxeditor.ui.term.PreservationMethodComboElement;
-import eu.etaxonomy.taxeditor.ui.term.RankComboElement;
-import eu.etaxonomy.taxeditor.ui.term.ReferenceSystemComboElement;
-import eu.etaxonomy.taxeditor.ui.term.ReferenceTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.RightsTypeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;
-import eu.etaxonomy.taxeditor.ui.term.SexComboElement;
-import eu.etaxonomy.taxeditor.ui.term.SpecimenTypeDesignationStatusComboElement;
-import eu.etaxonomy.taxeditor.ui.term.StageComboElement;
-import eu.etaxonomy.taxeditor.ui.term.StateComboElement;
-import eu.etaxonomy.taxeditor.ui.term.StatisticalMeasureComboElement;
-import eu.etaxonomy.taxeditor.ui.term.TaxonRelationshipTypeComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -962,33 +931,6 @@ public class CdmFormFactory extends FormToolkit {
                return element;
        }
 
                return element;
        }
 

-       public static enum TermComboType {
-               EXTENSIONTYPE, 
-               LANGUAGE, 
-               MARKERTYPE, 
-               NOMENCLATURALSTATUSTYPE, 
-               RANK, 
-               RIGHTSTYPE, 
-               NAMERELATIONSHIP, 
-               NAMEDAREATYPE, 
-               PRESENCEABSENCESTATUS, 
-               ANNOTATIONTYPE, 
-               NAMETYPEDESIGNATIONSTATUS, 
-               SPECIMENTYPEDESIGNATIONSTATUS, 
-               SEX, 
-               STAGE, 
-               PRESERVATION_METHOD, 
-               MEASUREMENT_UNIT, 
-               STATE, 
-               MODIFIER, 
-               STATISTICAL_MEASURE, 
-               SCOPE, 
-               EMPTY, 
-               DETERMINATION_MODIFIER, 
-               REFERENCE_SYSTEM, 
-               TAXON_RELATIONSHIP_TYPE_INVERSE_CONTAINER
-       }
-

        /**
         * <p>
         * createTermComboElement
        /**
         * <p>
         * createTermComboElement


@@ -1008,125 +950,19 @@ public class CdmFormFactory extends FormToolkit {
         *            object.
         * @param style
         *            a int.
         *            object.
         * @param style
         *            a int.

-        * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement}
+        * @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement}

         *         object.
         */
         *         object.
         */

-       public AbstractTermComboElement createTermComboElement(
-                       TermComboType termComboType, ICdmFormElement parentElement,
-                       String labelString, DefinedTermBase selection, int style) {
-               AbstractTermComboElement element = null;
-
-               switch (termComboType) {
-               case EMPTY:
-                       element = new EmptyComboElement<DefinedTermBase>(this,
-                                       parentElement, labelString, style);
-                       break;
-               case EXTENSIONTYPE:
-                       element = new ExtensionTypeComboElement(this, parentElement,
-                                       labelString, (ExtensionType) selection, style);
-                       break;
-               case LANGUAGE:
-                       element = new LanguageComboElement(this, parentElement,
-                                       labelString, (Language) selection, style);
-                       break;
-               case MARKERTYPE:
-                       element = new MarkerTypeComboElement(this, parentElement,
-                                       labelString, (MarkerType) selection, style);
-                       break;
-               case NOMENCLATURALSTATUSTYPE:
-                       element = new NomenclaturalStatusTypeComboElement(this,
-                                       parentElement, labelString,
-                                       (NomenclaturalStatusType) selection, style);
-                       break;
-               case RANK:
-                       element = new RankComboElement(this, parentElement, labelString,
-                                       (Rank) selection, style);
-                       break;
-               case RIGHTSTYPE:
-                       element = new RightsTypeComboElement(this, parentElement,
-                                       labelString, (RightsTerm) selection, style);
-                       break;
-               case NAMERELATIONSHIP:
-                       element = new NameRelationshipTypeComboElement(this, parentElement,
-                                       labelString, (NameRelationshipType) selection, style);
-                       break;
-               case NAMEDAREATYPE:
-                       element = new NamedAreaTypeComboElement(this, parentElement,
-                                       labelString, (NamedAreaType) selection, style);
-                       break;
-               case ANNOTATIONTYPE:
-                       element = new AnnotationTypeComboElement(this, parentElement,
-                                       labelString, (AnnotationType) selection, style);
-                       break;
-               case PRESENCEABSENCESTATUS:
-                       element = new PresenceAbsenceTermComboElement(this, parentElement,
-                                       labelString, (PresenceAbsenceTermBase) selection, style);
-                       break;
-               case NAMETYPEDESIGNATIONSTATUS:
-                       element = new NameTypeDesignationStatusComboElement(this,
-                                       parentElement, labelString,
-                                       (NameTypeDesignationStatus) selection, style);
-                       break;
-               case SPECIMENTYPEDESIGNATIONSTATUS:
-                       element = new SpecimenTypeDesignationStatusComboElement(this,
-                                       parentElement, labelString,
-                                       (SpecimenTypeDesignationStatus) selection, style);
-                       break;
-               case SEX:
-                       element = new SexComboElement(this, parentElement, labelString,
-                                       (Sex) selection, style);
-                       break;
-               case STAGE:
-                       element = new StageComboElement(this, parentElement, labelString,
-                                       (Stage) selection, style);
-                       break;
-               case PRESERVATION_METHOD:
-                       element = new PreservationMethodComboElement(this, parentElement,
-                                       labelString, (PreservationMethod) selection, style);
-                       break;
-               case MEASUREMENT_UNIT:
-                       element = new MeasurementUnitComboElement(this, parentElement,
-                                       labelString, (MeasurementUnit) selection, style);
-                       break;
-               case STATE:
-                       element = new StateComboElement(this, parentElement, labelString,
-                                       (State) selection, style);
-                       break;
-               case SCOPE:
-                       element = new ScopeComboElement(this, parentElement, labelString,
-                                       (Scope) selection, style);
-                       break;
-               case MODIFIER:
-                       element = new ModifierComboElement(this, parentElement,
-                                       labelString, (Modifier) selection, style);
-                       break;
-               case STATISTICAL_MEASURE:
-                       element = new StatisticalMeasureComboElement(this, parentElement,
-                                       labelString, (StatisticalMeasure) selection, style);
-                       break;
-               case DETERMINATION_MODIFIER:
-                       element = new DeterminationModifierComboElement(this,
-                                       parentElement, labelString,
-                                       (DeterminationModifier) selection, style);
-                       break;
-               case REFERENCE_SYSTEM:
-                       element = new ReferenceSystemComboElement(this, parentElement,
-                                       labelString, (ReferenceSystem) selection, style);
-                       break;
-               case TAXON_RELATIONSHIP_TYPE_INVERSE_CONTAINER:
-                       element = new TaxonRelationshipTypeComboElement(this, parentElement, labelString, (TaxonRelationshipTypeInverseContainer) selection, style);
-                       break;
-               }
-
+       
+       public <T extends DefinedTermBase> TermComboElement createTermComboElement(
+                       Class<T> termComboType, ICdmFormElement parentElement,
+                       String labelString, T selection, int style) {
+               TermComboElement element = new TermComboElement<T>(this, parentElement, termComboType, labelString, selection, style);

                adapt(element);
                parentElement.addElement(element);
                return element;
        }
 
                adapt(element);
                parentElement.addElement(element);
                return element;
        }
 

-       public static enum EnumComboType {
-               REFERENCETYPE, NOMENCLATURALCODE
-       }
-

        /**
         * <p>
         * createEnumComboElement
        /**
         * <p>
         * createEnumComboElement


@@ -1144,21 +980,10 @@ public class CdmFormFactory extends FormToolkit {
         * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement}
         *         object.
         */
         * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement}
         *         object.
         */

-       public AbstractEnumComboElement createEnumComboElement(
-                       EnumComboType enumComboType, ICdmFormElement parentElement,
+       public <T extends IDefinedTerm> EnumComboElement<T> createEnumComboElement(
+                       Class<T> enumComboType, ICdmFormElement parentElement,

                        int style) {
                        int style) {

-               AbstractEnumComboElement element = null;
-
-               switch (enumComboType) {
-               case REFERENCETYPE:
-                       element = new ReferenceTypeComboElement(this, parentElement,
-                                       "Reference Type", null, style);
-                       break;
-               case NOMENCLATURALCODE:
-                       element = new NomenclaturalCodeComboElement(this, parentElement,
-                                       "Nomenclatural Code", null, style);
-                       break;
-               }
+               EnumComboElement<T> element = new EnumComboElement<T>(this, parentElement, enumComboType, style);

                adapt(element);
                parentElement.addElement(element);
                return element;
                adapt(element);
                parentElement.addElement(element);
                return element;


@@ -1705,7 +1530,45 @@ public class CdmFormFactory extends FormToolkit {
                GROUP, 
                DETERMINATION, 
                TAXON_RELATIONSHIP, 
                GROUP, 
                DETERMINATION, 
                TAXON_RELATIONSHIP, 

-               REFERENCED_ENTITY
+               REFERENCED_ENTITY, 
+               TERM_VOCABULARY,
+               NAMED_AREA, 
+               NAMED_AREA_LEVEL
+       }
+       
+       public AbstractFormSection createDefinedTermDetailSection(Class definedTermClass,
+                       ConversationHolder conversation, ICdmFormElement parentElement,
+                       ISelectionProvider selectionProvider, int style) {
+               
+               AbstractFormSection section = new DefinedTermDetailSection(this, definedTermClass, conversation, parentElement, selectionProvider, style);
+                       
+               parentElement.addElement(section);
+               adapt(section);
+               return section;
+               
+       }
+       
+       /**
+        * @param definedTermClass
+        * @param formElement
+        * @param style
+        * @return
+        */
+       public AbstractCdmDetailElement createDefinedTermDetailElement(
+                       Class definedTermClass, AbstractCdmDetailSection parentElement,
+                       int style) {
+               AbstractCdmDetailElement element = null;
+               
+               if (NamedArea.class.isAssignableFrom(definedTermClass)){
+                       element = new eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement(this, parentElement);
+               }
+               else {
+                       element = new DefinedTermDetailElement(this, parentElement);
+               }
+               
+               adapt(element);
+               parentElement.addElement(element);
+               return element;

        }
 
        /**
        }
 
        /**


@@ -1860,6 +1723,14 @@ public class CdmFormFactory extends FormToolkit {
                        section = new ReferencedEntityDetailSection(this, conversation, parentElement, 
                                        selectionProvider, style);
                        break;
                        section = new ReferencedEntityDetailSection(this, conversation, parentElement, 
                                        selectionProvider, style);
                        break;

+               case TERM_VOCABULARY:
+                       section = new TermVocabularyDetailSection(this, conversation, parentElement, 
+                                       selectionProvider, style);
+                       break;
+               case NAMED_AREA:
+                       section = new NamedAreaDetailSection(this, conversation, parentElement, 
+                                       selectionProvider, style);
+                       break;

                }
 
                if (section == null) {
                }
 
                if (section == null) {


@@ -1872,6 +1743,8 @@ public class CdmFormFactory extends FormToolkit {
                return section;
        }
 
                return section;
        }
 

+       
+       

        /**
         * <p>
         * createCdmDetailElement
        /**
         * <p>
         * createCdmDetailElement


@@ -1984,6 +1857,15 @@ public class CdmFormFactory extends FormToolkit {
                case REFERENCED_ENTITY:
                        element = new RefereneEntityDetailElement(this, parentElement);
                        break;
                case REFERENCED_ENTITY:
                        element = new RefereneEntityDetailElement(this, parentElement);
                        break;

+               case TERM_VOCABULARY:
+                       element = new TermVocabularyDetailElement(this, parentElement);
+                       break;
+               case NAMED_AREA:
+                       element = new eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement(this, parentElement);
+                       break;
+               case NAMED_AREA_LEVEL:
+                       element = new DefinedTermDetailElement<NamedAreaLevel>(this, parentElement);
+                       break;

                }
 
                if (element == null) {
                }
 
                if (element == null) {


@@ -2005,7 +1887,41 @@ public class CdmFormFactory extends FormToolkit {
         * @version 1.0
         */
        public static enum EntityDetailType {
         * @version 1.0
         */
        public static enum EntityDetailType {

-               TEAM, TEAMMEMBER, ANNOTATION, CREDIT, DESCRIPTIONELEMENTSOURCE, EXTENSION, MARKER, MEDIA, DESCRIPTIONELEMENTMEDIA, MEDIAREPRESENTATION, MEDIAREPRESENTATIONPART, MODIFIER, NOMENCLATURALSTATUS, NAME_RELATIONSHIP, PROTOLOG, RIGHTS, SOURCE, SCOPE, DESCRIPTIONSOURCE, TYPEDESIGNATION, STATE_DATA, STATISTICAL_MEASUREMENT_VALUE, DESCRIBED_SPECIMEN, COLLECTING_AREA, DETERMINATION_EVENT, SPECIMEN_COLLECTION, IDENTIFIABLE_SOURCE_COLLECTION, GEOGRAPHICAL_SCOPE, SCOPE_RESTRICTION, MEMBER, GRANTED_AUTHORITY, GROUPS_BY_USER, TAXONOMIC_SCOPE, DETERMINATION_CURRENT, DETERMINATION_HISTORY
+               TEAM, 
+               TEAMMEMBER, 
+               ANNOTATION, 
+               CREDIT, 
+               DESCRIPTIONELEMENTSOURCE, 
+               EXTENSION, 
+               MARKER, 
+               MEDIA, 
+               DESCRIPTIONELEMENTMEDIA, 
+               MEDIAREPRESENTATION, 
+               MEDIAREPRESENTATIONPART, 
+               MODIFIER, 
+               NOMENCLATURALSTATUS, 
+               NAME_RELATIONSHIP, 
+               PROTOLOG, 
+               RIGHTS, 
+               SOURCE, 
+               SCOPE, 
+               DESCRIPTIONSOURCE, 
+               TYPEDESIGNATION, 
+               STATE_DATA, 
+               STATISTICAL_MEASUREMENT_VALUE, 
+               DESCRIBED_SPECIMEN, 
+               COLLECTING_AREA, 
+               DETERMINATION_EVENT, 
+               SPECIMEN_COLLECTION, 
+               IDENTIFIABLE_SOURCE_COLLECTION, 
+               GEOGRAPHICAL_SCOPE, 
+               SCOPE_RESTRICTION, 
+               MEMBER, 
+               GRANTED_AUTHORITY, 
+               GROUPS_BY_USER, 
+               TAXONOMIC_SCOPE, 
+               DETERMINATION_CURRENT, 
+               DETERMINATION_HISTORY

        }
 
        /**
        }
 
        /**


@@ -2589,4 +2505,6 @@ public class CdmFormFactory extends FormToolkit {
                // text.addFocusListener(visibilityHandler);
                return text;
        }
                // text.addFocusListener(visibilityHandler);
                return text;
        }

+
+

 }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java
index 19fe700b279423b79caf266ae3317482c0f51009..91829bbe3eb12e68d8e9b0fc14a262d84fb4679b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java
@@ -29,8 +29,7 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
+import eu.etaxonomy.taxeditor.ui.combo.EmptyComboElement;

 import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard;
 
 /**
 import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard;
 
 /**


@@ -117,7 +116,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        combo_language = (EmptyComboElement<Language>) formFactory
 
                if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
                        combo_language = (EmptyComboElement<Language>) formFactory

-                                       .createTermComboElement(TermComboType.EMPTY, formElement,
+                                       .createTermComboElement(Language.class, formElement,

                                                        "", null, style);
                        combo_language.addSelectionListener(this);
                        addControl(formFactory.createLabel(getLayoutComposite(), ""));
                                                        "", null, style);
                        combo_language.addSelectionListener(this);
                        addControl(formFactory.createLabel(getLayoutComposite(), ""));

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
index 6580325959295bfaeb4b836809a42227783ba739..f6f012f5f4b3d9fdb1c8a04728f038b5411426be 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
@@ -15,9 +15,9 @@ import java.text.ParseException;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import eu.etaxonomy.cdm.model.location.Point;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import eu.etaxonomy.cdm.model.location.Point;

+import eu.etaxonomy.cdm.model.location.ReferenceSystem;

 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.preference.Resources;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.ui.term.ReferenceSystemComboElement;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -36,7 +36,7 @@ public class PointElement extends AbstractCdmFormElement implements
        private final TextWithLabelElement text_latitude;
        private final TextWithLabelElement text_longitude;
        private final NumberWithLabelElement number_errorRadius;
        private final TextWithLabelElement text_latitude;
        private final TextWithLabelElement text_longitude;
        private final NumberWithLabelElement number_errorRadius;

-       private final ReferenceSystemComboElement combo_referenceSystem;
+       private final TermComboElement<ReferenceSystem> combo_referenceSystem;

 
        private final TextWithLabelElement text_latitudeParsed;
 
 
        private final TextWithLabelElement text_latitudeParsed;
 


@@ -76,8 +76,8 @@ public class PointElement extends AbstractCdmFormElement implements
                text_longitudeParsed.setEnabled(false);
                number_errorRadius = formFactory.createIntegerTextWithLabelElement(
                                formElement, "Error Radius (m)", null, style);
                text_longitudeParsed.setEnabled(false);
                number_errorRadius = formFactory.createIntegerTextWithLabelElement(
                                formElement, "Error Radius (m)", null, style);

-               combo_referenceSystem = (ReferenceSystemComboElement) formFactory
-                               .createTermComboElement(TermComboType.REFERENCE_SYSTEM,
+               combo_referenceSystem = formFactory
+                               .createTermComboElement(ReferenceSystem.class,

                                                formElement, "Reference System", null, style);
 
                setPoint(point);
                                                formElement, "Reference System", null, style);
 
                setPoint(point);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
index bb8514339623eb6d16d6129fc3f4c244c4bd26a6..7a99479399ca7125a3550abd045af6c505779d81 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
@@ -77,6 +77,30 @@ public abstract class AbstractCdmDetailSection<ENTITY> extends
 
                createControls(this, SWT.NULL);
        }
 
                createControls(this, SWT.NULL);
        }

+       
+       public AbstractCdmDetailSection(CdmFormFactory formFactory, Class<ENTITY> clazz,
+                       ConversationHolder conversation, ICdmFormElement parentElement,
+                       ISelectionProvider selectionProvider, int style) {
+               super(formFactory, parentElement, selectionProvider,
+                               Section.CLIENT_INDENT | style);
+               
+               setText(getHeading());
+
+               addExpansionListener(this);
+
+               createControlsByType(this, clazz, SWT.NULL);
+       }
+
+       /**
+        * @param abstractCdmDetailSection
+        * @param definedTermClass
+        * @param null1
+        */
+       protected void createControlsByType(
+                       AbstractCdmDetailSection<ENTITY> abstractCdmDetailSection,
+                       Class<ENTITY> entityClass, int style) {
+       }
+

 
        /**
         * <p>
 
        /**
         * <p>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
index d17339460d4a49fac0610868f10066161465c93f..5bfce5fd9218e8d92f6bcfc2b388de22aab2464a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
@@ -5,7 +5,6 @@ package eu.etaxonomy.taxeditor.ui.section;
 
 import java.util.Collection;
 
 
 import java.util.Collection;
 

-import org.apache.commons.collections.CollectionUtils;

 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.resource.ImageDescriptor;


@@ -29,8 +28,8 @@ import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

-import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
index acf9ff6211276d965d96bf822ac0a268d318ce9d..d7645a9ba060c58c554ff64e93ec61694ce0ca5b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
@@ -13,12 +13,11 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.description.Modifier;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.description.Modifier;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.ModifierComboElement;

 
 /**
  * <p>ModifierElement class.</p>
 
 /**
  * <p>ModifierElement class.</p>


@@ -29,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.term.ModifierComboElement;
  */
 public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
        
  */
 public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
        

-       private ModifierComboElement combo_modifier;
+       private TermComboElement<Modifier> combo_modifier;

 
        /**
         * <p>Constructor for ModifierElement.</p>
 
        /**
         * <p>Constructor for ModifierElement.</p>


@@ -56,7 +55,7 @@ public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {

-               combo_modifier = (ModifierComboElement) formFactory.createTermComboElement(TermComboType.MODIFIER, element, "Modifier", getEntity(), style);
+               combo_modifier = formFactory.createTermComboElement(Modifier.class, element, "Modifier", getEntity(), style);

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
index 181eb204b25cbe902ab9d8ec6f0541a8434fd0d9..9b0cd0c48df832eb667ed82b32b7459e8b8cd45f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
@@ -10,16 +10,14 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.description.Scope;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.description.Scope;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;

 
 /**
  * <p>ScopeElement class.</p>
 
 /**
  * <p>ScopeElement class.</p>


@@ -30,8 +28,7 @@ import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;
  */
 public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
        
  */
 public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
        

-       private static final Logger logger = Logger.getLogger(ScopeElement.class);
-       private ScopeComboElement combo_scope;
+       private TermComboElement<Scope> combo_scope;

 
        /**
         * <p>Constructor for ScopeElement.</p>
 
        /**
         * <p>Constructor for ScopeElement.</p>


@@ -58,7 +55,7 @@ public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {

-               combo_scope = (ScopeComboElement) formFactory.createTermComboElement(TermComboType.SCOPE, element, "Scope", null, style);
+               combo_scope = formFactory.createTermComboElement(Scope.class, element, "Scope", null, style);

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
index 26cb0719d07c05e380e3d29fe41ea50cd9c294de..b810b9405db4697198f82f0477e698d7c4508730 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
@@ -10,7 +10,6 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.Section;
 
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.Section;
 


@@ -18,14 +17,13 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.taxeditor.store.CdmStore;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;

 
 /**
  * <p>StateDataElement class.</p>
 
 /**
  * <p>StateDataElement class.</p>


@@ -36,9 +34,7 @@ import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
  */
 public class StateDataElement extends AbstractEntityCollectionElement<StateData> {
        
  */
 public class StateDataElement extends AbstractEntityCollectionElement<StateData> {
        

-       private static final Logger logger = Logger
-                       .getLogger(StateDataElement.class);
-       private AbstractTermComboElement<State> combo_state;
+       private TermComboElement<State> combo_state;

        private ModifierSection section_modifiers;
        private TextWithLabelElement text_modifyingText;
 
        private ModifierSection section_modifiers;
        private TextWithLabelElement text_modifyingText;
 


@@ -70,7 +66,7 @@ public class StateDataElement extends AbstractEntityCollectionElement<StateData>
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {

-               combo_state = formFactory.createTermComboElement(TermComboType.STATE, element, "State", null, style);
+               combo_state = formFactory.createTermComboElement(State.class, element, "State", null, style);

                section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE);
                section_modifiers.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
                text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style);
                section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE);
                section_modifiers.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
                text_modifyingText = formFactory.createTextWithLabelElement(element, "Modifying Text", null, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
index 7293090986ee879147b8288089b7344c0fec4752..60c54a43fe6ce762ff1854e5ac54ad22c9d5d181 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
@@ -10,19 +10,18 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.Section;
 
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.Section;
 

+import eu.etaxonomy.cdm.model.description.StatisticalMeasure;

 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.StatisticalMeasureComboElement;

 
 /**
  * <p>StatisticalMeasurementValueElement class.</p>
 
 /**
  * <p>StatisticalMeasurementValueElement class.</p>


@@ -34,11 +33,8 @@ import eu.etaxonomy.taxeditor.ui.term.StatisticalMeasureComboElement;
 public class StatisticalMeasurementValueElement extends
                AbstractEntityCollectionElement<StatisticalMeasurementValue> {
        
 public class StatisticalMeasurementValueElement extends
                AbstractEntityCollectionElement<StatisticalMeasurementValue> {
        

-
-       private static final Logger logger = Logger
-                       .getLogger(StatisticalMeasurementValueElement.class);

        private NumberWithLabelElement number_value;
        private NumberWithLabelElement number_value;

-       private StatisticalMeasureComboElement combo_type;
+       private TermComboElement<StatisticalMeasure> combo_type;

        private ModifierSection section_modifiers;
 
        /**
        private ModifierSection section_modifiers;
 
        /**


@@ -69,7 +65,7 @@ public class StatisticalMeasurementValueElement extends
        @Override
        public void createControls(ICdmFormElement element, int style) {
                number_value = formFactory.createFloatTextWithLabelElement(element, "Value", 0, style);
        @Override
        public void createControls(ICdmFormElement element, int style) {
                number_value = formFactory.createFloatTextWithLabelElement(element, "Value", 0, style);

-               combo_type = (StatisticalMeasureComboElement) formFactory.createTermComboElement(TermComboType.STATISTICAL_MEASURE, element, "Statistical Measure", null, style);
+               combo_type = formFactory.createTermComboElement(StatisticalMeasure.class, element, "Statistical Measure", null, style);

                section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE);
                section_modifiers.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
        }
                section_modifiers = (ModifierSection) formFactory.createEntityDetailSection(EntityDetailType.MODIFIER, getConversationHolder(), element, Section.TWISTIE);
                section_modifiers.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
index 40673eca33256052ca19edc73d96eaa255e5d178..46bb0780818bbc9d45cffa9abb2d6fcf78651fdb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
@@ -10,16 +10,15 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 
 package eu.etaxonomy.taxeditor.ui.section.description.detail;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.SWT;
 
 import org.eclipse.swt.SWT;
 

+import eu.etaxonomy.cdm.model.common.Language;

 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;

 
 /**
  * <p>CommonNameDetailElement class.</p>
 
 /**
  * <p>CommonNameDetailElement class.</p>


@@ -29,11 +28,8 @@ import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;
  * @version 1.0
  */
 public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailElement<CommonTaxonName> {
  * @version 1.0
  */
 public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailElement<CommonTaxonName> {

-
-       private static final Logger logger = Logger
-                       .getLogger(CommonNameDetailElement.class);

        
        

-       private LanguageComboElement combo_language;
+       private TermComboElement<Language> combo_language;

        private NamedAreaSelectionElement selection_namedArea;
        private TextWithLabelElement commonName;
 
        private NamedAreaSelectionElement selection_namedArea;
        private TextWithLabelElement commonName;
 


@@ -55,7 +51,7 @@ public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailEl
        @Override
        protected void createControls(ICdmFormElement formElement,
                        CommonTaxonName entity, int style) {
        @Override
        protected void createControls(ICdmFormElement formElement,
                        CommonTaxonName entity, int style) {

-               combo_language = (LanguageComboElement) formFactory.createTermComboElement(TermComboType.LANGUAGE, this, "Language", entity.getLanguage(), style);
+               combo_language = formFactory.createTermComboElement(Language.class, this, "Language", entity.getLanguage(), style);

 
                selection_namedArea = formFactory.createNamedAreaSelectionElement(this, getConversationHolder(), "Area", entity.getArea(), style);
                
 
                selection_namedArea = formFactory.createNamedAreaSelectionElement(this, getConversationHolder(), "Area", entity.getArea(), style);
                

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
index a6836a9bd9b2a1262c2527c240b823913e2918f9..4e06fabeb51ed11a7d196323d1085d4a4d7931e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
@@ -10,14 +10,12 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 
 package eu.etaxonomy.taxeditor.ui.section.description.detail;
 

-import org.apache.log4j.Logger;
-

 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Distribution;

+import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.PresenceAbsenceTermComboElement;

 
 /**
  * <p>DistributionDetailElement class.</p>
 
 /**
  * <p>DistributionDetailElement class.</p>


@@ -29,10 +27,8 @@ import eu.etaxonomy.taxeditor.ui.term.PresenceAbsenceTermComboElement;
 public class DistributionDetailElement extends
                AbstractDetailedDescriptionDetailElement<Distribution> {
 
 public class DistributionDetailElement extends
                AbstractDetailedDescriptionDetailElement<Distribution> {
 

-       private static final Logger logger = Logger
-                       .getLogger(DistributionDetailElement.class);

        private NamedAreaSelectionElement selection_namedArea;
        private NamedAreaSelectionElement selection_namedArea;

-       private PresenceAbsenceTermComboElement combo_presenceAbsence;
+       private TermComboElement<PresenceAbsenceTermBase> combo_presenceAbsence;

        
 
        /**
        
 
        /**


@@ -54,7 +50,7 @@ public class DistributionDetailElement extends
                        Distribution entity, int style) {
                selection_namedArea = formFactory.createNamedAreaSelectionElement(this, getConversationHolder(), "Area", entity.getArea(), style);
                
                        Distribution entity, int style) {
                selection_namedArea = formFactory.createNamedAreaSelectionElement(this, getConversationHolder(), "Area", entity.getArea(), style);
                

-        combo_presenceAbsence = (PresenceAbsenceTermComboElement) formFactory.createTermComboElement(TermComboType.PRESENCEABSENCESTATUS, this, "Distribution Status", entity.getStatus(), style);
+        combo_presenceAbsence = formFactory.createTermComboElement(PresenceAbsenceTermBase.class, this, "Distribution Status", entity.getStatus(), style);

         
        }
 
         
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
index 146d4f527d809387e516bff388d00918e1dc6e56..da5e7483aa97be741f0014ff592045d1ea5ff2cf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
@@ -5,13 +5,13 @@ package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 
 import org.eclipse.ui.forms.widgets.Section;
 

+import eu.etaxonomy.cdm.model.description.MeasurementUnit;

 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;

 import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValueSection;
 import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValueSection;

-import eu.etaxonomy.taxeditor.ui.term.MeasurementUnitComboElement;

 
 /**
  * <p>QuantitativeDataDetailElement class.</p>
 
 /**
  * <p>QuantitativeDataDetailElement class.</p>


@@ -22,7 +22,7 @@ import eu.etaxonomy.taxeditor.ui.term.MeasurementUnitComboElement;
 public class QuantitativeDataDetailElement extends
                AbstractDetailedDescriptionDetailElement<QuantitativeData> {
 
 public class QuantitativeDataDetailElement extends
                AbstractDetailedDescriptionDetailElement<QuantitativeData> {
 

-       private MeasurementUnitComboElement combo_mesaurementUnit;
+       private TermComboElement<MeasurementUnit> combo_mesaurementUnit;

        private StatisticalMeasurementValueSection section_statisticalMeasurementValues;
        
        /**
        private StatisticalMeasurementValueSection section_statisticalMeasurementValues;
        
        /**


@@ -42,7 +42,7 @@ public class QuantitativeDataDetailElement extends
        @Override
        protected void createControls(ICdmFormElement formElement,
                        QuantitativeData entity, int style) {
        @Override
        protected void createControls(ICdmFormElement formElement,
                        QuantitativeData entity, int style) {

-               combo_mesaurementUnit = (MeasurementUnitComboElement) formFactory.createTermComboElement(TermComboType.MEASUREMENT_UNIT, formElement, "Measurement Unit", entity.getUnit(), style);
+               combo_mesaurementUnit = formFactory.createTermComboElement(MeasurementUnit.class, formElement, "Measurement Unit", entity.getUnit(), style);

                section_statisticalMeasurementValues = (StatisticalMeasurementValueSection) formFactory.createEntityDetailSection(EntityDetailType.STATISTICAL_MEASUREMENT_VALUE, getConversationHolder(), formElement, Section.TWISTIE | Section.EXPANDED);
                section_statisticalMeasurementValues.setEntity(entity);
                section_statisticalMeasurementValues.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));
                section_statisticalMeasurementValues = (StatisticalMeasurementValueSection) formFactory.createEntityDetailSection(EntityDetailType.STATISTICAL_MEASUREMENT_VALUE, getConversationHolder(), formElement, Section.TWISTIE | Section.EXPANDED);
                section_statisticalMeasurementValues.setEntity(entity);
                section_statisticalMeasurementValues.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY(2, 1));

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 0a32e59cfc4e1e65ca91f39778683b991d879945..09f0ea8ef619101359d8617df6e6205506a624f3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -19,8 +19,8 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;


@@ -29,7 +29,6 @@ import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;

-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;

 
 /**
  * <p>NameDetailElement class.</p>
 
 /**
  * <p>NameDetailElement class.</p>


@@ -40,7 +39,7 @@ import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
  */
 public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<NonViralName> implements ISelectableElement, IEnableableFormElement{
 
  */
 public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<NonViralName> implements ISelectableElement, IEnableableFormElement{
 

-       private AbstractTermComboElement<Rank> combo_rank;
+       private TermComboElement<Rank> combo_rank;

        private TextWithLabelElement text_appendedPhrase;
        private TextWithLabelElement text_uninomial;
        private TextWithLabelElement text_infragenericEpithet;
        private TextWithLabelElement text_appendedPhrase;
        private TextWithLabelElement text_uninomial;
        private TextWithLabelElement text_infragenericEpithet;


@@ -75,7 +74,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
                
                toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
                
                
                toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
                

-               combo_rank = formFactory.createTermComboElement(TermComboType.RANK, this, "Rank", nonViralName.getRank(), style);
+               combo_rank = formFactory.createTermComboElement(Rank.class, this, "Rank", nonViralName.getRank(), style);

 
                createGenusOrUninomialControls(this, nonViralName, style);
                createInfragenerericEpithetControls(this, nonViralName, style);
 
                createGenusOrUninomialControls(this, nonViralName, style);
                createInfragenerericEpithetControls(this, nonViralName, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
index 1a316185cdbaa1e7e6a216e630eea39c4cd046de..74903e82745e0f0bd31075ff521994b241ffa58e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
@@ -15,7 +15,9 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import org.eclipse.swt.graphics.Color;
 
 import eu.etaxonomy.cdm.model.name.NameRelationship;

+import eu.etaxonomy.cdm.model.name.NameRelationshipType;

 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;


@@ -23,7 +25,6 @@ import eu.etaxonomy.taxeditor.ui.forms.LabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.NameRelationshipTypeComboElement;

 
 /**
  * <p>NameRelationshipDetailElement class.</p>
 
 /**
  * <p>NameRelationshipDetailElement class.</p>


@@ -36,7 +37,7 @@ public class NameRelationshipDetailElement extends AbstractReferencedEntityEleme
 
        private TextWithLabelElement text_ruleConsidered;
        private AbstractSelectionElement selection_toName;
 
        private TextWithLabelElement text_ruleConsidered;
        private AbstractSelectionElement selection_toName;

-       private NameRelationshipTypeComboElement combo_relationshipType;
+       private TermComboElement<NameRelationshipType> combo_relationshipType;

        private LabelElement label;
 
        /**
        private LabelElement label;
 
        /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
index 3acdf74bbffe90fc80010c1b1e7c869716d15687..dbbe6e393cf33a1453443c7fc1b435576b320df1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
@@ -19,12 +19,11 @@ import org.eclipse.swt.widgets.Composite;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.RootElement;
 import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.RootElement;
 import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.NameRelationshipTypeComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -42,7 +41,7 @@ public class NameRelationshipWizardPage extends WizardPage implements
 
        private NameSelectionElement selection_relatedTo;
 
 
        private NameSelectionElement selection_relatedTo;
 

-       private NameRelationshipTypeComboElement combo_relationshipType;
+       private TermComboElement<NameRelationshipType> combo_relationshipType;

 
        private final NameRelationshipDetailSection callingSection;
 
 
        private final NameRelationshipDetailSection callingSection;
 


@@ -94,8 +93,7 @@ public class NameRelationshipWizardPage extends WizardPage implements
 
                rootElement = new RootElement(formFactory, control);
 
 
                rootElement = new RootElement(formFactory, control);
 

-               combo_relationshipType = (NameRelationshipTypeComboElement) formFactory
-                               .createTermComboElement(TermComboType.NAMERELATIONSHIP,
+               combo_relationshipType = formFactory.createTermComboElement(NameRelationshipType.class,

                                                rootElement, "Name Relationship Type", null, SWT.NULL);
 
                selection_relatedTo = (NameSelectionElement) formFactory
                                                rootElement, "Name Relationship Type", null, SWT.NULL);
 
                selection_relatedTo = (NameSelectionElement) formFactory

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
index 6de937e7ee5109713a9f3a2e6363e305c3b7c6f6..02cfd7fe49ace439b3ea0b578be9d7b57459117c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
@@ -10,21 +10,19 @@
 
 package eu.etaxonomy.taxeditor.ui.section.name;
 
 
 package eu.etaxonomy.taxeditor.ui.section.name;
 

-import org.apache.log4j.Logger;

 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -38,12 +36,10 @@ import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;
 public class NameTypeDesignationElement extends
                AbstractTypeDesignationElement<NameTypeDesignation> {
 
 public class NameTypeDesignationElement extends
                AbstractTypeDesignationElement<NameTypeDesignation> {
 

-       private static final Logger logger = Logger
-                       .getLogger(NameTypeDesignationElement.class);

        private CheckboxElement checkbox_rejectedType;
        private CheckboxElement checkbox_conservedType;
        private NameSelectionElement selection_typeName;
        private CheckboxElement checkbox_rejectedType;
        private CheckboxElement checkbox_conservedType;
        private NameSelectionElement selection_typeName;

-       private NameTypeDesignationStatusComboElement combo_typeStatus;
+       private TermComboElement<NameTypeDesignationStatus> combo_typeStatus;

 
        /**
         * <p>
 
        /**
         * <p>


@@ -82,9 +78,8 @@ public class NameTypeDesignationElement extends
                                .createSelectionElement(SelectionType.NAME,
                                                getConversationHolder(), formElement, "Name", null,
                                                NameSelectionElement.DEFAULT, style);
                                .createSelectionElement(SelectionType.NAME,
                                                getConversationHolder(), formElement, "Name", null,
                                                NameSelectionElement.DEFAULT, style);

-               combo_typeStatus = (NameTypeDesignationStatusComboElement) formFactory
-                               .createTermComboElement(
-                                               TermComboType.NAMETYPEDESIGNATIONSTATUS, formElement,
+               combo_typeStatus = formFactory.createTermComboElement(
+                               NameTypeDesignationStatus.class, formElement,

                                                "Designation Status", null, style);
 
                super.createControls(formElement, style);
                                                "Designation Status", null, style);
 
                super.createControls(formElement, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
index 516f254bf647a37608793d68eb39c8affc8049fb..b7930d17e2317ca1e08994977567ba28464650ba 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
@@ -14,6 +14,7 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
 
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;


@@ -21,9 +22,7 @@ import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
 import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
 import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
 import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;

-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;

 
 /**
  * <p>NomenclaturalStatusElement class.</p>
 
 /**
  * <p>NomenclaturalStatusElement class.</p>


@@ -34,7 +33,7 @@ import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
  */
 public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<NomenclaturalStatus> implements IEntityElement<NomenclaturalStatus>, ISelectableElement{
 
  */
 public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<NomenclaturalStatus> implements IEntityElement<NomenclaturalStatus>, ISelectableElement{
 

-       private AbstractTermComboElement<NomenclaturalStatusType> nomenclaturalStatusTypeCombo;
+       private TermComboElement<NomenclaturalStatusType> nomenclaturalStatusTypeCombo;

        
        private TextWithLabelElement ruleConsideredText;
        
        
        private TextWithLabelElement ruleConsideredText;
        


@@ -61,7 +60,7 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {

-               nomenclaturalStatusTypeCombo = formFactory.createTermComboElement(TermComboType.NOMENCLATURALSTATUSTYPE, this, "Nomenclatural Status Type", null, style);
+               nomenclaturalStatusTypeCombo = formFactory.createTermComboElement(NomenclaturalStatusType.class, this, "Nomenclatural Status Type", null, style);

                ruleConsideredText = formFactory.createTextWithLabelElement(this, "Rule Considered", "", style);
                
                super.createControls(element, style);
                ruleConsideredText = formFactory.createTextWithLabelElement(this, "Rule Considered", "", style);
                
                super.createControls(element, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
index d15dd2eb8c8d3c552d31c4c6bf16126e629d4469..3979e7021f99c4a7e6b15107d53481e4d5074f5a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
@@ -14,14 +14,14 @@ import java.util.Arrays;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 
 import org.eclipse.ui.forms.widgets.Section;
 

+import eu.etaxonomy.cdm.model.name.NomenclaturalCode;

 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.NonViralName;

+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;

-import eu.etaxonomy.taxeditor.ui.term.NomenclaturalCodeComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -37,7 +37,7 @@ public class NonViralNameDetailElement extends
 
        private NameDetailSection section_name;
        private AuthorshipDetailSection section_author;
 
        private NameDetailSection section_name;
        private AuthorshipDetailSection section_author;

-       private NomenclaturalCodeComboElement combo_nomenclaturalCode;
+       private EnumComboElement<NomenclaturalCode> combo_nomenclaturalCode;

        private HybridDetailSection section_hybrid;
 
        /**
        private HybridDetailSection section_hybrid;
 
        /**


@@ -74,8 +74,8 @@ public class NonViralNameDetailElement extends
                                "Cache", entity.getTitleCache(), entity.isProtectedTitleCache()
                                                || entity.isProtectedFullTitleCache(), style);
 
                                "Cache", entity.getTitleCache(), entity.isProtectedTitleCache()
                                                || entity.isProtectedFullTitleCache(), style);
 

-               combo_nomenclaturalCode = (NomenclaturalCodeComboElement) formFactory
-                               .createEnumComboElement(EnumComboType.NOMENCLATURALCODE,
+               combo_nomenclaturalCode = formFactory
+                               .createEnumComboElement(NomenclaturalCode.class,

                                                formElement, style);
                combo_nomenclaturalCode.setSelection(entity.getNomenclaturalCode());
 
                                                formElement, style);
                combo_nomenclaturalCode.setSelection(entity.getNomenclaturalCode());
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
index f7bb967bbb764f38fc57174e505f19bd3350d845..d4750049efcea653e20185e0d553650cd43b4fc7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
@@ -16,14 +16,13 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.SpecimenTypeDesignationStatusComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -37,7 +36,7 @@ import eu.etaxonomy.taxeditor.ui.term.SpecimenTypeDesignationStatusComboElement;
 public class SpecimenTypeDesignationElement extends
                AbstractTypeDesignationElement<SpecimenTypeDesignation> {
 
 public class SpecimenTypeDesignationElement extends
                AbstractTypeDesignationElement<SpecimenTypeDesignation> {
 

-       private SpecimenTypeDesignationStatusComboElement combo_typeStatus;
+       private TermComboElement<SpecimenTypeDesignationStatus> combo_typeStatus;

        private DerivedUnitBaseSelectionElement selection_typeSpecimen;
        private TextWithLabelElement text_specimenTypeText;
 
        private DerivedUnitBaseSelectionElement selection_typeSpecimen;
        private TextWithLabelElement text_specimenTypeText;
 


@@ -73,9 +72,8 @@ public class SpecimenTypeDesignationElement extends
                                .createSelectionElement(SelectionType.DERIVED_UNIT,
                                                getConversationHolder(), formElement, "Unit", null,
                                                DerivedUnitBaseSelectionElement.DEFAULT, style);
                                .createSelectionElement(SelectionType.DERIVED_UNIT,
                                                getConversationHolder(), formElement, "Unit", null,
                                                DerivedUnitBaseSelectionElement.DEFAULT, style);

-               combo_typeStatus = (SpecimenTypeDesignationStatusComboElement) formFactory
-                               .createTermComboElement(
-                                               TermComboType.SPECIMENTYPEDESIGNATIONSTATUS,
+               combo_typeStatus = formFactory
+                               .createTermComboElement(SpecimenTypeDesignationStatus.class,

                                                formElement, "Designation Status", null, style);
 
                super.createControls(formElement, style);
                                                formElement, "Designation Status", null, style);
 
                super.createControls(formElement, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 2ee211722c6d9a365ef98a88a5654b30dbb0969e..91cd1282c4d1b33618d0647c06857fc8cc4e2080 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -14,17 +14,17 @@ import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;

+import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;

 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.PreservationMethodComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -48,7 +48,7 @@ public class DerivedUnitBaseDetailElement extends
 
        private TextWithLabelElement text_exsicatum;
 
 
        private TextWithLabelElement text_exsicatum;
 

-       private PreservationMethodComboElement combo_preservationMethod;
+       private TermComboElement<PreservationMethod> combo_preservationMethod;

 
        private SpecimenCollectionDetailSection section_duplicates;
 
 
        private SpecimenCollectionDetailSection section_duplicates;
 


@@ -91,8 +91,7 @@ public class DerivedUnitBaseDetailElement extends
                                                entity.getCatalogNumber(), style);
 
                try {
                                                entity.getCatalogNumber(), style);
 
                try {

-                       combo_preservationMethod = (PreservationMethodComboElement) formFactory
-                                       .createTermComboElement(TermComboType.PRESERVATION_METHOD,
+                       combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class,

                                                        formElement, "Preservation Method",
                                                        entity.getPreservationMethod(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
                                                        formElement, "Preservation Method",
                                                        entity.getPreservationMethod(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
index 8c51a2d869ddd043ca6e593bb5ffc289673e6907..a7c82f4d1daee7c853d98bc38bef2a771f5a234f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
@@ -13,15 +13,15 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;

+import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonBaseSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonBaseSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
 public class DeterminationEventDetailElement extends
                AbstractEventDetailElement<DeterminationEvent> {
 
 public class DeterminationEventDetailElement extends
                AbstractEventDetailElement<DeterminationEvent> {
 

-       private DeterminationModifierComboElement combo_determinationModifier;
+       private TermComboElement<DeterminationModifier> combo_determinationModifier;

        private CheckboxElement checkbox_preferredFlag;
        private TaxonBaseSelectionElement selection_taxonBase;
 
        private CheckboxElement checkbox_preferredFlag;
        private TaxonBaseSelectionElement selection_taxonBase;
 


@@ -106,8 +106,7 @@ public class DeterminationEventDetailElement extends
                selection_agent.setLabel("Determined by");
                
                
                selection_agent.setLabel("Determined by");
                
                

-               combo_determinationModifier = (DeterminationModifierComboElement) formFactory
-               .createTermComboElement(TermComboType.DETERMINATION_MODIFIER,
+               combo_determinationModifier = formFactory.createTermComboElement(DeterminationModifier.class,

                                element, "Modifier", null, style);
        }
 
                                element, "Modifier", null, style);
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
index 735fac83d2bab8ec912bf502e754210f218cc5dc..fc5e407ed7a268c8faa4b18b6b593440d75f7a7f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
@@ -11,16 +11,15 @@
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;

+import eu.etaxonomy.cdm.model.description.Sex;
+import eu.etaxonomy.cdm.model.description.Stage;

 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.CdmStore;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;

-import eu.etaxonomy.taxeditor.ui.term.SexComboElement;
-import eu.etaxonomy.taxeditor.ui.term.StageComboElement;

 
 /**
  * <p>FieldObservationDetailElement class.</p>
 
 /**
  * <p>FieldObservationDetailElement class.</p>


@@ -41,9 +40,9 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
 
        private NumberWithLabelElement number_individualCount;
 
 
        private NumberWithLabelElement number_individualCount;
 

-       private SexComboElement combo_sex;
+       private TermComboElement<Sex> combo_sex;

 
 

-       private StageComboElement combo_lifeStage;
+       private TermComboElement<Stage> combo_lifeStage;

        
        /**
         * <p>Constructor for FieldObservationDetailElement.</p>
        
        /**
         * <p>Constructor for FieldObservationDetailElement.</p>


@@ -67,8 +66,8 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
                text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
                
                number_individualCount = formFactory.createIntegerTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
                text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
                
                number_individualCount = formFactory.createIntegerTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);

-               combo_lifeStage = (StageComboElement) formFactory.createTermComboElement(TermComboType.STAGE, formElement, "Life Stage", entity.getLifeStage(), style);
-               combo_sex = (SexComboElement) formFactory.createTermComboElement(TermComboType.SEX, formElement, "Sex", entity.getSex(), style);
+               combo_lifeStage = formFactory.createTermComboElement(Stage.class, formElement, "Life Stage", entity.getLifeStage(), style);
+               combo_sex = formFactory.createTermComboElement(Sex.class, formElement, "Sex", entity.getSex(), style);

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
index 1b7beb78192df669cbc299f1364d375b890afb6e..01ca4dc3e6947691b6548ce40583bf23d2c62bb0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
@@ -23,8 +23,8 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.taxeditor.model.AuthorHelper;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.taxeditor.model.AuthorHelper;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;


@@ -32,13 +32,11 @@ import eu.etaxonomy.taxeditor.ui.forms.IErrorIntolerableElement;
 import eu.etaxonomy.taxeditor.ui.forms.IExceptionHandler;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.forms.IExceptionHandler;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement;

-import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;

 import eu.etaxonomy.taxeditor.ui.forms.UriWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.UriWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.ReferenceTypeComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -70,7 +68,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
        private TimePeriodElement element_timePeriod;
        private ReferenceSelectionElement selection_inReference;
        private InstitutionSelectionElement selection_institution;
        private TimePeriodElement element_timePeriod;
        private ReferenceSelectionElement selection_inReference;
        private InstitutionSelectionElement selection_institution;

-       private ReferenceTypeComboElement combo_referenceType;
+       private EnumComboElement<ReferenceType> combo_referenceType;

 
        private ReferenceSelectionElement selection_inSeries;
 
 
        private ReferenceSelectionElement selection_inSeries;
 


@@ -108,8 +106,7 @@ public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElem
                                "Reference Cache", entity.getTitleCache(),
                                entity.isProtectedTitleCache(), style);
 
                                "Reference Cache", entity.getTitleCache(),
                                entity.isProtectedTitleCache(), style);
 

-               combo_referenceType = (ReferenceTypeComboElement) formFactory
-                               .createEnumComboElement(EnumComboType.REFERENCETYPE,
+               combo_referenceType = formFactory.createEnumComboElement(ReferenceType.class,

                                                formElement, style);
 
                combo_referenceType.setSelection(entity.getType());
                                                formElement, style);
 
                combo_referenceType.setSelection(entity.getType());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
index 295b8132c5754205ce4976db49514bf00c1a35f3..5e651fa3b7d61c93b7984594a75c90ccf34de0d2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
@@ -6,13 +6,13 @@ package eu.etaxonomy.taxeditor.ui.section.supplemental;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Annotation;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Annotation;

+import eu.etaxonomy.cdm.model.common.AnnotationType;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.AnnotationTypeComboElement;

 
 /**
  * <p>AnnotationElement class.</p>
 
 /**
  * <p>AnnotationElement class.</p>


@@ -23,7 +23,7 @@ import eu.etaxonomy.taxeditor.ui.term.AnnotationTypeComboElement;
 public class AnnotationElement extends AbstractEntityCollectionElement<Annotation>{
 
        private TextWithLabelElement text;
 public class AnnotationElement extends AbstractEntityCollectionElement<Annotation>{
 
        private TextWithLabelElement text;

-       private AnnotationTypeComboElement combo_annotationType;
+       private TermComboElement<AnnotationType> combo_annotationType;

 
        /**
         * <p>Constructor for AnnotationElement.</p>
 
        /**
         * <p>Constructor for AnnotationElement.</p>


@@ -44,7 +44,7 @@ public class AnnotationElement extends AbstractEntityCollectionElement<Annotatio
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {

-               combo_annotationType = (AnnotationTypeComboElement) formFactory.createTermComboElement(TermComboType.ANNOTATIONTYPE, this, "Annotation Type", null, style);
+               combo_annotationType = formFactory.createTermComboElement(AnnotationType.class, this, "Annotation Type", null, style);

                
                text = formFactory.createMultilineTextWithLabel(this, "Annotation", 100, style);
        }
                
                text = formFactory.createMultilineTextWithLabel(this, "Annotation", 100, style);
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
index c62db242ac007488156821d2e250ead1f650cfed..1551d86a8688e1ab04427779b6d95bb03939ef31 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
@@ -8,13 +8,12 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.ExtensionTypeComboElement;

 
 /**
  * <p>ExtensionElement class.</p>
 
 /**
  * <p>ExtensionElement class.</p>


@@ -25,7 +24,7 @@ import eu.etaxonomy.taxeditor.ui.term.ExtensionTypeComboElement;
  */
 public class ExtensionElement extends AbstractEntityCollectionElement<Extension> {
 
  */
 public class ExtensionElement extends AbstractEntityCollectionElement<Extension> {
 

-       private ExtensionTypeComboElement combo_extensionType;
+       private TermComboElement<ExtensionType> combo_extensionType;

        private TextWithLabelElement text_extensionValue;
        
        /**
        private TextWithLabelElement text_extensionValue;
        
        /**


@@ -48,7 +47,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {

-               combo_extensionType = (ExtensionTypeComboElement) formFactory.createTermComboElement(TermComboType.EXTENSIONTYPE, this, null, null, style);
+               combo_extensionType = formFactory.createTermComboElement(ExtensionType.class, this, null, null, style);

                text_extensionValue = formFactory.createTextWithLabelElement(element, null, null, style);
                text_extensionValue.getLayoutComposite().setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
        }
                text_extensionValue = formFactory.createTextWithLabelElement(element, null, null, style);
                text_extensionValue.getLayoutComposite().setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
index c709959df9c7b6afdebd4c495807f68a5aa6e45f..c54ab30bc8a84627f037c337bc181c65ca84b909 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
@@ -36,6 +36,7 @@ public class HeadlineSection extends AbstractFormSection<ICdmBase> {
        public void setEntity(ICdmBase cdmBase) {
                ICdmBase entity = (ICdmBase) HibernateProxyHelper.deproxy(cdmBase);
                super.setEntity(entity);
        public void setEntity(ICdmBase cdmBase) {
                ICdmBase entity = (ICdmBase) HibernateProxyHelper.deproxy(cdmBase);
                super.setEntity(entity);

+

                setText(entity.getClass().getSimpleName() + (entity instanceof IdentifiableEntity ? ": " + ((IdentifiableEntity) entity).getTitleCache() : ""));
                layout();
        }
                setText(entity.getClass().getSimpleName() + (entity instanceof IdentifiableEntity ? ": " + ((IdentifiableEntity) entity).getTitleCache() : ""));
                layout();
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
index 7c70ac19a28c0d089de70855ae71b1a60e2ceec2..4aecefd1655e670aa295b66ac3a8c8eb976e4ab0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
@@ -7,13 +7,12 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;

-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;

 
 /**
  * <p>MarkerElement class.</p>
 
 /**
  * <p>MarkerElement class.</p>


@@ -38,7 +37,7 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
        
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
        

-       private AbstractTermComboElement<MarkerType> combo_markerType;
+       private TermComboElement<MarkerType> combo_markerType;

        private CheckboxElement checkbox_markerState;
 
 
        private CheckboxElement checkbox_markerState;
 
 


@@ -49,7 +48,7 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
        @Override
        public void createControls(ICdmFormElement element, int style) {
                checkbox_markerState = formFactory.createCheckbox(this, null, false, style);
        @Override
        public void createControls(ICdmFormElement element, int style) {
                checkbox_markerState = formFactory.createCheckbox(this, null, false, style);

-               combo_markerType = formFactory.createTermComboElement(TermComboType.MARKERTYPE, this, null, null, style);
+               combo_markerType = formFactory.createTermComboElement(MarkerType.class, this, null, null, style);

        }
 
        /* (non-Javadoc)
        }
 
        /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
index 6570a1360da8296bf902466df3a91f7da48bbae6..f75a2932e95542d64b96a7f2b7eb722cd683bd9b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
@@ -8,16 +8,15 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.media.RightsTerm;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.media.RightsTerm;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -54,7 +53,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
 
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
 

-       private AbstractTermComboElement<RightsTerm> combo_rightsType;
+       private TermComboElement<RightsTerm> combo_rightsType;

        private AbstractSelectionElement<AgentBase> selection_agent;
        private TextWithLabelElement text;
 
        private AbstractSelectionElement<AgentBase> selection_agent;
        private TextWithLabelElement text;
 


@@ -69,7 +68,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
        @Override
        public void createControls(ICdmFormElement element, int style) {
                combo_rightsType = formFactory.createTermComboElement(
        @Override
        public void createControls(ICdmFormElement element, int style) {
                combo_rightsType = formFactory.createTermComboElement(

-                               TermComboType.RIGHTSTYPE, this, "Rights Type", null, style);
+                               RightsTerm.class, this, "Rights Type", null, style);

                selection_agent = formFactory.createSelectionElement(
                                SelectionType.AGENT, getConversationHolder(), this, "Agent",
                                null, AgentSelectionElement.DEFAULT, style);
                selection_agent = formFactory.createSelectionElement(
                                SelectionType.AGENT, getConversationHolder(), this, "Agent",
                                null, AgentSelectionElement.DEFAULT, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
index 85ddb57603a12c79735b4e1f3b181ce6fc438ab1..b924539f37d5a741c0ebf851f4b258ebfab9c4bd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
@@ -15,14 +15,13 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;

-import eu.etaxonomy.taxeditor.ui.term.TaxonRelationshipTypeComboElement;

 
 /**
  * @author n.hoffmann
 
 /**
  * @author n.hoffmann


@@ -31,7 +30,7 @@ import eu.etaxonomy.taxeditor.ui.term.TaxonRelationshipTypeComboElement;
  */
 public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement<TaxonRelationship> {
 
  */
 public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement<TaxonRelationship> {
 

-       private TaxonRelationshipTypeComboElement combo_taxonRelationshipType;
+       private TermComboElement<TaxonRelationshipTypeInverseContainer> combo_taxonRelationshipType;

        
        private TaxonSelectionElement selection_relatedTaxon;
        
        
        private TaxonSelectionElement selection_relatedTaxon;
        


@@ -43,8 +42,8 @@ public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement<Tax
        @Override
        protected void createControls(ICdmFormElement formElement,
                        TaxonRelationship entity, int style) {
        @Override
        protected void createControls(ICdmFormElement formElement,
                        TaxonRelationship entity, int style) {

-               combo_taxonRelationshipType = (TaxonRelationshipTypeComboElement) formFactory.createTermComboElement(
-                               TermComboType.TAXON_RELATIONSHIP_TYPE_INVERSE_CONTAINER, 
+               combo_taxonRelationshipType = formFactory.createTermComboElement(
+                               TaxonRelationshipTypeInverseContainer.class, 

                                formElement, "Relationship Type", 
                                getTaxonRelationshipTypeInverseContainer(), style);
                combo_taxonRelationshipType.setEnabled(false);
                                formElement, "Relationship Type", 
                                getTaxonRelationshipTypeInverseContainer(), style);
                combo_taxonRelationshipType.setEnabled(false);


@@ -77,7 +76,6 @@ public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement<Tax
                        }else{
                                getEntity().setToTaxon(relatedTaxon);
                        }
                        }else{
                                getEntity().setToTaxon(relatedTaxon);
                        }

-                       

                }
                firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
        }
                }
                firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
new file mode 100644 (file)
index 0000000..bd3da62
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/AbstractTermBaseDetailElement.java
@@ -0,0 +1,68 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import java.util.HashSet;\r
+import java.util.Set;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.Marker;\r
+import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.common.TermBase;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;\r
+import eu.etaxonomy.taxeditor.ui.forms.UriWithLabelElement;\r
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 20 Dec 2011\r
+ *\r
+ */\r
+public abstract class AbstractTermBaseDetailElement<T extends TermBase> extends AbstractCdmDetailElement<T> {\r
+\r
+       protected TextWithLabelElement text_label;\r
+       protected TextWithLabelElement text_description;\r
+       protected UriWithLabelElement uri_uri;\r
+       \r
+       /**\r
+        * @param formFactory\r
+        * @param formElement\r
+        */\r
+       public AbstractTermBaseDetailElement(CdmFormFactory formFactory,\r
+                       ICdmFormElement formElement) {\r
+               super(formFactory, formElement);\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, java.lang.Object, int)\r
+        */\r
+       @Override\r
+       protected void createControls(ICdmFormElement formElement,\r
+                       T entity, int style) {\r
+               text_label = formFactory.createTextWithLabelElement(formElement, "Label", getEntity().getLabel(), style);\r
+               text_description = formFactory.createMultilineTextWithLabel(formElement, "Description", 100, style);\r
+               text_description.setText(getEntity().getDescription());\r
+               uri_uri = formFactory.createUriWithLabelElement(formElement, "URI", getEntity().getUri(), style);\r
+               \r
+       }\r
+\r
+       @Override\r
+       public void setEntity(T entity) {\r
+               super.setEntity(entity);\r
+               setEnabled(TermBasePropertyTester.isModifiable(entity));\r
+       }\r
+\r
+       public abstract TermVocabulary getVocabulary();\r
+               \r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
new file mode 100644 (file)
index 0000000..01a0e52
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
@@ -0,0 +1,56 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.common.Representation;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 20 Dec 2011\r
+ *\r
+ */\r
+public class DefinedTermDetailElement<T extends DefinedTermBase> extends AbstractTermBaseDetailElement<T> {\r
+       \r
+       /**\r
+        * @param formFactory\r
+        * @param formElement\r
+        */\r
+       public DefinedTermDetailElement(CdmFormFactory formFactory,\r
+                       ICdmFormElement formElement) {\r
+               super(formFactory, formElement);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)\r
+        */\r
+       @Override\r
+       public void handleEvent(Object eventSource) {\r
+               if (eventSource == text_label){\r
+                       getEntity().setLabel(text_label.getText());\r
+               }else if (eventSource == text_description){\r
+                       Representation representation = getEntity().getRepresentation(Language.DEFAULT());\r
+                       representation.setText(text_description.getText());\r
+               }\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement#getVocabularyMarkers()\r
+        */\r
+       @Override\r
+       public TermVocabulary getVocabulary() {\r
+               return getEntity() != null ? getEntity().getVocabulary() : null;\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java
new file mode 100644 (file)
index 0000000..8cdcb1e
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java
@@ -0,0 +1,76 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import org.eclipse.jface.viewers.ISelectionProvider;\r
+import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
+\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 4 Jan 2012\r
+ *\r
+ */\r
+public class DefinedTermDetailSection<T extends DefinedTermBase> extends AbstractCdmDetailSection<T> {\r
+\r
+\r
+       private Class definedTermClass;\r
+\r
+       /**\r
+        * @param formFactory\r
+        * @param definedTermClass \r
+        * @param conversation\r
+        * @param parentElement\r
+        * @param selectionProvider\r
+        * @param style\r
+        */\r
+       public DefinedTermDetailSection(CdmFormFactory formFactory,\r
+                       Class definedTermClass, ConversationHolder conversation, ICdmFormElement parentElement,\r
+                       ISelectionProvider selectionProvider, int style) {\r
+               super(formFactory, definedTermClass, conversation, parentElement, selectionProvider, style);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType()\r
+        */\r
+       @Override\r
+       protected DetailType getDetailType() {\r
+               return null;\r
+       }\r
+       \r
+       @Override\r
+       protected void createControlsByType(\r
+                       AbstractCdmDetailSection<T> abstractCdmDetailSection,\r
+                       Class<T> clazz, int style) {\r
+               TableWrapLayout layout = (TableWrapLayout) getLayoutComposite()\r
+                               .getLayout();\r
+               layout.topMargin = 10;\r
+               layout.numColumns = 2;\r
+\r
+               getLayoutComposite().setLayout(layout);\r
+               detailElement = formFactory.createDefinedTermDetailElement(clazz,\r
+                               abstractCdmDetailSection, style);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()\r
+        */\r
+       @Override\r
+       public String getHeading() {\r
+               return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : "");\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
new file mode 100644 (file)
index 0000000..6cb0296
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java
@@ -0,0 +1,90 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import java.net.URISyntaxException;\r
+\r
+import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.common.Representation;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
+import eu.etaxonomy.cdm.model.location.NamedAreaType;\r
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 20 Dec 2011\r
+ *\r
+ */\r
+public class NamedAreaDetailElement extends DefinedTermDetailElement<NamedArea> {\r
+\r
+       // level\r
+       // type\r
+       private TermComboElement<NamedAreaType> combo_namedAreaType;\r
+       private TermComboElement<NamedAreaLevel> combo_namedAreaLevel;\r
+       // validPeriod\r
+       private TimePeriodElement timePeriod_validPeriod;\r
+       \r
+       /**\r
+        * @param formFactory\r
+        * @param formElement\r
+        */\r
+       public NamedAreaDetailElement(CdmFormFactory formFactory,\r
+                       ICdmFormElement formElement) {\r
+               super(formFactory, formElement);\r
+       }\r
+       \r
+       public void createControls(ICdmFormElement formElement, NamedArea entity, int style) {\r
+               super.createControls(formElement, entity, style);\r
+               \r
+               timePeriod_validPeriod = formFactory.createTimePeriodElement(formElement, "Valid Period", getEntity().getValidPeriod(), style);\r
+               combo_namedAreaType = formFactory.createTermComboElement(NamedAreaType.class, formElement, "Named Area Type", getEntity().getType(), style);\r
+               combo_namedAreaLevel = formFactory.createTermComboElement(NamedAreaLevel.class, formElement, "Named Area Level", getEntity().getLevel(), style);\r
+               \r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)\r
+        */\r
+       @Override\r
+       public void handleEvent(Object eventSource) {\r
+               \r
+               if (eventSource == text_label) {\r
+                       getEntity().setLabel(text_label.getText());\r
+                       getEntity().setTitleCache(null);\r
+               } else if (eventSource == text_description) {\r
+                       \r
+                       Representation representation = getEntity().getRepresentation(Language.DEFAULT());\r
+                       representation.setText(text_description.getText());\r
+                       \r
+               } else if (eventSource == uri_uri) {\r
+                       \r
+                       try {\r
+                               getEntity().setUri(uri_uri.getUri());\r
+                       } catch (URISyntaxException e) {\r
+                               \r
+                               e.printStackTrace();\r
+                       }\r
+               } else if (eventSource == timePeriod_validPeriod) {\r
+                       getEntity().setValidPeriod(timePeriod_validPeriod.getTimePeriod());\r
+               } else if (eventSource == combo_namedAreaType) {\r
+                       getEntity().setType(combo_namedAreaType.getSelection());\r
+               } else if (eventSource == combo_namedAreaLevel) {\r
+                       getEntity().setLevel(combo_namedAreaLevel.getSelection());\r
+               }\r
+               \r
+               \r
+       }\r
+\r
+       \r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java
new file mode 100644 (file)
index 0000000..34f9566
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java
@@ -0,0 +1,60 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import org.eclipse.jface.viewers.ISelectionProvider;\r
+\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.model.location.NamedArea;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 20 Dec 2011\r
+ *\r
+ */\r
+public class NamedAreaDetailSection extends AbstractCdmDetailSection<NamedArea> {\r
+\r
+       /**\r
+        * @param formFactory\r
+        * @param conversation\r
+        * @param parentElement\r
+        * @param selectionProvider\r
+        * @param style\r
+        */\r
+       public NamedAreaDetailSection(CdmFormFactory formFactory,\r
+                       ConversationHolder conversation, ICdmFormElement parentElement,\r
+                       ISelectionProvider selectionProvider, int style) {\r
+               super(formFactory, conversation, parentElement, selectionProvider, style);\r
+\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType()\r
+        */\r
+       @Override\r
+       protected DetailType getDetailType() {\r
+               \r
+               return DetailType.NAMED_AREA;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()\r
+        */\r
+       @Override\r
+       public String getHeading() {\r
+               \r
+               return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : "");\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java
new file mode 100644 (file)
index 0000000..e040753
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java
@@ -0,0 +1,56 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import org.eclipse.jface.viewers.ISelectionProvider;\r
+\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 4 Jan 2012\r
+ *\r
+ */\r
+public class NamedAreaLevelDetailSection extends AbstractCdmDetailSection<NamedAreaLevel> {\r
+\r
+       /**\r
+        * @param formFactory\r
+        * @param parentElement\r
+        * @param style\r
+        */\r
+       public NamedAreaLevelDetailSection(CdmFormFactory formFactory,\r
+                       ConversationHolder conversation, ICdmFormElement parentElement,\r
+                       ISelectionProvider selectionProvider, int style) {\r
+               super(formFactory, conversation, parentElement, selectionProvider, style);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType()\r
+        */\r
+       @Override\r
+       protected DetailType getDetailType() {\r
+               \r
+               return DetailType.NAMED_AREA_LEVEL;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()\r
+        */\r
+       @Override\r
+       public String getHeading() {\r
+               return "Defined Term: "+ (getEntity() != null ? getEntity().getLabel() : "");\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
new file mode 100644 (file)
index 0000000..c66d81f
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
@@ -0,0 +1,91 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import java.net.URISyntaxException;\r
+import java.util.HashSet;\r
+import java.util.Set;\r
+\r
+import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.common.Marker;\r
+import eu.etaxonomy.cdm.model.common.Representation;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.forms.UriWithLabelElement;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 20 Dec 2011\r
+ *\r
+ */\r
+public class TermVocabularyDetailElement extends AbstractTermBaseDetailElement<TermVocabulary> {\r
+\r
+       private UriWithLabelElement uri_uriTermSource;\r
+       /**\r
+        * @param formFactory\r
+        * @param formElement\r
+        */\r
+       public TermVocabularyDetailElement(CdmFormFactory formFactory,\r
+                       ICdmFormElement formElement) {\r
+               super(formFactory, formElement);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, java.lang.Object, int)\r
+        */\r
+       @Override\r
+       protected void createControls(ICdmFormElement formElement,\r
+                       TermVocabulary entity, int style) {\r
+               \r
+               super.createControls(formElement, entity, style);\r
+               uri_uriTermSource = formFactory.createUriWithLabelElement(formElement, "URI Term Source", getEntity().getTermSourceUri(), style);\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)\r
+        */\r
+       @Override\r
+       public void handleEvent(Object eventSource) {\r
+               \r
+               if (eventSource == text_label) {\r
+                       getEntity().setLabel(text_label.getText());\r
+                       getEntity().setTitleCache(null);\r
+               } else if (eventSource == text_description) {\r
+                       \r
+                       Representation representation = getEntity().getRepresentation(Language.DEFAULT());\r
+                       representation.setText(text_description.getText());\r
+               } else if (eventSource == uri_uri) {\r
+                       \r
+                       try {\r
+                               getEntity().setUri(uri_uri.getUri());\r
+                       } catch (URISyntaxException e) {\r
+                               \r
+                               e.printStackTrace();\r
+                       }\r
+               } else if (eventSource == uri_uriTermSource) {\r
+                       try {\r
+                               getEntity().setTermSourceUri(uri_uriTermSource.getUri());\r
+                       } catch (URISyntaxException e) {\r
+                               // TODO Auto-generated catch block\r
+                               e.printStackTrace();\r
+                       }\r
+               }\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement#getVocabularyMarkers()\r
+        */\r
+       @Override\r
+       public TermVocabulary getVocabulary() {\r
+               return getEntity();\r
+       }\r
+\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java
new file mode 100644 (file)
index 0000000..6128434
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java
@@ -0,0 +1,68 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
+\r
+import org.eclipse.jface.viewers.ISelectionProvider;\r
+\r
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
+import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;\r
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;\r
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;\r
+\r
+/**\r
+ * @author l.morris\r
+ * @date 20 Dec 2011\r
+ *\r
+ */\r
+public class TermVocabularyDetailSection extends\r
+               AbstractCdmDetailSection<TermVocabulary> {\r
+\r
+       /**\r
+        * @param formFactory\r
+        * @param conversation\r
+        * @param parentElement\r
+        * @param selectionProvider\r
+        * @param style\r
+        */\r
+       public TermVocabularyDetailSection(CdmFormFactory formFactory,\r
+                       ConversationHolder conversation, ICdmFormElement parentElement,\r
+                       ISelectionProvider selectionProvider, int style) {\r
+               super(formFactory, conversation, parentElement, selectionProvider, style);\r
+               // TODO Auto-generated constructor stub\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getDetailType()\r
+        */\r
+       @Override\r
+       protected DetailType getDetailType() {\r
+               \r
+               return DetailType.TERM_VOCABULARY;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()\r
+        */\r
+       @Override\r
+       public String getHeading() {\r
+               \r
+               return "Vocabulary: "+ (getEntity() != null ? getEntity().getLabel() : "");\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#setSectionTitle()\r
+        */\r
+       @Override\r
+       protected void setSectionTitle() {\r
+               setText(getHeading());\r
+       }\r
+}\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java
deleted file mode 100644 (file)
index f0368c8..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.common.AnnotationType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>AnnotationTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created May 12, 2010
- * @version 1.0
- */
-public class AnnotationTypeComboElement extends AbstractTermComboElement<AnnotationType> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for AnnotationTypeComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.common.AnnotationType} object.
-        * @param style a int.
-        */
-       public AnnotationTypeComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       AnnotationType selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<AnnotationType> preferredTerms() {
-               return getTermManager().getPreferredAnnotationTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java
deleted file mode 100644 (file)
index 6a60893..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>DeterminationModifierComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Oct 14, 2010
- * @version 1.0
- */
-public class DeterminationModifierComboElement extends AbstractTermComboElement<DeterminationModifier> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for DeterminationModifierComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.occurrence.DeterminationModifier} object.
-        * @param style a int.
-        */
-       public DeterminationModifierComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       DeterminationModifier selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<DeterminationModifier> preferredTerms() {
-               return getTermManager().getPreferredDeterminationModifiers();
-       }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java
deleted file mode 100644 (file)
index 145d570..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>ExtensionTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Nov 16, 2009
- * @version 1.0
- */
-public class ExtensionTypeComboElement extends AbstractTermComboElement<ExtensionType> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for ExtensionTypeComboElement.</p>
-        *
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.common.ExtensionType} object.
-        * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        */
-       public ExtensionTypeComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString,
-                       ExtensionType selection, int style) {
-               super(toolkit, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.termcombos.AbstractTermComboComposite#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<ExtensionType> preferredTerms() {
-               return getTermManager().getPreferredExtensionTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java
deleted file mode 100644 (file)
index 0ba64e0..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>LanguageComboElement class.</p>
- *
- * @author n.hoffmann
- * @version $Id: $
- */
-public class LanguageComboElement extends AbstractTermComboElement<Language> {
-
-       private static final int VISIBLE_ITEMS = 20;
-
-       /**
-        * <p>Constructor for LanguageComboElement.</p>
-        *
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.common.Language} object.
-        * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        */
-       public LanguageComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString, Language selection, int style) {
-               super(toolkit, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.AbstractTermComboComposite#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<Language> preferredTerms() {
-               return getTermManager().getPreferredLanguages();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java
deleted file mode 100644 (file)
index 715685d..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>MarkerTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Nov 16, 2009
- * @version 1.0
- */
-public class MarkerTypeComboElement extends AbstractTermComboElement<MarkerType> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for MarkerTypeComboElement.</p>
-        *
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.common.MarkerType} object.
-        * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        */
-       public MarkerTypeComboElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
-                       MarkerType selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.termcombos.AbstractTermComboComposite#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<MarkerType> preferredTerms() {
-               return getTermManager().getPreferredMarkerTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java
deleted file mode 100644 (file)
index 01b6617..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.MeasurementUnit;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>MeasurementUnitComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Sep 15, 2010
- * @version 1.0
- */
-public class MeasurementUnitComboElement extends AbstractTermComboElement<MeasurementUnit> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for MeasurementUnitComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.MeasurementUnit} object.
-        * @param style a int.
-        */
-       public MeasurementUnitComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       MeasurementUnit selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<MeasurementUnit> preferredTerms() {
-               return getTermManager().getPreferredMeasurementUnits();
-       }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java
deleted file mode 100644 (file)
index 8cd8071..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>ModifierComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Sep 15, 2010
- * @version 1.0
- */
-public class ModifierComboElement extends AbstractTermComboElement<Modifier> {
-       
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for ModifierComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.Modifier} object.
-        * @param style a int.
-        */
-       public ModifierComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       Modifier selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       protected List<Modifier> preferredTerms() {
-               return getTermManager().getPreferredModifiers();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java
deleted file mode 100644 (file)
index c16bae6..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>NameRelationshipTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Mar 19, 2010
- * @version 1.0
- */
-public class NameRelationshipTypeComboElement extends AbstractTermComboElement<NameRelationshipType> {
-
-       private static final int VISIBLE_ITEMS = 10;
-
-       /**
-        * <p>Constructor for NameRelationshipTypeComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.name.NameRelationshipType} object.
-        * @param style a int.
-        */
-       public NameRelationshipTypeComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, NameRelationshipType selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       protected List<NameRelationshipType> preferredTerms() {
-               return getTermManager().getPreferredNameRelationshipTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java
deleted file mode 100644 (file)
index 53f5c28..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>NameTypeDesignationStatusComboElement class.</p>
- *
- * @author n.hoffmann
- * @created May 17, 2010
- * @version 1.0
- */
-public class NameTypeDesignationStatusComboElement extends
-               AbstractTermComboElement<NameTypeDesignationStatus> {
-       
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for NameTypeDesignationStatusComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus} object.
-        * @param style a int.
-        */
-       public NameTypeDesignationStatusComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       NameTypeDesignationStatus selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<NameTypeDesignationStatus> preferredTerms() {
-               return getTermManager().getPreferredNameTypeDesignationStatus();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java
deleted file mode 100644 (file)
index 5b0a375..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>NamedAreaTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created May 11, 2010
- * @version 1.0
- */
-public class NamedAreaTypeComboElement extends AbstractTermComboElement<NamedAreaType> {
-       
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for NamedAreaTypeComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.location.NamedAreaType} object.
-        * @param style a int.
-        */
-       public NamedAreaTypeComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       NamedAreaType selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       protected List<NamedAreaType> preferredTerms() {
-               return getTermManager().getPreferredNamedAreaTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java
deleted file mode 100644 (file)
index e27371b..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>NomenclaturalCodeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Mar 16, 2010
- * @version 1.0
- */
-public class NomenclaturalCodeComboElement extends AbstractEnumComboElement<NomenclaturalCode> {
-       
-       /**
-        * <p>Constructor for NomenclaturalCodeComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param nomenclaturalCode a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
-        * @param style a int.
-        */
-       public NomenclaturalCodeComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, NomenclaturalCode nomenclaturalCode, int style) {
-               super(formFactory, parentElement, labelString);
-       }
-
-       /**
-        * <p>populateTypes</p>
-        */
-       protected void populateTypes() {
-               for(NomenclaturalCode nomenclaturalCode : NomenclaturalCode.values()){
-                       elementTypeList.add(nomenclaturalCode);
-                       combo.add(nomenclaturalCode.name());
-               }
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java
deleted file mode 100644 (file)
index 4e30806..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>NomenclaturalStatusTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Nov 5, 2009
- * @version 1.0
- */
-public class NomenclaturalStatusTypeComboElement extends
-               AbstractTermComboElement<NomenclaturalStatusType> {
-       
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for NomenclaturalStatusTypeComboElement.</p>
-        *
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.name.NomenclaturalStatusType} object.
-        * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        */
-       public NomenclaturalStatusTypeComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement,
-                       String labelString, NomenclaturalStatusType selection, int style) {
-               super(toolkit, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.termcombos.AbstractTermComboComposite#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<NomenclaturalStatusType> preferredTerms() {
-               return getTermManager().getPreferredNomenclaturalStatusTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java
deleted file mode 100644 (file)
index b03ed89..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>PresenceAbsenceTermComboElement class.</p>
- *
- * @author n.hoffmann
- * @created May 11, 2010
- * @version 1.0
- */
-public class PresenceAbsenceTermComboElement extends
-               AbstractTermComboElement<PresenceAbsenceTermBase> {
-       
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for PresenceAbsenceTermComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase} object.
-        * @param style a int.
-        */
-       public PresenceAbsenceTermComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       PresenceAbsenceTermBase selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       protected List<PresenceAbsenceTermBase> preferredTerms() {
-               return getTermManager().getPreferredPresenceAbsenceTerms();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java
deleted file mode 100644 (file)
index 20f4fbb..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>PreservationMethodComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Jun 25, 2010
- * @version 1.0
- */
-public class PreservationMethodComboElement extends AbstractTermComboElement<PreservationMethod> {
-       
-       private static final int VISIBLE_ITEMS = 5;     
-       
-       /**
-        * <p>Constructor for PreservationMethodComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.occurrence.PreservationMethod} object.
-        * @param style a int.
-        */
-       public PreservationMethodComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       PreservationMethod selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<PreservationMethod> preferredTerms() {
-               return getTermManager().getPreferredPreservationMethods();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java
deleted file mode 100644 (file)
index 4be334a..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>RankComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Nov 5, 2009
- * @version 1.0
- */
-public class RankComboElement extends AbstractTermComboElement<Rank> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for RankComboElement.</p>
-        *
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.name.Rank} object.
-        * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        */
-       public RankComboElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
-                       Rank selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.termcombos.AbstractTermComboComposite#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<Rank> preferredTerms() {
-               return getTermManager().getPreferredRanks();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java
deleted file mode 100644 (file)
index 6a0e9d4..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.location.ReferenceSystem;
-import eu.etaxonomy.taxeditor.store.TermStore;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>ReferenceSystemComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Oct 15, 2010
- * @version 1.0
- */
-public class ReferenceSystemComboElement extends AbstractTermComboElement<ReferenceSystem> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for ReferenceSystemComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.location.ReferenceSystem} object.
-        * @param style a int.
-        */
-       public ReferenceSystemComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       ReferenceSystem selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<ReferenceSystem> preferredTerms() {
-               return TermStore.getReferenceSystems();
-       }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java
deleted file mode 100644 (file)
index 5d0eb02..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import eu.etaxonomy.cdm.model.reference.ReferenceType;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>ReferenceTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Nov 16, 2009
- * @version 1.0
- */
-public class ReferenceTypeComboElement extends AbstractEnumComboElement<ReferenceType>{
-
-       /**
-        * <p>Constructor for ReferenceTypeComboElement.</p>
-        *
-        * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param referenceType a {@link eu.etaxonomy.cdm.model.reference.ReferenceType} object.
-        */
-       public ReferenceTypeComboElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString, ReferenceType referenceType, int style) {
-               super(formFactory, parentElement, labelString);
-       }
-
-       /**
-        * <p>populateTypes</p>
-        */
-       protected void populateTypes() {
-               for(ReferenceType referenceType : ReferenceType.values()){
-                       elementTypeList.add(referenceType);
-                       combo.add(referenceType.getMessage(CdmStore.getDefaultLanguage()));
-               }
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java
deleted file mode 100644 (file)
index 9c0d585..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.media.RightsTerm;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>RightsTypeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Nov 16, 2009
- * @version 1.0
- */
-public class RightsTypeComboElement extends AbstractTermComboElement<RightsTerm> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for RightsTypeComboElement.</p>
-        *
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.media.RightsTerm} object.
-        * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        */
-       public RightsTypeComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString,
-                       RightsTerm selection, int style) {
-               super(toolkit, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.termcombos.AbstractTermComboComposite#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<RightsTerm> preferredTerms() {
-               return getTermManager().getPreferredRightsTypes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java
deleted file mode 100644 (file)
index d64d75e..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>ScopeComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Sep 17, 2010
- * @version 1.0
- */
-public class ScopeComboElement extends AbstractTermComboElement<Scope> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for ScopeComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.Scope} object.
-        * @param style a int.
-        */
-       public ScopeComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, Scope selection,
-                       int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       protected List<Scope> preferredTerms() {
-               return getTermManager().getPreferredScopes();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java
deleted file mode 100644 (file)
index fad77d9..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.Sex;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>SexComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Jun 24, 2010
- * @version 1.0
- */
-public class SexComboElement extends AbstractTermComboElement<Sex> {
-
-       private static final int VISIBLE_ITEMS = 2;
-       
-       /**
-        * <p>Constructor for SexComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.Sex} object.
-        * @param style a int.
-        */
-       public SexComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, Sex selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<Sex> preferredTerms() {
-               List<Sex> list = new ArrayList<Sex>();
-               list.add(Sex.FEMALE());
-               list.add(Sex.MALE());
-               return list;
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java
deleted file mode 100644 (file)
index 86e7c3e..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>SpecimenTypeDesignationStatusComboElement class.</p>
- *
- * @author n.hoffmann
- * @created May 17, 2010
- * @version 1.0
- */
-public class SpecimenTypeDesignationStatusComboElement extends
-               AbstractTermComboElement<SpecimenTypeDesignationStatus> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for SpecimenTypeDesignationStatusComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus} object.
-        * @param style a int.
-        */
-       public SpecimenTypeDesignationStatusComboElement(
-                       CdmFormFactory formFactory, ICdmFormElement parentElement,
-                       String labelString, SpecimenTypeDesignationStatus selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<SpecimenTypeDesignationStatus> preferredTerms() {
-               return getTermManager().getPreferredSpecimenTypeDesignationStatus();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java
deleted file mode 100644 (file)
index ad598b9..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.Stage;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>StageComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Jun 25, 2010
- * @version 1.0
- */
-public class StageComboElement extends AbstractTermComboElement<Stage> {
-       
-       private static final int VISIBLE_ITEMS = 5;
-       
-       /**
-        * <p>Constructor for StageComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.Stage} object.
-        * @param style a int.
-        */
-       public StageComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, Stage selection,
-                       int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement#preferredTerms()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected List<Stage> preferredTerms() {
-               return getTermManager().getPreferredStages();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java
deleted file mode 100644 (file)
index c55f64e..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>StateComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Sep 15, 2010
- * @version 1.0
- */
-public class StateComboElement extends AbstractTermComboElement<State> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       /**
-        * <p>Constructor for StateComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.State} object.
-        * @param style a int.
-        */
-       public StateComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString, State selection,
-                       int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       protected List<State> preferredTerms() {
-               return getTermManager().getPreferredStates();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java
deleted file mode 100644 (file)
index 38f2704..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2007 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * <p>StatisticalMeasureComboElement class.</p>
- *
- * @author n.hoffmann
- * @created Sep 15, 2010
- * @version 1.0
- */
-public class StatisticalMeasureComboElement extends AbstractTermComboElement<StatisticalMeasure> {
-
-       private static final int VISIBLE_ITEMS = 5;
-       
-       /**
-        * <p>Constructor for StatisticalMeasureComboElement.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
-        * @param labelString a {@link java.lang.String} object.
-        * @param selection a {@link eu.etaxonomy.cdm.model.description.StatisticalMeasure} object.
-        * @param style a int.
-        */
-       public StatisticalMeasureComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       StatisticalMeasure selection, int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-       /** {@inheritDoc} */
-       @Override
-       protected List<StatisticalMeasure> preferredTerms() {
-               return getTermManager().getPreferredStatisticalMeasures();
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/TaxonRelationshipTypeComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/TaxonRelationshipTypeComboElement.java
deleted file mode 100644 (file)
index c6b8215..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/term/TaxonRelationshipTypeComboElement.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 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.ui.term;
-
-import java.util.List;
-
-import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-
-/**
- * @author n.hoffmann
- * @date Dec 1, 2011
- *
- */
-public class TaxonRelationshipTypeComboElement extends AbstractTermComboElement<TaxonRelationshipTypeInverseContainer> {
-
-       private static final int VISIBLE_ITEMS = 10;
-       
-       public TaxonRelationshipTypeComboElement(CdmFormFactory formFactory,
-                       ICdmFormElement parentElement, String labelString,
-                       TaxonRelationshipTypeInverseContainer selection, 
-                       int style) {
-               super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement#preferredTerms()
-        */
-       @Override
-       protected List preferredTerms() {
-               return getTermManager().getRelationshipTypesWithInverses();
-       }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
index 1113625a0e73215530db43a7c7cdf928188db58d..4f1f5071812d1aeb7bf5e5d5e4d8e26e03fcef43 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
@@ -30,14 +30,12 @@ import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;

-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;

 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement;
 import eu.etaxonomy.taxeditor.ui.forms.RootElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement;
 import eu.etaxonomy.taxeditor.ui.forms.RootElement;

-import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
-import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;

 
 /**
  * <p>TranslationWizardPage class.</p>
 
 /**
  * <p>TranslationWizardPage class.</p>


@@ -56,11 +54,11 @@ public class TranslationWizardPage extends WizardPage{
        
        private CdmFormFactory formFactory;
 
        
        private CdmFormFactory formFactory;
 

-       private EmptyComboElement<Language> combo_sourceLanguage;
+       private TermComboElement combo_sourceLanguage;

 
        private LanguageStringWithLabelElement text_source;
 
 
        private LanguageStringWithLabelElement text_source;
 

-       private LanguageComboElement combo_targetLanguage;
+       private TermComboElement<Language> combo_targetLanguage;

 
        private LanguageStringWithLabelElement text_target;
        
 
        private LanguageStringWithLabelElement text_target;
        


@@ -131,7 +129,7 @@ public class TranslationWizardPage extends WizardPage{
         */
        private void createLeftControls(ICdmFormElement element){
                
         */
        private void createLeftControls(ICdmFormElement element){
                

-               combo_sourceLanguage = (EmptyComboElement<Language>) formFactory.createTermComboElement(TermComboType.EMPTY, element, null, null, SWT.NULL);
+               combo_sourceLanguage = formFactory.createTermComboElement(null, element, null, null, SWT.NULL);

                combo_sourceLanguage.setTerms(getLanguages());
                
                combo_sourceLanguage.addSelectionListener(new SelectionAdapter() {
                combo_sourceLanguage.setTerms(getLanguages());
                
                combo_sourceLanguage.addSelectionListener(new SelectionAdapter() {


@@ -158,7 +156,7 @@ public class TranslationWizardPage extends WizardPage{
         * @param element
         */
        private void createRightControls(ICdmFormElement element){
         * @param element
         */
        private void createRightControls(ICdmFormElement element){

-               combo_targetLanguage = (LanguageComboElement) formFactory.createTermComboElement(TermComboType.LANGUAGE, element, null, null, SWT.NULL);
+               combo_targetLanguage = formFactory.createTermComboElement(Language.class, element, null, null, SWT.NULL);

                
                combo_targetLanguage.addSelectionListener(new SelectionAdapter() {
                        /* (non-Javadoc)
                
                combo_targetLanguage.addSelectionListener(new SelectionAdapter() {
                        /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
index e84c11ea886f383b00742cd6557d55bfb5e14973..5a48d1831a3802a1037a7c9bb4b34e1a5727c224 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
@@ -132,7 +132,7 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection
        public void setFocus() {
                if(getConversationHolder() != null){
                        getConversationHolder().bind();
        public void setFocus() {
                if(getConversationHolder() != null){
                        getConversationHolder().bind();

-               }
+               }       

                getViewer().getControl().setFocus();    
        }
        
                getViewer().getControl().setFocus();    
        }
        

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index e29e253568ae9f255ef0e1f393084f98990797c9..46dfa6d4d7a0e7356ce13237948723e79055bef5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -21,7 +21,9 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;

+import eu.etaxonomy.cdm.model.common.DefinedTermBase;

 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.Group;

+import eu.etaxonomy.cdm.model.common.TermVocabulary;

 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;


@@ -37,6 +39,7 @@ import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;

+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;

 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
 import eu.etaxonomy.taxeditor.ui.forms.RootElement;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
 import eu.etaxonomy.taxeditor.ui.forms.RootElement;


@@ -79,6 +82,7 @@ import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonBaseDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonRelationshipDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonRelationshipDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailSection;

+import eu.etaxonomy.taxeditor.ui.section.vocabulary.TermVocabularyDetailSection;

 import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
 import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
 import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 


@@ -93,29 +97,6 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
  */
 public class DetailsViewer extends AbstractCdmDataViewer {
 
  */
 public class DetailsViewer extends AbstractCdmDataViewer {
 

-       private enum VIEW_PART {
-               TAXON, 
-               NAME, 
-               REFEERENCE, 
-               TEAM, 
-               PERSON, 
-               DESCRIPTION, 
-               DESCRIPTION_ELEMENT, 
-               EMPTY, 
-               IMAGE_GALLERY, 
-               MEDIA, 
-               TEAM_OR_PERSON_BASE, 
-               DERIVED_UNIT, 
-               FEATURE_DISTRIBUTION, 
-               POLYTOMOUS_KEY, 
-               POLYTOMOUS_KEY_NODE, 
-               USER, 
-               GROUP,
-               TAXON_RELATIONSHIP
-       }
-
-       private VIEW_PART currentViewPart;
-

        private ISelection selection;
 
        /**
        private ISelection selection;
 
        /**


@@ -179,99 +160,67 @@ public class DetailsViewer extends AbstractCdmDataViewer {
        @Override
        protected void showParts() {
                if (getInput() instanceof TaxonBase) {
        @Override
        protected void showParts() {
                if (getInput() instanceof TaxonBase) {

-                       if (currentViewPart != VIEW_PART.TAXON) {
-                               createTaxonSections(rootElement);
-                               currentViewPart = VIEW_PART.TAXON;
-                       }
+                       createTaxonSections(rootElement);
+

                } else if (getInput() instanceof NonViralName) {
                } else if (getInput() instanceof NonViralName) {

-                       if (currentViewPart != VIEW_PART.NAME) {
-                               createNameSections(rootElement);
-                               currentViewPart = VIEW_PART.NAME;
-                       }
+                       createNameSections(rootElement);
+

                } else if (getInput() instanceof Reference) {
                } else if (getInput() instanceof Reference) {

-                       if (currentViewPart != VIEW_PART.REFEERENCE) {
-                               createReferenceSections(rootElement);
-                               currentViewPart = VIEW_PART.REFEERENCE;
-                       }
+                       createReferenceSections(rootElement);
+

                } else if (getInput() instanceof Team) {
                } else if (getInput() instanceof Team) {

-                       if (currentViewPart != VIEW_PART.TEAM) {
-                               createTeamDetailSection(rootElement);
-                               currentViewPart = VIEW_PART.TEAM;
-                       }
+                       createTeamDetailSection(rootElement);
+

                } else if (getInput() instanceof Person) {
                } else if (getInput() instanceof Person) {

-                       if (currentViewPart != VIEW_PART.PERSON) {
-                               createPersonDetailSection(rootElement);
-                               currentViewPart = VIEW_PART.PERSON;
-                       }
+                       createPersonDetailSection(rootElement);
+

                } else if (getInput() instanceof TeamOrPersonBase) {
                } else if (getInput() instanceof TeamOrPersonBase) {

-                       // fallback
-                       if (currentViewPart != VIEW_PART.TEAM_OR_PERSON_BASE) {
-                               createTeamOrPersonBaseDetailSection(rootElement);
-                               currentViewPart = VIEW_PART.TEAM_OR_PERSON_BASE;
-                       }
+                       createTeamOrPersonBaseDetailSection(rootElement);
+

                } else if (getInput() instanceof DescriptionBase) {
                        if (((DescriptionBase) getInput()).isImageGallery()) {
                } else if (getInput() instanceof DescriptionBase) {
                        if (((DescriptionBase) getInput()).isImageGallery()) {

-                               if (currentViewPart != VIEW_PART.IMAGE_GALLERY) {
-                                       createImageGallerySection(rootElement);
-                                       currentViewPart = VIEW_PART.IMAGE_GALLERY;
-                               }
+                               createImageGallerySection(rootElement);
+

                        } else {
                        } else {

-                               if (currentViewPart != VIEW_PART.DESCRIPTION) {
-                                       createDescriptionSection(rootElement);
-                                       currentViewPart = VIEW_PART.DESCRIPTION;
-                               }
+                               createDescriptionSection(rootElement);
+

                        }
                } else if (getInput() instanceof DescriptionElementBase) {
                        }
                } else if (getInput() instanceof DescriptionElementBase) {

-                       if (currentViewPart != VIEW_PART.DESCRIPTION_ELEMENT) {
-                               createDescriptionElementSection(rootElement);
-                               currentViewPart = VIEW_PART.DESCRIPTION_ELEMENT;
-                       }
+                       createDescriptionElementSection(rootElement);
+

                } else if (getInput() instanceof Media) {
                } else if (getInput() instanceof Media) {

-                       if (currentViewPart != VIEW_PART.MEDIA) {
-                               createMediaElementSection(rootElement);
-                               currentViewPart = VIEW_PART.MEDIA;
-                       }
+                       createMediaElementSection(rootElement);
+

                } else if (getInput() instanceof DerivedUnitFacade) {
                } else if (getInput() instanceof DerivedUnitFacade) {

-                       if (currentViewPart != VIEW_PART.DERIVED_UNIT) {
-                               createDerivedUnitBaseElementSection(rootElement);
-                               currentViewPart = VIEW_PART.DERIVED_UNIT;
-                       }
+                       createDerivedUnitBaseElementSection(rootElement);
+

                } else if (getInput() instanceof FeatureNodeContainer) {
                } else if (getInput() instanceof FeatureNodeContainer) {

-                       if (currentViewPart != VIEW_PART.FEATURE_DISTRIBUTION) {
-                               createFeatureDistributionSection(rootElement);
-                               currentViewPart = VIEW_PART.FEATURE_DISTRIBUTION;
-                       }
+                       createFeatureDistributionSection(rootElement);
+

                } else if (getInput() instanceof PolytomousKey) {
                } else if (getInput() instanceof PolytomousKey) {

-                       if (currentViewPart != VIEW_PART.POLYTOMOUS_KEY) {
-                               createPolytomousKeySection(rootElement);
-                               currentViewPart = VIEW_PART.POLYTOMOUS_KEY;
-                       }
+                       createPolytomousKeySection(rootElement);
+

                } else if ((getInput() instanceof PolytomousKeyNode)
                                || (getInput() instanceof PolytomousKeyRelationship)) {
                } else if ((getInput() instanceof PolytomousKeyNode)
                                || (getInput() instanceof PolytomousKeyRelationship)) {

-                       if (currentViewPart != VIEW_PART.POLYTOMOUS_KEY_NODE) {
-                               createPolytomousKeyNodeSection(rootElement);
-                               currentViewPart = VIEW_PART.POLYTOMOUS_KEY_NODE;
-                       }
+                       createPolytomousKeyNodeSection(rootElement);
+

                } else if (getInput() instanceof User) {
                } else if (getInput() instanceof User) {

-                       if (currentViewPart != VIEW_PART.USER) {
-                               createUserSection(rootElement);
-                               currentViewPart = VIEW_PART.USER;
-                       }
+                       createUserSection(rootElement);
+

                } else if (getInput() instanceof Group) {
                } else if (getInput() instanceof Group) {

-                       if (currentViewPart != VIEW_PART.GROUP) {
-                               createGroupSection(rootElement);
-                               currentViewPart = VIEW_PART.GROUP;
-                       }
+                       createGroupSection(rootElement);
+

                } else if (getInput() instanceof TaxonRelationship) {
                } else if (getInput() instanceof TaxonRelationship) {

-                       if (currentViewPart != VIEW_PART.TAXON_RELATIONSHIP) {
-                               createTaxonRelationshipSection(rootElement);
-                               currentViewPart = VIEW_PART.TAXON_RELATIONSHIP;
-                       }
+                       createTaxonRelationshipSection(rootElement);
+
+               } else if (getInput() instanceof TermVocabulary) {
+                       createTermVocabularySection(rootElement);
+
+               } else if (getInput() instanceof DefinedTermBase) {
+                       createDefinedTermSection(rootElement);

                } else {
                        destroySections();
                } else {
                        destroySections();

-                       currentViewPart = VIEW_PART.EMPTY;

                }
                }

-

                layout();
        }
 
                layout();
        }
 


@@ -682,18 +631,43 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                addPart(userDetailSection);
                addPart(groupByUserDetailSection);
        }
                addPart(userDetailSection);
                addPart(groupByUserDetailSection);
        }

-       
-       private void createTaxonRelationshipSection(RootElement parent){
+
+       private void createTaxonRelationshipSection(RootElement parent) {

                destroySections();
                destroySections();

-               
+

                TaxonRelationshipDetailSection taxonRelationshipDetailSection = (TaxonRelationshipDetailSection) formFactory
                TaxonRelationshipDetailSection taxonRelationshipDetailSection = (TaxonRelationshipDetailSection) formFactory

-                               .createCdmDetailSection(DetailType.TAXON_RELATIONSHIP, getConversationHolder(), parent, this, Section.TWISTIE
+                               .createCdmDetailSection(DetailType.TAXON_RELATIONSHIP,
+                                               getConversationHolder(), parent, this, Section.TWISTIE

                                                                | Section.EXPANDED);
                                                                | Section.EXPANDED);

-               
+

                ReferencedEntityDetailSection referencedEntityBaseDetailSection = (ReferencedEntityDetailSection) formFactory
                ReferencedEntityDetailSection referencedEntityBaseDetailSection = (ReferencedEntityDetailSection) formFactory

-                               .createCdmDetailSection(DetailType.REFERENCED_ENTITY, getConversationHolder(), parent, this, Section.TWISTIE
+                               .createCdmDetailSection(DetailType.REFERENCED_ENTITY,
+                                               getConversationHolder(), parent, this, Section.TWISTIE

                                                                | Section.EXPANDED);
                addPart(taxonRelationshipDetailSection);
                addPart(referencedEntityBaseDetailSection);
        }
                                                                | Section.EXPANDED);
                addPart(taxonRelationshipDetailSection);
                addPart(referencedEntityBaseDetailSection);
        }

+
+       /**
+        * @param rootElement
+        */
+       private void createTermVocabularySection(RootElement parent) {
+               destroySections();
+
+               TermVocabularyDetailSection termVocabularyDetailSection = (TermVocabularyDetailSection) formFactory
+                               .createCdmDetailSection(DetailType.TERM_VOCABULARY,
+                                               getConversationHolder(), parent, this, Section.TWISTIE
+                                                               | Section.EXPANDED);
+               addPart(termVocabularyDetailSection);
+       }
+
+       private void createDefinedTermSection(RootElement parent) {
+               destroySections();
+
+               AbstractFormSection definedTermDetailSection = formFactory
+                               .createDefinedTermDetailSection(getInput().getClass(),
+                                               getConversationHolder(), parent, this, Section.TWISTIE
+                                                               | Section.EXPANDED);
+               addPart(definedTermDetailSection);
+       }

 }
 }