From ac7b0ec72f8b15ad0cca4974a9bb27a3a9f73ddc Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Fri, 4 Feb 2011 18:24:18 +0000
Subject: [PATCH] Fixing issues with display of images in the supplemental data
 view

---
 .../taxeditor/editor/EditorUtil.java          | 19 ++++++++++++++++---
 .../editor/view/detail/DetailsViewPart.java   | 10 +---------
 .../SupplementalDataViewPart.java             |  6 +++---
 .../supplemental/ImageFileElement.java        |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 60d277db2..ea55d9c77 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -29,7 +29,10 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditor;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditorInput;
+import eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer;
 import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart;
+import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewer;
+import eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 
 /**
@@ -257,23 +260,33 @@ public class EditorUtil extends AbstractUtility{
 	 * @return a {@link eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart} object.
 	 */
 	public static DetailsViewPart getDetailsView(){
-		return  (DetailsViewPart) EditorUtil.showView(DetailsViewPart.ID);
+		return  (DetailsViewPart) EditorUtil.getView(DetailsViewPart.ID, false);
 	}
 	
 	/**
 	 * <p>refreshDetailsViewer</p>
 	 */
 	public static void refreshDetailsViewer(){
-		getDetailsView().getDetailsViewer().refresh();
+		((AbstractCdmDataViewer) getDetailsView().getViewer()).refresh();
 	}
 	
 	/**
 	 * <p>reflowDetailsViewer</p>
 	 */
 	public static void reflowDetailsViewer(){
-		getDetailsView().getDetailsViewer().reflow();
+		((DetailsViewer) getDetailsView().getViewer()).reflow();
 	}
 	
+	public static SupplementalDataViewPart getSupplementalDataView(){
+		return (SupplementalDataViewPart) EditorUtil.getView(SupplementalDataViewPart.ID, false);
+	}
+	
+	public static void reflowSupplementalViewer(){
+		((AbstractCdmDataViewer) getSupplementalDataView().getViewer()).reflow();
+	}
+	
+	
+	
 	/**
 	 * <p>getSelection</p>
 	 *
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java
index f97b0a3e0..aa1640eb8 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java
@@ -84,15 +84,6 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
 			showEmptyPage();		
 		}	
 	}
-
-	/**
-	 * <p>getDetailsViewer</p>
-	 *
-	 * @return a {@link eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewer} object.
-	 */
-	public DetailsViewer getDetailsViewer() {
-		return (DetailsViewer) getViewer();
-	}
 	
 	/** {@inheritDoc} */
 	@Override
@@ -103,6 +94,7 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
 		return super.postOperation(objectAffectedByOperation);
 	}
 	
+	
 	/** {@inheritDoc} */
 	@Override
 	public Viewer getViewer() {
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java
index 143a2b5ff..867e7bcf2 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java
@@ -36,7 +36,7 @@ public class SupplementalDataViewPart extends AbstractCdmEditorViewPart {
 	/** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.supp"{trunked}</code> */
 	public static final String ID = "eu.etaxonomy.taxeditor.editor.view.supplementalData";
 
-	private SupplementalDataViewer supplementalDataViewer;
+	private SupplementalDataViewer viewer;
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
@@ -44,7 +44,7 @@ public class SupplementalDataViewPart extends AbstractCdmEditorViewPart {
 	/** {@inheritDoc} */
 	@Override
 	public void createViewer(Composite parent) {
-		supplementalDataViewer = new SupplementalDataViewer(parent, this);
+		viewer = new SupplementalDataViewer(parent, this);
 	}
 
 
@@ -87,7 +87,7 @@ public class SupplementalDataViewPart extends AbstractCdmEditorViewPart {
 	/** {@inheritDoc} */
 	@Override
 	public Viewer getViewer() {
-		return supplementalDataViewer;
+		return viewer;
 	}
 
 	/**
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
index 59454fcb8..529a9dae1 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
@@ -118,8 +118,8 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
 				
 				element_image.loadImage(new Runnable(){
 					public void run() {
-						getLayoutComposite().layout();
 						EditorUtil.reflowDetailsViewer();
+						EditorUtil.reflowSupplementalViewer();
 					}
 				});
 				
-- 
2.34.1