From: n.hoffmann <n.hoffmann@localhost>
Date: Thu, 17 Feb 2011 17:42:55 +0000 (+0000)
Subject: Fixing bugs in open url dialog
X-Git-Tag: rcp.ss-first-working-version~193
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/82eaddd371127f787476879b7887de11b20f7b0c

Fixing bugs in open url dialog
---

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java
index 25b393648..69fe0a4f3 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java
@@ -65,7 +65,8 @@ public class OpenUrlResultPage extends WizardPage {
 		List<OpenUrlReference> results = getWizard().getResult();
 		
 		if(results == null || results.isEmpty()){
-			setMessage("No results for the given reference", WizardPage.WARNING);
+			String nomenclaturalCitation = getWizard().getReference().getNomenclaturalCitation(getWizard().getReferenceDetail());
+			setMessage("No results for the given reference: " + nomenclaturalCitation, WizardPage.WARNING);
 		}
 		viewer.setInput(results);
 		
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java
index 7cbafcb33..0a1ece659 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java
@@ -66,12 +66,16 @@ public class OpenUrlSelectorElement extends AbstractCdmFormElement implements Se
 	 */
 	@Override
 	public void widgetSelected(SelectionEvent e) {
+		if(openUrlEnabled.getReference() == null){
+			EditorUtil.warningDialog("No reference", getClass(), "The given reference is empty");
+			return;
+		}
 		OpenUrlSelectorWizard wizard = new OpenUrlSelectorWizard(openUrlEnabled.getReference(), openUrlEnabled.getDetail());
 		
 		WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);
 		
 		if(dialog.open() == IStatus.OK){
-			openUrlEnabled.setOpenUrl(wizard.getOpenUrlReferenceImageUri());
+			openUrlEnabled.setOpenUrl(wizard.getOpenUrlReference().getUri());
 		}
 	}
 
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
index ca1822acb..d40df1ce6 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
@@ -36,11 +36,16 @@ public class OpenUrlSelectorWizard extends Wizard {
 
 	private MobotOpenUrlQuery query;
 	
+	private Reference reference;
+
+
 	private OpenUrlReference openUrlReference;
 	
 	private CdmFormFactory formFactory;
 
 	private URI openUrlReferenceImageUri;
+
+	private String referenceDetail;
 	
 	
 	
@@ -49,6 +54,12 @@ public class OpenUrlSelectorWizard extends Wizard {
 	 * @param reference
 	 */
 	public OpenUrlSelectorWizard(Reference reference, String referenceDetail) {
+		if(reference == null){
+			throw new IllegalArgumentException("Reference may not be empty.");
+		}
+		this.reference = reference;
+		this.referenceDetail = referenceDetail;
+		
 		setWindowTitle("Mobot Open Url");
 		setNeedsProgressMonitor(true);
 		
@@ -60,8 +71,11 @@ public class OpenUrlSelectorWizard extends Wizard {
 		query  = new MobotOpenUrlQuery();
 		
 		query.refType = ReferenceType.getReferenceType(reference);
-		query.authorName = reference.getAuthorTeam().getTitleCache();
-		query.bookTitle = reference.getTitle();
+		if(reference.getAuthorTeam() != null){
+			query.authorName = reference.getAuthorTeam().getTitleCache();
+		}
+		query.abbreviation = reference.getTitle();
+		
 		if(reference.getInReference() != null){
 			query.journalTitle = reference.getInReference().getTitle();
 		}
@@ -140,4 +154,13 @@ public class OpenUrlSelectorWizard extends Wizard {
 	public URI getOpenUrlReferenceImageUri() {
 		return openUrlReferenceImageUri;
 	}
+	
+	
+	public Reference getReference() {
+		return reference;
+	}
+
+	public String getReferenceDetail() {
+		return referenceDetail;
+	}
 }