From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 23 Jul 2013 15:34:26 +0000 (+0000)
Subject: FIME:3.3MC tags for code to be aligned with the 3.3 model changes related to the... 
X-Git-Tag: 3.6.0~960^2~7
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/1c4f6bb6c9841c4faeaeb4d9de3b04dfed165be7

FIME:3.3MC tags for code to be aligned with the 3.3 model changes related to the 'Uses' perspective
---

diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 61f897c86..92ca4981b 100644
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -31,11 +31,12 @@
             id="eu.etaxonomy.taxeditor.application.perspective.polytomous"
             name="Polytomous Key">
       </perspective>
-       <perspective
+      <!-- FIXME:3.3MC -->
+       <!--perspective
             class="eu.etaxonomy.taxeditor.perspective.Uses"
             id="eu.etaxonomy.taxeditor.application.perspective.uses"
             name="Uses">
-      </perspective>
+      </perspective-->
      
    </extension>
    <!--extension
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 bfe4e7369..3d40d7c2e 100644
--- 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
@@ -25,6 +25,7 @@ import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.State;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -131,12 +132,25 @@ public class UseObjectManager extends ContextListenerAdapter{
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);
+			
+			//FIXME:3.3MC----
+			//humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);
+			humanGroupVocabulary = null;
 			humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary);
-			DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newDummyModifier = null;
 			newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy);
-			DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newSubDummyModifier = null;
 			newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy);
+			//FIXME:3.3MC----
+			
 			newDummyModifier.addIncludes(newSubDummyModifier);
 			humanGroupVocabulary.addTerm(newDummyModifier);
 			CdmStore.getService(IVocabularyService.class).saveOrUpdate(humanGroupVocabulary);
@@ -155,11 +169,19 @@ public class UseObjectManager extends ContextListenerAdapter{
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri);
+			//FIXME:3.3MC----
+			//plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri);
+			plantPartVocabulary = null;
 			plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary);
-			DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newDummyModifier = null;
 			newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy);
 			plantPartVocabulary.addTerm(newDummyModifier);
+			//FIXME:3.3MC----
+			
 			CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary);
 			conversation.commit(true);
 		}
@@ -176,10 +198,17 @@ public class UseObjectManager extends ContextListenerAdapter{
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);
+			//FIXME:3.3MC----
+			//countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);
+			countryVocabulary = null;
 			countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary);
-			DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newDummyModifier = null;
 			newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy);
+			//FIXME:3.3MC----
 			countryVocabulary.addTerm(newDummyModifier);
 			CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary);
 			conversation.commit(true);
@@ -197,8 +226,11 @@ public class UseObjectManager extends ContextListenerAdapter{
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);
+			//FIXME:3.3MC----
+			//stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);
+			stateVocabulary = null;
 			stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary);
+			//FIXME:3.3MC----
 			State newDummyState = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
 			newDummyState.setUuid(UsageTermCollection.uuidUseCategoryDummy);
 			State newDummySubCat = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
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 648e35a6a..0f7cadb8a 100644
--- 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,8 +43,10 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
 		EditorStateManager stateManager = new EditorStateManager();
 		CdmStore.getContextManager().addContextListener(stateManager);
 		
-		UseObjectManager useManager = new UseObjectManager();
-		CdmStore.getContextManager().addContextListener(useManager);
+		//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.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 cf0133919..81ba19af3 100644
--- 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
@@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
+import eu.etaxonomy.cdm.model.common.ISimpleTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.TermBase;
@@ -229,6 +230,25 @@ public class PreferencesUtil implements IPreferenceKeys {
 		}
 		return key;
 	}
+	
+	/**
+	 * Construct a unique key using the CdmBase object's uuid
+	 * 
+	 * @param cdmBase
+	 * @return
+	 */
+	public static String getPreferenceKey(ISimpleTerm simpleTerm) {
+		simpleTerm = (ISimpleTerm) HibernateProxyHelper.deproxy(simpleTerm);
+		String key = simpleTerm.getClass().getName().concat(".")
+				.concat(simpleTerm.getUuid().toString());
+		if (key.contains("javassist")) {
+			StoreUtil.warn(PreferencesUtil.class,
+					"Trying to persist a preference based on a proxy class.");
+		}
+		return key;
+	}
+	
+	
 
 	/**
 	 * Construct a unique key using the CdmBase object's uuid