From 6a9ce9d34e5de16d7b4c938fa75e5e3e9fea4811 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Wed, 25 Sep 2013 10:43:26 +0000 Subject: [PATCH] - commented compile errors due to model changes (Ticket #3732) --- .../PreservationMethodMenuPreferences.java | 21 ++++--- .../DerivedUnitBaseDetailElement.java | 58 ++++++++++--------- 2 files changed, 42 insertions(+), 37 deletions(-) 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..4971cb3e6 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; /** *

PreservationMethodMenuPreferences class.

@@ -19,14 +19,17 @@ import eu.etaxonomy.cdm.model.occurrence.PreservationMethod; * @created Jun 25, 2010 * @version 1.0 */ -public class PreservationMethodMenuPreferences extends AbstractMenuPreferences { - +public class PreservationMethodMenuPreferences extends AbstractMenuPreferences { + //FIXME:3.3MC---- +//extends AbstractMenuPreferences { + //FIXME:3.3MC---- + /** *

Constructor for PreservationMethodMenuPreferences.

*/ 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

getTermClass() { - return PreservationMethod.class; + protected Class 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 6085c7c87..1bc963872 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. */ @@ -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; *

* DerivedUnitBaseDetailElement class. *

- * + * * @author n.hoffmann * @created Jun 24, 2010 * @version 1.0 @@ -47,9 +45,10 @@ public class DerivedUnitBaseDetailElement extends private EntitySelectionElement selection_storedUnder; private TextWithLabelElement text_exsicatum; - - - private TermComboElement combo_preservationMethod; + + //FIXME:3.3MC---- +// private TermComboElement combo_preservationMethod; + //FIXME:3.3MC---- private SpecimenCollectionDetailSection section_duplicates; @@ -59,7 +58,7 @@ public class DerivedUnitBaseDetailElement extends *

* Constructor for DerivedUnitBaseDetailElement. *

- * + * * @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) { -- 2.34.1