Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / ui / section / supplemental / ImageFileElement.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java
index 529a9dae1cbd6f45d6f35d9b1f9cdb854cad76d8..d249bcd00f98eabd43d1806bd6f92d2eabd79284 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.io.IOException;
 import java.net.URI;
@@ -20,14 +20,14 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.api.service.IMediaService;
 import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
 import eu.etaxonomy.cdm.model.media.ImageFile;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.ImageElement;
-import eu.etaxonomy.taxeditor.forms.KeyValueViewerElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ImageElement;
+import eu.etaxonomy.taxeditor.ui.forms.KeyValueViewerElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 
 /**
  * <p>ImageFileElement class.</p>
@@ -46,8 +46,8 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
        /**
         * <p>Constructor for ImageFileElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.media.ImageFile} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -118,16 +118,16 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
                                
                                element_image.loadImage(new Runnable(){
                                        public void run() {
-                                               EditorUtil.reflowDetailsViewer();
-                                               EditorUtil.reflowSupplementalViewer();
+                                               StoreUtil.reflowDetailsViewer();
+                                               StoreUtil.reflowSupplementalViewer();
                                        }
                                });
                                
                        } catch (IOException e) {
-                               EditorUtil.error(getClass(), e);
+                               StoreUtil.error(getClass(), e);
                        }
                }  catch (Exception e) {
-                       EditorUtil.error(getClass(), "Image could not be shown: ", e);
+                       StoreUtil.error(getClass(), "Image could not be shown: ", e);
                }
        }
 
@@ -142,7 +142,7 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
                        try {
                                getEntity().setUri(new URI(text_uri.getText()));
                        } catch (URISyntaxException e) {
-                               EditorUtil.warningDialog("Could not parse URI", getClass(), e.getMessage());
+                               StoreUtil.warningDialog("Could not parse URI", getClass(), e.getMessage());
                        }
                        showImage(getEntity().getUri());
                }