- 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 9459ed7a60884e0cdb6b8ab32e7dc99506b08b49..4971cb3e625badaf0bb8170f5cb7c8bfba2467a7 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
@@ -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----
+//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 6085c7c87c9a3948f02235729a2c0cc9b800f9a1..1bc96387291137eada9ce254a92dd666524852d8 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
@@ -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.
  */
@@ -15,11 +15,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.TaxonNameBase;
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
@@ -30,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * DerivedUnitBaseDetailElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Jun 24, 2010
  * @version 1.0
@@ -47,9 +45,10 @@ public class DerivedUnitBaseDetailElement extends
        private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
 
        private TextWithLabelElement text_exsicatum;
-       
-       
-       private TermComboElement<PreservationMethod> combo_preservationMethod;
+
+       //FIXME:3.3MC----
+//     private TermComboElement<PreservationMethod> combo_preservationMethod;
+       //FIXME:3.3MC----
 
        private SpecimenCollectionDetailSection section_duplicates;
 
@@ -59,7 +58,7 @@ public class DerivedUnitBaseDetailElement extends
         * <p>
         * Constructor for DerivedUnitBaseDetailElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -84,13 +83,14 @@ 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 {
@@ -124,18 +124,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) {