Commit before playing with JFace Databinding.

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath
index d2a5d755bd7a5c172db45573ca3a55cab5d45e22..8d8e59ba1f5fe7e3333220f69d5f72d9a917731a 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.5.0_06"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif
index abaf009f3d162103f6ba0ce362419b120d51b7c7..955c6ae9dcffc759303187cea506306cc6316382 100644 (file)
Binary files a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif and b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif differ

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
index 82b17f99fcd1b1e12c984aac3cca783e9aed8bd0..e83e086e4ed457a321893f0c249faae05033dd81 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
@@ -6,6 +6,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.prototype1.model.ObjectList;\r
 \r
 /**\r
@@ -27,6 +28,14 @@ public class Activator extends AbstractUIPlugin {
         * The constructor\r
         */\r
        public Activator() {\r
+//             makeNames();\r
+       }\r
+\r
+       private void makeNames() {\r
+               TaxonName tn = cdmApp.getNameService().createTaxonName(null);\r
+               tn.setGenus("Hieracium");\r
+               tn.setSpecificEpithet("joemama");\r
+               cdmApp.getNameService().saveTaxonName(tn);\r
        }\r
 \r
        /*\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java
index d4fbbef427762fd8cd56f9646fc6c3ec7f92eb48..103f56a07cfb4d2ab9ba65eaaa87a1e23ea2c454 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java
@@ -12,9 +12,7 @@ public class Perspective implements IPerspectiveFactory {
        
        public void createInitialLayout(IPageLayout layout) {
                String editorArea = layout.getEditorArea();
-               IFolderLayout navigatorFolder = layout.createFolder("Navigator", 
-                               IPageLayout.LEFT, 0.25f, editorArea);
-               navigatorFolder.addView(NameListView.ID);
+               layout.addStandaloneView(NameListView.ID, false, IPageLayout.LEFT, 0.25f, editorArea);
                // navigatorFolder.addView(LastNameView.ID);
                layout.getViewLayout(NameListView.ID).setCloseable(false);
                // navigatorFolder.addView(LastNameView.ID);

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
index 3ff82c87c1d0f55e14a50d84c10f81167e6e8722..a7fc42fec35100d2c5938599926357f17dc69f8b 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
@@ -13,7 +13,7 @@ public class CreateNameAction extends Action {
        public CreateNameAction(String genus, String spEpithet) {\r
                \r
                INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
-               this.tn = ns.getNewTaxonName(null);\r
+               this.tn = ns.createTaxonName(null);\r
                tn.setGenus(genus);\r
                tn.setSpecificEpithet(spEpithet);\r
        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java
index c526f1de7adb7221e00767bb53e32de94cbfe8cf..2b83999607065fbe56f6c3fdad079ad785f0c179 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java
@@ -9,6 +9,7 @@ public class SaveNameAction extends Action {
        TaxonName taxonname;\r
        \r
        public SaveNameAction(TaxonName taxonname) {\r
+               taxonname.setName(taxonname.getGenus() + " " + taxonname.getSpecificEpithet());\r
                this.taxonname = taxonname;\r
        }\r
        \r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
index d2c7a03d71391501b80363f70bab2e0c354d6ac4..4a97ce120d60a283454a0609e0ffe33ba2518382 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
@@ -31,11 +31,13 @@ import com.swtdesigner.ResourceManager;
 \r
 //import org.eclipse.ui.texteditor.AbstractTextEditor;\r
 \r
+import eu.etaxonomy.cdm.event.ICdmEventListener;\r
+import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.prototype1.Activator;\r
 import eu.etaxonomy.taxeditor.prototype1.controller.SaveNameAction;\r
 \r
-public class NameEditorView extends EditorPart implements PropertyChangeListener {\r
+public class NameEditorView extends EditorPart implements ICdmEventListener {\r
 \r
        private StyledText styledText;\r
        private TaxonName taxonname;\r
@@ -222,7 +224,7 @@ public class NameEditorView extends EditorPart implements PropertyChangeListener
                \r
                if (input.getAdapter(TaxonName.class) != null) {\r
                        taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-                       taxonname.addPropertyChangeListener(this);\r
+                       taxonname.addCdmEventListener(this);\r
                } else {\r
                        \r
                        taxonname = null;\r
@@ -252,5 +254,25 @@ public class NameEditorView extends EditorPart implements PropertyChangeListener
                //      if (evt.getPropertyName().equalsIgnoreCase("genus"))\r
                //              txtGenus.setText ...\r
        }\r
+\r
+       public void onDelete(ICdmEventListenerRegistration arg0) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       public void onInsert(Object arg0) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       public void onLoad(Object arg0) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       public void onUpdate(ICdmEventListenerRegistration arg0) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
        \r
 }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
index 8876cf286ed2d8bc5d96bced923f3af944a4cbf3..319574b655596c39d99dffa5511d99530949dece 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
@@ -21,13 +21,13 @@ import org.eclipse.swt.widgets.ExpandItem;
 import org.eclipse.ui.part.ViewPart;\r
 \r
 import eu.etaxonomy.cdm.api.service.INameService;\r
+import eu.etaxonomy.cdm.event.ICdmEventListener;\r
+import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration;\r
 import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.prototype1.Activator;\r
 import eu.etaxonomy.taxeditor.prototype1.controller.OpenNameEditorAction;\r
 \r
-public class NameListView extends ViewPart {\r
-\r
-\r
+public class NameListView extends ViewPart implements ICdmEventListener {\r
        private Composite nameListComposite = null;\r
        private Composite recentNamesComposite = null;\r
        private Composite searchComposite = null;       \r
@@ -40,7 +40,7 @@ public class NameListView extends ViewPart {
        public static final String ID = "eu.etaxonomy.mvctest.view.NameListView"; //$NON-NLS-1$\r
 \r
        class ViewContentProvider implements IStructuredContentProvider {\r
-\r
+               \r
                public Object[] getElements(Object inputElement) {\r
                        INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
                        return ns.getAllNames().toArray();\r
@@ -59,14 +59,21 @@ public class NameListView extends ViewPart {
        \r
        class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {\r
 \r
+               NameListView nlv;\r
+               \r
+               public ViewLabelProvider(NameListView view) {\r
+                       this.nlv = view;\r
+               }\r
+               \r
                public Image getColumnImage(Object element, int columnIndex) {\r
                        // TODO Auto-generated method stub\r
                        return null;\r
                }\r
 \r
                public String getColumnText(Object element, int columnIndex) {\r
+                       ((TaxonName) element).addCdmEventListener(nlv);\r
                        return ((TaxonName) element).getName();\r
-               }\r
+               } \r
 \r
                public void updateLabel(ViewerLabel label, Object element) {\r
                        // TODO Auto-generated method stub\r
@@ -131,9 +138,11 @@ public class NameListView extends ViewPart {
                viewer = new TableViewer(nameListComposite, SWT.MULTI | SWT.H_SCROLL\r
                                | SWT.V_SCROLL);\r
                viewer.setContentProvider(new ViewContentProvider());\r
-               viewer.setLabelProvider(new ViewLabelProvider());\r
+               viewer.setLabelProvider(new ViewLabelProvider(this));\r
                viewer.setInput(getViewSite());\r
-                               \r
+               \r
+               final NameListView me = this;\r
+               \r
                viewer.addDoubleClickListener(new IDoubleClickListener(){\r
 \r
                        public void doubleClick(DoubleClickEvent event) {                                                               \r
@@ -144,6 +153,7 @@ public class NameListView extends ViewPart {
                                        e.printStackTrace();\r
                                        taxonname = null;\r
                                }\r
+                               taxonname.addCdmEventListener(me);\r
                                new OpenNameEditorAction(taxonname).run();\r
                        }\r
                });             \r
@@ -221,5 +231,23 @@ public class NameListView extends ViewPart {
        public void refreshElement(TaxonName taxonname) {\r
                this.viewer.refresh(taxonname);\r
        }\r
+\r
+       public void onDelete(ICdmEventListenerRegistration arg0) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       public void onInsert(Object arg0) {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+\r
+       public void onLoad(Object arg0) {\r
+       }\r
+\r
+       public void onUpdate(ICdmEventListenerRegistration arg0) {\r
+               System.out.println("here i am");\r
+               refreshElement((TaxonName)arg0);\r
+       }\r
        \r
 }\r