From: p.ciardelli
Date: Thu, 18 Oct 2007 13:22:23 +0000 (+0000)
Subject: Commit before playing with JFace Databinding.
X-Git-Tag: rcp.ss-first-working-version~1234
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a987028074459d6b33d0a421398eb8455f8ec724
Commit before playing with JFace Databinding.
---
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath
index d2a5d755b..8d8e59ba1 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif
index abaf009f3..955c6ae9d 100644
Binary files a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif and b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/icons/homonym.gif differ
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
index 82b17f99f..e83e086e4 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
@@ -6,6 +6,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import eu.etaxonomy.cdm.api.application.CdmApplicationController;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.prototype1.model.ObjectList;
/**
@@ -27,6 +28,14 @@ public class Activator extends AbstractUIPlugin {
* The constructor
*/
public Activator() {
+// makeNames();
+ }
+
+ private void makeNames() {
+ TaxonName tn = cdmApp.getNameService().createTaxonName(null);
+ tn.setGenus("Hieracium");
+ tn.setSpecificEpithet("joemama");
+ cdmApp.getNameService().saveTaxonName(tn);
}
/*
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java
index d4fbbef42..103f56a07 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Perspective.java
@@ -12,9 +12,7 @@ public class Perspective implements IPerspectiveFactory {
public void createInitialLayout(IPageLayout layout) {
String editorArea = layout.getEditorArea();
- IFolderLayout navigatorFolder = layout.createFolder("Navigator",
- IPageLayout.LEFT, 0.25f, editorArea);
- navigatorFolder.addView(NameListView.ID);
+ layout.addStandaloneView(NameListView.ID, false, IPageLayout.LEFT, 0.25f, editorArea);
// navigatorFolder.addView(LastNameView.ID);
layout.getViewLayout(NameListView.ID).setCloseable(false);
// navigatorFolder.addView(LastNameView.ID);
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
index 3ff82c87c..a7fc42fec 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
@@ -13,7 +13,7 @@ public class CreateNameAction extends Action {
public CreateNameAction(String genus, String spEpithet) {
INameService ns = Activator.getDefault().getApplicationController().getNameService();
- this.tn = ns.getNewTaxonName(null);
+ this.tn = ns.createTaxonName(null);
tn.setGenus(genus);
tn.setSpecificEpithet(spEpithet);
}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java
index c526f1de7..2b8399960 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/SaveNameAction.java
@@ -9,6 +9,7 @@ public class SaveNameAction extends Action {
TaxonName taxonname;
public SaveNameAction(TaxonName taxonname) {
+ taxonname.setName(taxonname.getGenus() + " " + taxonname.getSpecificEpithet());
this.taxonname = taxonname;
}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
index d2c7a03d7..4a97ce120 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
@@ -31,11 +31,13 @@ import com.swtdesigner.ResourceManager;
//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.taxeditor.prototype1.Activator;
import eu.etaxonomy.taxeditor.prototype1.controller.SaveNameAction;
-public class NameEditorView extends EditorPart implements PropertyChangeListener {
+public class NameEditorView extends EditorPart implements ICdmEventListener {
private StyledText styledText;
private TaxonName taxonname;
@@ -222,7 +224,7 @@ public class NameEditorView extends EditorPart implements PropertyChangeListener
if (input.getAdapter(TaxonName.class) != null) {
taxonname = (TaxonName) input.getAdapter(TaxonName.class);
- taxonname.addPropertyChangeListener(this);
+ taxonname.addCdmEventListener(this);
} else {
taxonname = null;
@@ -252,5 +254,25 @@ public class NameEditorView extends EditorPart implements PropertyChangeListener
// if (evt.getPropertyName().equalsIgnoreCase("genus"))
// txtGenus.setText ...
}
+
+ public void onDelete(ICdmEventListenerRegistration arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onInsert(Object arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onLoad(Object arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onUpdate(ICdmEventListenerRegistration arg0) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
index 8876cf286..319574b65 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
@@ -21,13 +21,13 @@ import org.eclipse.swt.widgets.ExpandItem;
import org.eclipse.ui.part.ViewPart;
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.prototype1.Activator;
import eu.etaxonomy.taxeditor.prototype1.controller.OpenNameEditorAction;
-public class NameListView extends ViewPart {
-
-
+public class NameListView extends ViewPart implements ICdmEventListener {
private Composite nameListComposite = null;
private Composite recentNamesComposite = null;
private Composite searchComposite = null;
@@ -40,7 +40,7 @@ public class NameListView extends ViewPart {
public static final String ID = "eu.etaxonomy.mvctest.view.NameListView"; //$NON-NLS-1$
class ViewContentProvider implements IStructuredContentProvider {
-
+
public Object[] getElements(Object inputElement) {
INameService ns = Activator.getDefault().getApplicationController().getNameService();
return ns.getAllNames().toArray();
@@ -59,14 +59,21 @@ public class NameListView extends ViewPart {
class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
+ NameListView nlv;
+
+ public ViewLabelProvider(NameListView view) {
+ this.nlv = view;
+ }
+
public Image getColumnImage(Object element, int columnIndex) {
// TODO Auto-generated method stub
return null;
}
public String getColumnText(Object element, int columnIndex) {
+ ((TaxonName) element).addCdmEventListener(nlv);
return ((TaxonName) element).getName();
- }
+ }
public void updateLabel(ViewerLabel label, Object element) {
// TODO Auto-generated method stub
@@ -131,9 +138,11 @@ public class NameListView extends ViewPart {
viewer = new TableViewer(nameListComposite, SWT.MULTI | SWT.H_SCROLL
| SWT.V_SCROLL);
viewer.setContentProvider(new ViewContentProvider());
- viewer.setLabelProvider(new ViewLabelProvider());
+ viewer.setLabelProvider(new ViewLabelProvider(this));
viewer.setInput(getViewSite());
-
+
+ final NameListView me = this;
+
viewer.addDoubleClickListener(new IDoubleClickListener(){
public void doubleClick(DoubleClickEvent event) {
@@ -144,6 +153,7 @@ public class NameListView extends ViewPart {
e.printStackTrace();
taxonname = null;
}
+ taxonname.addCdmEventListener(me);
new OpenNameEditorAction(taxonname).run();
}
});
@@ -221,5 +231,23 @@ public class NameListView extends ViewPart {
public void refreshElement(TaxonName taxonname) {
this.viewer.refresh(taxonname);
}
+
+ public void onDelete(ICdmEventListenerRegistration arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onInsert(Object arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onLoad(Object arg0) {
+ }
+
+ public void onUpdate(ICdmEventListenerRegistration arg0) {
+ System.out.println("here i am");
+ refreshElement((TaxonName)arg0);
+ }
}