Decoupled mockup from CDM Library plug-in.
authorp.ciardelli <p.ciardelli@localhost>
Fri, 12 Oct 2007 16:17:05 +0000 (16:17 +0000)
committerp.ciardelli <p.ciardelli@localhost>
Fri, 12 Oct 2007 16:17:05 +0000 (16:17 +0000)
19 files changed:
.gitattributes
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/icons/edit_16x16.ico [new file with mode: 0644]
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/CreateNameAction.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/ObjectList.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java [new file with mode: 0644]
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CreateNameView.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/LastNameView.java [deleted file]
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.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/NameListView.java
eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java

index 473e8610a6d8b950e55e233aa3feb591e1dbe7e7..10d0d25052c7c26242c25237bd43715226d02db9 100644 (file)
@@ -17,6 +17,7 @@ eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/concept_no_bg.gif -
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/db.gif -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/delete.gif -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.gif -text
+eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.ico -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/heterosyn.gif -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/heterosyn_no_bg.gif -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/homonym.gif -text
@@ -47,16 +48,13 @@ eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxedito
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchAdvisor.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchWindowAdvisor.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Perspective.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/CreateNameAction.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/ObjectList.java -text
+eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CreateNameView.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/EditNameProperties.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/EmptyEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/LastNameView.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyCompletionProcessor.java -text
 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java -text
index e7f0dd950e1d4e1dc3278c8c2a585f98bbee7939..9358735fe1128e17c30db07228312aeef83f2c5f 100644 (file)
@@ -7,6 +7,5 @@ Bundle-Activator: eu.etaxonomy.taxeditor.designproposal1.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.forms,
- eu.etaxonomy.cdmLibrary,
  org.eclipse.jface.text
 Eclipse-LazyStart: true
index 78d73f7600944d019a04ca86a3e594bdf562fcaa..50ca378702a89e69a63ec461e5b1a78f67ff2f03 100644 (file)
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/\r
 bin.includes = plugin.xml,\\r
                META-INF/,\\r
-               .\r
+               .,\\r
+               icons/,\\r
+               splash.bmp\r
index a595d61224b810a4d1afcd6c456bf6154bd89748..405df78e481041ceb4779e35d5b16e18adc14521 100644 (file)
 \r
    <splash\r
       location="eu.etaxonomy.taxeditor.designproposal1" />\r
+   <launcher>\r
+      <solaris/>\r
+      <win useIco="true">\r
+         <ico path="/eu.etaxonomy.taxeditor.designproposal2/icons/edit_16x16.ico"/>\r
+         <bmp/>\r
+      </win>\r
+   </launcher>\r
+\r
+\r
+   <vm>\r
+   </vm>\r
 \r
    <plugins>\r
       <plugin id="com.ibm.icu"/>\r
-      <plugin id="eu.etaxonomy.cdmLibrary"/>\r
       <plugin id="eu.etaxonomy.taxeditor.designproposal1"/>\r
       <plugin id="org.eclipse.core.commands"/>\r
       <plugin id="org.eclipse.core.contenttype"/>\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.ico b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.ico
new file mode 100644 (file)
index 0000000..d4b6c2b
Binary files /dev/null and b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.ico differ
index a80b54d68982b6d14a0a8ad7ff8a0b650653dc45..95ae9994f1f6d43c3b474e0ec7c9cd6c84426bb3 100644 (file)
@@ -5,8 +5,8 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;\r
 import org.osgi.framework.BundleContext;\r
 \r
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
-import eu.etaxonomy.taxeditor.designproposal1.model.ObjectList;\r
+//import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
+\r
 \r
 /**\r
  * The activator class controls the plug-in life cycle\r
@@ -19,10 +19,8 @@ public class Activator extends AbstractUIPlugin {
        // The shared instance\r
        private static Activator plugin;\r
        \r
-       private CdmApplicationController cdmApp = new CdmApplicationController();\r
+//     private CdmApplicationController cdmApp = new CdmApplicationController();\r
        \r
-       private ObjectList objectList = new ObjectList();\r
-               \r
        /**\r
         * The constructor\r
         */\r
@@ -75,15 +73,9 @@ public class Activator extends AbstractUIPlugin {
        /**\r
      * @return the objectList\r
      */\r
-    public CdmApplicationController getApplicationController() {\r
-        return this.cdmApp;\r
-    }  \r
-       \r
+//    public CdmApplicationController getApplicationController() {\r
+//        return this.cdmApp;\r
+//    }        \r
        \r
-    /**\r
-     * @return the objectList\r
-     */\r
-    public ObjectList getObjectList() {\r
-        return this.objectList;\r
-    }  \r
+               \r
 }\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/CreateNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/CreateNameAction.java
deleted file mode 100644 (file)
index b611174..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.controller;\r
-\r
-import org.eclipse.jface.action.Action;\r
-\r
-import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
-import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
-\r
-public class CreateNameAction extends Action {\r
-\r
-       private TaxonName tn;\r
-       \r
-       public CreateNameAction(String genus, String spEpithet) {\r
-               \r
-               INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
-               this.tn = ns.createTaxonName(null);\r
-               tn.setGenus(genus);\r
-               tn.setSpecificEpithet(spEpithet);\r
-       }\r
-       \r
-       /* (non-Javadoc)\r
-     * @see org.eclipse.jface.action.Action#run()\r
-     */\r
-       public void run() {\r
-               //Application.\r
-               Activator.getDefault().getApplicationController().getNameService().saveTaxonName(tn);\r
-               Activator.getDefault().getObjectList().add(tn);\r
-       }\r
-}\r
index 178541e9ee7e604a2423d9e9fcf85f1c98f863a8..5c2fa5b1e6c4e2cbe00f80a27799d0be4207734c 100644 (file)
@@ -4,10 +4,11 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.PartInitException;\r
 \r
-import eu.etaxonomy.cdm.api.service.INameService;\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
+//import eu.etaxonomy.cdm.api.service.INameService;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
 import eu.etaxonomy.taxeditor.designproposal1.model.NameEditorInput;\r
+import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.view.MultiPagePilosellaView;\r
 import eu.etaxonomy.taxeditor.designproposal1.view.NameEditorView;\r
 \r
@@ -21,15 +22,18 @@ public class OpenNameEditorAction extends Action {
        }\r
 \r
        public OpenNameEditorAction() {\r
-               INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
-               this.taxonname = ns.createTaxonName(null);\r
+//             INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
+//             this.taxonname = ns.createTaxonName(null);\r
+               this.taxonname = new TaxonName();\r
+               this.taxonname.setName("new");\r
                setId(ID);\r
                setText("New taxon");\r
        }\r
 \r
        public OpenNameEditorAction(String name) {\r
-               INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
-               this.taxonname = ns.createTaxonName(null);\r
+//             INameService ns = Activator.getDefault().getApplicationController().getNameService();\r
+//             this.taxonname = ns.createTaxonName(null);\r
+               this.taxonname = new TaxonName();\r
                this.taxonname.setName(name);\r
 //             setId(ID);\r
 //             setText("New name");\r
index 53b31c8e7340deef7643a1fbcd5e2f1cbc1efb51..9257abff4c75fbc09dd1fbc8d4c652740945db52 100644 (file)
@@ -2,8 +2,9 @@ package eu.etaxonomy.taxeditor.designproposal1.controller;
 \r
 import org.eclipse.jface.action.Action;\r
 \r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
+import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 \r
 public class SaveNameAction extends Action {\r
        TaxonName taxonname;\r
@@ -13,7 +14,7 @@ public class SaveNameAction extends Action {
        }\r
        \r
        public void run() {\r
-               Activator.getDefault().getApplicationController().getNameService().\r
-                       saveTaxonName(taxonname);\r
+//             Activator.getDefault().getApplicationController().getNameService().\r
+//                     saveTaxonName(taxonname);\r
        }\r
 }\r
index 402fa0c1a96dd1f1f161df296d8752957a06cc19..9afdba27a5008246238dd2f49728513cc84ba196 100644 (file)
@@ -4,7 +4,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IPersistableElement;\r
 \r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 \r
 public class NameEditorInput implements IEditorInput {\r
 \r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/ObjectList.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/ObjectList.java
deleted file mode 100644 (file)
index fa5b9c1..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.model;\r
-\r
-import java.beans.PropertyChangeListener;\r
-import java.beans.PropertyChangeSupport;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import eu.etaxonomy.cdm.model.common.VersionableEntity;\r
-\r
-public class ObjectList {\r
-    \r
-    private List objectList = new ArrayList();\r
-    \r
-    protected transient PropertyChangeSupport listeners = new PropertyChangeSupport(this);\r
-    \r
-    \r
-  //public class ObjectList extends PlatformObject {    \r
-    \r
-    /**\r
-     * Adds a property-change listener.\r
-     * @param l the listener\r
-     */\r
-    public void addPropertyChangeListener(PropertyChangeListener l){\r
-        if (l == null) {\r
-            throw new IllegalArgumentException();\r
-        }\r
-        this.listeners.addPropertyChangeListener(l);\r
-    }\r
-    \r
-    \r
-    public void removePropertyChangeListener(PropertyChangeListener l){\r
-        this.listeners.removePropertyChangeListener(l);\r
-    }\r
-    \r
-    /**\r
-     * Notifies all listeners to a model-change\r
-     * @param prop the property-id\r
-     * @param old the old-value\r
-     * @param newValue the new value\r
-     */\r
-    protected void firePropertyChange(String prop, Object old, Object newValue){\r
-        if (this.listeners.hasListeners(prop)) {\r
-            this.listeners.firePropertyChange(prop, old, newValue);\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * @param o\r
-     * @return\r
-     * @see java.util.List#add(java.lang.Object)\r
-     */\r
-    public void add(VersionableEntity ve) {\r
-        this.objectList.add(ve);\r
-        // model has changed --> fire\r
-        firePropertyChange("ITEM_ADD", null, ve); //$NON-NLS-1$\r
-    }\r
-    \r
-    \r
-    /**\r
-     * @param o\r
-     * @return\r
-     * @see java.util.List#remove(java.lang.Object)\r
-     */\r
-    public void remove(Object o) {\r
-        this.objectList.remove(o);\r
-//      model has changed --> fire\r
-        firePropertyChange("ITEM_REMOVE", o, null); //$NON-NLS-1$\r
-    }\r
-\r
-\r
-    /**\r
-     * @return\r
-     * @see java.util.List#toArray()\r
-     */\r
-    public Object[] toArray() {\r
-        return (Object[]) this.objectList.toArray(new Object[this.objectList.size()]);\r
-    }\r
-}\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java
new file mode 100644 (file)
index 0000000..66b7cde
--- /dev/null
@@ -0,0 +1,15 @@
+package eu.etaxonomy.taxeditor.designproposal1.model;\r
+\r
+public class TaxonName {\r
+       String name;\r
+\r
+       public String getName() {\r
+               return name;\r
+       }\r
+\r
+       public void setName(String name) {\r
+               this.name = name;\r
+       }\r
+       \r
+       \r
+}\r
index 4fe5047f247ce7e8fab5aaef7f01b0a278478b01..181cc47df37f97397eec37a69fe1dbdd7e9662e6 100644 (file)
@@ -53,14 +53,16 @@ import com.swtdesigner.SWTResourceManager;
 \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.cdm.event.ICdmEventListener;\r
+//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;\r
+import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 \r
-public class CarduusEditorView extends EditorPart implements ICdmEventListener {\r
+//public class CarduusEditorView extends EditorPart implements ICdmEventListener {\r
+public class CarduusEditorView extends EditorPart {\r
 \r
        private Table table_1;\r
        private Text carduusLSpText;\r
@@ -413,7 +415,7 @@ public class CarduusEditorView extends EditorPart implements ICdmEventListener {
                \r
                if (input.getAdapter(TaxonName.class) != null) {\r
                        taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-                       taxonname.addCdmEventListener(this);\r
+//                     taxonname.addCdmEventListener(this);\r
                } else {\r
                        \r
                        taxonname = null;\r
@@ -444,10 +446,10 @@ public class CarduusEditorView extends EditorPart implements ICdmEventListener {
                //              txtGenus.setText ...\r
        }\r
 \r
-       public void onDelete(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\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
@@ -459,10 +461,10 @@ public class CarduusEditorView extends EditorPart implements ICdmEventListener {
                \r
        }\r
 \r
-       public void onUpdate(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
+//     public void onUpdate(ICdmEventListenerRegistration arg0) {\r
+//             // TODO Auto-generated method stub\r
+//             \r
+//     }\r
        \r
        private static void addDropDown(final ToolItem item, final Menu menu) {\r
                item.addListener(SWT.Selection, new Listener() {\r
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CreateNameView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CreateNameView.java
deleted file mode 100644 (file)
index 42165cc..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-import eu.etaxonomy.taxeditor.designproposal1.controller.CreateNameAction;
-
-public class CreateNameView extends ViewPart {
-       private Text txtSpEpithet;
-       private Text txtGenus;
-       public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.createnameview";
-
-       /**
-        * This is a callback that will allow us to create the viewer and initialize
-        * it.
-        */
-       public void createPartControl(Composite parent) {
-               final GridLayout gridLayout = new GridLayout();
-               gridLayout.numColumns = 2;
-               parent.setLayout(gridLayout);
-
-               final Label genusLabel = new Label(parent, SWT.NONE);
-               genusLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-               genusLabel.setText("Genus:");
-
-               txtGenus = new Text(parent, SWT.BORDER);
-               final GridData gd_txtGenus = new GridData(SWT.FILL, SWT.CENTER, true, false);
-               txtGenus.setLayoutData(gd_txtGenus);
-
-               final Label epithetLabel = new Label(parent, SWT.NONE);
-               epithetLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-               epithetLabel.setText("Epithet:");
-
-               txtSpEpithet = new Text(parent, SWT.BORDER);
-               final GridData gd_txtSpEpithet = new GridData(SWT.FILL, SWT.CENTER, true, false);
-               txtSpEpithet.setLayoutData(gd_txtSpEpithet);
-               new Label(parent, SWT.NONE);
-
-               final Button saveNameButton = new Button(parent, SWT.NONE);
-               
-               saveNameButton.addListener(SWT.Selection, new Listener() {
-            public void handleEvent(Event event) {
-                new CreateNameAction(CreateNameView.this.txtGenus.getText(),
-                               CreateNameView.this.txtSpEpithet.getText()).run();
-            }
-        });            
-               
-               final GridData gd_saveNameButton = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
-               saveNameButton.setLayoutData(gd_saveNameButton);
-               saveNameButton.setText("Save Name");
-               initializeToolBar();
-       }
-
-       /**
-        * Passing the focus request to the viewer's control.
-        */
-       public void setFocus() {
-       }
-       private void initializeToolBar() {
-               IToolBarManager toolBarManager = getViewSite().getActionBars().getToolBarManager();
-       }
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/LastNameView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/LastNameView.java
deleted file mode 100644 (file)
index bb70ea1..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;\r
-\r
-import java.beans.PropertyChangeEvent;\r
-import java.beans.PropertyChangeListener;\r
-\r
-import org.eclipse.jface.action.IMenuManager;\r
-import org.eclipse.jface.action.IToolBarManager;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.layout.GridData;\r
-import org.eclipse.swt.layout.GridLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.ui.part.ViewPart;\r
-\r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
-import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
-\r
-public class LastNameView extends ViewPart implements PropertyChangeListener {\r
-\r
-       public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.LastNameView"; //$NON-NLS-1$\r
-       private Label lblName;\r
-       /**\r
-        * Create contents of the view part\r
-        * @param parent\r
-        */\r
-       @Override\r
-       public void createPartControl(Composite parent) {\r
-               Composite container = new Composite(parent, SWT.NONE);\r
-               final GridLayout gridLayout = new GridLayout();\r
-               gridLayout.numColumns = 2;\r
-               container.setLayout(gridLayout);\r
-\r
-               final Label theLastNameLabel = new Label(container, SWT.NONE);\r
-               theLastNameLabel.setText("The last name created was: ");\r
-\r
-               lblName = new Label(container, SWT.NONE);\r
-               lblName.setText("none yet");\r
-               lblName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));\r
-\r
-               \r
-               new Label(container, SWT.NONE);\r
-               //\r
-               createActions();\r
-               initializeToolBar();\r
-               initializeMenu();\r
-\r
-               Activator.getDefault().getObjectList().addPropertyChangeListener(this);\r
-               \r
-       }\r
-\r
-       /**\r
-        * Create the actions\r
-        */\r
-       private void createActions() {\r
-               // Create the actions\r
-       }\r
-\r
-       /**\r
-        * Initialize the toolbar\r
-        */\r
-       private void initializeToolBar() {\r
-               IToolBarManager toolbarManager = getViewSite().getActionBars()\r
-                               .getToolBarManager();\r
-       }\r
-\r
-       /**\r
-        * Initialize the menu\r
-        */\r
-       private void initializeMenu() {\r
-               IMenuManager menuManager = getViewSite().getActionBars()\r
-                               .getMenuManager();\r
-       }\r
-\r
-       @Override\r
-       public void setFocus() {\r
-               // Set the focus\r
-       }\r
-\r
-       public void propertyChange(PropertyChangeEvent evt) {\r
-               if (evt.getPropertyName().equalsIgnoreCase("ITEM_ADD")){\r
-                       TaxonName tn = (TaxonName)evt.getNewValue();\r
-                       lblName.setText( tn.getName());\r
-               }\r
-       }\r
-\r
-}\r
index d2f56c0b747f439073ff3d12599a191632e64ca9..7f22029bc04571c6347fdd216135cf9a74d6cc81 100644 (file)
@@ -6,8 +6,9 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.part.MultiPageEditorPart;\r
 \r
-import eu.etaxonomy.cdm.model.name.TaxonName;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.model.NameEditorInput;\r
+import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 \r
 public class MultiPagePilosellaView extends MultiPageEditorPart {\r
 \r
@@ -71,7 +72,7 @@ public class MultiPagePilosellaView extends MultiPageEditorPart {
                \r
                if (input.getAdapter(TaxonName.class) != null) {\r
                        taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-                       System.out.println(taxonname.getCreatedWho());\r
+//                     System.out.println(taxonname.getCreatedWho());\r
 //                     taxonname.addCdmEventListener(this);\r
                } else {\r
                        \r
index 61bd4a0bc6d44dbbafe8e2b1a0051ae5a97f23a4..7f18476ea09fc51405b2e5d288140917546f0d18 100644 (file)
@@ -54,14 +54,16 @@ import com.swtdesigner.SWTResourceManager;
 \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.cdm.event.ICdmEventListener;\r
+//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;\r
+import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 \r
-public class NameEditorView extends EditorPart implements ICdmEventListener {\r
+//public class NameEditorView extends EditorPart implements ICdmEventListener {\r
+public class NameEditorView extends EditorPart {\r
 \r
        private Table table_1;\r
        private Text text_3;\r
@@ -451,7 +453,7 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
                \r
                if (input.getAdapter(TaxonName.class) != null) {\r
                        taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-                       taxonname.addCdmEventListener(this);\r
+//                     taxonname.addCdmEventListener(this);\r
                } else {\r
                        \r
                        taxonname = null;\r
@@ -482,10 +484,10 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
                //              txtGenus.setText ...\r
        }\r
 \r
-       public void onDelete(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\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
@@ -497,10 +499,10 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
                \r
        }\r
 \r
-       public void onUpdate(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
+//     public void onUpdate(ICdmEventListenerRegistration arg0) {\r
+//             // TODO Auto-generated method stub\r
+//             \r
+//     }\r
        \r
        private static void addDropDown(final ToolItem item, final Menu menu) {\r
                item.addListener(SWT.Selection, new Listener() {\r
index b9b5b9aedf5056a5c349b20ad395515e801ae4d9..9271b851e3c5b3b3d55d29f1016b35ebb217962e 100644 (file)
@@ -45,14 +45,15 @@ import org.eclipse.ui.part.ViewPart;
 import com.swtdesigner.ResourceManager;\r
 import com.swtdesigner.SWTResourceManager;\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.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.designproposal1.Activator;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;\r
 \r
-public class NameListView extends ViewPart implements ICdmEventListener {\r
+//public class NameListView extends ViewPart implements ICdmEventListener {\r
+public class NameListView extends ViewPart {\r
        private Text searchText;\r
        private Table table;\r
        private Composite composite;\r
@@ -379,13 +380,13 @@ public class NameListView extends ViewPart implements ICdmEventListener {
        /**\r
         * Refreshes a taxon name in the list\r
         */\r
-       public void refreshElement(TaxonName taxonname) {\r
-       }\r
+//     public void refreshElement(TaxonName taxonname) {\r
+//     }\r
 \r
-       public void onDelete(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\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
@@ -395,9 +396,9 @@ public class NameListView extends ViewPart implements ICdmEventListener {
        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
+//     public void onUpdate(ICdmEventListenerRegistration arg0) {\r
+//             System.out.println("here i am");\r
+//             refreshElement((TaxonName)arg0);\r
+//     }\r
        \r
 }\r
index e3b70c087e50ed46c92e06688556a5957bf2b235..b4abfc8498836f6af31edf93b9daa2f8d50afc91 100644 (file)
@@ -53,14 +53,16 @@ import com.swtdesigner.SWTResourceManager;
 \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.cdm.event.ICdmEventListener;\r
+//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration;\r
+//import eu.etaxonomy.cdm.model.name.TaxonName;\r
 import eu.etaxonomy.taxeditor.designproposal1.Activator;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;\r
 import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;\r
+import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;\r
 \r
-public class PilosellaEditorView extends EditorPart implements ICdmEventListener {\r
+//public class PilosellaEditorView extends EditorPart implements ICdmEventListener {\r
+public class PilosellaEditorView extends EditorPart {\r
 \r
        private Table table_1;\r
        private Text text_3;\r
@@ -549,7 +551,7 @@ public class PilosellaEditorView extends EditorPart implements ICdmEventListener
                \r
                if (input.getAdapter(TaxonName.class) != null) {\r
                        taxonname = (TaxonName) input.getAdapter(TaxonName.class);\r
-                       taxonname.addCdmEventListener(this);\r
+//                     taxonname.addCdmEventListener(this);\r
                } else {\r
                        \r
                        taxonname = null;\r
@@ -580,10 +582,10 @@ public class PilosellaEditorView extends EditorPart implements ICdmEventListener
                //              txtGenus.setText ...\r
        }\r
 \r
-       public void onDelete(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\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
@@ -595,10 +597,10 @@ public class PilosellaEditorView extends EditorPart implements ICdmEventListener
                \r
        }\r
 \r
-       public void onUpdate(ICdmEventListenerRegistration arg0) {\r
-               // TODO Auto-generated method stub\r
-               \r
-       }\r
+//     public void onUpdate(ICdmEventListenerRegistration arg0) {\r
+//             // TODO Auto-generated method stub\r
+//             \r
+//     }\r
        \r
        private static void addDropDown(final ToolItem item, final Menu menu) {\r
                item.addListener(SWT.Selection, new Listener() {\r