Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / ui / openurl / OpenUrlSelectorWizard.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
similarity index 97%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
index d40df1ce60dfcad5f5813dd63ea2fec963038dd3..dacd714b58b8ee4585ddc3453b98e296d3d29dd0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import java.net.URI;
 import java.util.List;
@@ -21,9 +21,9 @@ import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper;
 import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper.ReferenceType;
 import eu.etaxonomy.cdm.ext.openurl.OpenUrlReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * @author n.hoffmann
@@ -36,15 +36,14 @@ public class OpenUrlSelectorWizard extends Wizard {
 
        private MobotOpenUrlQuery query;
        
-       private Reference reference;
-
-
        private OpenUrlReference openUrlReference;
        
        private CdmFormFactory formFactory;
 
        private URI openUrlReferenceImageUri;
-
+       
+       private Reference reference;
+       
        private String referenceDetail;
        
        
@@ -55,8 +54,9 @@ public class OpenUrlSelectorWizard extends Wizard {
         */
        public OpenUrlSelectorWizard(Reference reference, String referenceDetail) {
                if(reference == null){
-                       throw new IllegalArgumentException("Reference may not be empty.");
+                       throw new IllegalArgumentException("Reference may not be empty");
                }
+               
                this.reference = reference;
                this.referenceDetail = referenceDetail;
                
@@ -75,7 +75,6 @@ public class OpenUrlSelectorWizard extends Wizard {
                        query.authorName = reference.getAuthorTeam().getTitleCache();
                }
                query.abbreviation = reference.getTitle();
-               
                if(reference.getInReference() != null){
                        query.journalTitle = reference.getInReference().getTitle();
                }
@@ -154,8 +153,7 @@ public class OpenUrlSelectorWizard extends Wizard {
        public URI getOpenUrlReferenceImageUri() {
                return openUrlReferenceImageUri;
        }
-       
-       
+
        public Reference getReference() {
                return reference;
        }