From 0b7a47d085b5f40db4a49e97031a55023883b847 Mon Sep 17 00:00:00 2001
From: "p.ciardelli"
Date: Tue, 29 Jan 2008 12:58:41 +0000
Subject: [PATCH]
---
.gitattributes | 22 -
.../taxeditor/designproposal1/Activator.java | 82 ---
.../designproposal1/Application.java | 45 --
.../ApplicationActionBarAdvisor.java | 55 --
.../ApplicationWorkbenchAdvisor.java | 20 -
.../ApplicationWorkbenchWindowAdvisor.java | 30 -
.../designproposal1/Perspective.java | 26 -
.../controller/OpenNameEditorAction.java | 54 --
.../controller/SaveNameAction.java | 20 -
.../model/NameEditorInput.java | 49 --
.../designproposal1/model/TaxonName.java | 15 -
.../view/CarduusEditorView.java | 482 ------------
.../view/EditNameProperties.java | 28 -
.../designproposal1/view/EmptyEditorView.java | 56 --
.../designproposal1/view/MoveDialogView.java | 281 -------
.../view/MultiPagePilosellaView.java | 87 ---
.../view/MyCompletionProcessor.java | 105 ---
.../designproposal1/view/MyRuleScanner.java | 37 -
.../view/MySourceViewerConfig.java | 71 --
.../designproposal1/view/NameEditorView.java | 523 -------------
.../designproposal1/view/NameListView.java | 404 ----------
.../view/PilosellaEditorView.java | 692 ------------------
.../designproposal1/view/UndoView.java | 117 ---
23 files changed, 3301 deletions(-)
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Application.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationActionBarAdvisor.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchAdvisor.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchWindowAdvisor.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Perspective.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EditNameProperties.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EmptyEditorView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyCompletionProcessor.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
delete mode 100644 eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/UndoView.java
diff --git a/.gitattributes b/.gitattributes
index bbbac9fe8..8fd16acff 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -107,28 +107,6 @@ eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/plugin.xml -text
eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/splash.bmp -text
eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/com/swtdesigner/ResourceManager.java -text
eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/com/swtdesigner/SWTResourceManager.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Application.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationActionBarAdvisor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchAdvisor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchWindowAdvisor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Perspective.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EditNameProperties.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EmptyEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyCompletionProcessor.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java -text
-eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/UndoView.java -text
eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal2/Activator.java -text
eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal2/Application.java -text
eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal2/ApplicationActionBarAdvisor.java -text
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
deleted file mode 100644
index 3e52b5d05..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-//import eu.etaxonomy.cdm.api.application.CdmApplicationController;
-
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "eu.etaxonomy.mvctest";
-
- // The shared instance
- private static Activator plugin;
-
-// private CdmApplicationController cdmApp = new CdmApplicationController();
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
-
- public Image getImage(String key) {
- return getImageRegistry().get(key);
- }
-
- /**
- * @return the objectList
- */
-// public CdmApplicationController getApplicationController() {
-// return this.cdmApp;
-// }
-
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Application.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Application.java
deleted file mode 100644
index 8a7b97c64..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Application.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IApplication {
-
- /* (non-Javadoc)
- * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
- */
- public Object start(IApplicationContext context) {
- Display display = PlatformUI.createDisplay();
- try {
- int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
- if (returnCode == PlatformUI.RETURN_RESTART) {
- return IApplication.EXIT_RESTART;
- }
- return IApplication.EXIT_OK;
- } finally {
- display.dispose();
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.equinox.app.IApplication#stop()
- */
- public void stop() {
- final IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench == null)
- return;
- final Display display = workbench.getDisplay();
- display.syncExec(new Runnable() {
- public void run() {
- if (!display.isDisposed())
- workbench.close();
- }
- });
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationActionBarAdvisor.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 93e743fa1..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationActionBarAdvisor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;
-
-/**
- * An action bar advisor is responsible for creating, adding, and disposing of
- * the actions added to a workbench window. Each window will be populated with
- * new actions.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
- // Actions - important to allocate these only in makeActions, and then use
- // them
- // in the fill methods. This ensures that the actions aren't recreated
- // when fillActionBars is called with FILL_PROXY.
- private IWorkbenchAction exitAction;
- private OpenNameEditorAction newNameAction;
-
- public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
- super(configurer);
- }
-
- protected void makeActions(final IWorkbenchWindow window) {
- // Creates the actions and registers them.
- // Registering is needed to ensure that key bindings work.
- // The corresponding commands keybindings are defined in the plugin.xml
- // file.
- // Registering also provides automatic disposal of the actions when
- // the window is closed.
-
- exitAction = ActionFactory.QUIT.create(window);
- register(exitAction);
-
- newNameAction = new OpenNameEditorAction();
- register(newNameAction);
- }
-
- protected void fillMenuBar(IMenuManager menuBar) {
- MenuManager fileMenu = new MenuManager("&File",
- IWorkbenchActionConstants.M_FILE);
- menuBar.add(fileMenu);
- fileMenu.add(newNameAction);
- fileMenu.add(exitAction);
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchAdvisor.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 6749cbdec..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchAdvisor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
- private static final String PERSPECTIVE_ID = "eu.etaxonomy.taxeditor.designproposal1.perspective";
-
- public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
- IWorkbenchWindowConfigurer configurer) {
- return new ApplicationWorkbenchWindowAdvisor(configurer);
- }
-
- public String getInitialWindowPerspectiveId() {
- return PERSPECTIVE_ID;
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchWindowAdvisor.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 09376c2c4..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-//import eu.etaxonomy.taxeditor.prototype1.controller.PopulateNameListViewAction;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
- public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
- super(configurer);
- }
-
- public ActionBarAdvisor createActionBarAdvisor(
- IActionBarConfigurer configurer) {
- return new ApplicationActionBarAdvisor(configurer);
- }
-
- public void preWindowOpen() {
- IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
- configurer.setInitialSize(new Point(800, 600));
- configurer.setShowCoolBar(false);
- configurer.setShowStatusLine(false);
- configurer.setTitle("EDIT Taxonomic Editor");
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Perspective.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Perspective.java
deleted file mode 100644
index 9c0f5c77d..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/Perspective.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.IPlaceholderFolderLayout;
-
-import eu.etaxonomy.taxeditor.designproposal1.view.NameListView;
-import eu.etaxonomy.taxeditor.designproposal1.view.UndoView;
-//import eu.etaxonomy.taxeditor.designproposal1.view.DogView;
-
-public class Perspective implements IPerspectiveFactory {
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.perspective";
-
- public void createInitialLayout(IPageLayout layout) {
- String editorArea = layout.getEditorArea();
- layout.addStandaloneView(NameListView.ID, false, IPageLayout.LEFT, 0.30f, editorArea);
- layout.addView(UndoView.ID, IPageLayout.BOTTOM, 0.8f, editorArea);
- layout.getViewLayout(NameListView.ID).setCloseable(false);
- addFastViews(layout);
- }
- private void addFastViews(IPageLayout layout) {
- System.currentTimeMillis();
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java
deleted file mode 100644
index 5c2fa5b1e..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/OpenNameEditorAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.controller;
-
-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.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;
-
-public class OpenNameEditorAction extends Action {
-
- private TaxonName taxonname;
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.controller.opennameeditoraction"; //$NON-NLS-1$
-
- public OpenNameEditorAction(TaxonName taxonname) {
- this.taxonname = taxonname;
- }
-
- public OpenNameEditorAction() {
-// 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);
- this.taxonname = new TaxonName();
- this.taxonname.setName(name);
-// setId(ID);
-// setText("New name");
- }
-
- public void run() {
- IEditorInput input = new NameEditorInput(taxonname);
- try {
-// Activator.getDefault().getWorkbench().getActiveWorkbenchWindow().
-// getActivePage().openEditor(input, NameEditorView.ID);
- Activator.getDefault().getWorkbench().getActiveWorkbenchWindow().
- getActivePage().openEditor(input, MultiPagePilosellaView.ID);
- } catch (PartInitException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java
deleted file mode 100644
index 9257abff4..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/controller/SaveNameAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.controller;
-
-import org.eclipse.jface.action.Action;
-
-//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;
-
- public SaveNameAction(TaxonName taxonname) {
- this.taxonname = taxonname;
- }
-
- public void run() {
-// Activator.getDefault().getApplicationController().getNameService().
-// saveTaxonName(taxonname);
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java
deleted file mode 100644
index 9afdba27a..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/NameEditorInput.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.model;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-//import eu.etaxonomy.cdm.model.name.TaxonName;
-
-public class NameEditorInput implements IEditorInput {
-
- private TaxonName taxonname;
-
- public NameEditorInput (TaxonName taxonname) {
- this.taxonname = taxonname;
- }
-
- public boolean exists() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public ImageDescriptor getImageDescriptor() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getName() {
- return taxonname.getName();
- }
-
- public IPersistableElement getPersistable() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getToolTipText() {
- return taxonname.getName();
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == TaxonName.class) {
- return this.taxonname;
- }
-
- return null;
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java
deleted file mode 100644
index 66b7cde6a..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/model/TaxonName.java
+++ /dev/null
@@ -1,15 +0,0 @@
-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.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java
deleted file mode 100644
index 181cc47df..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/CarduusEditorView.java
+++ /dev/null
@@ -1,482 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.PopupList;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-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.CoolBar;
-import org.eclipse.swt.widgets.CoolItem;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import com.swtdesigner.ResourceManager;
-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.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 {
-
- private Table table_1;
- private Text carduusLSpText;
- private StyledText styledText;
- private TaxonName taxonname;
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.carduuseditorview"; //$NON-NLS-1$
-
- /**
- * Create contents of the editor part
- * @param parent
- */
- @Override
- public void createPartControl(Composite parent) {
- //
-
-
-// txtPlay = new Text(container, SWT.BORDER);
-// txtPlay.setCapture(true);
-// final GridData gd_txtPlay = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-// gd_txtPlay.heightHint = 96;
-// txtPlay.setLayoutData(gd_txtPlay);
-//// txtPlay.addVerifyListener(new VerifyListener() {
-//// @Override
-//// public void verifyText(VerifyEvent e) {
-//// e.doit = Character.isDigit(e.character);
-//// }
-//// });
-// txtPlay.addSelectionListener(new SelectionListener() {
-//
-// @Override
-// public void widgetDefaultSelected(SelectionEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-//
-// @Override
-// public void widgetSelected(SelectionEvent e) {
-// System.out.println(e.toString());
-// }
-//
-//
-// });
-//
-//
-// txtPlay.addKeyListener(new KeyListener() {
-//
-// public void keyPressed(KeyEvent e) {
-// System.out.println(e.character);
-// if (e.character == '=') {
-// Shell shell = Activator.getDefault().getWorkbench().
-// getActiveWorkbenchWindow().getShell();
-// PopupList list = new PopupList(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-//
-//// Combo list = new Combo(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-//
-// // Add the items to the list
-// String[] OPTIONS = { "Create homo. syn.",
-// "Create hetero. syn.",
-// "Create mis. name",
-// "Create homonym"};
-//
-// list.setItems(OPTIONS);
-//
-// // Open the list and get the selected item
-// String selected = list.open(txtPlay.getBounds());
-//
-// // Print the item to the console
-// System.out.println(selected);
-// }
-//
-// }
-//
-// public void keyReleased(KeyEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-// });
- parent.setLayout(new GridLayout());
- Document doc = new Document("");
-
- final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);
- taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- taxonomicallyIncludedInLabel.setText("Higher taxon: \"Cardueae Cass.\"");
-
- final ToolBar toolBar = new ToolBar(parent, SWT.NONE);
-// toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
-
- final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);
- itemSave.setToolTipText("Save taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemSave.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/save.gif"));
- itemSave.addSelectionListener(new SelectionListener() {
- public void mouseDown(final MouseEvent e) {
-
-// taxonname.setGenus(txtGenus.getText());
-// taxonname.setSpecificEpithet(txtSpEpi.getText());
-
- new SaveNameAction(taxonname).run();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- new SaveNameAction(taxonname).run();
- }
-
- public void widgetSelected(SelectionEvent e) {
- new SaveNameAction(taxonname).run();
- }
- });
-
- final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemMove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent e) {
- }
- });
-
- final Menu menuMove = new Menu(toolBar);
- menuMove.setData("x", null);
- addDropDown(itemMove, menuMove);
-
- final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
- moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");
-
- final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
- turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");
-
-// });
-// newItemToolItem.setText("New item");
- itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));
-
- final ToolItem itemDelete = new ToolItem(toolBar, SWT.NONE);
- itemDelete.setToolTipText("Delete taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemDelete.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));
-
- final ToolItem separator1 = new ToolItem(toolBar, SWT.SEPARATOR);
-
- final ToolItem itemAddRelationship = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemAddRelationship.setToolTipText("Add nom. or tax. relation to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemAddRelationship.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/rel_no_bg.gif"));
-
- final Menu menuAddRel = new Menu(toolBar);
- menuAddRel.setData("x", null);
- addDropDown(itemAddRelationship, menuAddRel);
-
- final MenuItem testMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- testMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));
- testMenuItem.setText("Add synonymy (type unknown)");
-
- final MenuItem addHomotypicSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHomotypicSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));
- addHomotypicSynonymMenuItem.setText("Add homotypic synonym");
-
- final MenuItem addHeterotypicSynoynmMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHeterotypicSynoynmMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
- addHeterotypicSynoynmMenuItem.setText("Add heterotypic synoynm");
-
- final MenuItem addBasionymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addBasionymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));
- addBasionymMenuItem.setText("Add basionym");
-
- final MenuItem addReplacedSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addReplacedSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));
- addReplacedSynonymMenuItem.setText("Add replaced synonym");
-
- final MenuItem addHomonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHomonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));
- addHomonymMenuItem.setText("Add homonym");
-
- final MenuItem addOrthographicVariantMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addOrthographicVariantMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));
- addOrthographicVariantMenuItem.setText("Add orthographic variant");
-
- final MenuItem addMisappliedNameMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addMisappliedNameMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));
- addMisappliedNameMenuItem.setText("Add misapplied name");
-
- final MenuItem addConceptRelationMenuItem_1 = new MenuItem(menuAddRel, SWT.CASCADE);
- addConceptRelationMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));
- addConceptRelationMenuItem_1.setText("Add concept relation");
-
- final Menu menu = new Menu(addConceptRelationMenuItem_1);
- addConceptRelationMenuItem_1.setMenu(menu);
-
- final MenuItem checkboxMenuItem = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem.setText("congruent");
-
- final MenuItem checkboxMenuItem_1 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_1.setSelection(true);
- checkboxMenuItem_1.setText("included in");
-
- final MenuItem checkboxMenuItem_2 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_2.setText("includes");
-
- final MenuItem checkboxMenuItem_3 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_3.setText("overlaps");
-
- final MenuItem checkboxMenuItem_4 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_4.setText("excludes");
-
- final MenuItem checkboxMenuItem_5 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_5.setSelection(true);
- checkboxMenuItem_5.setText("doubtful");
-
- final ToolItem separator2 = new ToolItem(toolBar, SWT.SEPARATOR);
-
- final ToolItem itemAddTaxon = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemAddTaxon.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/add_no_bg2.gif"));
- itemAddTaxon.setToolTipText("Add new taxon");
-
- final Menu menuAdd = new Menu(toolBar);
- menuAdd.setData("x", null);
- addDropDown(itemAddTaxon, menuAdd);
-
- final MenuItem addTaxonToMenuItem = new MenuItem(menuAdd, SWT.NONE);
- addTaxonToMenuItem.setText("Add new taxon to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final MenuItem addNewTaxonMenuItem = new MenuItem(menuAdd, SWT.NONE);
- addNewTaxonMenuItem.setText("Add new taxon to \"Pilosella fuscoatra coll.\"");
-
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- final GridLayout gridLayout_2 = new GridLayout();
- gridLayout_2.horizontalSpacing = 3;
- gridLayout_2.numColumns = 2;
- composite.setLayout(gridLayout_2);
-
- carduusLSpText = new Text(composite, SWT.WRAP);
- carduusLSpText.setText("Carduus L., Sp. Pl.: 820. 1753");
- carduusLSpText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));
- final GridData gd_carduusLSpText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- carduusLSpText.setLayoutData(gd_carduusLSpText);
- carduusLSpText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- carduusLSpText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- carduusLSpText.setBackground(null);
- }
-
- });
-
- table_1 = new Table(composite, SWT.BORDER);
- table_1.setLinesVisible(true);
- table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 2));
-
- final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);
- newColumnTableColumn.setWidth(100);
- newColumnTableColumn.setText("New column");
-
- final TableColumn newColumnTableColumn_1 = new TableColumn(table_1, SWT.NONE);
- newColumnTableColumn_1.setWidth(100);
- newColumnTableColumn_1.setText("New column");
-
- final TableItem newItemTableItem = new TableItem(table_1, SWT.BORDER);
- newItemTableItem.setText(0, "Rank");
- newItemTableItem.setText(1, "genus");
- newItemTableItem.setText("Rank");
-
- final TableItem newItemTableItem_1 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_1.setText(1, "Carduus");
- newItemTableItem_1.setText(0, "Genus");
-
- final TableItem newItemTableItem_2 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_2.setText(0, "Species epithet");
-
- final TableItem newItemTableItem_3 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_3.setText(1, "L.");
- newItemTableItem_3.setText(0, "Author team");
-
- final TableItem newItemTableItem_4 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_4.setText("...");
-// newItemTableItem_2.setText("Species epithet");
-// newItemTableItem_1.setText("Genus");
- //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
-
- SourceViewer sourceviewer = new SourceViewer(composite, null, SWT.WRAP | SWT.FULL_SELECTION);
- sourceviewer.setAnnotationHover(null);
- styledText = sourceviewer.getTextWidget();
- final GridData gd_styledText = new GridData(SWT.FILL, SWT.TOP, true, false);
- gd_styledText.heightHint = 41;
- gd_styledText.widthHint = 450;
- styledText.setLayoutData(gd_styledText);
- sourceviewer.setDocument(doc);
- sourceviewer.configure(new MySourceViewerConfig());
- sourceviewer.setTabsToSpacesConverter(null);
-
-
-// final Menu menu = new Menu(toolBar);
-// addDropDown(newItemToolItem, menu);
-// );
-
-// Action testAction = new OpenNameEditorAction();
-// testAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor(Activator.getDefault(), "icons/edit_16x16.gif"));
-// testAction.setToolTipText("Add relation");
-// toolBar.add(testAction);
-
- populateForm();
- }
-
-// private void populateForm() {
-//
-// String fulltext = "";
-//
-// if (taxonname.getGenus() != null) {
-// fulltext = taxonname.getGenus();
-// }
-//
-// if (taxonname.getSpecificEpithet() != null) {
-// fulltext += " " + taxonname.getSpecificEpithet();
-// }
-//
-// if (taxonname.getAuthorship() != null) {
-// fulltext += " " + taxonname.getAuthorship();
-// }
-//
-//// txtPlay.setText(fulltext);
-//// txtPlay.setToolTipText("Joe mama\njoe daddy\njoe gramammy");
-//
-// this.setPartName(taxonname.getName());
-// }
-
- private void populateForm() {
- this.setPartName("Pilosella fuscoatra (Nägeli & Peter) Soják");
- }
-
- @Override
- public void setFocus() {
- // Set the focus
- }
-
- @Override
- public void doSave(IProgressMonitor monitor) {
- // Do the Save operation
- }
-
- @Override
- public void doSaveAs() {
- // Do the Save As operation
- }
-
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-
- if (!(input instanceof IEditorInput))
- throw new PartInitException(
- "Invalid Input: Must be IFileEditorInput");
-
- if (input.getAdapter(TaxonName.class) != null) {
- taxonname = (TaxonName) input.getAdapter(TaxonName.class);
-// taxonname.addCdmEventListener(this);
- } else {
-
- taxonname = null;
- }
-
- setSite(site);
- setInput(input);
- }
-
- @Override
- public boolean isDirty() {
- return false;
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- return false;
- }
-
- public void propertyChange(PropertyChangeEvent evt) {
-// TaxonName taxonname = (TaxonName)evt.getNewValue();
- this.taxonname = (TaxonName)evt.getNewValue();
- System.out.println(((TaxonName)evt.getNewValue()).getName());
- populateForm();
-
- // for individual fields, do something like:
- // 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
-//
-// }
-
- private static void addDropDown(final ToolItem item, final Menu menu) {
- item.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
- if (event.detail == SWT.ARROW) {
- Rectangle rect = item.getBounds();
- Point pt = new Point(rect.x, rect.y + rect.height);
- pt = item.getParent().toDisplay(pt);
- menu.setLocation(pt.x, pt.y);
- menu.setVisible(true);
- }
- }
- });
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EditNameProperties.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EditNameProperties.java
deleted file mode 100644
index 1919037c1..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EditNameProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-public class EditNameProperties extends PropertyPage {
-
- /**
- * Create the property page
- */
- public EditNameProperties() {
- super();
- }
-
- /**
- * Create contents of the property page
- * @param parent
- */
- @Override
- public Control createContents(Composite parent) {
- Composite container = new Composite(parent, SWT.NULL);
- //
- return container;
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EmptyEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EmptyEditorView.java
deleted file mode 100644
index 67634d449..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/EmptyEditorView.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-
-public class EmptyEditorView extends EditorPart {
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.EmptyEditorView"; //$NON-NLS-1$
-
- /**
- * Create contents of the editor part
- * @param parent
- */
- @Override
- public void createPartControl(Composite parent) {
- Composite container = new Composite(parent, SWT.NONE);
- //
- }
-
- @Override
- public void setFocus() {
- // Set the focus
- }
-
- @Override
- public void doSave(IProgressMonitor monitor) {
- // Do the Save operation
- }
-
- @Override
- public void doSaveAs() {
- // Do the Save As operation
- }
-
- @Override
- public void init(IEditorSite site, IEditorInput input)
- throws PartInitException {
- // Initialize the editor part
- }
-
- @Override
- public boolean isDirty() {
- return false;
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- return false;
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
deleted file mode 100644
index 6b048b10e..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MoveDialogView.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-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.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-import com.swtdesigner.ResourceManager;
-import com.swtdesigner.SWTResourceManager;
-
-import eu.etaxonomy.taxeditor.designproposal1.Activator;
-import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;
-
-public class MoveDialogView extends Dialog {
-
- Text searchText;
-
- private Tree tree;
- /**
- * Create the dialog
- * @param parentShell
- */
- public MoveDialogView(Shell parentShell) {
- super(parentShell);
- }
-
- /**
- * Create contents of the dialog
- * @param parent
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- parent.setRedraw(true);
- Composite container = (Composite) super.createDialogArea(parent);
- final GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- container.setLayout(gridLayout);
-
- final Label youHaveChosenLabel = new Label(container, SWT.WRAP);
- final GridData gd_youHaveChosenLabel = new GridData(SWT.CENTER, SWT.FILL, true, false, 2, 1);
- gd_youHaveChosenLabel.heightHint = 30;
- youHaveChosenLabel.setLayoutData(gd_youHaveChosenLabel);
- youHaveChosenLabel.setText("You have chosen to turn \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym. Please choose a new accepted name from one of the following options.");
-
- final Group group_1 = new Group(container, SWT.NONE);
- group_1.setLayout(new GridLayout());
- final GridData gd_group_1 = new GridData(SWT.FILL, SWT.FILL, true, true);
- gd_group_1.heightHint = 83;
- group_1.setLayoutData(gd_group_1);
-
- final Button chooseAcceptedNameButton = new Button(group_1, SWT.RADIO);
- chooseAcceptedNameButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
- chooseAcceptedNameButton.setText("Choose from taxonomic tree");
-
- tree = new Tree(group_1, SWT.FULL_SELECTION | SWT.BORDER);
- tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- tree.setItemCount(1);
- tree.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(final MouseEvent e) {
- new OpenNameEditorAction("Pilosella").run();
- }
- });
-
- final TreeItem newItemTreeItem = new TreeItem(tree, SWT.NONE);
- newItemTreeItem.setChecked(true);
- newItemTreeItem.setText("Compositae Giseke");
-
- final TreeItem newItemTreeItem_1 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_1.setItemCount(1);
- newItemTreeItem_1.setText("Anthemideae Cass.");
-
- final TreeItem newItemTreeItem_2 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_2.setItemCount(1);
- newItemTreeItem_2.setText("Arctotideae Cass.");
-
- final TreeItem newItemTreeItem_3 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_3.setItemCount(1);
- newItemTreeItem_3.setText("Astereae Cass.");
-
- final TreeItem newItemTreeItem_4 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_4.setItemCount(1);
- newItemTreeItem_4.setText("Calenduleae Cass.");
-
- final TreeItem newItemTreeItem_5 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_5.setItemCount(1);
- newItemTreeItem_5.setText("Cardueae Cass.");
-
- final TreeItem newItemTreeItem_6 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_6.setText("Cichorieae Lam. & DC.");
-
- final TreeItem newItemTreeItem_16 = new TreeItem(newItemTreeItem_6, SWT.NONE);
- newItemTreeItem_16.setExpanded(true);
- newItemTreeItem_16.setText("Pilosella Vaill.");
-
- final TreeItem newItemTreeItem_17 = new TreeItem(newItemTreeItem_16, SWT.NONE);
- newItemTreeItem_17.setText("Pilosella fuscoatra coll.");
-
- final TreeItem newItemTreeItem_18 = new TreeItem(newItemTreeItem_17, SWT.NONE);
- newItemTreeItem_18.setFont(SWTResourceManager.getFont("", 8, SWT.BOLD));
- newItemTreeItem_18.setExpanded(true);
- newItemTreeItem_18.setText("Pilosella fuscoatra (Nägeli & Peter) Soják");
-
- final TreeItem newItemTreeItem_7 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_7.setItemCount(1);
- newItemTreeItem_7.setText("Eupatorieae Cass.");
-
- final TreeItem newItemTreeItem_8 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_8.setItemCount(1);
- newItemTreeItem_8.setText("Gnaphalieae Lecoq & Juillet");
-
- final TreeItem newItemTreeItem_9 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_9.setItemCount(1);
- newItemTreeItem_9.setText("Helenieae Lindl.");
-
- final TreeItem newItemTreeItem_10 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_10.setItemCount(1);
- newItemTreeItem_10.setText("Heliantheae Cass.");
-
- final TreeItem newItemTreeItem_11 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_11.setItemCount(1);
- newItemTreeItem_11.setText("Inuleae Cass.");
-
- final TreeItem newItemTreeItem_12 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_12.setItemCount(1);
- newItemTreeItem_12.setText("Mutisieae Cass.");
-
- final TreeItem newItemTreeItem_13 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_13.setItemCount(1);
- newItemTreeItem_13.setText("Plucheeae Anderb.");
-
- final TreeItem newItemTreeItem_14 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_14.setItemCount(1);
- newItemTreeItem_14.setText("Senecioneae Cass.");
-
- final TreeItem newItemTreeItem_15 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_15.setItemCount(1);
- newItemTreeItem_15.setText("Vernonieae Cass.");
-
- final Composite composite = new Composite(container, SWT.NONE);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setLayout(new FillLayout(SWT.VERTICAL));
-
- final Group group = new Group(composite, SWT.NONE);
- group.setLayout(new GridLayout());
-
- final Button chooseAcceptedTaxonButton = new Button(group, SWT.RADIO);
- chooseAcceptedTaxonButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent e) {
- }
- });
- chooseAcceptedTaxonButton.setText("Choose from recently viewed taxa");
-
-
-
-
-
- Table table = new Table(group, SWT.BORDER);
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(final MouseEvent e) {
- new OpenNameEditorAction("Carduus").run();
- }
- });
- table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- final TableItem newItemTableItem = new TableItem(table, SWT.BORDER);
- newItemTableItem.setText("Laphangium (Hilliard & B. L. Burtt) Tzvelev");
-
- final TableItem newItemTableItem_1 = new TableItem(table, SWT.BORDER);
- newItemTableItem_1.setText("Carduus L.");
-
- final TableItem newItemTableItem_2 = new TableItem(table, SWT.BORDER);
- newItemTableItem_2.setText("Carduus carpetanus Boiss. & Reut.");
-
- final TableItem newItemTableItem_3 = new TableItem(table, SWT.BORDER);
- newItemTableItem_3.setText("Carduus kerneri Simonk.");
-
- final TableItem newItemTableItem_5 = new TableItem(table, SWT.BORDER);
- newItemTableItem_5.setText("Senecio eboracensis R. J. Abbott & A. J. Lowe");
-
- final TableItem newItemTableItem_6 = new TableItem(table, SWT.BORDER);
- newItemTableItem_6.setText("Senecio elegans L.");
-
- final Group group_2 = new Group(composite, SWT.NONE);
- final GridLayout gridLayout_1 = new GridLayout();
- gridLayout_1.numColumns = 2;
- group_2.setLayout(gridLayout_1);
-
- final Button searchForNameButton = new Button(group_2, SWT.RADIO);
- searchForNameButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
- searchForNameButton.setText("Search for name of accepted taxon");
- new Label(group_2, SWT.NONE);
-
- searchText = new Text(group_2, SWT.BORDER);
- searchText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
- searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));
- searchText.setText("Use \"*\" for wildcard searching");
- searchText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- searchText.setForeground(SWTResourceManager.getColor(0,0,0));
- searchText.setText("");
- }
-
- public void focusLost(FocusEvent e) {
- if (searchText.getText() == "") {
- searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));
- searchText.setText("Use \"*\" for wildcard searching");
- }
-
- }
-
- });
-
- final Button searchButton = new Button(group_2, SWT.NONE);
- searchButton.setLayoutData(new GridData());
- searchButton.setText("Search");
-
- final Composite composite_1 = new Composite(container, SWT.NONE);
- composite_1.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 2, 1));
- composite_1.setLayout(new FillLayout());
-
- final Label selectedTaxonLabel = new Label(composite_1, SWT.NONE);
- selectedTaxonLabel.setText("Selected taxon: ");
-
- final Label currentSelectionSenecioLabel = new Label(composite_1, SWT.RIGHT);
- currentSelectionSenecioLabel.setFont(SWTResourceManager.getFont("", 9, SWT.BOLD));
- currentSelectionSenecioLabel.setText("Senecio elegans L.");
- new Label(container, SWT.NONE);
-
-
- //
- return container;
- }
-
- /**
- * Create contents of the button bar
- * @param parent
- */
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
- }
-
- /**
- * Return the initial size of the dialog
- */
- @Override
- protected Point getInitialSize() {
- return new Point(700, 500);
- }
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/edit_16x16.ico"));
- newShell.setText("Move \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java
deleted file mode 100644
index 7f22029bc..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MultiPagePilosellaView.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.IEditorInput;
-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.taxeditor.designproposal1.model.NameEditorInput;
-import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;
-
-public class MultiPagePilosellaView extends MultiPageEditorPart {
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.mpetestview";
- private TaxonName taxonname;
-
- @Override
- protected void createPages() {
- try {
- if (taxonname.getName() == "Carduus") {
- this.setPartName("Carduus L.");
- addPage(0, new CarduusEditorView(), new NameEditorInput(new TaxonName()));
- } else if (taxonname.getName() == "Pilosella") {
- this.setPartName("Pilosella fuscoatra (Nägeli & Peter) Soják");
- addPage(0, new PilosellaEditorView(), new NameEditorInput(new TaxonName()));
- } else {
- this.setPartName("New taxon");
- addPage(0, new NameEditorView(), new NameEditorInput(new TaxonName()));
- }
- setPageText(0, "Name");
-
- addPage(1, new EmptyEditorView(), new NameEditorInput(new TaxonName()));
- setPageText(1, "Facts");
-
- addPage(2, new EmptyEditorView(), new NameEditorInput(new TaxonName()));
- setPageText(2, "Specimen");
-
- addPage(3, new EmptyEditorView(), new NameEditorInput(new TaxonName()));
- setPageText(3, "Geographic");
-
- } catch (PartInitException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- @Override
- public void doSave(IProgressMonitor monitor) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void doSaveAs() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-
- if (!(input instanceof IEditorInput))
- throw new PartInitException(
- "Invalid Input: Must be IFileEditorInput");
-
- if (input.getAdapter(TaxonName.class) != null) {
- taxonname = (TaxonName) input.getAdapter(TaxonName.class);
-// System.out.println(taxonname.getCreatedWho());
-// taxonname.addCdmEventListener(this);
- } else {
-
- taxonname = null;
- }
-
-
- setSite(site);
- setInput(input);
- }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyCompletionProcessor.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyCompletionProcessor.java
deleted file mode 100644
index 55beddb77..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyCompletionProcessor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ContextInformation;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-
-import com.swtdesigner.ResourceManager;
-
-import eu.etaxonomy.taxeditor.designproposal1.Activator;
-
-public class MyCompletionProcessor implements IContentAssistProcessor {
-
- protected final static String[] myProposals = { "Unknown synonymy",
- "Create homotypic synonym",
- "Create heterotypic synoynm",
- "Create basionym",
- "Create replaced synonym",
- "Create homonym",
- "Create orthographic variant",
- "Create misapplied name",
- "Create concept relation"};
- protected final static String[] myIcons = { "icons/unknown.gif",
- "icons/homosyn.gif",
- "icons/heterosyn.gif",
- "icons/basionym.gif",
- "icons/repsyn.gif",
- "icons/homonym.gif",
- "icons/orthovariant.gif",
- "icons/misapplied.gif",
- "icons/concept.gif"};
- protected final static String[] myContexts = { "To create a homotypic synonym, there are many things to consider. I could go on all day.",
- "Create homotypic synonym",
- "Create heterotypic synoynm",
- "Create basionym",
- "Create replaced synonym",
- "Create homonym",
- "Create orthographic variant",
- "Create misapplied name",
- "Create concept relation"};
-
- /* (non-Javadoc)
- * Method declared on IContentAssistProcessor
- */
- public ICompletionProposal[] computeCompletionProposals(
- ITextViewer viewer, int documentOffset) {
- String context = "Describe formatting / parsing of this rel. type.";
-// Image img = ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown.gif");
- ICompletionProposal[] result =
- new ICompletionProposal[myProposals.length];
- for (int i = 0; i < myProposals.length; i++) {
- IContextInformation contextInfo =
- new ContextInformation(null, myProposals[i]+" Style");
- result[i] = new CompletionProposal(myProposals[i],documentOffset, 0,
- myProposals[i].length(), ResourceManager.getPluginImage(Activator.getDefault(), myIcons[i]),
- myProposals[i], contextInfo, context);
-
- }
- return result;
- }
-
- /* (non-Javadoc)
- * Method declared on IContentAssistProcessor
- */
- public char[] getCompletionProposalAutoActivationCharacters() {
- return new char[] { '=', (char) SWT.CR };
- }
-
- /* (non-Javadoc)
- * Method declared on IContentAssistProcessor
- */
- public char[] getContextInformationAutoActivationCharacters() {
- return null;
- }
-
- // For Context information
- /* (non-Javadoc)
- * Method declared on IContentAssistProcessor
- */
- public IContextInformationValidator getContextInformationValidator() {
- return null;
- }
-
- /* (non-Javadoc)
- * Method declared on IContentAssistProcessor
- */
- public IContextInformation[] computeContextInformation(
- ITextViewer viewer,
- int documentOffset) {
- return null;
- }
-
- /* (non-Javadoc)
- * Method declared on IContentAssistProcessor
- */
- public String getErrorMessage() {
- return null;
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
deleted file mode 100644
index c68ce97f8..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-import com.swtdesigner.SWTResourceManager;
-
-public class MyRuleScanner extends RuleBasedScanner {
- private static Color TAG_COLOR= new Color(Display.getCurrent(), new RGB(200, 0, 0));
- private static Color COMMENT_COLOR= new Color(Display.getCurrent(), new RGB(0, 200, 0));
-
- public MyRuleScanner() {
- IToken tagToken =
- new Token(new TextAttribute(TAG_COLOR));
-// new TextAttribute(TAG_COLOR,
-// null,
-// SWT.BOLD,
-// SWTResourceManager.getFont("Georgia", 11, SWT.NONE)));
-
- IToken commentToken= new Token(new TextAttribute(COMMENT_COLOR));
-
- IRule[] rules = new IRule[2];
- //Add rule for processing instructions
- rules[0] = new SingleLineRule("", tagToken);
- rules[1] = new EndOfLineRule("//", commentToken); //$NON-NLS-1$
- setRules(rules);
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
deleted file mode 100644
index a66fade85..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-import com.swtdesigner.SWTResourceManager;
-
-public class MySourceViewerConfig extends SourceViewerConfiguration {
- private MyRuleScanner scanner;
- private static Color DEFAULT_TAG_COLOR =
- new Color(Display.getCurrent(), new RGB(0, 0, 0));
-
- public MySourceViewerConfig() {
- }
-
- protected MyRuleScanner getTagScanner() {
- if (scanner == null) {
- scanner = new MyRuleScanner();
- scanner.setDefaultReturnToken(
- new Token(
- new TextAttribute(DEFAULT_TAG_COLOR,
- null,
- 0,
- SWTResourceManager.getFont("Georgia", 11, SWT.BOLD | SWT.ITALIC))
- ));
- }
- return scanner;
- }
-
- /**
- * Define reconciler for MyEditor
- */
- public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
- PresentationReconciler reconciler = new PresentationReconciler();
- DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getTagScanner());
- reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
- reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
- return reconciler;
- }
-
- public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-
- ContentAssistant assistant = new ContentAssistant();
- assistant.setContentAssistProcessor(
- new MyCompletionProcessor(),
- IDocument.DEFAULT_CONTENT_TYPE);
- assistant.enableAutoActivation(true);
- assistant.setAutoActivationDelay(50);
- assistant.setProposalPopupOrientation(
- IContentAssistant.PROPOSAL_OVERLAY);
- assistant.setStatusLineVisible(true);
- assistant.setStatusMessage("Create a nomenclatural or taxonomic relationship");
- assistant.setProposalSelectorBackground(
- new Color(Display.getCurrent(), new RGB(255, 255, 255)));
- assistant.setInformationControlCreator(
- getInformationControlCreator(sourceViewer)); // this is what pops up the yellow context box
- return assistant;
- }
-}
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
deleted file mode 100644
index fc039c7e2..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
+++ /dev/null
@@ -1,523 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.PopupList;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-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.CoolBar;
-import org.eclipse.swt.widgets.CoolItem;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import com.swtdesigner.ResourceManager;
-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.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 {
-
- private Table table_1;
- private Text text_3;
- private StyledText styledText;
- private TaxonName taxonname;
- private Text clickHereToText;
-
- public boolean dirtyBoy = false;
- String clickText;
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.nameeditorview"; //$NON-NLS-1$
-
- /**
- * Create contents of the editor part
- * @param parent
- */
- @Override
- public void createPartControl(Composite parent) {
- //
-
-
-// txtPlay = new Text(container, SWT.BORDER);
-// txtPlay.setCapture(true);
-// final GridData gd_txtPlay = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-// gd_txtPlay.heightHint = 96;
-// txtPlay.setLayoutData(gd_txtPlay);
-//// txtPlay.addVerifyListener(new VerifyListener() {
-//// @Override
-//// public void verifyText(VerifyEvent e) {
-//// e.doit = Character.isDigit(e.character);
-//// }
-//// });
-// txtPlay.addSelectionListener(new SelectionListener() {
-//
-// @Override
-// public void widgetDefaultSelected(SelectionEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-//
-// @Override
-// public void widgetSelected(SelectionEvent e) {
-// System.out.println(e.toString());
-// }
-//
-//
-// });
-//
-//
-// txtPlay.addKeyListener(new KeyListener() {
-//
-// public void keyPressed(KeyEvent e) {
-// System.out.println(e.character);
-// if (e.character == '=') {
-// Shell shell = Activator.getDefault().getWorkbench().
-// getActiveWorkbenchWindow().getShell();
-// PopupList list = new PopupList(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-//
-//// Combo list = new Combo(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-//
-// // Add the items to the list
-// String[] OPTIONS = { "Create homo. syn.",
-// "Create hetero. syn.",
-// "Create mis. name",
-// "Create homonym"};
-//
-// list.setItems(OPTIONS);
-//
-// // Open the list and get the selected item
-// String selected = list.open(txtPlay.getBounds());
-//
-// // Print the item to the console
-// System.out.println(selected);
-// }
-//
-// }
-//
-// public void keyReleased(KeyEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-// });
- parent.setLayout(new GridLayout());
- Document doc = new Document("");
-
- final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);
- taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- taxonomicallyIncludedInLabel.setText(" ");
-
- final ToolBar toolBar = new ToolBar(parent, SWT.NONE);
-// toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
-
- final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);
- itemSave.setToolTipText("Save taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemSave.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/save.gif"));
- itemSave.addSelectionListener(new SelectionListener() {
- public void mouseDown(final MouseEvent e) {
-
-// taxonname.setGenus(txtGenus.getText());
-// taxonname.setSpecificEpithet(txtSpEpi.getText());
-
- new SaveNameAction(taxonname).run();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- new SaveNameAction(taxonname).run();
- }
-
- public void widgetSelected(SelectionEvent e) {
- new SaveNameAction(taxonname).run();
- }
- });
-
- final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemMove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent e) {
- }
- });
-
- final Menu menuMove = new Menu(toolBar);
- addDropDown(itemMove, menuMove);
-
- final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
- moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");
-
- final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
- turnTaxonpilosellaMenuItem.setSelection(true);
- turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");
-
-
-// });
-// newItemToolItem.setText("New item");
- itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));
-
- final ToolItem itemDelete = new ToolItem(toolBar, SWT.NONE);
- itemDelete.setToolTipText("Delete taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemDelete.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));
-
- final ToolItem separator1 = new ToolItem(toolBar, SWT.SEPARATOR);
-
- final ToolItem itemAddRelationship = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemAddRelationship.setToolTipText("Add nom. or tax. relation to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemAddRelationship.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/rel_no_bg.gif"));
-
- final Menu menuAddRel = new Menu(toolBar);
- menuAddRel.setData("x", null);
- addDropDown(itemAddRelationship, menuAddRel);
-
- final MenuItem testMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- testMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));
- testMenuItem.setText("Add synonymy (type unknown)");
-
- final MenuItem addHomotypicSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHomotypicSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));
- addHomotypicSynonymMenuItem.setText("Add homotypic synonym");
-
- final MenuItem addHeterotypicSynoynmMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHeterotypicSynoynmMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
- addHeterotypicSynoynmMenuItem.setText("Add heterotypic synoynm");
-
- final MenuItem addBasionymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addBasionymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));
- addBasionymMenuItem.setText("Add basionym");
-
- final MenuItem addReplacedSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addReplacedSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));
- addReplacedSynonymMenuItem.setText("Add replaced synonym");
-
- final MenuItem addHomonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHomonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));
- addHomonymMenuItem.setText("Add homonym");
-
- final MenuItem addOrthographicVariantMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addOrthographicVariantMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));
- addOrthographicVariantMenuItem.setText("Add orthographic variant");
-
- final MenuItem addMisappliedNameMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addMisappliedNameMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));
- addMisappliedNameMenuItem.setText("Add misapplied name");
-
- final MenuItem addConceptRelationMenuItem_1 = new MenuItem(menuAddRel, SWT.CASCADE);
- addConceptRelationMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));
- addConceptRelationMenuItem_1.setText("Add concept relation");
-
- final Menu menu = new Menu(addConceptRelationMenuItem_1);
- addConceptRelationMenuItem_1.setMenu(menu);
-
- final MenuItem checkboxMenuItem = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem.setText("congruent");
-
- final MenuItem checkboxMenuItem_1 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_1.setSelection(true);
- checkboxMenuItem_1.setText("included in");
-
- final MenuItem checkboxMenuItem_2 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_2.setText("includes");
-
- final MenuItem checkboxMenuItem_3 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_3.setText("overlaps");
-
- final MenuItem checkboxMenuItem_4 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_4.setText("excludes");
-
- final MenuItem checkboxMenuItem_5 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_5.setSelection(true);
- checkboxMenuItem_5.setText("doubtful");
-
- final ToolItem separator2 = new ToolItem(toolBar, SWT.SEPARATOR);
-
- final ToolItem itemAddTaxon = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemAddTaxon.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/add_no_bg2.gif"));
- itemAddTaxon.setToolTipText("Add new taxon");
-
- final Menu menuAdd = new Menu(toolBar);
- menuAdd.setData("x", null);
- addDropDown(itemAddTaxon, menuAdd);
-
- final MenuItem addTaxonToMenuItem = new MenuItem(menuAdd, SWT.NONE);
- addTaxonToMenuItem.setText("Add new taxon to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final MenuItem addNewTaxonMenuItem = new MenuItem(menuAdd, SWT.NONE);
- addNewTaxonMenuItem.setText("Add new taxon to \"Pilosella fuscoatra coll.\"");
-
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- final GridLayout gridLayout_2 = new GridLayout();
- gridLayout_2.horizontalSpacing = 3;
- gridLayout_2.numColumns = 2;
- composite.setLayout(gridLayout_2);
-
- clickText = "Click here to start entering accepted name or enter its individual fields in the property sheet to the right";
-
- clickHereToText = new Text(composite, SWT.WRAP);
- clickHereToText.addKeyListener(new KeyAdapter() {
- public void keyPressed(final KeyEvent e) {
- }
- });
- clickHereToText.setForeground(SWTResourceManager.getColor(192, 192, 192));
- clickHereToText.setText(clickText);
- clickHereToText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.ITALIC));
- final GridData gd_clickHereToText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_clickHereToText.widthHint = 426;
- clickHereToText.setLayoutData(gd_clickHereToText);
- clickHereToText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
-// clickHereToText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- if (!dirtyBoy) {
- clickHereToText.setText("");
- clickHereToText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));
- clickHereToText.setForeground(SWTResourceManager.getColor(0, 0, 0));
- dirtyBoy = true;
- firePropertyChange(PROP_DIRTY);
- }
- }
-
- public void focusLost(FocusEvent e) {
-// clickHereToText.setBackground(null);
- if (clickHereToText.getText() == "") {
- clickHereToText.setForeground(SWTResourceManager.getColor(192, 192, 192));
- clickHereToText.setText(clickText);
- clickHereToText.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.ITALIC));
- dirtyBoy = false;
- } else {
- dirtyBoy = true;
- }
- }
-
- });
-// clickHereToText.addKeyListener(new KeyListener() {
-//
-// public void keyPressed(KeyEvent e) {
-// dirtyBoy = true;
-// isDirty();
-//
-// }
-//
-// public void keyReleased(KeyEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-//
-// });
-
- table_1 = new Table(composite, SWT.BORDER);
- table_1.setLinesVisible(true);
- table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 2));
-
- final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);
- newColumnTableColumn.setWidth(100);
- newColumnTableColumn.setText("New column");
-
- final TableColumn newColumnTableColumn_1 = new TableColumn(table_1, SWT.NONE);
- newColumnTableColumn_1.setWidth(100);
- newColumnTableColumn_1.setText("New column");
-
- final TableItem newItemTableItem = new TableItem(table_1, SWT.BORDER);
- newItemTableItem.setText(0, "Rank");
- newItemTableItem.setText("Rank");
-
- final TableItem newItemTableItem_1 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_1.setText(0, "Genus");
-
- final TableItem newItemTableItem_2 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_2.setText(0, "Species epithet");
-
- final TableItem newItemTableItem_3 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_3.setText(0, "Author team");
-
- final TableItem newItemTableItem_4 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_4.setText("...");
-// newItemTableItem_1.setText("Genus");
- //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
-
- SourceViewer sourceviewer = new SourceViewer(composite, null, SWT.WRAP | SWT.FULL_SELECTION);
- sourceviewer.setAnnotationHover(null);
- styledText = sourceviewer.getTextWidget();
- final GridData gd_styledText = new GridData(SWT.FILL, SWT.TOP, true, false);
- gd_styledText.heightHint = 41;
- gd_styledText.widthHint = 450;
- styledText.setLayoutData(gd_styledText);
- sourceviewer.setDocument(doc);
- sourceviewer.configure(new MySourceViewerConfig());
- sourceviewer.setTabsToSpacesConverter(null);
-
-
-// final Menu menu = new Menu(toolBar);
-// addDropDown(newItemToolItem, menu);
-// );
-
-// Action testAction = new OpenNameEditorAction();
-// testAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor(Activator.getDefault(), "icons/edit_16x16.gif"));
-// testAction.setToolTipText("Add relation");
-// toolBar.add(testAction);
-
- populateForm();
- }
-
-// private void populateForm() {
-//
-// String fulltext = "";
-//
-// if (taxonname.getGenus() != null) {
-// fulltext = taxonname.getGenus();
-// }
-//
-// if (taxonname.getSpecificEpithet() != null) {
-// fulltext += " " + taxonname.getSpecificEpithet();
-// }
-//
-// if (taxonname.getAuthorship() != null) {
-// fulltext += " " + taxonname.getAuthorship();
-// }
-//
-//// txtPlay.setText(fulltext);
-//// txtPlay.setToolTipText("Joe mama\njoe daddy\njoe gramammy");
-//
-// this.setPartName(taxonname.getName());
-// }
-
- private void populateForm() {
- this.setPartName("Pilosella fuscoatra (Nägeli & Peter) Soják");
- }
-
- @Override
- public void setFocus() {
- // Set the focus
- }
-
- @Override
- public void doSave(IProgressMonitor monitor) {
- // Do the Save operation
- }
-
- @Override
- public void doSaveAs() {
- // Do the Save As operation
- }
-
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-
- if (!(input instanceof IEditorInput))
- throw new PartInitException(
- "Invalid Input: Must be IFileEditorInput");
-
- if (input.getAdapter(TaxonName.class) != null) {
- taxonname = (TaxonName) input.getAdapter(TaxonName.class);
-// taxonname.addCdmEventListener(this);
- } else {
-
- taxonname = null;
- }
-
- setSite(site);
- setInput(input);
- }
-
- @Override
- public boolean isDirty() {
- return dirtyBoy;
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- return false;
- }
-
- public void propertyChange(PropertyChangeEvent evt) {
-// TaxonName taxonname = (TaxonName)evt.getNewValue();
- this.taxonname = (TaxonName)evt.getNewValue();
- System.out.println(((TaxonName)evt.getNewValue()).getName());
- populateForm();
-
- // for individual fields, do something like:
- // 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
-//
-// }
-
- private static void addDropDown(final ToolItem item, final Menu menu) {
- item.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
- if (event.detail == SWT.ARROW) {
- Rectangle rect = item.getBounds();
- Point pt = new Point(rect.x, rect.y + rect.height);
- pt = item.getParent().toDisplay(pt);
- menu.setLocation(pt.x, pt.y);
- menu.setVisible(true);
- }
- }
- });
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java
deleted file mode 100644
index 9271b851e..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/NameListView.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerLabel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ExpandBar;
-import org.eclipse.swt.widgets.ExpandItem;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-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.taxeditor.designproposal1.Activator;
-import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;
-
-//public class NameListView extends ViewPart implements ICdmEventListener {
-public class NameListView extends ViewPart {
- private Text searchText;
- private Table table;
- private Composite composite;
- private Tree tree;
- private Composite taxTreeComposite = null;
- private Composite recentNamesComposite = null;
- private Composite searchComposite = null;
- private Composite top = null;
- private ExpandBar expandBar = null;
- private ExpandItem taxTreeExpandItem;
- private ExpandItem recentNamesExpandItem;
- private ExpandItem searchExpandItem;
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.namelistview"; //$NON-NLS-1$
-
-
-
- /**
- * Create contents of the view part
- * @param parent
- */
- @Override
- public void createPartControl(Composite parent) {
- // TODO Auto-generated method stub
- parent.setLayout(new FillLayout());
- GridLayout gridLayout = new GridLayout();
- gridLayout.horizontalSpacing = 0;
- gridLayout.marginWidth = 0;
- gridLayout.marginHeight = 0;
- gridLayout.verticalSpacing = 0;
-
- top = new Composite(parent, SWT.NONE);
- top.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-
- composite = new Composite(top, SWT.NONE);
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- final GridLayout gridLayout_1 = new GridLayout();
- gridLayout_1.numColumns = 2;
- composite.setLayout(gridLayout_1);
- final Label lblDataSourceTitle = new Label(composite, SWT.NONE);
- lblDataSourceTitle.setFont(SWTResourceManager.getFont("Arial", 14, SWT.BOLD));
- lblDataSourceTitle.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- lblDataSourceTitle.setAlignment(SWT.CENTER);
- lblDataSourceTitle.setText(" Euro+Med");
-
- final Label lblDbImg = new Label(composite, SWT.NONE);
- lblDbImg.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
- lblDbImg.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- lblDbImg.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/db.gif"));
-
- final Menu menu = new Menu(lblDbImg);
- lblDbImg.setMenu(menu);
-
- final MenuItem checkboxMenuItem = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem.setSelection(true);
- checkboxMenuItem.setText("Euro+Med (mssql://128.14.101.12:80/europlusmed)");
-
- final MenuItem checkboxMenuItem_1 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_1.setText("WP6 (mssql://128.14.101.13:80/wp6)");
-
- final MenuItem palmWebora1922299480pwMenuItem = new MenuItem(menu, SWT.NONE);
- palmWebora1922299480pwMenuItem.setText("Palm Web (ora://192.22.99.4:80/pw)");
-
- new MenuItem(menu, SWT.SEPARATOR);
-
- final MenuItem newDataSourceMenuItem = new MenuItem(menu, SWT.NONE);
- newDataSourceMenuItem.setText("New data source ...");
-
- final Label lblDataSource = new Label(composite, SWT.NONE);
- final GridData gd_lblDataSource = new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1);
- gd_lblDataSource.heightHint = 16;
- lblDataSource.setLayoutData(gd_lblDataSource);
- lblDataSource.setFont(SWTResourceManager.getFont("Arial", 8, SWT.NONE));
- lblDataSource.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- lblDataSource.setAlignment(SWT.CENTER);
- lblDataSource.setText(" mssql://128.14.101.12:80/europlusmed");
-
-
- createExpandBar();
- top.setLayout(gridLayout);
- top.setTabList(new Control[] {composite, expandBar});
- }
-
- /**
- * This method initializes expandBar
- *
- */
- private void createExpandBar() {
- expandBar = new ExpandBar(top, SWT.V_SCROLL);
- GridData gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.grabExcessHorizontalSpace = true;
- gridData.grabExcessVerticalSpace = true;
- gridData.verticalAlignment = GridData.FILL;
- expandBar.setLayoutData(gridData);
- createNameListComposite();
- createRecentNamesComposite();
- createSearchComposite();
-
- createActions();
- initializeToolBar();
- initializeMenu();
-
- }
-
- private void createNameListComposite() {
-
-
-
- }
-
- private void createRecentNamesComposite() {
- taxTreeExpandItem = new ExpandItem(expandBar, SWT.NONE, 0);
- taxTreeExpandItem.setExpanded(true);
- taxTreeExpandItem.setHeight(200);
- taxTreeExpandItem.setText("Taxonomic Tree");
-// IFileArrangerImages.IMG_HOME);
-// nameListExpandItem.setImage(image);
-
- taxTreeComposite = new Composite(expandBar, SWT.NONE);
- taxTreeComposite.setLayout(new FillLayout());
- taxTreeComposite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-
- taxTreeExpandItem.setControl(taxTreeComposite);
-
- tree = new Tree(taxTreeComposite, SWT.FULL_SELECTION);
- tree.setItemCount(1);
- tree.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(final MouseEvent e) {
- new OpenNameEditorAction("Pilosella").run();
- }
- });
-
- final TreeItem newItemTreeItem = new TreeItem(tree, SWT.NONE);
- newItemTreeItem.setChecked(true);
- newItemTreeItem.setText("Compositae Giseke");
-
- final TreeItem newItemTreeItem_1 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_1.setItemCount(1);
- newItemTreeItem_1.setText("Anthemideae Cass.");
-
- final TreeItem newItemTreeItem_2 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_2.setItemCount(1);
- newItemTreeItem_2.setText("Arctotideae Cass.");
-
- final TreeItem newItemTreeItem_3 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_3.setItemCount(1);
- newItemTreeItem_3.setText("Astereae Cass.");
-
- final TreeItem newItemTreeItem_4 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_4.setItemCount(1);
- newItemTreeItem_4.setText("Calenduleae Cass.");
-
- final TreeItem newItemTreeItem_5 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_5.setItemCount(1);
- newItemTreeItem_5.setText("Cardueae Cass.");
-
- final TreeItem newItemTreeItem_6 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_6.setText("Cichorieae Lam. & DC.");
-
- final TreeItem newItemTreeItem_16 = new TreeItem(newItemTreeItem_6, SWT.NONE);
- newItemTreeItem_16.setExpanded(true);
- newItemTreeItem_16.setText("Pilosella Vaill.");
-
- final TreeItem newItemTreeItem_17 = new TreeItem(newItemTreeItem_16, SWT.NONE);
- newItemTreeItem_17.setText("Pilosella fuscoatra coll.");
-
- final TreeItem newItemTreeItem_18 = new TreeItem(newItemTreeItem_17, SWT.NONE);
- newItemTreeItem_18.setFont(SWTResourceManager.getFont("", 8, SWT.BOLD));
- newItemTreeItem_18.setExpanded(true);
- newItemTreeItem_18.setText("Pilosella fuscoatra (Nägeli & Peter) Soják");
-
- final TreeItem newItemTreeItem_7 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_7.setItemCount(1);
- newItemTreeItem_7.setText("Eupatorieae Cass.");
-
- final TreeItem newItemTreeItem_8 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_8.setItemCount(1);
- newItemTreeItem_8.setText("Gnaphalieae Lecoq & Juillet");
-
- final TreeItem newItemTreeItem_9 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_9.setItemCount(1);
- newItemTreeItem_9.setText("Helenieae Lindl.");
-
- final TreeItem newItemTreeItem_10 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_10.setItemCount(1);
- newItemTreeItem_10.setText("Heliantheae Cass.");
-
- final TreeItem newItemTreeItem_11 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_11.setItemCount(1);
- newItemTreeItem_11.setText("Inuleae Cass.");
-
- final TreeItem newItemTreeItem_12 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_12.setItemCount(1);
- newItemTreeItem_12.setText("Mutisieae Cass.");
-
- final TreeItem newItemTreeItem_13 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_13.setItemCount(1);
- newItemTreeItem_13.setText("Plucheeae Anderb.");
-
- final TreeItem newItemTreeItem_14 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_14.setItemCount(1);
- newItemTreeItem_14.setText("Senecioneae Cass.");
-
- final TreeItem newItemTreeItem_15 = new TreeItem(newItemTreeItem, SWT.NONE);
- newItemTreeItem_15.setItemCount(1);
- newItemTreeItem_15.setText("Vernonieae Cass.");
- taxTreeComposite.setTabList(new Control[] {tree});
- recentNamesExpandItem = new ExpandItem(expandBar, SWT.NONE, 1);
- recentNamesExpandItem.setHeight(130);
- recentNamesExpandItem.setExpanded(true);
- recentNamesExpandItem.setText("Recently viewed names");
- recentNamesComposite = new Composite(expandBar, SWT.NONE);
- final GridLayout gridLayout = new GridLayout();
- recentNamesComposite.setLayout(gridLayout);
-
- recentNamesExpandItem.setControl(recentNamesComposite);
-
- table = new Table(recentNamesComposite, SWT.NONE);
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(final MouseEvent e) {
- new OpenNameEditorAction("Carduus").run();
- }
- });
- table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- final TableItem newItemTableItem = new TableItem(table, SWT.BORDER);
- newItemTableItem.setText("Laphangium (Hilliard & B. L. Burtt) Tzvelev");
-
- final TableItem newItemTableItem_1 = new TableItem(table, SWT.BORDER);
- newItemTableItem_1.setText("Carduus L.");
-
- final TableItem newItemTableItem_2 = new TableItem(table, SWT.BORDER);
- newItemTableItem_2.setText("Carduus carpetanus Boiss. & Reut.");
-
- final TableItem newItemTableItem_3 = new TableItem(table, SWT.BORDER);
- newItemTableItem_3.setText("Carduus kerneri Simonk.");
-
- final TableItem newItemTableItem_5 = new TableItem(table, SWT.BORDER);
- newItemTableItem_5.setText("Senecio eboracensis R. J. Abbott & A. J. Lowe");
-
- final TableItem newItemTableItem_6 = new TableItem(table, SWT.BORDER);
- newItemTableItem_6.setText("Senecio elegans L.");
-
-// Image image = FileArrangerImages.getImageRegistry().get(
-// IFileArrangerImages.IMG_BOOKMARK);
-// bookmarksExpandItem.setImage(image);
- }
-
- private void createSearchComposite() {
- searchExpandItem = new ExpandItem(expandBar, SWT.NONE, 2);
- searchExpandItem.setHeight(50);
- searchExpandItem.setExpanded(true);
- searchExpandItem.setText("Search");
- searchComposite = new Composite(expandBar, SWT.NONE);
- final GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- searchComposite.setLayout(gridLayout);
-
- searchExpandItem.setControl(searchComposite);
-
- searchText = new Text(searchComposite, SWT.BORDER);
- searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));
- searchText.setText("Use \"*\" for wildcard searching");
- final GridData gd_useForText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- searchText.setLayoutData(gd_useForText);
- searchText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- searchText.setForeground(SWTResourceManager.getColor(0,0,0));
- searchText.setText("");
- }
-
- public void focusLost(FocusEvent e) {
- if (searchText.getText() == "") {
- searchText.setForeground(SWTResourceManager.getColor(192, 192, 192));
- searchText.setText("Use \"*\" for wildcard searching");
- }
-
- }
-
- });
-
- final Button searchButton = new Button(searchComposite, SWT.NONE);
- searchButton.setText("Search");
-
-// final Label carduusLLabel = new Label(searchComposite, SWT.NONE);
-// carduusLLabel.setLayoutData(gd_carduusLLabel);
-// carduusLLabel.setText("Carduus L.");
-//
-// final Label carduusCarpetanusBoissLabel = new Label(searchComposite, SWT.NONE);
-// carduusCarpetanusBoissLabel.setLayoutData(gd_carduusCarpetanusBoissLabel);
-// carduusCarpetanusBoissLabel.setText("Carduus carpetanus Boiss. & Reut.");
-
-// Image image = FileArrangerImages.getImageRegistry().get(
-// IFileArrangerImages.IMG_FTP);
-// ftpExpandItem.setImage(image);
- }
-
- 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
- }
-
- /**
- * Refreshes a taxon name in the list
- */
-// public void refreshElement(TaxonName 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);
-// }
-
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
deleted file mode 100644
index bf66c06f2..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
+++ /dev/null
@@ -1,692 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.PopupList;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-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.CoolBar;
-import org.eclipse.swt.widgets.CoolItem;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.part.EditorPart;
-import com.swtdesigner.ResourceManager;
-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.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 {
-//public class PilosellaEditorView extends TextEditor {
-
- private Text hieraciumFuscoatrumSubspText_1;
- private Text hieraciumRubroonegenseNorrlText;
- private Table table_1;
- private Text text_3;
- private Text hieraciumFuscoatrumSubspText;
- private Text hieraciumAurantiacumSubspText;
- private Text text_1;
- private StyledText styledText;
- private TaxonName taxonname;
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.pilosellaeditorview"; //$NON-NLS-1$
-
- /**
- * Create contents of the editor part
- * @param parent
- */
- @Override
- public void createPartControl(Composite parent) {
- //
-
-
-// txtPlay = new Text(container, SWT.BORDER);
-// txtPlay.setCapture(true);
-// final GridData gd_txtPlay = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-// gd_txtPlay.heightHint = 96;
-// txtPlay.setLayoutData(gd_txtPlay);
-//// txtPlay.addVerifyListener(new VerifyListener() {
-//// @Override
-//// public void verifyText(VerifyEvent e) {
-//// e.doit = Character.isDigit(e.character);
-//// }
-//// });
-// txtPlay.addSelectionListener(new SelectionListener() {
-//
-// @Override
-// public void widgetDefaultSelected(SelectionEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-//
-// @Override
-// public void widgetSelected(SelectionEvent e) {
-// System.out.println(e.toString());
-// }
-//
-//
-// });
-//
-//
-// txtPlay.addKeyListener(new KeyListener() {
-//
-// public void keyPressed(KeyEvent e) {
-// System.out.println(e.character);
-// if (e.character == '=') {
-// Shell shell = Activator.getDefault().getWorkbench().
-// getActiveWorkbenchWindow().getShell();
-// PopupList list = new PopupList(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-//
-//// Combo list = new Combo(shell, SWT.H_SCROLL | SWT.V_SCROLL);
-//
-// // Add the items to the list
-// String[] OPTIONS = { "Create homo. syn.",
-// "Create hetero. syn.",
-// "Create mis. name",
-// "Create homonym"};
-//
-// list.setItems(OPTIONS);
-//
-// // Open the list and get the selected item
-// String selected = list.open(txtPlay.getBounds());
-//
-// // Print the item to the console
-// System.out.println(selected);
-// }
-//
-// }
-//
-// public void keyReleased(KeyEvent e) {
-// // TODO Auto-generated method stub
-//
-// }
-// });
- parent.setLayout(new GridLayout());
- Document doc = new Document();
-
- final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);
- taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- taxonomicallyIncludedInLabel.setText("Higher taxon: \"Pilosella fuscoatra coll.\"");
-
- final ToolBar toolBar = new ToolBar(parent, SWT.NONE);
-// toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
-
- final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);
- itemSave.setToolTipText("Save taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemSave.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/save.gif"));
- itemSave.addSelectionListener(new SelectionListener() {
- public void mouseDown(final MouseEvent e) {
-
-// taxonname.setGenus(txtGenus.getText());
-// taxonname.setSpecificEpithet(txtSpEpi.getText());
-
- new SaveNameAction(taxonname).run();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- new SaveNameAction(taxonname).run();
- }
-
- public void widgetSelected(SelectionEvent e) {
- new SaveNameAction(taxonname).run();
- }
- });
-
- final ToolItem itemMove = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemMove.setToolTipText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final Menu menuMove = new Menu(toolBar);
- menuMove.setData("x", null);
- addDropDown(itemMove, menuMove);
-
- final MenuItem moveTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
- moveTaxonpilosellaMenuItem.setText("Move taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to another higher taxon");
-
- final MenuItem turnTaxonpilosellaMenuItem = new MenuItem(menuMove, SWT.NONE);
- turnTaxonpilosellaMenuItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(final SelectionEvent e) {
- new MoveDialogView(getSite().getShell());
-// MessageDialog.openInformation(getSite().getShell(),"Readme Editor","View Action executed");
- MoveDialogView dialog = new MoveDialogView(getSite().getShell());
- dialog.open();
- }
- });
- turnTaxonpilosellaMenuItem.setText("Turn taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" into a synonym");
-
-// });
-// newItemToolItem.setText("New item");
- itemMove.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));
-
- final ToolItem itemDelete = new ToolItem(toolBar, SWT.NONE);
- itemDelete.setToolTipText("Delete taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemDelete.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));
-
- final ToolItem separator1 = new ToolItem(toolBar, SWT.SEPARATOR);
-
- final ToolItem itemAddRelationship = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemAddRelationship.setToolTipText("Add nom. or tax. relation to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- itemAddRelationship.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/rel_no_bg.gif"));
-
- final Menu menuAddRel = new Menu(toolBar);
- menuAddRel.setData("x", null);
- addDropDown(itemAddRelationship, menuAddRel);
-
- final MenuItem testMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- testMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));
- testMenuItem.setText("Add synonymy (type unknown)");
-
- final MenuItem addHomotypicSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHomotypicSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));
- addHomotypicSynonymMenuItem.setText("Add homotypic synonym");
-
- final MenuItem addHeterotypicSynoynmMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHeterotypicSynoynmMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
- addHeterotypicSynoynmMenuItem.setText("Add heterotypic synoynm");
-
- final MenuItem addBasionymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addBasionymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));
- addBasionymMenuItem.setText("Add basionym");
-
- final MenuItem addReplacedSynonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addReplacedSynonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));
- addReplacedSynonymMenuItem.setText("Add replaced synonym");
-
- final MenuItem addHomonymMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addHomonymMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));
- addHomonymMenuItem.setText("Add homonym");
-
- final MenuItem addOrthographicVariantMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addOrthographicVariantMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));
- addOrthographicVariantMenuItem.setText("Add orthographic variant");
-
- final MenuItem addMisappliedNameMenuItem = new MenuItem(menuAddRel, SWT.NONE);
- addMisappliedNameMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));
- addMisappliedNameMenuItem.setText("Add misapplied name");
-
- final MenuItem addConceptRelationMenuItem_1 = new MenuItem(menuAddRel, SWT.CASCADE);
- addConceptRelationMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));
- addConceptRelationMenuItem_1.setText("Add concept relation");
-
- final Menu menu = new Menu(addConceptRelationMenuItem_1);
- addConceptRelationMenuItem_1.setMenu(menu);
-
- final MenuItem checkboxMenuItem = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem.setText("congruent");
-
- final MenuItem checkboxMenuItem_1 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_1.setSelection(true);
- checkboxMenuItem_1.setText("included in");
-
- final MenuItem checkboxMenuItem_2 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_2.setText("includes");
-
- final MenuItem checkboxMenuItem_3 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_3.setText("overlaps");
-
- final MenuItem checkboxMenuItem_4 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_4.setText("excludes");
-
- final MenuItem checkboxMenuItem_5 = new MenuItem(menu, SWT.CHECK);
- checkboxMenuItem_5.setSelection(true);
- checkboxMenuItem_5.setText("doubtful");
-
- final ToolItem separator2 = new ToolItem(toolBar, SWT.SEPARATOR);
-
- final ToolItem itemAddTaxon = new ToolItem(toolBar, SWT.DROP_DOWN);
- itemAddTaxon.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/add_no_bg2.gif"));
- itemAddTaxon.setToolTipText("Add new taxon");
-
- final Menu menuAdd = new Menu(toolBar);
- menuAdd.setData("x", null);
- addDropDown(itemAddTaxon, menuAdd);
-
- final MenuItem addTaxonToMenuItem = new MenuItem(menuAdd, SWT.NONE);
- addTaxonToMenuItem.setText("Add new taxon to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final MenuItem addNewTaxonMenuItem = new MenuItem(menuAdd, SWT.NONE);
- addNewTaxonMenuItem.setText("Add new taxon to \"Pilosella fuscoatra coll.\"");
-
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- final GridLayout gridLayout_2 = new GridLayout();
- gridLayout_2.horizontalSpacing = 3;
- gridLayout_2.numColumns = 3;
- composite.setLayout(gridLayout_2);
-
- text_3 = new Text(composite, SWT.WRAP);
- text_3.setText("Pilosella fuscoatra (Nägeli & Peter) Soják in Preslia 43: 184. 1971 ");
- text_3.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));
- text_3.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
- text_3.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- text_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- text_3.setBackground(null);
- }
-
- });
-
- table_1 = new Table(composite, SWT.BORDER);
- table_1.setLinesVisible(true);
- table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 7));
-
- final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);
- newColumnTableColumn.setWidth(100);
- newColumnTableColumn.setText("New column");
-
- final TableColumn newColumnTableColumn_1 = new TableColumn(table_1, SWT.NONE);
- newColumnTableColumn_1.setWidth(100);
- newColumnTableColumn_1.setText("New column");
-
- final TableItem newItemTableItem = new TableItem(table_1, SWT.BORDER);
- newItemTableItem.setText(0, "Rank");
- newItemTableItem.setText(1, "species");
- newItemTableItem.setText("Rank");
-
- final TableItem newItemTableItem_1 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_1.setText(1, "Pilosella");
- newItemTableItem_1.setText(0, "Genus");
-
- final TableItem newItemTableItem_2 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_2.setText(1, "fuscoatra");
- newItemTableItem_2.setText(0, "Species epithet");
-
- final TableItem newItemTableItem_3 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_3.setText(1, "Nägeli & Peter");
- newItemTableItem_3.setText(0, "Author team");
-
- final TableItem newItemTableItem_4 = new TableItem(table_1, SWT.BORDER);
- newItemTableItem_4.setText("...");
-// newItemTableItem_3.setText("Author team");
-// newItemTableItem_2.setText("Species epithet");
-// newItemTableItem_1.setText("Genus");
-
- final Label labelWithMenu = new Label(composite, SWT.NONE);
- labelWithMenu.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- labelWithMenu.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));
- final GridData gd_labelWithMenu = new GridData(SWT.LEFT, SWT.TOP, false, false);
- labelWithMenu.setLayoutData(gd_labelWithMenu);
-
- text_1 = new Text(composite, SWT.WRAP);
- final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_text_1.widthHint = 300;
- text_1.setLayoutData(gd_text_1);
- text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.BOLD | SWT.ITALIC));
- text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");
- text_1.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- text_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- text_1.setBackground(null);
- }
-
- });
-
-
- final Label label_1 = new Label(composite, SWT.NONE);
- label_1.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- label_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
- label_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-
- hieraciumAurantiacumSubspText = new Text(composite, SWT.WRAP);
- final GridData gd_hieraciumAurantiacumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_hieraciumAurantiacumSubspText.widthHint = 300;
- hieraciumAurantiacumSubspText.setLayoutData(gd_hieraciumAurantiacumSubspText);
- hieraciumAurantiacumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
- hieraciumAurantiacumSubspText.setText("Hieracium aurantiacum subsp. chaetodermum Pohle & Zahn in Allg. Bot. Z. Syst. 13: 110. 1907");
- hieraciumAurantiacumSubspText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- hieraciumAurantiacumSubspText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- hieraciumAurantiacumSubspText.setBackground(null);
- }
-
- });
-
-
- final Label label_2 = new Label(composite, SWT.NONE);
- label_2.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- label_2.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- label_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
-
-// addDropDown(label_2, menuAddRel);
-
- hieraciumFuscoatrumSubspText = new Text(composite, SWT.WRAP);
- final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_hieraciumFuscoatrumSubspText.widthHint = 300;
- hieraciumFuscoatrumSubspText.setLayoutData(gd_hieraciumFuscoatrumSubspText);
- hieraciumFuscoatrumSubspText.setText("Hieracium fuscoatrum subsp. chaetodermum (Pohle & Zahn) Zahn in Engler, Pflanzenr. 82: 1267. 1923");
- hieraciumFuscoatrumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
- hieraciumFuscoatrumSubspText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- hieraciumFuscoatrumSubspText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- hieraciumFuscoatrumSubspText.setBackground(null);
- }
-
- });
-
- final Label label = new Label(composite, SWT.NONE);
- label.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- label.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- label.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));
-
- hieraciumRubroonegenseNorrlText = new Text(composite, SWT.WRAP);
- hieraciumRubroonegenseNorrlText.setText("Hieracium rubroonegense Norrl. in Acta Soc. Fauna Fl. Fenn. 26(7): 61. 1904");
- hieraciumRubroonegenseNorrlText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
- hieraciumRubroonegenseNorrlText.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- hieraciumRubroonegenseNorrlText.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- hieraciumRubroonegenseNorrlText.setBackground(null);
- }
-
- });
- final GridData gd_hieraciumRubroonegenseNorrlText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_hieraciumRubroonegenseNorrlText.widthHint = 300;
- hieraciumRubroonegenseNorrlText.setLayoutData(gd_hieraciumRubroonegenseNorrlText);
-
- final Label label_3 = new Label(composite, SWT.NONE);
- label_3.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- label_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));
- label_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-
- hieraciumFuscoatrumSubspText_1 = new Text(composite, SWT.WRAP);
- hieraciumFuscoatrumSubspText_1.setText("Hieracium fuscoatrum subsp. rubroonegense (Norrl.) Zahn in Engler, Pflanzenr. 82: 1267. 1923");
- hieraciumFuscoatrumSubspText_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
- hieraciumFuscoatrumSubspText_1.addFocusListener(new FocusListener() {
-
- public void focusGained(FocusEvent e) {
- hieraciumFuscoatrumSubspText_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
- }
-
- public void focusLost(FocusEvent e) {
- hieraciumFuscoatrumSubspText_1.setBackground(null);
- }
-
- });
- final GridData gd_hieraciumFuscoatrumSubspText_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gd_hieraciumFuscoatrumSubspText_1.widthHint = 300;
- hieraciumFuscoatrumSubspText_1.setLayoutData(gd_hieraciumFuscoatrumSubspText_1);
-
- final Label label_4 = new Label(composite, SWT.NONE);
- label_4.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- label_4.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));
- label_4.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));
-
- final Menu menu1 = new Menu(labelWithMenu);
- labelWithMenu.setMenu(menu1);
- labelWithMenu.addMouseListener(new MouseListener() {
-
- public void mouseDoubleClick(MouseEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseDown(MouseEvent e) {
- menu1.setVisible(true);
- }
-
- public void mouseUp(MouseEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- });
-
- final MenuItem deletehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);
- deletehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));
- deletehieraciumFuscoatrumMenuItem.setText("Delete \"Hieracium fuscoatrum Nägeli & Peter\" from this taxon");
-
- new MenuItem(menu1, SWT.SEPARATOR);
-
- final MenuItem moveMenuItem = new MenuItem(menu1, SWT.NONE);
- moveMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));
- moveMenuItem.setText("Move \"Hieracium fuscoatrum Nägeli & Peter\" to another taxon");
-
- final MenuItem makehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);
- makehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/a_no_bg.gif"));
- makehieraciumFuscoatrumMenuItem.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into an accepted name");
-
- new MenuItem(menu1, SWT.SEPARATOR);
-
- final MenuItem turnhieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a synonym (type unknown)");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_1 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_1.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a homotypic synonym");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_2 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_2.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a heterotypic synoynm");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_3 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_3.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a basionym");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_4 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_4.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_4.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a replaced synonym");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_5 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_5.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_5.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a homonym");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_6 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_6.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_6.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a orthographic variant");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_7 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_7.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_7.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a misapplied name");
-
- final MenuItem turnhieraciumFuscoatrumMenuItem_8 = new MenuItem(menu1, SWT.NONE);
- turnhieraciumFuscoatrumMenuItem_8.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));
- turnhieraciumFuscoatrumMenuItem_8.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a concept relation");
-
- SourceViewer sourceviewer = new SourceViewer(composite, null, SWT.WRAP | SWT.FULL_SELECTION);
- sourceviewer.setAnnotationHover(null);
- styledText = sourceviewer.getTextWidget();
- final GridData gd_styledText = new GridData(SWT.FILL, SWT.TOP, true, false);
- gd_styledText.heightHint = 41;
- gd_styledText.widthHint = 450;
- styledText.setLayoutData(gd_styledText);
- sourceviewer.setDocument(doc);
- sourceviewer.configure(new MySourceViewerConfig());
-// sourceviewer.setTabsToSpacesConverter(null);
-
-
-// final Menu menu = new Menu(toolBar);
-// addDropDown(newItemToolItem, menu);
-// );
-
-// Action testAction = new OpenNameEditorAction();
-// testAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor(Activator.getDefault(), "icons/edit_16x16.gif"));
-// testAction.setToolTipText("Add relation");
-// toolBar.add(testAction);
-
- populateForm();
- }
-
-// private void populateForm() {
-//
-// String fulltext = "";
-//
-// if (taxonname.getGenus() != null) {
-// fulltext = taxonname.getGenus();
-// }
-//
-// if (taxonname.getSpecificEpithet() != null) {
-// fulltext += " " + taxonname.getSpecificEpithet();
-// }
-//
-// if (taxonname.getAuthorship() != null) {
-// fulltext += " " + taxonname.getAuthorship();
-// }
-//
-//// txtPlay.setText(fulltext);
-//// txtPlay.setToolTipText("Joe mama\njoe daddy\njoe gramammy");
-//
-// this.setPartName(taxonname.getName());
-// }
-
- private void populateForm() {
- this.setPartName("Pilosella fuscoatra (Nägeli & Peter) Soják");
- }
-
- @Override
- public void setFocus() {
- // Set the focus
- }
-
- @Override
- public void doSave(IProgressMonitor monitor) {
- // Do the Save operation
- }
-
- @Override
- public void doSaveAs() {
- // Do the Save As operation
- }
-
- @Override
- public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-
- if (!(input instanceof IEditorInput))
- throw new PartInitException(
- "Invalid Input: Must be IFileEditorInput");
-
- if (input.getAdapter(TaxonName.class) != null) {
- taxonname = (TaxonName) input.getAdapter(TaxonName.class);
-// taxonname.addCdmEventListener(this);
- } else {
-
- taxonname = null;
- }
-
- setSite(site);
- setInput(input);
- }
-
- @Override
- public boolean isDirty() {
- return true;
- }
-
- @Override
- public boolean isSaveAsAllowed() {
- return false;
- }
-
- public void propertyChange(PropertyChangeEvent evt) {
-// TaxonName taxonname = (TaxonName)evt.getNewValue();
- this.taxonname = (TaxonName)evt.getNewValue();
- System.out.println(((TaxonName)evt.getNewValue()).getName());
- populateForm();
-
- // for individual fields, do something like:
- // 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
-//
-// }
-
- private static void addDropDown(final ToolItem item, final Menu menu) {
- item.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event event) {
- if (event.detail == SWT.ARROW) {
- Rectangle rect = item.getBounds();
- Point pt = new Point(rect.x, rect.y + rect.height);
- pt = item.getParent().toDisplay(pt);
- menu.setLocation(pt.x, pt.y);
- menu.setVisible(true);
- }
- }
- });
- }
-}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/UndoView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/UndoView.java
deleted file mode 100644
index 37a7f2395..000000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal2/src/eu/etaxonomy/taxeditor/designproposal1/view/UndoView.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package eu.etaxonomy.taxeditor.designproposal1.view;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.ViewPart;
-import com.swtdesigner.ResourceManager;
-import com.swtdesigner.SWTResourceManager;
-import eu.etaxonomy.taxeditor.designproposal1.Activator;
-
-public class UndoView extends ViewPart {
-
- public static final String ID = "eu.etaxonomy.taxeditor.designproposal1.view.undoview"; //$NON-NLS-1$
- private Table table;
-
- /**
- * Create contents of the view part
- * @param parent
- */
- @Override
- public void createPartControl(Composite parent) {
- Composite container = new Composite(parent, SWT.NONE);
- container.setLayout(new FillLayout(SWT.VERTICAL));
-
- table = new Table(container, SWT.NONE);
- table.getHorizontalBar().setVisible(false);
- table.setLinesVisible(true);
-
- final TableColumn newColumnTableColumn = new TableColumn(table, SWT.NONE);
- newColumnTableColumn.setWidth(19);
-
- final TableColumn newColumnTableColumn_1 = new TableColumn(table, SWT.NONE);
- newColumnTableColumn_1.setWidth(1000);
- newColumnTableColumn_1.setText("New column");
-
- final TableItem newItemTableItem = new TableItem(table, SWT.BORDER);
- newItemTableItem.setText(1, "Created taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final TableItem newItemTableItem_1 = new TableItem(table, SWT.BORDER);
- newItemTableItem_1.setText(1, "Added fact (Distribution) \"California deciduous forest ...\" to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final TableItem newItemTableItem_2 = new TableItem(table, SWT.BORDER);
- newItemTableItem_2.setText(1, "Added fact (Distribution) \"Brazilian (Northerly region)\" to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final TableItem newItemTableItem_3 = new TableItem(table, SWT.BORDER);
- newItemTableItem_3.setText(1, "Moved taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\" to \"Pilosella fuscoatra coll.\"");
-
- final TableItem newItemTableItem_4 = new TableItem(table, SWT.BORDER);
- newItemTableItem_4.setText(1, "Added unknown syn. \"Hieracium fuscoatrum Nägeli & Peter\" to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final TableItem newItemTableItem_5 = new TableItem(table, SWT.BORDER);
- newItemTableItem_5.setText(1, "Changed rel. type to homo. syn. for \"Hieracium fuscoatrum Nägeli & Peter\" to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final TableItem newItemTableItem_6 = new TableItem(table, SWT.BORDER);
- newItemTableItem_6.setText(1, "Edited name \"Hieracium fuscoatrum Nägeli & Peter\" to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
-
- final TableItem newItemTableItem_7 = new TableItem(table, SWT.BORDER);
- newItemTableItem_7.setText(new String[] {"Undo the last action"});
- newItemTableItem_7.setImage(0, ResourceManager.getPluginImage(Activator.getDefault(), "icons/undo.gif"));
- newItemTableItem_7.setText(1, "Deleted fact (Distribution) \"Brazilian (Northerly region)\" to \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");
- //
- createActions();
- initializeToolBar();
- initializeMenu();
- }
-
- /**
- * 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
- }
-
-}
--
2.34.1