From: p.ciardelli Date: Fri, 12 Oct 2007 16:17:05 +0000 (+0000) Subject: Decoupled mockup from CDM Library plug-in. X-Git-Tag: rcp.ss-first-working-version~1237 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a6a02fea598efd506d6bb92c9a85c44676554b3b Decoupled mockup from CDM Library plug-in. --- 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 000000000..d4b6c2b64 Binary files /dev/null and b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/icons/edit_16x16.ico differ diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java index a80b54d68..95ae9994f 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java @@ -5,8 +5,8 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -import eu.etaxonomy.cdm.api.application.CdmApplicationController; -import eu.etaxonomy.taxeditor.designproposal1.model.ObjectList; +//import eu.etaxonomy.cdm.api.application.CdmApplicationController; + /** * The activator class controls the plug-in life cycle @@ -19,10 +19,8 @@ public class Activator extends AbstractUIPlugin { // The shared instance private static Activator plugin; - private CdmApplicationController cdmApp = new CdmApplicationController(); +// private CdmApplicationController cdmApp = new CdmApplicationController(); - private ObjectList objectList = new ObjectList(); - /** * The constructor */ @@ -75,15 +73,9 @@ public class Activator extends AbstractUIPlugin { /** * @return the objectList */ - public CdmApplicationController getApplicationController() { - return this.cdmApp; - } - +// public CdmApplicationController getApplicationController() { +// return this.cdmApp; +// } - /** - * @return the objectList - */ - public ObjectList getObjectList() { - return this.objectList; - } + } 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 index b61117491..000000000 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/CreateNameAction.java +++ /dev/null @@ -1,29 +0,0 @@ -package eu.etaxonomy.taxeditor.designproposal1.controller; - -import org.eclipse.jface.action.Action; - -import eu.etaxonomy.cdm.api.service.INameService; -import eu.etaxonomy.cdm.model.name.TaxonName; -import eu.etaxonomy.taxeditor.designproposal1.Activator; - -public class CreateNameAction extends Action { - - private TaxonName tn; - - public CreateNameAction(String genus, String spEpithet) { - - INameService ns = Activator.getDefault().getApplicationController().getNameService(); - this.tn = ns.createTaxonName(null); - tn.setGenus(genus); - tn.setSpecificEpithet(spEpithet); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.action.Action#run() - */ - public void run() { - //Application. - Activator.getDefault().getApplicationController().getNameService().saveTaxonName(tn); - Activator.getDefault().getObjectList().add(tn); - } -} diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java index 178541e9e..5c2fa5b1e 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java @@ -4,10 +4,11 @@ import org.eclipse.jface.action.Action; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PartInitException; -import eu.etaxonomy.cdm.api.service.INameService; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.api.service.INameService; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.Activator; import eu.etaxonomy.taxeditor.designproposal1.model.NameEditorInput; +import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.view.MultiPagePilosellaView; import eu.etaxonomy.taxeditor.designproposal1.view.NameEditorView; @@ -21,15 +22,18 @@ public class OpenNameEditorAction extends Action { } public OpenNameEditorAction() { - INameService ns = Activator.getDefault().getApplicationController().getNameService(); - this.taxonname = ns.createTaxonName(null); +// INameService ns = Activator.getDefault().getApplicationController().getNameService(); +// this.taxonname = ns.createTaxonName(null); + this.taxonname = new TaxonName(); + this.taxonname.setName("new"); setId(ID); setText("New taxon"); } public OpenNameEditorAction(String name) { - INameService ns = Activator.getDefault().getApplicationController().getNameService(); - this.taxonname = ns.createTaxonName(null); +// INameService ns = Activator.getDefault().getApplicationController().getNameService(); +// this.taxonname = ns.createTaxonName(null); + this.taxonname = new TaxonName(); this.taxonname.setName(name); // setId(ID); // setText("New name"); diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java index 53b31c8e7..9257abff4 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java @@ -2,8 +2,9 @@ package eu.etaxonomy.taxeditor.designproposal1.controller; import org.eclipse.jface.action.Action; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.taxeditor.designproposal1.Activator; +import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName; public class SaveNameAction extends Action { TaxonName taxonname; @@ -13,7 +14,7 @@ public class SaveNameAction extends Action { } public void run() { - Activator.getDefault().getApplicationController().getNameService(). - saveTaxonName(taxonname); +// Activator.getDefault().getApplicationController().getNameService(). +// saveTaxonName(taxonname); } } diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java index 402fa0c1a..9afdba27a 100644 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java +++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java @@ -4,7 +4,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; -import eu.etaxonomy.cdm.model.name.TaxonName; +//import eu.etaxonomy.cdm.model.name.TaxonName; public class NameEditorInput implements IEditorInput { 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 index fa5b9c15c..000000000 --- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/model/ObjectList.java +++ /dev/null @@ -1,79 +0,0 @@ -package eu.etaxonomy.taxeditor.designproposal1.model; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.ArrayList; -import java.util.List; - -import eu.etaxonomy.cdm.model.common.VersionableEntity; - -public class ObjectList { - - private List objectList = new ArrayList(); - - protected transient PropertyChangeSupport listeners = new PropertyChangeSupport(this); - - - //public class ObjectList extends PlatformObject { - - /** - * Adds a property-change listener. - * @param l the listener - */ - public void addPropertyChangeListener(PropertyChangeListener l){ - if (l == null) { - throw new IllegalArgumentException(); - } - this.listeners.addPropertyChangeListener(l); - } - - - public void removePropertyChangeListener(PropertyChangeListener l){ - this.listeners.removePropertyChangeListener(l); - } - - /** - * Notifies all listeners to a model-change - * @param prop the property-id - * @param old the old-value - * @param newValue the new value - */ - protected void firePropertyChange(String prop, Object old, Object newValue){ - if (this.listeners.hasListeners(prop)) { - this.listeners.firePropertyChange(prop, old, newValue); - } - } - - - /** - * @param o - * @return - * @see java.util.List#add(java.lang.Object) - */ - public void add(VersionableEntity ve) { - this.objectList.add(ve); - // model has changed --> 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() {