ref #9114 further adapt some classes to URI wrapper in taxeditor

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java
index 1fc440d603a873f0e9183da822cf4b91700c0a68..bac5856431cf5e209b88b6053a4528186b7ebd8f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java
@@ -8,7 +8,7 @@
 */
 package eu.etaxonomy.taxeditor.ui.dialog;
 
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
 import java.net.URISyntaxException;
 
 import org.eclipse.jface.dialogs.IInputValidator;
@@ -73,7 +73,7 @@ public class UriDialog extends InputDialog {
         * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
         * @param dialogTitle a {@link java.lang.String} object.
         * @param dialogMessage a {@link java.lang.String} object.
-        * @return a {@link java.net.URI} object.
+        * @return a {@link eu.etaxonomy.cdm.common.URI} object.
         */
        public static URI getUri(Shell shell, String dialogTitle,
                        String dialogMessage) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
index 7e4dd53645253ad6dd4da781bba4a9674884bcf4..57c2e3cabfe039e37eb0e37f0363b308389b69aa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
@@ -34,7 +34,7 @@ public class BrowserElement extends AbstractCdmFormElement implements ControlLis
         * @param style a int.
         * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
         * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
-        * @param imageUri a {@link java.net.URI} object.
+        * @param imageUri a {@link eu.etaxonomy.cdm.common.URI} object.
         */
        protected BrowserElement(CdmFormFactory formFactory, ICdmFormElement parentElement, URI imageUri, int style) {
                super(formFactory, parentElement);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 5e71882da7d541d1b30dce6531d1ec429e6ded58..6be1d9ec05c8b284c233c57ed4785b2ca485337e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -1175,7 +1175,7 @@ public class CdmFormFactory extends FormToolkit {
      * </p>
      *
      * @param imageUri
-     *            a {@link java.net.URI} object.
+     *            a {@link eu.etaxonomy.cdm.common.URI} object.
      * @param style
      *            a int.
      * @param parentElement
@@ -1200,7 +1200,7 @@ public class CdmFormFactory extends FormToolkit {
      *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
      *            object.
      * @param imageUri
-     *            a {@link java.net.URI} object.
+     *            a {@link eu.etaxonomy.cdm.common.URI} object.
      * @param style
      *            a int.
      * @return a {@link eu.etaxonomy.taxeditor.ui.element.ImageElement} object.

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
index bfc4791c9f3a041d777d62818d5436cc9e234d19..4d26195b2c0aa364c83787aef124d54690cbac93 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
@@ -9,7 +9,7 @@
 package eu.etaxonomy.taxeditor.view.dataimport;
 
 import java.net.MalformedURLException;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 
@@ -68,7 +68,7 @@ public class SpecimenProviderSelectionWizardPage extends WizardPage{
         if(specimenProviderSelectionController.getComposite().getBtnBioCaseProvider().getSelection()){
             endPoint = null;
             try {
-                endPoint = new URL(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText()).toURI();
+                endPoint = URI.fromUrl(new URL(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText()));
                 serviceWrapper = new BioCaseQueryServiceWrapper();
                 serviceWrapper.setBaseUrl(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText());
                 this.setErrorMessage(null);