From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Wed, 25 Sep 2013 10:05:22 +0000 (+0000)
Subject:  - commented compile errors due to model changes (Ticket #3732)
X-Git-Tag: 3.6.0~960^2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6ac587586294af4d6976063049eedfa936bda98b

 - commented compile errors due to model changes (Ticket #3732)
---

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 9459ed7a6..dfaa62d7a 100644
--- 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
@@ -1,16 +1,16 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.preference.menu;
 
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 
 /**
  * <p>PreservationMethodMenuPreferences class.</p>
@@ -19,14 +19,17 @@ import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
  * @created Jun 25, 2010
  * @version 1.0
  */
-public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<PreservationMethod> {
-	
+public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<DefinedTerm>  {
+//FIXME:3.3MC---- see Ticket #3732
+//extends AbstractMenuPreferences<PreservationMethod> {
+  //FIXME:3.3MC----
+
 	/**
 	 * <p>Constructor for PreservationMethodMenuPreferences.</p>
 	 */
 	public PreservationMethodMenuPreferences() {
-		super("Preservation Method Preferences", 
-				"Select preservation methods to be shown in selections", 
+		super("Preservation Method Preferences",
+				"Select preservation methods to be shown in selections",
 				false);
 	}
 
@@ -35,7 +38,7 @@ public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<P
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected Class<PreservationMethod> getTermClass() {
-		return PreservationMethod.class;
+	protected Class<DefinedTerm> getTermClass() {
+		return DefinedTerm.class;
 	}
 }
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 204ab8822..61ab18ee5 100644
--- 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
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * 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.
  */
@@ -14,14 +14,9 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
-import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
@@ -33,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * DerivedUnitBaseDetailElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Jun 24, 2010
  * @version 1.0
@@ -50,9 +45,10 @@ public class DerivedUnitBaseDetailElement extends
 	private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
 
 	private TextWithLabelElement text_exsicatum;
-	
-	
-	private TermComboElement<PreservationMethod> combo_preservationMethod;
+
+	//FIXME:3.3MC---- see Ticket #3732
+//	private TermComboElement<PreservationMethod> combo_preservationMethod;
+	//FIXME:3.3MC----
 
 	private SpecimenCollectionDetailSection section_duplicates;
 
@@ -62,7 +58,7 @@ public class DerivedUnitBaseDetailElement extends
 	 * <p>
 	 * Constructor for DerivedUnitBaseDetailElement.
 	 * </p>
-	 * 
+	 *
 	 * @param formFactory
 	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
 	 *            object.
@@ -87,13 +83,15 @@ public class DerivedUnitBaseDetailElement extends
         text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
         text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
 
-		
-		try {
-            combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, formElement, "Preservation Method", entity.getPreservationMethod(), style);
-		} catch (MethodNotSupportedByDerivedUnitTypeException e) {
-			// we ignore this
-            AbstractUtility.info(e.getMessage());
-		}
+
+        //FIXME:3.3MC----
+//		try {
+//            combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, formElement, "Preservation Method", entity.getPreservationMethod(), style);
+//		} catch (MethodNotSupportedByDerivedUnitTypeException e) {
+//			// we ignore this
+//            AbstractUtility.info(e.getMessage());
+//		}
+		//FIXME:3.3MC----
         selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
 
 		try {
@@ -127,18 +125,20 @@ public class DerivedUnitBaseDetailElement extends
 			getEntity().setBarcode(text_barcode.getText());
 		} else if (eventSource == text_catalogNumber) {
 			getEntity().setCatalogNumber(text_catalogNumber.getText());
-		} else if (eventSource == combo_preservationMethod) {
-			try {
-				getEntity().setPreservationMethod(
-						combo_preservationMethod.getSelection());
-			} catch (MethodNotSupportedByDerivedUnitTypeException e) {
-				AbstractUtility
-						.errorDialog(
-								"MethodNotSupportedByDerivedUnitTypeException",
-								this,
-								"MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit",
-								e);
-			}
+			//FIXME:3.3MC----
+//		} else if (eventSource == combo_preservationMethod) {
+//			try {
+//				getEntity().setPreservationMethod(
+//						combo_preservationMethod.getSelection());
+//			} catch (MethodNotSupportedByDerivedUnitTypeException e) {
+//				AbstractUtility
+//						.errorDialog(
+//								"MethodNotSupportedByDerivedUnitTypeException",
+//								this,
+//								"MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit",
+//								e);
+//			}
+			//FIXME:3.3MC----
 		} else if (eventSource == selection_storedUnder) {
 			getEntity().setStoredUnder(selection_storedUnder.getEntity());
 		} else if (eventSource == text_exsicatum) {