From: p.ciardelli
Date: Mon, 15 Oct 2007 15:36:25 +0000 (+0000)
Subject: Version being presented at October 15 Portal Meeting.
X-Git-Tag: rcp.ss-first-working-version~1235
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/cc18e6aab16155a3e439d5194cc3f284274fa38b
Version being presented at October 15 Portal Meeting.
---
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/.classpath b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/.classpath
index d2a5d755b..021596729 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/.classpath
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/.classpath
@@ -2,6 +2,6 @@
-
+
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
index 9358735fe..035b8684b 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
@@ -9,3 +9,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.forms,
org.eclipse.jface.text
Eclipse-LazyStart: true
+Export-Package: com.swtdesigner,
+ eu.etaxonomy.taxeditor.designproposal1,
+ eu.etaxonomy.taxeditor.designproposal1.controller,
+ eu.etaxonomy.taxeditor.designproposal1.model,
+ eu.etaxonomy.taxeditor.designproposal1.view
+Main-Class: eu.etaxonomy.taxeditor.designproposal1.Application
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties
index 50ca37870..ef1b9e5ab 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties
@@ -4,4 +4,9 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/,\
- splash.bmp
+ splash.bmp,\
+ bin/,\
+ .project,\
+ .classpath,\
+ build.properties,\
+ eu.etaxonomy.taxeditor.designproposal1.product
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product
index 405df78e4..33b432080 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product
@@ -20,7 +20,7 @@
-
+
@@ -30,6 +30,7 @@
+ jre1.5.0_06
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
index c48f12dcd..6b048b10e 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
@@ -58,7 +58,7 @@ public class MoveDialogView extends Dialog {
final Label youHaveChosenLabel = new Label(container, SWT.WRAP);
final GridData gd_youHaveChosenLabel = new GridData(SWT.CENTER, SWT.FILL, true, false, 2, 1);
- gd_youHaveChosenLabel.heightHint = 48;
+ gd_youHaveChosenLabel.heightHint = 30;
youHaveChosenLabel.setLayoutData(gd_youHaveChosenLabel);
youHaveChosenLabel.setText("You have chosen to turn \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym. Please choose a new accepted name from one of the following options.");
@@ -202,16 +202,19 @@ public class MoveDialogView extends Dialog {
newItemTableItem_6.setText("Senecio elegans L.");
final Group group_2 = new Group(composite, SWT.NONE);
- group_2.setLayout(new GridLayout());
+ final GridLayout gridLayout_1 = new GridLayout();
+ gridLayout_1.numColumns = 2;
+ group_2.setLayout(gridLayout_1);
final Button searchForNameButton = new Button(group_2, SWT.RADIO);
+ searchForNameButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
searchForNameButton.setText("Search for name of accepted taxon");
+ new Label(group_2, SWT.NONE);
searchText = new Text(group_2, SWT.BORDER);
+ searchText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));
searchText.setText("Use \"*\" for wildcard searching");
- final GridData gd_useForText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- searchText.setLayoutData(gd_useForText);
searchText.addFocusListener(new FocusListener() {
public void focusGained(FocusEvent e) {
@@ -230,7 +233,20 @@ public class MoveDialogView extends Dialog {
});
final Button searchButton = new Button(group_2, SWT.NONE);
+ searchButton.setLayoutData(new GridData());
searchButton.setText("Search");
+
+ final Composite composite_1 = new Composite(container, SWT.NONE);
+ composite_1.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 2, 1));
+ composite_1.setLayout(new FillLayout());
+
+ final Label selectedTaxonLabel = new Label(composite_1, SWT.NONE);
+ selectedTaxonLabel.setText("Selected taxon: ");
+
+ final Label currentSelectionSenecioLabel = new Label(composite_1, SWT.RIGHT);
+ currentSelectionSenecioLabel.setFont(SWTResourceManager.getFont("", 9, SWT.BOLD));
+ currentSelectionSenecioLabel.setText("Senecio elegans L.");
+ new Label(container, SWT.NONE);
//
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
index 7f18476ea..fc039c7e2 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
@@ -18,6 +18,8 @@ import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MenuAdapter;
+import org.eclipse.swt.events.MenuEvent;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.SelectionAdapter;
@@ -185,15 +187,16 @@ public class NameEditorView extends EditorPart {
});
final Menu menuMove = new Menu(toolBar);
- menuMove.setData("x", null);
addDropDown(itemMove, menuMove);
final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");
final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
+ turnTaxonpilosellaMenuItem.setSelection(true);
turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");
-
+
+
// });
// newItemToolItem.setText("New item");
itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
index b4abfc849..31a71072e 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
@@ -5,6 +5,7 @@ import java.beans.PropertyChangeListener;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.TextViewer;
import org.eclipse.jface.text.source.SourceViewer;
@@ -64,6 +65,8 @@ import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;
//public class PilosellaEditorView extends EditorPart implements ICdmEventListener {
public class PilosellaEditorView extends EditorPart {
+ private Text hieraciumFuscoatrumSubspText_1;
+ private Text hieraciumRubroonegenseNorrlText;
private Table table_1;
private Text text_3;
private Text hieraciumFuscoatrumSubspText;
@@ -177,10 +180,6 @@ public class PilosellaEditorView extends EditorPart {
final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);
itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemMove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent e) {
- }
- });
final Menu menuMove = new Menu(toolBar);
menuMove.setData("x", null);
@@ -190,6 +189,14 @@ public class PilosellaEditorView extends EditorPart {
moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");
final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
+ turnTaxonpilosellaMenuItem.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(final SelectionEvent e) {
+ new MoveDialogView(getSite().getShell());
+// MessageDialog.openInformation(getSite().getShell(),"Readme Editor","View Action executed");
+ MoveDialogView dialog = new MoveDialogView(getSite().getShell());
+ dialog.open();
+ }
+ });
turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");
// });
@@ -311,7 +318,7 @@ public class PilosellaEditorView extends EditorPart {
table_1 = new Table(composite, SWT.BORDER);
table_1.setLinesVisible(true);
- table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 5));
+ table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 7));
final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);
newColumnTableColumn.setWidth(100);
@@ -352,7 +359,7 @@ public class PilosellaEditorView extends EditorPart {
text_1 = new Text(composite, SWT.WRAP);
final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_text_1.widthHint = 444;
+ gd_text_1.widthHint = 300;
text_1.setLayoutData(gd_text_1);
text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");
@@ -376,7 +383,7 @@ public class PilosellaEditorView extends EditorPart {
hieraciumAurantiacumSubspText = new Text(composite, SWT.WRAP);
final GridData gd_hieraciumAurantiacumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_hieraciumAurantiacumSubspText.widthHint = 441;
+ gd_hieraciumAurantiacumSubspText.widthHint = 300;
hieraciumAurantiacumSubspText.setLayoutData(gd_hieraciumAurantiacumSubspText);
hieraciumAurantiacumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
hieraciumAurantiacumSubspText.setText("Hieracium aurantiacum subsp. chaetodermum Pohle & Zahn in Allg. Bot. Z. Syst. 13: 110. 1907");
@@ -400,7 +407,7 @@ public class PilosellaEditorView extends EditorPart {
hieraciumFuscoatrumSubspText = new Text(composite, SWT.WRAP);
final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_hieraciumFuscoatrumSubspText.widthHint = 447;
+ gd_hieraciumFuscoatrumSubspText.widthHint = 300;
hieraciumFuscoatrumSubspText.setLayoutData(gd_hieraciumFuscoatrumSubspText);
hieraciumFuscoatrumSubspText.setText("Hieracium fuscoatrum subsp. chaetodermum (Pohle & Zahn) Zahn in Engler, Pflanzenr. 82: 1267. 1923");
hieraciumFuscoatrumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
@@ -415,6 +422,52 @@ public class PilosellaEditorView extends EditorPart {
}
});
+
+ final Label label = new Label(composite, SWT.NONE);
+ label.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
+ label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+ label.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));
+
+ hieraciumRubroonegenseNorrlText = new Text(composite, SWT.WRAP);
+ hieraciumRubroonegenseNorrlText.setText("Hieracium rubroonegense Norrl. in Acta Soc. Fauna Fl. Fenn. 26(7): 61. 1904");
+ hieraciumRubroonegenseNorrlText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
+ hieraciumRubroonegenseNorrlText.addFocusListener(new FocusListener() {
+
+ public void focusGained(FocusEvent e) {
+ hieraciumRubroonegenseNorrlText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
+ }
+
+ public void focusLost(FocusEvent e) {
+ hieraciumRubroonegenseNorrlText.setBackground(null);
+ }
+
+ });
+ final GridData gd_hieraciumRubroonegenseNorrlText = new GridData(SWT.FILL, SWT.CENTER, true, false);
+ gd_hieraciumRubroonegenseNorrlText.widthHint = 300;
+ hieraciumRubroonegenseNorrlText.setLayoutData(gd_hieraciumRubroonegenseNorrlText);
+
+ final Label label_3 = new Label(composite, SWT.NONE);
+ label_3.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
+ label_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));
+ label_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+
+ hieraciumFuscoatrumSubspText_1 = new Text(composite, SWT.WRAP);
+ hieraciumFuscoatrumSubspText_1.setText("Hieracium fuscoatrum subsp. rubroonegense (Norrl.) Zahn in Engler, Pflanzenr. 82: 1267. 1923");
+ hieraciumFuscoatrumSubspText_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
+ hieraciumFuscoatrumSubspText_1.addFocusListener(new FocusListener() {
+
+ public void focusGained(FocusEvent e) {
+ hieraciumFuscoatrumSubspText_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
+ }
+
+ public void focusLost(FocusEvent e) {
+ hieraciumFuscoatrumSubspText_1.setBackground(null);
+ }
+
+ });
+ final GridData gd_hieraciumFuscoatrumSubspText_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);
+ gd_hieraciumFuscoatrumSubspText_1.widthHint = 300;
+ hieraciumFuscoatrumSubspText_1.setLayoutData(gd_hieraciumFuscoatrumSubspText_1);
final Label label_4 = new Label(composite, SWT.NONE);
label_4.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));