From 3156d799f4c5e1943101bd0bce08c8cc9a320992 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Mon, 6 Jul 2015 15:11:20 +0200
Subject: [PATCH 1/1] Display URI parsing errors
---
.../ui/section/media/ImageFileElement.java | 24 +++----------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
index ffa008b59..fbde0b7e0 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
@@ -14,14 +14,12 @@ import java.io.IOException;
import java.net.URI;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpException;
import org.eclipse.swt.events.SelectionListener;
import eu.etaxonomy.cdm.common.media.ImageInfo;
import eu.etaxonomy.cdm.model.media.ImageFile;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
@@ -31,8 +29,6 @@ import eu.etaxonomy.taxeditor.ui.element.KeyValueViewerElement;
import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
/**
- * ImageFileElement class.
- *
* @author n.hoffmann
* @created Mar 26, 2010
* @version 1.0
@@ -48,21 +44,12 @@ public class ImageFileElement extends MediaRepresentationPartElement
private final Runnable postRunnable = new Runnable(){
@Override
public void run() {
- StoreUtil.reflowDetailsViewer();
- StoreUtil.reflowSupplementalViewer();
+ AbstractUtility.reflowDetailsViewer();
+ AbstractUtility.reflowSupplementalViewer();
}
};
- /**
- * Constructor for ImageFileElement.
- *
- * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
- * @param section a {@link eu.etaxonomy.taxeditor.ui.element.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.
- */
public ImageFileElement(CdmFormFactory cdmFormFactory,
AbstractFormSection section, ImageFile element,
SelectionListener removeListener, int style) {
@@ -125,17 +112,12 @@ public class ImageFileElement extends MediaRepresentationPartElement
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if(eventSource == text_uri){
try {
- String uriString = text_uri.getText();
- URI uri = StringUtils.isNotEmpty(uriString) ? new URI(uriString) : null;
+ URI uri = text_uri.getUri();
getEntity().setUri(uri);
--
2.34.1