Version being presented at October 15 Portal Meeting.
authorp.ciardelli <p.ciardelli@localhost>
Mon, 15 Oct 2007 15:36:25 +0000 (15:36 +0000)
committerp.ciardelli <p.ciardelli@localhost>
Mon, 15 Oct 2007 15:36:25 +0000 (15:36 +0000)
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/.classpath
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java

index d2a5d755bd7a5c172db45573ca3a55cab5d45e22..02159672985953c1c52ca50277e7bb40c98ea757 100644 (file)
@@ -2,6 +2,6 @@
 <classpath>\r
        <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index 9358735fe1128e17c30db07228312aeef83f2c5f..035b8684be80a2196001c158547395b339019368 100644 (file)
@@ -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
index 50ca378702a89e69a63ec461e5b1a78f67ff2f03..ef1b9e5ab9cabf0c5d219dfbcb52f6a76beaaffb 100644 (file)
@@ -4,4 +4,9 @@ bin.includes = plugin.xml,\
                META-INF/,\\r
                .,\\r
                icons/,\\r
-               splash.bmp\r
+               splash.bmp,\\r
+               bin/,\\r
+               .project,\\r
+               .classpath,\\r
+               build.properties,\\r
+               eu.etaxonomy.taxeditor.designproposal1.product\r
index 405df78e481041ceb4779e35d5b16e18adc14521..33b4320804a1fe4ba6753feb75abc6f6c302b3bb 100644 (file)
@@ -20,7 +20,7 @@
 \r
    <splash\r
       location="eu.etaxonomy.taxeditor.designproposal1" />\r
-   <launcher>\r
+   <launcher name="EDIT Taxonomic Editor">\r
       <solaris/>\r
       <win useIco="true">\r
          <ico path="/eu.etaxonomy.taxeditor.designproposal2/icons/edit_16x16.ico"/>\r
@@ -30,6 +30,7 @@
 \r
 \r
    <vm>\r
+      <windows type="jre">jre1.5.0_06</windows>\r
    </vm>\r
 \r
    <plugins>\r
index c48f12dcd2f42303ba4ae002df19a386a40b5a7a..6b048b10ebdba6e7f21b6838d9be6b489cd95215 100644 (file)
@@ -58,7 +58,7 @@ public class MoveDialogView extends Dialog {
 \r
                final Label youHaveChosenLabel = new Label(container, SWT.WRAP);\r
                final GridData gd_youHaveChosenLabel = new GridData(SWT.CENTER, SWT.FILL, true, false, 2, 1);\r
-               gd_youHaveChosenLabel.heightHint = 48;\r
+               gd_youHaveChosenLabel.heightHint = 30;\r
                youHaveChosenLabel.setLayoutData(gd_youHaveChosenLabel);\r
                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.");\r
 \r
@@ -202,16 +202,19 @@ public class MoveDialogView extends Dialog {
                newItemTableItem_6.setText("Senecio elegans L.");               \r
                \r
                final Group group_2 = new Group(composite, SWT.NONE);\r
-               group_2.setLayout(new GridLayout());\r
+               final GridLayout gridLayout_1 = new GridLayout();\r
+               gridLayout_1.numColumns = 2;\r
+               group_2.setLayout(gridLayout_1);\r
 \r
                final Button searchForNameButton = new Button(group_2, SWT.RADIO);\r
+               searchForNameButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));\r
                searchForNameButton.setText("Search for name of accepted taxon");\r
+               new Label(group_2, SWT.NONE);\r
                \r
                searchText = new Text(group_2, SWT.BORDER);\r
+               searchText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
                searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));\r
                searchText.setText("Use \"*\" for wildcard searching");\r
-               final GridData gd_useForText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               searchText.setLayoutData(gd_useForText);\r
                searchText.addFocusListener(new FocusListener() {\r
 \r
                        public void focusGained(FocusEvent e) {\r
@@ -230,7 +233,20 @@ public class MoveDialogView extends Dialog {
                });\r
 \r
                final Button searchButton = new Button(group_2, SWT.NONE);\r
+               searchButton.setLayoutData(new GridData());\r
                searchButton.setText("Search");\r
+\r
+               final Composite composite_1 = new Composite(container, SWT.NONE);\r
+               composite_1.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 2, 1));\r
+               composite_1.setLayout(new FillLayout());\r
+\r
+               final Label selectedTaxonLabel = new Label(composite_1, SWT.NONE);\r
+               selectedTaxonLabel.setText("Selected taxon: ");\r
+\r
+               final Label currentSelectionSenecioLabel = new Label(composite_1, SWT.RIGHT);\r
+               currentSelectionSenecioLabel.setFont(SWTResourceManager.getFont("", 9, SWT.BOLD));\r
+               currentSelectionSenecioLabel.setText("Senecio elegans L.");\r
+               new Label(container, SWT.NONE);\r
                \r
                \r
                //\r
index 7f18476ea09fc51405b2e5d288140917546f0d18..fc039c7e2bc51a7a57c1e76ac318b77d6d6ad6dc 100644 (file)
@@ -18,6 +18,8 @@ import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.KeyAdapter;\r
 import org.eclipse.swt.events.KeyEvent;\r
 import org.eclipse.swt.events.KeyListener;\r
+import org.eclipse.swt.events.MenuAdapter;\r
+import org.eclipse.swt.events.MenuEvent;\r
 import org.eclipse.swt.events.MouseAdapter;\r
 import org.eclipse.swt.events.MouseEvent;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
@@ -185,15 +187,16 @@ public class NameEditorView extends EditorPart {
                });\r
                \r
                final Menu menuMove = new Menu(toolBar);\r
-               menuMove.setData("x", null);\r
                addDropDown(itemMove, menuMove);\r
 \r
                final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
                moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");\r
 \r
                final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
+               turnTaxonpilosellaMenuItem.setSelection(true);\r
                turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");\r
-               \r
+\r
+                               \r
 //             });\r
 //             newItemToolItem.setText("New item");\r
                itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));\r
index b4abfc8498836f6af31edf93b9daa2f8d50afc91..31a71072e9510da434612da82d0146a689c1a9e2 100644 (file)
@@ -5,6 +5,7 @@ import java.beans.PropertyChangeListener;
 \r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.jface.action.Action;\r
+import org.eclipse.jface.dialogs.MessageDialog;\r
 import org.eclipse.jface.text.Document;\r
 import org.eclipse.jface.text.TextViewer;\r
 import org.eclipse.jface.text.source.SourceViewer;\r
@@ -64,6 +65,8 @@ import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;
 //public class PilosellaEditorView extends EditorPart implements ICdmEventListener {\r
 public class PilosellaEditorView extends EditorPart {\r
 \r
+       private Text hieraciumFuscoatrumSubspText_1;\r
+       private Text hieraciumRubroonegenseNorrlText;\r
        private Table table_1;\r
        private Text text_3;\r
        private Text hieraciumFuscoatrumSubspText;\r
@@ -177,10 +180,6 @@ public class PilosellaEditorView extends EditorPart {
 \r
                final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);\r
                itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
-               itemMove.addSelectionListener(new SelectionAdapter() {\r
-                       public void widgetSelected(final SelectionEvent e) {\r
-                       }\r
-               });\r
                \r
                final Menu menuMove = new Menu(toolBar);\r
                menuMove.setData("x", null);\r
@@ -190,6 +189,14 @@ public class PilosellaEditorView extends EditorPart {
                moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");\r
 \r
                final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);\r
+               turnTaxonpilosellaMenuItem.addSelectionListener(new SelectionAdapter() {\r
+                       public void widgetSelected(final SelectionEvent e) {\r
+                               new MoveDialogView(getSite().getShell());\r
+//                             MessageDialog.openInformation(getSite().getShell(),"Readme Editor","View Action executed");                             \r
+                               MoveDialogView dialog = new MoveDialogView(getSite().getShell());\r
+                               dialog.open();                          \r
+                       }\r
+               });\r
                turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");\r
                \r
 //             });\r
@@ -311,7 +318,7 @@ public class PilosellaEditorView extends EditorPart {
 \r
                table_1 = new Table(composite, SWT.BORDER);\r
                table_1.setLinesVisible(true);\r
-               table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 5));\r
+               table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 7));\r
 \r
                final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);\r
                newColumnTableColumn.setWidth(100);\r
@@ -352,7 +359,7 @@ public class PilosellaEditorView extends EditorPart {
                \r
                text_1 = new Text(composite, SWT.WRAP);\r
                final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_text_1.widthHint = 444;\r
+               gd_text_1.widthHint = 300;\r
                text_1.setLayoutData(gd_text_1);\r
                text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
                text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");\r
@@ -376,7 +383,7 @@ public class PilosellaEditorView extends EditorPart {
 \r
                hieraciumAurantiacumSubspText = new Text(composite, SWT.WRAP);\r
                final GridData gd_hieraciumAurantiacumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_hieraciumAurantiacumSubspText.widthHint = 441;\r
+               gd_hieraciumAurantiacumSubspText.widthHint = 300;\r
                hieraciumAurantiacumSubspText.setLayoutData(gd_hieraciumAurantiacumSubspText);\r
                hieraciumAurantiacumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
                hieraciumAurantiacumSubspText.setText("Hieracium aurantiacum subsp. chaetodermum Pohle & Zahn in Allg. Bot. Z. Syst. 13: 110. 1907");\r
@@ -400,7 +407,7 @@ public class PilosellaEditorView extends EditorPart {
 \r
                hieraciumFuscoatrumSubspText = new Text(composite, SWT.WRAP);\r
                final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
-               gd_hieraciumFuscoatrumSubspText.widthHint = 447;\r
+               gd_hieraciumFuscoatrumSubspText.widthHint = 300;\r
                hieraciumFuscoatrumSubspText.setLayoutData(gd_hieraciumFuscoatrumSubspText);\r
                hieraciumFuscoatrumSubspText.setText("Hieracium fuscoatrum subsp. chaetodermum (Pohle & Zahn) Zahn in Engler, Pflanzenr. 82: 1267. 1923");\r
                hieraciumFuscoatrumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
@@ -415,6 +422,52 @@ public class PilosellaEditorView extends EditorPart {
                        }\r
 \r
                });\r
+\r
+               final Label label = new Label(composite, SWT.NONE);\r
+               label.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
+               label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+               label.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));\r
+\r
+               hieraciumRubroonegenseNorrlText = new Text(composite, SWT.WRAP);\r
+               hieraciumRubroonegenseNorrlText.setText("Hieracium rubroonegense Norrl. in Acta Soc. Fauna Fl. Fenn. 26(7): 61. 1904");\r
+               hieraciumRubroonegenseNorrlText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
+               hieraciumRubroonegenseNorrlText.addFocusListener(new FocusListener() {\r
+\r
+                       public void focusGained(FocusEvent e) {\r
+                               hieraciumRubroonegenseNorrlText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
+                       }\r
+\r
+                       public void focusLost(FocusEvent e) {\r
+                               hieraciumRubroonegenseNorrlText.setBackground(null);                            \r
+                       }\r
+\r
+               });             \r
+               final GridData gd_hieraciumRubroonegenseNorrlText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_hieraciumRubroonegenseNorrlText.widthHint = 300;\r
+               hieraciumRubroonegenseNorrlText.setLayoutData(gd_hieraciumRubroonegenseNorrlText);\r
+\r
+               final Label label_3 = new Label(composite, SWT.NONE);\r
+               label_3.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
+               label_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));\r
+               label_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+\r
+               hieraciumFuscoatrumSubspText_1 = new Text(composite, SWT.WRAP);\r
+               hieraciumFuscoatrumSubspText_1.setText("Hieracium fuscoatrum subsp. rubroonegense (Norrl.) Zahn in Engler, Pflanzenr. 82: 1267. 1923");\r
+               hieraciumFuscoatrumSubspText_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
+               hieraciumFuscoatrumSubspText_1.addFocusListener(new FocusListener() {\r
+\r
+                       public void focusGained(FocusEvent e) {\r
+                               hieraciumFuscoatrumSubspText_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
+                       }\r
+\r
+                       public void focusLost(FocusEvent e) {\r
+                               hieraciumFuscoatrumSubspText_1.setBackground(null);                             \r
+                       }\r
+\r
+               });     \r
+               final GridData gd_hieraciumFuscoatrumSubspText_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_hieraciumFuscoatrumSubspText_1.widthHint = 300;\r
+               hieraciumFuscoatrumSubspText_1.setLayoutData(gd_hieraciumFuscoatrumSubspText_1);\r
                \r
                final Label label_4 = new Label(composite, SWT.NONE);\r
                label_4.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r