Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / view / detail / CdmSectionPart.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
index 09a393b986d8129d84db0748179db980601ee21e..9e78f57be1320bb2bc220941b85b4ace0f021513 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view.detail;
+package eu.etaxonomy.taxeditor.view.detail;
 
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -18,13 +18,13 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.IDerivedUnitFacadeDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection;
 
 /**
  * <p>CdmSectionPart class.</p>
@@ -40,7 +40,7 @@ public class CdmSectionPart<T> extends SectionPart implements IPropertyChangeLis
        /**
         * <p>Constructor for CdmSectionPart.</p>
         *
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param <T> a T object.
         */
        public CdmSectionPart(AbstractFormSection<T> section) {
@@ -51,8 +51,8 @@ public class CdmSectionPart<T> extends SectionPart implements IPropertyChangeLis
        /** {@inheritDoc} */
        @Override
        public boolean setFormInput(Object input) {
-               if(input instanceof AbstractGroupedContainer){
-                       input = ((AbstractGroupedContainer) input).getData();
+               if(input instanceof IElementHasDetails){
+                       input = ((IElementHasDetails) input).getData();
                }
                if((input instanceof TaxonBase) && (formSection instanceof ITaxonBaseDetailSection)){
                        ((ITaxonBaseDetailSection) formSection).setTaxonBase((TaxonBase) input);
@@ -63,7 +63,7 @@ public class CdmSectionPart<T> extends SectionPart implements IPropertyChangeLis
                        try {
                                input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input, PreferencesUtil.getDerivedUnitConfigurator());
                        } catch (DerivedUnitFacadeNotSupportedException e) {
-                               EditorUtil.error(getClass(), e);
+                               StoreUtil.error(getClass(), e);
                        }
                }