merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / view / AbstractCdmDataViewer.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
index 2a019c07d46fd032af85d7ac9a7724c73bfc5384..57cb798855860ffd4ba5adf4329fbd317353866d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
@@ -1,16 +1,15 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
 // $Id$
 /**
 * Copyright (C) 2007 EDIT

-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy

 * http://www.e-taxonomy.eu
 * 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.view;
 
 * 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.view;
 

-import org.eclipse.jface.viewers.ISelectionProvider;

 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Composite;


@@ -36,23 +35,24 @@ import eu.etaxonomy.taxeditor.view.detail.CdmSectionPart;
  * @created Feb 9, 2010
  * @version 1.0
  */
  * @created Feb 9, 2010
  * @version 1.0
  */

-public abstract class AbstractCdmDataViewer extends Viewer implements ISelectionProvider, IConversationEnabled{
-       
+public abstract class AbstractCdmDataViewer extends Viewer implements IConversationEnabled{
+

        protected ManagedForm managedForm;
 
        protected CdmFormFactory formFactory;
 
        protected ScrolledForm scrolledForm;
        protected ManagedForm managedForm;
 
        protected CdmFormFactory formFactory;
 
        protected ScrolledForm scrolledForm;

-       
-       private Composite body;
-       
+
+       private final Composite body;
+

        protected RootElement rootElement;
 
        protected RootElement rootElement;
 

+       //TODO: create a super class for this?

        private Object input;
 
        private Object input;
 

-       private AbstractCdmViewPart viewPart;
+       private final AbstractCdmViewPart viewPart;
+

 
 

-       

        /**
         * <p>Constructor for AbstractCdmDataViewer.</p>
         *
        /**
         * <p>Constructor for AbstractCdmDataViewer.</p>
         *


@@ -61,9 +61,9 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
         */
        public AbstractCdmDataViewer(Composite parent, AbstractCdmViewPart viewPart) {
                this.viewPart = viewPart;
         */
        public AbstractCdmDataViewer(Composite parent, AbstractCdmViewPart viewPart) {
                this.viewPart = viewPart;

-               
+

                managedForm = new ManagedForm(parent){
                managedForm = new ManagedForm(parent){

-                       
+

                        /* (non-Javadoc)
                         * @see org.eclipse.ui.forms.ManagedForm#dirtyStateChanged()
                         */
                        /* (non-Javadoc)
                         * @see org.eclipse.ui.forms.ManagedForm#dirtyStateChanged()
                         */


@@ -72,18 +72,18 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
                                markViewPartDirty();
                        }
                };
                                markViewPartDirty();
                        }
                };

-               
+

                createFormFactory();
                createFormFactory();

-               
+

                scrolledForm = managedForm.getForm();
                scrolledForm = managedForm.getForm();

-               
+

                body = scrolledForm.getBody();
                body = scrolledForm.getBody();

-               
+

                body.setLayout(LayoutConstants.LAYOUT());
                body.setLayout(LayoutConstants.LAYOUT());

-               
+

                rootElement = new RootElement(formFactory, body);
        }
                rootElement = new RootElement(formFactory, body);
        }

-       
+

        /**
         * <p>createFormFactory</p>
         */
        /**
         * <p>createFormFactory</p>
         */


@@ -98,8 +98,8 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
        protected void markViewPartDirty(){
                viewPart.changed(input);
        }
        protected void markViewPartDirty(){
                viewPart.changed(input);
        }

-       
-       
+
+

        /**
         * @return
         */
        /**
         * @return
         */


@@ -116,22 +116,22 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
                for(Control child : body.getChildren()){
                        return child;
                }
                for(Control child : body.getChildren()){
                        return child;
                }

-               
+

                return body;
        }
                return body;
        }

-       
+

        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#setInput(java.lang.Object)
         */
        /** {@inheritDoc} */
        @Override
        public void setInput(Object input) {
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#setInput(java.lang.Object)
         */
        /** {@inheritDoc} */
        @Override
        public void setInput(Object input) {

-               this.input = input;     
+               this.input = input;

                // reset selection
                setSelection(new StructuredSelection(input));
                refresh();
        }
                // reset selection
                setSelection(new StructuredSelection(input));
                refresh();
        }

-       
+

        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#getInput()
         */
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#getInput()
         */


@@ -140,7 +140,7 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
        public Object getInput() {
                return input;
        }
        public Object getInput() {
                return input;
        }

-       
+

        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#refresh()
         */
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#refresh()
         */


@@ -148,51 +148,51 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
        @Override
        public void refresh() {
                showParts();
        @Override
        public void refresh() {
                showParts();

-               
+

                managedForm.setInput(input);
                managedForm.setInput(input);

-               
+

                managedForm.refresh();
                managedForm.refresh();

-               
+

                managedForm.reflow(true);
        }
 
                managedForm.reflow(true);
        }
 

-       
+

        /**
         * <p>layout</p>
         */
        public void layout(){
                body.layout();
        }
        /**
         * <p>layout</p>
         */
        public void layout(){
                body.layout();
        }

-       
+

        /**
         * <p>showParts</p>
         */
        protected abstract void showParts();
        /**
         * <p>showParts</p>
         */
        protected abstract void showParts();

-       
-       
+
+

        /**
         * <p>destroySections</p>
         */
        /**
         * <p>destroySections</p>
         */

-       protected void destroySections() {      
+       protected void destroySections() {

                for (IFormPart formPart : managedForm.getParts()){
                        removePart((CdmSectionPart) formPart);
                for (IFormPart formPart : managedForm.getParts()){
                        removePart((CdmSectionPart) formPart);

-               }       
-               
+               }
+

                managedForm.setInput(null);
                managedForm.setInput(null);

-                               
+

                formFactory.destroyElement(rootElement);
                formFactory.destroyElement(rootElement);

-               
+

                createFormFactory();
                createFormFactory();

-               
+

                rootElement = new RootElement(formFactory, body);
                rootElement = new RootElement(formFactory, body);

-               
+

                for(Control control : body.getChildren()){
                        control.dispose();
                        control = null;
                }
        }
                for(Control control : body.getChildren()){
                        control.dispose();
                        control = null;
                }
        }

-       
-       
+
+

        /**
         * <p>setFocus</p>
         */
        /**
         * <p>setFocus</p>
         */


@@ -205,14 +205,14 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
                        break;
                }
        }
                        break;
                }
        }

-       
+

        /**
         * <p>reflow</p>
         */
        public void reflow(){
                managedForm.reflow(true);
        }
        /**
         * <p>reflow</p>
         */
        public void reflow(){
                managedForm.reflow(true);
        }

-       
+

        /**
         * <p>removePart</p>
         *
        /**
         * <p>removePart</p>
         *


@@ -222,7 +222,7 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
                managedForm.removePart(sectionPart);
                formFactory.removePropertyChangeListener(sectionPart);
        }
                managedForm.removePart(sectionPart);
                formFactory.removePropertyChangeListener(sectionPart);
        }

-       
+

        /**
         * <p>addPart</p>
         *
        /**
         * <p>addPart</p>
         *


@@ -233,17 +233,19 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
                managedForm.addPart(sectionPart);
                formFactory.addPropertyChangeListener(sectionPart);
        }
                managedForm.addPart(sectionPart);
                formFactory.addPropertyChangeListener(sectionPart);
        }

-       
+

        /**
         * <p>getConversationHolder</p>
         *
         * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        /**
         * <p>getConversationHolder</p>
         *
         * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */

-       public ConversationHolder getConversationHolder() {
+       @Override
+    public ConversationHolder getConversationHolder() {

                return viewPart.getConversationHolder();
        }
                return viewPart.getConversationHolder();
        }

-       
+

        /** {@inheritDoc} */
        /** {@inheritDoc} */

-       public void update(CdmDataChangeMap changeEvents) {}
+       @Override
+    public void update(CdmDataChangeMap changeEvents) {}

 
 }
 
 }