merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / mvc / AbstractCdmComposite.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java
index c2767aeaf58db6091b2daff7b9f6ef173a08fc02..08ed755b4dbd365aaae7368789931f0bd9dd5a97 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java
@@ -14,17 +14,19 @@ import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.mvc.interfaces.ICdmComposite;
 import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
+import eu.etaxonomy.taxeditor.ui.mvc.interfaces.ICdmComposite;
 
 /**
+ * Basic implementation of {@link ICdmComposite}.
  * @author pplitzner
  * @date 11.02.2014
  *
+ * @param <T> The {@link CdmCompositeController} for this composite.
  */
-public abstract class AbstractCdmComposite extends Composite implements ICdmComposite {
+public abstract class AbstractCdmComposite<T extends CdmCompositeController> extends Composite implements ICdmComposite {
 
-    protected CdmCompositeController controller;
+    protected T controller;
 
     /**
      * @param parent
@@ -63,7 +65,7 @@ public abstract class AbstractCdmComposite extends Composite implements ICdmComp
     protected abstract void initInternalController(CdmFormFactory formFactory, ICdmFormElement parentElement);
 
     @Override
-    public CdmCompositeController getController(){
+    public T getController(){
         return controller;
     }