Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / view / supplementaldata / SupplementalDataViewer.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java
index d247b10a161a80f92f8988556e5963a48dd1d6e9..373191faea9462d6f8bd62b365cc8053e87c3861 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.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.supplementaldata;
+package eu.etaxonomy.taxeditor.view.supplementaldata;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -22,22 +22,22 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
-import eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer;
-import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewer;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
-import eu.etaxonomy.taxeditor.section.supplemental.AnnotationSection;
-import eu.etaxonomy.taxeditor.section.supplemental.CreditSection;
-import eu.etaxonomy.taxeditor.section.supplemental.ExtensionSection;
-import eu.etaxonomy.taxeditor.section.supplemental.HeadlineSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MarkerSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaSection;
-import eu.etaxonomy.taxeditor.section.supplemental.RightsSection;
-import eu.etaxonomy.taxeditor.section.supplemental.SourceSection;
-import eu.etaxonomy.taxeditor.section.supplemental.VersionSection;
+import eu.etaxonomy.taxeditor.model.IElementHasDetails;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.CreditSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.ExtensionSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.HeadlineSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MarkerSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.SourceSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.VersionSection;
+import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
+import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewer;
 
 /**
  * <p>SupplementalDataViewer class.</p>
@@ -63,7 +63,7 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe
         * <p>Constructor for SupplementalDataViewer.</p>
         *
         * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
-        * @param viewPart a {@link eu.etaxonomy.taxeditor.model.AbstractCdmViewPart} object.
+        * @param viewPart a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart} object.
         */
        public SupplementalDataViewer(Composite parent, AbstractCdmViewPart viewPart) {
                super(parent, viewPart);
@@ -85,7 +85,6 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe
        /** {@inheritDoc} */
        @Override
        public void setSelection(ISelection selection, boolean reveal) {
-               // TODO Auto-generated method stub
 
        }
 
@@ -98,8 +97,8 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe
                
                Object input;
                
-               if(getInput() instanceof AbstractGroupedContainer){
-                       input = ((AbstractGroupedContainer<?>) getInput()).getData();
+               if(getInput() instanceof IElementHasDetails){
+                       input = ((IElementHasDetails) getInput()).getData();
                }else{
                        input = getInput();
                }