fix "Uses" issue #3624, #3609

diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 92ca4981ba913769d30dbb4756289aa40acca357..0ae54ce1186a952ae65dce11a9ebe1218ea8f250 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -21,22 +21,21 @@
             id="eu.etaxonomy.taxeditor.application.perspective.taxonomic"\r
             name="Taxonomic">\r
       </perspective>\r
-      <perspective\r
+      <!--perspective\r
             class="eu.etaxonomy.taxeditor.perspective.BulkEditing"\r
             id="eu.etaxonomy.taxeditor.application.perspective.bulkeditor"\r
             name="Bulk Editing">\r
-      </perspective>\r
-      <perspective\r
+      </perspective-->\r
+      <!--perspective\r
             class="eu.etaxonomy.taxeditor.perspective.PolytomousKey"\r
             id="eu.etaxonomy.taxeditor.application.perspective.polytomous"\r
             name="Polytomous Key">\r
-      </perspective>\r
-      <!-- FIXME:3.3MC -->\r
-       <!--perspective\r
+      </perspective-->\r
+      <perspective\r
             class="eu.etaxonomy.taxeditor.perspective.Uses"\r
             id="eu.etaxonomy.taxeditor.application.perspective.uses"\r
             name="Uses">\r
-      </perspective-->\r
+      </perspective>\r
      \r
    </extension>\r
    <!--extension\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java
index 5ede554fcda2bcd27f45091303e78861f26d986a..d22a6a60930e1ea4a290bacb0cd111015f7736f4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java
@@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.MarkerType;\r
+import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -35,10 +36,13 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * It will persist the terms that aren't present, using the CDMLib's services classes.\r
  * @author a.theys\r
  * @created mar 13, 2012\r
- * @version 1.0\r
  */\r
 public class UseObjectManager extends ContextListenerAdapter{\r
 \r
+       public UseObjectManager() {\r
+               CdmStore.getContextManager().addContextListener(this);\r
+       }\r
+\r
 \r
        @Override\r
        public void contextRefresh(IProgressMonitor monitor) {\r
@@ -81,39 +85,38 @@ public class UseObjectManager extends ContextListenerAdapter{
 \r
                if(featureUseRecord == null || featureUseSummary == null) {\r
                        TermVocabulary<Feature> featureVocabulary = CdmStore.getService(IVocabularyService.class).find((UsageTermCollection.uuidFeatureVocabulary));\r
-                       FeatureTree palmWebFeatureTree = CdmStore.getService(IFeatureTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree);\r
+//                     FeatureTree palmWebFeatureTree = CdmStore.getService(IFeatureTreeService.class).find(UsageTermCollection.uuidPalmWebFeatureTree);\r
 \r
                        if (featureUseRecord == null ) {\r
                                featureUseRecord = Feature.NewInstance(UsageTermCollection.useRecordFeatureLabel, UsageTermCollection.useRecordFeatureLabel, null);\r
                                featureUseRecord.setUuid(UsageTermCollection.uuidUseRecordFeature);\r
-                               featureUseRecord.isSupportsCategoricalData();\r
                                featureUseRecord.setSupportsCategoricalData(true);\r
                                featureVocabulary.addTerm(featureUseRecord);\r
-                               if (palmWebFeatureTree != null){\r
-                                       FeatureNode useRecFeatureNode = FeatureNode.NewInstance(featureUseRecord);\r
-                                       palmWebFeatureTree.getRoot().addChild(useRecFeatureNode);\r
-                               }else{\r
-                                       StoreUtil.warn(getClass(), "No current feature tree available to add useRecord feature");\r
-                               }\r
+                               \r
+//                             if (palmWebFeatureTree != null){\r
+//                                     FeatureNode useRecFeatureNode = FeatureNode.NewInstance(featureUseRecord);\r
+//                                     palmWebFeatureTree.getRoot().addChild(useRecFeatureNode);\r
+//                             }else{\r
+//                                     StoreUtil.warn(getClass(), "No current feature tree available to add useRecord feature");\r
+//                             }\r
                        }\r
                        if (featureUseSummary == null) {\r
                                featureUseSummary = Feature.NewInstance(UsageTermCollection.useSummaryFeatureLabel, UsageTermCollection.useSummaryFeatureLabel, null);\r
                                featureUseSummary.setUuid(UsageTermCollection.uuidUseSummaryFeature);\r
-                               featureUseSummary.isSupportsTextData();\r
                                featureUseSummary.setSupportsTextData(true);\r
                                featureVocabulary.addTerm(featureUseSummary);\r
-                               if (palmWebFeatureTree != null){\r
-                                       FeatureNode useSumFeatureNode = FeatureNode.NewInstance(featureUseSummary);\r
-                                       palmWebFeatureTree.getRoot().addChild(useSumFeatureNode);\r
-                               }else{\r
-                                       StoreUtil.warn(getClass(), "No current feature tree available to add use summary feature");\r
-                               }\r
+//                             if (palmWebFeatureTree != null){\r
+//                                     FeatureNode useSumFeatureNode = FeatureNode.NewInstance(featureUseSummary);\r
+//                                     palmWebFeatureTree.getRoot().addChild(useSumFeatureNode);\r
+//                             }else{\r
+//                                     StoreUtil.warn(getClass(), "No current feature tree available to add use summary feature");\r
+//                             }\r
                        }\r
 \r
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(featureVocabulary);\r
-                       if (palmWebFeatureTree != null){\r
-                               CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(palmWebFeatureTree);\r
-                       }\r
+//                     if (palmWebFeatureTree != null){\r
+//                             CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(palmWebFeatureTree);\r
+//                     }\r
                        conversation.commit(true);\r
 \r
                }\r
@@ -132,22 +135,16 @@ public class UseObjectManager extends ContextListenerAdapter{
                                e.printStackTrace();\r
                        }\r
 \r
-                       //FIXME:3.3MC----\r
-                       //humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);\r
-//                     humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary);\r
-                       //FIXME:3.3MC----\r
+                       humanGroupVocabulary = TermVocabulary.NewInstance(TermType.Modifier, UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);\r
+                       humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary);\r
 \r
-                       //FIXME:3.3MC----\r
-                       //DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-//                     newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy);\r
-                       //FIXME:3.3MC----\r
+                       DefinedTerm newDummyModifier = DefinedTerm.NewInstance(TermType.Modifier, UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy);\r
 \r
-                       //FIXME:3.3MC----\r
-                       //DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-//                     newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy);\r
-//                     newDummyModifier.addIncludes(newSubDummyModifier);\r
-//                     humanGroupVocabulary.addTerm(newDummyModifier);\r
-                       //FIXME:3.3MC----\r
+                       DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(TermType.Modifier, UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy);\r
+                       newDummyModifier.addIncludes(newSubDummyModifier);\r
+                       humanGroupVocabulary.addTerm(newDummyModifier);\r
 \r
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(humanGroupVocabulary);\r
                        conversation.commit(true);\r
@@ -165,16 +162,12 @@ public class UseObjectManager extends ContextListenerAdapter{
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r
-                       //FIXME:3.3MC----\r
-                       //plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri);\r
-//                     plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary);\r
-                       //FIXME:3.3MC----\r
+                       plantPartVocabulary = TermVocabulary.NewInstance(TermType.Modifier, UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri);\r
+                       plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary);\r
 \r
-                       //FIXME:3.3MC----\r
-                       //DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-//                     newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy);\r
-//                     plantPartVocabulary.addTerm(newDummyModifier);\r
-                       //FIXME:3.3MC----\r
+                       DefinedTerm newDummyModifier = DefinedTerm.NewInstance(TermType.Modifier, UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy);\r
+                       plantPartVocabulary.addTerm(newDummyModifier);\r
 \r
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary);\r
                        conversation.commit(true);\r
@@ -192,16 +185,13 @@ public class UseObjectManager extends ContextListenerAdapter{
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r
-                       //FIXME:3.3MC----\r
-                       //countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);\r
-//                     countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary);\r
-                       //FIXME:3.3MC----\r
-\r
-                       //FIXME:3.3MC----\r
-                       //DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
-//                     newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy);\r
-//                     countryVocabulary.addTerm(newDummyModifier);\r
-                       //FIXME:3.3MC----\r
+                       countryVocabulary = TermVocabulary.NewInstance(TermType.Modifier, UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);\r
+                       countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary);\r
+\r
+                       DefinedTerm newDummyModifier = DefinedTerm.NewInstance(TermType.Modifier, UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
+                       newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy);\r
+                       countryVocabulary.addTerm(newDummyModifier);\r
+\r
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary);\r
                        conversation.commit(true);\r
                }\r
@@ -218,18 +208,18 @@ public class UseObjectManager extends ContextListenerAdapter{
                        } catch (URISyntaxException e) {\r
                                e.printStackTrace();\r
                        }\r
-                       //FIXME:3.3MC----\r
-                       //stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);\r
-//                     stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary);\r
-                       //FIXME:3.3MC----\r
+\r
+                       stateVocabulary = TermVocabulary.NewInstance(TermType.State, UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);\r
+                       stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary);\r
+\r
                        State newDummyState = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
                        newDummyState.setUuid(UsageTermCollection.uuidUseCategoryDummy);\r
                        State newDummySubCat = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);\r
                        newDummySubCat.setUuid(UsageTermCollection.uuidUseSubCategoryDummy);\r
                        newDummyState.addIncludes(newDummySubCat);\r
-                       //FIXME:3.3MC----\r
-//                     stateVocabulary.addTerm(newDummyState);\r
-                       //FIXME:3.3MC----\r
+\r
+                       stateVocabulary.addTerm(newDummyState);\r
+\r
                        CdmStore.getService(IVocabularyService.class).saveOrUpdate(stateVocabulary);\r
                        conversation.commit(true);\r
                }\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
index 0f7cadb8a79e08dba1229f1a37409b61cf432619..7da4103c24ade1664baba8b9e114c6d6753fe38d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
@@ -43,11 +43,6 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
                EditorStateManager stateManager = new EditorStateManager();
                CdmStore.getContextManager().addContextListener(stateManager);
                
-               //FIXME:3.3MC----
-               //UseObjectManager useManager = new UseObjectManager();
-               //CdmStore.getContextManager().addContextListener(useManager);
-               //FIXME:3.3MC----
-               
                plugin = this;
                logger.trace("Plugin started: " + this.getBundle().getSymbolicName());
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
index 403a6b25c51b5d1b156a5d3df6d5570e1d22bf8d..c38a85ec97822e7521f76f2e19bb2dc9dcfa1966 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesViewPart.java
@@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;\r
 \r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
+import eu.etaxonomy.taxeditor.editor.UseObjectManager;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;\r
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementTransfer;\r
@@ -29,6 +30,13 @@ import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
  */\r
 public class UsesViewPart extends DescriptiveViewPart {\r
 \r
+       \r
+       \r
+       public UsesViewPart() {\r
+               super();\r
+               UseObjectManager useManager = new UseObjectManager();\r
+       }\r
+\r
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.uses"</code> */\r
        public static final String ID = "eu.etaxonomy.taxeditor.editor.view.uses";\r
        /** {@inheritDoc} */\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/UsageTermCollection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/UsageTermCollection.java
index de2ced2d27d745c457b55af678cbeb654075a1db..8c86f112e96457c5f3a818473d675bab8bd081fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/UsageTermCollection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/UsageTermCollection.java
@@ -10,13 +10,15 @@ package eu.etaxonomy.taxeditor.editor;
 \r
 import java.util.UUID;\r
 \r
+import eu.etaxonomy.cdm.model.common.VocabularyEnum;\r
+\r
 public class UsageTermCollection {\r
        public final static UUID uuidMarkersVocabulary = UUID.fromString("19dffff7-e142-429c-a420-5d28e4ebe305");\r
        \r
        public final static UUID uuidUseMarkerType = UUID.fromString("2e6e42d9-e92a-41f4-899b-03c0ac64f039");\r
        public final static String useMakerLabel = "use";\r
        \r
-       public final static UUID uuidFeatureVocabulary = UUID.fromString("b187d555-f06f-4d65-9e53-da7c93f8eaa8");\r
+       public final static UUID uuidFeatureVocabulary = VocabularyEnum.Feature.getUuid(); //  UUID.fromString("b187d555-f06f-4d65-9e53-da7c93f8eaa8");\r
        public final static UUID uuidPalmWebFeatureTree = UUID.fromString("72ccce05-7cc8-4dab-8e47-bf3f5fd848a0");\r
        \r
        \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
index 015af402f763c684af16b1742b20fa4a700b7054..9217a71d89af8f5b2854ee53df2ad55f671b88d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
@@ -44,8 +44,8 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 public class UseRecordDetailElement extends\r
                AbstractCdmDetailElement<CategoricalData> implements SelectionListener {\r
 \r
-       private static final Logger logger = Logger\r
-                       .getLogger(UseRecordDetailElement.class);\r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(UseRecordDetailElement.class);\r
 \r
        private TermComboElement<State> combo_UseCategory;\r
        private TermComboElement<State> combo_UseSubCategory;\r
@@ -493,10 +493,9 @@ public class UseRecordDetailElement extends
                                        }\r
                                }\r
                                List<DefinedTerm> emptyListToResetComboBox = new ArrayList<DefinedTerm>();\r
-                               //FIXME:3.3MC----\r
-                               //DefinedTerm emptyMod = DefinedTerm.NewInstance();\r
+                               \r
+//                             DefinedTerm emptyMod = DefinedTerm.NewInstance();\r
                                DefinedTerm emptyMod = null;\r
-                               //FIXME:3.3MC----\r
                                \r
                                \r
                                emptyListToResetComboBox.add(emptyMod);\r