From a6a02fea598efd506d6bb92c9a85c44676554b3b Mon Sep 17 00:00:00 2001 From: "p.ciardelli" Date: Fri, 12 Oct 2007 16:17:05 +0000 Subject: [PATCH] Decoupled mockup from CDM Library plug-in. --- .gitattributes | 6 +- .../META-INF/MANIFEST.MF | 1 - .../build.properties | 4 +- ...taxonomy.taxeditor.designproposal1.product | 12 ++- .../icons/edit_16x16.ico | Bin 0 -> 1150 bytes .../taxeditor/designproposal1/Activator.java | 22 ++--- .../controller/CreateNameAction.java | 29 ------ .../controller/OpenNameEditorAction.java | 16 ++-- .../controller/SaveNameAction.java | 7 +- .../model/NameEditorInput.java | 2 +- .../designproposal1/model/ObjectList.java | 79 ---------------- .../designproposal1/model/TaxonName.java | 15 +++ .../view/CarduusEditorView.java | 28 +++--- .../designproposal1/view/CreateNameView.java | 81 ----------------- .../designproposal1/view/LastNameView.java | 86 ------------------ .../view/MultiPagePilosellaView.java | 5 +- .../designproposal1/view/NameEditorView.java | 28 +++--- .../designproposal1/view/NameListView.java | 31 ++++--- .../view/PilosellaEditorView.java | 28 +++--- 19 files changed, 117 insertions(+), 363 deletions(-) create mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.ico delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/CreateNameAction.java delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/ObjectList.java create mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CreateNameView.java delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/LastNameView.java diff --git a/.gitattributes b/.gitattributes index 473e8610a..10d0d2505 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF index e7f0dd950..9358735fe 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF @@ -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 diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties index 78d73f760..50ca37870 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/build.properties @@ -2,4 +2,6 @@ source.. = src/ output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ - . + .,\ + icons/,\ + splash.bmp 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 a595d6122..405df78e4 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/eu.etaxonomy.taxeditor.designproposal1.product @@ -20,10 +20,20 @@ + + + + + + + + + + + - 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 index 0000000000000000000000000000000000000000..d4b6c2b64d059044f19fd7eca29cd601ce5f890d GIT binary patch literal 1150 zcmbu7Sxj727{_l-rR)rYZE-*()IC0GOsc6PGcb2%7@#GkjWrr$jK;)Zj8ACTW~DQb zPPg>I5Fd=u7*n^VK!Fa-z@n-Np7Q9c=j6LNIp@3Q`~JW4 zm!w@{8Vr&cwbJ{$C25~nJtN}5R;`F#J6}mMi?jcZyz)Y7Wfyrx#Z)=%6d6k}S!43?Gk!Q%qB)5otgE()bxV#jT-9n+U5L1IpmEDZl7edcvY4Y|{=dhDsR*vuVC6wvA z_`PBBN-L!)z{?Xh2c`R8Az$dLthZ87CiFEmQEVup$|m!0NeMM_D|;&PsjD|rVl?jb zRj{|58cQ>~OCRuX?C5U}o}=sJ5YLJF{r&-LJ-vASgVfkwqs<+{8vK%AFpRakgVylp zf`_=Xv4vvOA)b{FaChY|;#!(SMirXV=$gi+uH*5CITgFinwn&3V;w!Kfne~>$TUy4 z9-+$eGWDLf$s`t0lUsCoP7#bM^bVXSpv)i(78A-Wi7k}{@oQJ`0-CC`DLALMmj#1k zJY|zuOK;ORJHzAl2BG;esvS-a$aR?I2F{IjlFjJ!y8A@FOpWtN=4M9tCzE4hI!c?@ zhN`J-Bol;$W?$?q2VF1H-t#I>n~UlBIqoHN#^$5c3lGShCpbFjCbhZ2jk#O691`)A zD*DNi6WVlD<7_C*Az9+E|8*kKn{1`l@sEW$;cLUvU(dSw^&Ppc3^2#0bpyG-1H2{%wM)M{&OAUWA8FPdKjNaA` fire - firePropertyChange("ITEM_ADD", null, ve); //$NON-NLS-1$ - } - - - /** - * @param o - * @return - * @see java.util.List#remove(java.lang.Object) - */ - public void remove(Object o) { - this.objectList.remove(o); -// model has changed --> fire - firePropertyChange("ITEM_REMOVE", o, null); //$NON-NLS-1$ - } - - - /** - * @return - * @see java.util.List#toArray() - */ - public Object[] toArray() { - return (Object[]) this.objectList.toArray(new Object[this.objectList.size()]); - } -} 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 index 000000000..66b7cde6a --- /dev/null +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java @@ -0,0 +1,15 @@ +package eu.etaxonomy.taxeditor.designproposal1.model; + +public class TaxonName { + String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + +} diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java index 4fe5047f2..181cc47df 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java @@ -53,14 +53,16 @@ import com.swtdesigner.SWTResourceManager; //import org.eclipse.ui.texteditor.AbstractTextEditor; -import eu.etaxonomy.cdm.event.ICdmEventListener; -import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.event.ICdmEventListener; +//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.Activator; import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction; import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction; +import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName; -public class CarduusEditorView extends EditorPart implements ICdmEventListener { +//public class CarduusEditorView extends EditorPart implements ICdmEventListener { +public class CarduusEditorView extends EditorPart { private Table table_1; private Text carduusLSpText; @@ -413,7 +415,7 @@ public class CarduusEditorView extends EditorPart implements ICdmEventListener { if (input.getAdapter(TaxonName.class) != null) { taxonname = (TaxonName) input.getAdapter(TaxonName.class); - taxonname.addCdmEventListener(this); +// taxonname.addCdmEventListener(this); } else { taxonname = null; @@ -444,10 +446,10 @@ public class CarduusEditorView extends EditorPart implements ICdmEventListener { // txtGenus.setText ... } - public void onDelete(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onDelete(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } public void onInsert(Object arg0) { // TODO Auto-generated method stub @@ -459,10 +461,10 @@ public class CarduusEditorView extends EditorPart implements ICdmEventListener { } - public void onUpdate(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onUpdate(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } private static void addDropDown(final ToolItem item, final Menu menu) { item.addListener(SWT.Selection, new Listener() { 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 index 42165cc2d..000000000 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/CreateNameView.java +++ /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 index bb70ea1d7..000000000 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/LastNameView.java +++ /dev/null @@ -1,86 +0,0 @@ -package eu.etaxonomy.taxeditor.designproposal1.view; - -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.part.ViewPart; - -import eu.etaxonomy.cdm.model.name.TaxonName; -import eu.etaxonomy.taxeditor.designproposal1.Activator; - -public class LastNameView extends ViewPart implements PropertyChangeListener { - - public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.LastNameView"; //$NON-NLS-1$ - private Label lblName; - /** - * Create contents of the view part - * @param parent - */ - @Override - public void createPartControl(Composite parent) { - Composite container = new Composite(parent, SWT.NONE); - final GridLayout gridLayout = new GridLayout(); - gridLayout.numColumns = 2; - container.setLayout(gridLayout); - - final Label theLastNameLabel = new Label(container, SWT.NONE); - theLastNameLabel.setText("The last name created was: "); - - lblName = new Label(container, SWT.NONE); - lblName.setText("none yet"); - lblName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false)); - - - new Label(container, SWT.NONE); - // - createActions(); - initializeToolBar(); - initializeMenu(); - - Activator.getDefault().getObjectList().addPropertyChangeListener(this); - - } - - /** - * Create the actions - */ - private void createActions() { - // Create the actions - } - - /** - * Initialize the toolbar - */ - private void initializeToolBar() { - IToolBarManager toolbarManager = getViewSite().getActionBars() - .getToolBarManager(); - } - - /** - * Initialize the menu - */ - private void initializeMenu() { - IMenuManager menuManager = getViewSite().getActionBars() - .getMenuManager(); - } - - @Override - public void setFocus() { - // Set the focus - } - - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName().equalsIgnoreCase("ITEM_ADD")){ - TaxonName tn = (TaxonName)evt.getNewValue(); - lblName.setText( tn.getName()); - } - } - -} diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java index d2f56c0b7..7f22029bc 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java @@ -6,8 +6,9 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.MultiPageEditorPart; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.model.NameEditorInput; +import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName; public class MultiPagePilosellaView extends MultiPageEditorPart { @@ -71,7 +72,7 @@ public class MultiPagePilosellaView extends MultiPageEditorPart { if (input.getAdapter(TaxonName.class) != null) { taxonname = (TaxonName) input.getAdapter(TaxonName.class); - System.out.println(taxonname.getCreatedWho()); +// System.out.println(taxonname.getCreatedWho()); // taxonname.addCdmEventListener(this); } else { 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 61bd4a0bc..7f18476ea 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 @@ -54,14 +54,16 @@ import com.swtdesigner.SWTResourceManager; //import org.eclipse.ui.texteditor.AbstractTextEditor; -import eu.etaxonomy.cdm.event.ICdmEventListener; -import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.event.ICdmEventListener; +//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.Activator; import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction; import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction; +import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName; -public class NameEditorView extends EditorPart implements ICdmEventListener { +//public class NameEditorView extends EditorPart implements ICdmEventListener { +public class NameEditorView extends EditorPart { private Table table_1; private Text text_3; @@ -451,7 +453,7 @@ public class NameEditorView extends EditorPart implements ICdmEventListener { if (input.getAdapter(TaxonName.class) != null) { taxonname = (TaxonName) input.getAdapter(TaxonName.class); - taxonname.addCdmEventListener(this); +// taxonname.addCdmEventListener(this); } else { taxonname = null; @@ -482,10 +484,10 @@ public class NameEditorView extends EditorPart implements ICdmEventListener { // txtGenus.setText ... } - public void onDelete(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onDelete(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } public void onInsert(Object arg0) { // TODO Auto-generated method stub @@ -497,10 +499,10 @@ public class NameEditorView extends EditorPart implements ICdmEventListener { } - public void onUpdate(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onUpdate(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } private static void addDropDown(final ToolItem item, final Menu menu) { item.addListener(SWT.Selection, new Listener() { diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java index b9b5b9aed..9271b851e 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java @@ -45,14 +45,15 @@ import org.eclipse.ui.part.ViewPart; import com.swtdesigner.ResourceManager; import com.swtdesigner.SWTResourceManager; -import eu.etaxonomy.cdm.api.service.INameService; -import eu.etaxonomy.cdm.event.ICdmEventListener; -import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.api.service.INameService; +//import eu.etaxonomy.cdm.event.ICdmEventListener; +//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.Activator; import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction; -public class NameListView extends ViewPart implements ICdmEventListener { +//public class NameListView extends ViewPart implements ICdmEventListener { +public class NameListView extends ViewPart { private Text searchText; private Table table; private Composite composite; @@ -379,13 +380,13 @@ public class NameListView extends ViewPart implements ICdmEventListener { /** * Refreshes a taxon name in the list */ - public void refreshElement(TaxonName taxonname) { - } +// public void refreshElement(TaxonName taxonname) { +// } - public void onDelete(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onDelete(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } public void onInsert(Object arg0) { // TODO Auto-generated method stub @@ -395,9 +396,9 @@ public class NameListView extends ViewPart implements ICdmEventListener { public void onLoad(Object arg0) { } - public void onUpdate(ICdmEventListenerRegistration arg0) { - System.out.println("here i am"); - refreshElement((TaxonName)arg0); - } +// public void onUpdate(ICdmEventListenerRegistration arg0) { +// System.out.println("here i am"); +// refreshElement((TaxonName)arg0); +// } } 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 e3b70c087..b4abfc849 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 @@ -53,14 +53,16 @@ import com.swtdesigner.SWTResourceManager; //import org.eclipse.ui.texteditor.AbstractTextEditor; -import eu.etaxonomy.cdm.event.ICdmEventListener; -import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.event.ICdmEventListener; +//import eu.etaxonomy.cdm.event.ICdmEventListenerRegistration; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.Activator; import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction; import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction; +import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName; -public class PilosellaEditorView extends EditorPart implements ICdmEventListener { +//public class PilosellaEditorView extends EditorPart implements ICdmEventListener { +public class PilosellaEditorView extends EditorPart { private Table table_1; private Text text_3; @@ -549,7 +551,7 @@ public class PilosellaEditorView extends EditorPart implements ICdmEventListener if (input.getAdapter(TaxonName.class) != null) { taxonname = (TaxonName) input.getAdapter(TaxonName.class); - taxonname.addCdmEventListener(this); +// taxonname.addCdmEventListener(this); } else { taxonname = null; @@ -580,10 +582,10 @@ public class PilosellaEditorView extends EditorPart implements ICdmEventListener // txtGenus.setText ... } - public void onDelete(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onDelete(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } public void onInsert(Object arg0) { // TODO Auto-generated method stub @@ -595,10 +597,10 @@ public class PilosellaEditorView extends EditorPart implements ICdmEventListener } - public void onUpdate(ICdmEventListenerRegistration arg0) { - // TODO Auto-generated method stub - - } +// public void onUpdate(ICdmEventListenerRegistration arg0) { +// // TODO Auto-generated method stub +// +// } private static void addDropDown(final ToolItem item, final Menu menu) { item.addListener(SWT.Selection, new Listener() { -- 2.34.1