merge-update from trunk

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
index 88d8449c484889e012acab9d0e91fad63b626ec1..9ab025086f14916cbfb2cf6c920ffa2ab0f64153 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
@@ -60,7 +60,8 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection
                selectionService.addSelectionListener(this);
 
                pageBook = new PageBook(parent, SWT.NULL);
-               createViewerComposite(pageBook);
+               //create viewerComposite
+               viewerComposite = new SashForm(pageBook, SWT.HORIZONTAL);
                createViewer(viewerComposite);
 
                // Page 2: Nothing selected
@@ -85,10 +86,6 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection
                return selectionService.getSelection();
        }
 
-       private void createViewerComposite(Composite parent) {
-               viewerComposite = new SashForm(parent, SWT.HORIZONTAL);
-       }
-
        /**
         * <p>showEmptyPage</p>
         */
@@ -165,6 +162,7 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection
        @Override
     public ConversationHolder getConversationHolder() {
                if(part != null) {
+                   //FIXME what if part is not an IConversationEnabled? ClassCastException?
             return ((IConversationEnabled) part).getConversationHolder();
         }