From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 25 Aug 2015 06:22:23 +0000 (+0200)
Subject: Merge develop into branch
X-Git-Tag: 3.8.0^2~46
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/75ebabd08659d1671161f22bda37619f473b0571

Merge develop into branch
---

75ebabd08659d1671161f22bda37619f473b0571
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
index 915e342f2,31486b409..e7c1e2e7b
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
@@@ -10,25 -10,14 +10,27 @@@
  
  package eu.etaxonomy.taxeditor.ui.element;
  
 +import java.net.MalformedURLException;
  import java.net.URI;
  
 +import org.eclipse.core.runtime.IStatus;
 +import org.eclipse.core.runtime.Status;
+ import org.eclipse.jface.resource.JFaceResources;
  import org.eclipse.swt.SWT;
 +import org.eclipse.swt.events.SelectionAdapter;
 +import org.eclipse.swt.events.SelectionEvent;
 +import org.eclipse.swt.widgets.Button;
 +import org.eclipse.swt.widgets.Composite;
  import org.eclipse.swt.widgets.Display;
  import org.eclipse.swt.widgets.Label;
 +import org.eclipse.ui.PartInitException;
 +import org.eclipse.ui.PlatformUI;
 +import org.eclipse.ui.forms.widgets.TableWrapLayout;
  
+ import eu.etaxonomy.taxeditor.Messages;
 +import eu.etaxonomy.taxeditor.model.ImageResources;
 +import eu.etaxonomy.taxeditor.model.MessagingUtils;
 +import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  
  /**
   * @author n.hoffmann