MobotOpenUrl UI minor improvements

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java
index 9b1bd8e1a2e138203586149baa1c831532b031b6..1e5be3f01b0b11d04e0a3dfb587434d182222701 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java
@@ -85,6 +85,7 @@ public class OpenUrlReferencePage extends WizardPage implements SelectionListene
                button_previous.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, false));
                
                label_pageNumber = getWizard().getFormFactory().createLabel(buttonContainer, "              "); 
                button_previous.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, false));
                
                label_pageNumber = getWizard().getFormFactory().createLabel(buttonContainer, "              "); 

+               label_pageNumber.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false));

                
                button_next = getWizard().getFormFactory().createButton(buttonContainer, "Next", SWT.PUSH);
                button_next.addSelectionListener(this);
                
                button_next = getWizard().getFormFactory().createButton(buttonContainer, "Next", SWT.PUSH);
                button_next.addSelectionListener(this);

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 946e92dfba095e22b35a3a3ac8f9b68722b14ba5..7cbafcb332588b30082bf823b152143cfc247897 100644 (file)
--- 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
@@ -16,6 +16,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Label;

 
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;


@@ -50,7 +51,12 @@ public class OpenUrlSelectorElement extends AbstractCdmFormElement implements Se
                        ICdmFormElement parentElement, String labelString, IOpenUrlEnabled openUrlEnabled, int style) {
                super(formFactory, parentElement);
                this.openUrlEnabled = openUrlEnabled;
                        ICdmFormElement parentElement, String labelString, IOpenUrlEnabled openUrlEnabled, int style) {
                super(formFactory, parentElement);
                this.openUrlEnabled = openUrlEnabled;

-               button = formFactory.createButton(getLayoutComposite(), "Browse", SWT.PUSH);
+               
+               Label label = formFactory.createLabel(getLayoutComposite(), null);
+               addControl(label);
+               
+               button = formFactory.createButton(getLayoutComposite(), labelString, SWT.PUSH);
+               button.setLayoutData(CdmFormFactory.RIGHT());

                addControl(button);
                button.addSelectionListener(this);
        }
                addControl(button);
                button.addSelectionListener(this);
        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java
index 852419b249d2a6c4d08a3d0c6e085a76a55ff595..035b0c1ef565753abed94ee982b3dcfaa33d3206 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java
@@ -75,7 +75,7 @@ public class ProtologueElement extends AbstractEntityCollectionElement<Descripti
        public void createControls(ICdmFormElement element, int style) {
                protologueUriText = formFactory.createTextWithLabelElement(this, "Protologue URI", "", style);
 
        public void createControls(ICdmFormElement element, int style) {
                protologueUriText = formFactory.createTextWithLabelElement(this, "Protologue URI", "", style);
 

-               element_openUrl = formFactory.createOpenUrlSelectorElement(element, "URI", this, style);
+               element_openUrl = formFactory.createOpenUrlSelectorElement(element, "Query BHL for Reference Image", this, style);

        }
 
        /* (non-Javadoc)
        }
 
        /* (non-Javadoc)