From 090abd69204b561ae8bf777c7d85891fce8d2ff4 Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Tue, 24 Feb 2009 13:35:30 +0000
Subject: [PATCH] migrating to cdmlib-plugin 2.0.0.20 including new term
 loading

---
 .gitignore                                    |   1 +
 .../eu.etaxonomy.taxeditor/.classpath         |  14 +-
 .../META-INF/MANIFEST.MF                      |   7 +-
 .../eu.etaxonomy.taxeditor/build.properties   |  12 +-
 .../eu.etaxonomy.taxeditor.product            | 753 +++++++++---------
 .../eu.etaxonomy.taxeditor/log4j.properties   |   2 +-
 .../eu.etaxonomy.taxeditor/plugin.xml         |  78 +-
 .../ApplicationActionBarAdvisor.java          |  17 +-
 .../etaxonomy/taxeditor/TaxEditorPlugin.java  |   5 +
 .../taxeditor/actions/io/ExportAction.java    |  26 +-
 .../taxeditor/actions/io/ImportAction.java    |  36 +-
 .../actions/ui/OpenTaxonEditorAction.java     |   1 -
 .../datasource/CdmDataSourceRepository.java   |  20 +-
 .../datasource/CdmTransactionController.java  |   2 +-
 .../taxeditor/editor/AbstractTaxonEditor.java |  16 +-
 .../editor/CompositeBorderDecorator.java      |   4 +-
 .../editor/EmptyTextViewerPrompt.java         |   2 +-
 .../taxeditor/editor/ErrorAnnotation.java     |   2 +-
 .../editor/FreeTextElementFactory.java        |  14 +-
 .../taxeditor/editor/GroupComposite.java      |   2 +-
 .../taxeditor/editor/GroupedComposite.java    |   4 +-
 .../taxeditor/editor/LineBreakListener.java   |   4 +-
 .../taxeditor/editor/MenuConstants.java       |  12 +-
 .../DescriptionElementComposite.java          |   2 +-
 .../DescriptionLabelComposite.java            |   1 -
 .../description/TaxonDescriptionEditor.java   |   8 +-
 .../editor/name/AcceptedNameComposite.java    |   2 +-
 .../editor/name/ConceptComposite.java         |   2 +-
 .../editor/name/SynonymComposite.java         |   4 +-
 .../editor/name/TaxonNameEditor.java          |  16 +-
 .../handlers/AddTaxonomicChildHandler.java    |   1 -
 .../CreateHeterotypicSynonymHandler.java      |   1 -
 .../CreateHomotypicSynonymHandler.java        |   1 -
 .../handlers/DeleteTaxonHandler.java          |   1 -
 .../taxeditor/handlers/NewTaxonHandler.java   |   1 -
 .../taxeditor/handlers/OpenTaxonHandler.java  |   1 -
 .../taxeditor/handlers/SaveAllHandler.java    |   1 -
 .../model/CdmSessionDataRepository.java       |  46 +-
 .../taxeditor/navigation/SearchResult.java    |  26 +-
 .../navigation/TaxonomicTreeView.java         |   4 +-
 .../navigation/TaxonomicTreeViewer.java       |   6 +-
 .../taxeditor/preference/PreferencesUtil.java |   8 +-
 .../taxeditor/propertysheet/DayValidator.java |   2 +-
 .../name/TaxonBasePropertySource.java         |  19 +-
 .../type/wizard/ListTypeWizardPage.java       |  10 +-
 45 files changed, 632 insertions(+), 565 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..612cf961a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/sandbox
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/.classpath b/eclipseprojects/eu.etaxonomy.taxeditor/.classpath
index 021596729..1fa3e6803 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/.classpath
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF b/eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF
index 9236f3c27..ecff57d5a 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF
@@ -13,12 +13,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.forms,
  org.eclipse.core.resources,
  org.eclipse.ui.views,
- org.eclipse.pde.source,
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
- eu.etaxonomy.cdmLibrary;bundle-version="2.0.0",
- org.eclipse.core.expressions;bundle-version="3.4.0"
+ org.eclipse.core.expressions;bundle-version="3.4.0",
+ eu.etaxonomy.cdmLibrary;bundle-version="2.0.0"
 Eclipse-LazyStart: true
 Export-Package: com.swtdesigner,
  eu.etaxonomy.taxeditor,
@@ -26,3 +25,5 @@ Export-Package: com.swtdesigner,
  eu.etaxonomy.taxeditor.editor,
  eu.etaxonomy.taxeditor.model
 Main-Class: eu.etaxonomy.taxeditor.Application
+Import-Package: junit.framework,
+ org.junit
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/build.properties b/eclipseprojects/eu.etaxonomy.taxeditor/build.properties
index ec0dad2db..79facc532 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/build.properties
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/build.properties
@@ -6,11 +6,9 @@ bin.includes = plugin.xml,\
                icons/,\
                splash.bmp,\
                bin/,\
-               .project,\
-               .classpath,\
-               build.properties,\
+               log4j.properties,\
                eu.etaxonomy.taxeditor.product,\
-               src/eu/etaxonomy/taxeditor/log4j.properties,\
-               log4jjj.properties
-src.includes = src/eu/etaxonomy/taxeditor/log4j.properties,\
-               log4jjj.properties
+               build.properties,\
+               plugin_customization.ini
+src.includes = log4j.properties
+jars.compile.order = .
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 901cbb26f..b5311f583 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,376 +1,377 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.1"?>
-
-<product name="%productName" id="eu.etaxonomy.taxeditor.TaxEditorProduct" application="eu.etaxonomy.taxeditor.application" useFeatures="true">
-
-   <aboutInfo>
-      <text>
-         %productBlurb
-      </text>
-   </aboutInfo>
-
-   <configIni use="default"/>
-
-   <launcherArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/eu.etaxonomy.taxeditor/icons/edit_16x16.gif"/>
-
-   <splash
-      startupProgressRect="0,280,455,15"
-      startupMessageRect="7,220,441,20"
-      startupForegroundColor="C8D5EA" />
-   <launcher name="Taxonomic Editor">
-      <solaris/>
-      <win useIco="false">
-         <bmp
-            winSmallLow="/eu.etaxonomy.taxeditor/icons/256color_16x16.bmp"/>
-      </win>
-   </launcher>
-
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="ExampleViewer"/>
-      <plugin id="com.ibm.etools.emf.event"/>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.ibm.icu.source"/>
-      <plugin id="com.instantiations.common.core"/>
-      <plugin id="com.instantiations.common.help"/>
-      <plugin id="com.instantiations.common.ui"/>
-      <plugin id="com.instantiations.css"/>
-      <plugin id="com.instantiations.designer.databinding"/>
-      <plugin id="com.instantiations.eclipse.debug"/>
-      <plugin id="com.instantiations.eclipse.startup"/>
-      <plugin id="com.instantiations.eclipse.ui"/>
-      <plugin id="com.instantiations.eclipse.util"/>
-      <plugin id="com.instantiations.j2ee"/>
-      <plugin id="com.instantiations.tools"/>
-      <plugin id="com.jcraft.jsch"/>
-      <plugin id="com.opnworks.tableviewer.example"/>
-      <plugin id="com.picosoft.keytool"/>
-      <plugin id="com.swtdesigner"/>
-      <plugin id="com.swtdesigner.fragment.jdt.core" fragment="true"/>
-      <plugin id="com.swtdesigner.gwt"/>
-      <plugin id="com.swtdesigner.gwt.ie"/>
-      <plugin id="com.swtdesigner.gwt.moz"/>
-      <plugin id="com.swtdesigner.gwt.saf"/>
-      <plugin id="com.swtdesigner.gwt.saf.browser" fragment="true"/>
-      <plugin id="com.swtdesigner.help"/>
-      <plugin id="com.swtdesigner.layout.group"/>
-      <plugin id="com.swtdesigner.layout.group.designer"/>
-      <plugin id="com.swtdesigner.properties.java5"/>
-      <plugin id="eu.etaxonomy.cdmLibrary"/>
-      <plugin id="eu.etaxonomy.taxeditor"/>
-      <plugin id="eu.etaxonomy.taxeditor.designproposal1"/>
-      <plugin id="eu.etaxonomy.taxeditor.webstarttest"/>
-      <plugin id="javax.servlet"/>
-      <plugin id="javax.servlet.jsp"/>
-      <plugin id="javax.servlet.jsp.source"/>
-      <plugin id="javax.servlet.source"/>
-      <plugin id="mview"/>
-      <plugin id="org.apache.ant"/>
-      <plugin id="org.apache.ant.source"/>
-      <plugin id="org.apache.commons.el"/>
-      <plugin id="org.apache.commons.el.source"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.commons.logging.source"/>
-      <plugin id="org.apache.jasper"/>
-      <plugin id="org.apache.jasper.source"/>
-      <plugin id="org.apache.lucene"/>
-      <plugin id="org.apache.lucene.analysis"/>
-      <plugin id="org.apache.lucene.analysis.source"/>
-      <plugin id="org.apache.lucene.source"/>
-      <plugin id="org.eclipse.ant.core"/>
-      <plugin id="org.eclipse.ant.ui"/>
-      <plugin id="org.eclipse.compare"/>
-      <plugin id="org.eclipse.compare.examples"/>
-      <plugin id="org.eclipse.compare.examples.xml"/>
-      <plugin id="org.eclipse.core.boot"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filebuffers"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.net"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
-      <plugin id="org.eclipse.core.resources.win32" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.core.variables"/>
-      <plugin id="org.eclipse.cvs"/>
-      <plugin id="org.eclipse.cvs.source"/>
-      <plugin id="org.eclipse.debug.core"/>
-      <plugin id="org.eclipse.debug.ui"/>
-      <plugin id="org.eclipse.draw2d"/>
-      <plugin id="org.eclipse.draw2d.doc.isv"/>
-      <plugin id="org.eclipse.emf"/>
-      <plugin id="org.eclipse.emf.activities"/>
-      <plugin id="org.eclipse.emf.ant"/>
-      <plugin id="org.eclipse.emf.cheatsheets"/>
-      <plugin id="org.eclipse.emf.codegen"/>
-      <plugin id="org.eclipse.emf.codegen.ecore"/>
-      <plugin id="org.eclipse.emf.codegen.ecore.ui"/>
-      <plugin id="org.eclipse.emf.codegen.ui"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.common.ui"/>
-      <plugin id="org.eclipse.emf.commonj.sdo"/>
-      <plugin id="org.eclipse.emf.converter"/>
-      <plugin id="org.eclipse.emf.doc"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.change.edit"/>
-      <plugin id="org.eclipse.emf.ecore.edit"/>
-      <plugin id="org.eclipse.emf.ecore.editor"/>
-      <plugin id="org.eclipse.emf.ecore.sdo"/>
-      <plugin id="org.eclipse.emf.ecore.sdo.doc"/>
-      <plugin id="org.eclipse.emf.ecore.sdo.edit"/>
-      <plugin id="org.eclipse.emf.ecore.sdo.editor"/>
-      <plugin id="org.eclipse.emf.ecore.sdo.source"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.emf.edit"/>
-      <plugin id="org.eclipse.emf.edit.ui"/>
-      <plugin id="org.eclipse.emf.examples"/>
-      <plugin id="org.eclipse.emf.examples.library"/>
-      <plugin id="org.eclipse.emf.examples.library.edit"/>
-      <plugin id="org.eclipse.emf.examples.library.editor"/>
-      <plugin id="org.eclipse.emf.exporter"/>
-      <plugin id="org.eclipse.emf.exporter.html"/>
-      <plugin id="org.eclipse.emf.importer"/>
-      <plugin id="org.eclipse.emf.importer.ecore"/>
-      <plugin id="org.eclipse.emf.importer.java"/>
-      <plugin id="org.eclipse.emf.importer.rose"/>
-      <plugin id="org.eclipse.emf.java"/>
-      <plugin id="org.eclipse.emf.java.edit"/>
-      <plugin id="org.eclipse.emf.java.editor"/>
-      <plugin id="org.eclipse.emf.mapping"/>
-      <plugin id="org.eclipse.emf.mapping.ecore2ecore"/>
-      <plugin id="org.eclipse.emf.mapping.ecore2ecore.editor"/>
-      <plugin id="org.eclipse.emf.mapping.ecore2xml"/>
-      <plugin id="org.eclipse.emf.mapping.ecore2xml.ui"/>
-      <plugin id="org.eclipse.emf.mapping.ui"/>
-      <plugin id="org.eclipse.emf.mapping.xsd2ecore"/>
-      <plugin id="org.eclipse.emf.mapping.xsd2ecore.editor"/>
-      <plugin id="org.eclipse.emf.source"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.http.jetty"/>
-      <plugin id="org.eclipse.equinox.http.registry"/>
-      <plugin id="org.eclipse.equinox.http.servlet"/>
-      <plugin id="org.eclipse.equinox.jsp.jasper"/>
-      <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
-      <plugin id="org.eclipse.equinox.launcher"/>
-      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.gef"/>
-      <plugin id="org.eclipse.gef.doc.isv"/>
-      <plugin id="org.eclipse.gef.examples.flow"/>
-      <plugin id="org.eclipse.gef.examples.logic"/>
-      <plugin id="org.eclipse.gef.examples.shapes"/>
-      <plugin id="org.eclipse.gef.examples.source"/>
-      <plugin id="org.eclipse.gef.examples.text"/>
-      <plugin id="org.eclipse.gef.source"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.help.appserver"/>
-      <plugin id="org.eclipse.help.base"/>
-      <plugin id="org.eclipse.help.ui"/>
-      <plugin id="org.eclipse.help.webapp"/>
-      <plugin id="org.eclipse.jdt"/>
-      <plugin id="org.eclipse.jdt.apt.core"/>
-      <plugin id="org.eclipse.jdt.apt.pluggable.core"/>
-      <plugin id="org.eclipse.jdt.apt.ui"/>
-      <plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
-      <plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
-      <plugin id="org.eclipse.jdt.core"/>
-      <plugin id="org.eclipse.jdt.core.manipulation"/>
-      <plugin id="org.eclipse.jdt.debug"/>
-      <plugin id="org.eclipse.jdt.debug.ui"/>
-      <plugin id="org.eclipse.jdt.doc.isv"/>
-      <plugin id="org.eclipse.jdt.doc.user"/>
-      <plugin id="org.eclipse.jdt.junit"/>
-      <plugin id="org.eclipse.jdt.junit.runtime"/>
-      <plugin id="org.eclipse.jdt.junit4.runtime"/>
-      <plugin id="org.eclipse.jdt.launching"/>
-      <plugin id="org.eclipse.jdt.source"/>
-      <plugin id="org.eclipse.jdt.ui"/>
-      <plugin id="org.eclipse.jdt.ui.examples.projects"/>
-      <plugin id="org.eclipse.jem"/>
-      <plugin id="org.eclipse.jem.beaninfo"/>
-      <plugin id="org.eclipse.jem.proxy"/>
-      <plugin id="org.eclipse.jem.sdk"/>
-      <plugin id="org.eclipse.jem.source"/>
-      <plugin id="org.eclipse.jem.ui"/>
-      <plugin id="org.eclipse.jem.util"/>
-      <plugin id="org.eclipse.jem.workbench"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.jface.examples.databinding"/>
-      <plugin id="org.eclipse.jface.text"/>
-      <plugin id="org.eclipse.jsch.core"/>
-      <plugin id="org.eclipse.jsch.ui"/>
-      <plugin id="org.eclipse.ltk.core.refactoring"/>
-      <plugin id="org.eclipse.ltk.ui.refactoring"/>
-      <plugin id="org.eclipse.mylar"/>
-      <plugin id="org.eclipse.mylar.bugzilla.core"/>
-      <plugin id="org.eclipse.mylar.bugzilla.ui"/>
-      <plugin id="org.eclipse.mylar.context.core"/>
-      <plugin id="org.eclipse.mylar.context.ui"/>
-      <plugin id="org.eclipse.mylar.doc"/>
-      <plugin id="org.eclipse.mylar.ide"/>
-      <plugin id="org.eclipse.mylar.java"/>
-      <plugin id="org.eclipse.mylar.jira.core"/>
-      <plugin id="org.eclipse.mylar.jira.ui"/>
-      <plugin id="org.eclipse.mylar.monitor.core"/>
-      <plugin id="org.eclipse.mylar.monitor.ui"/>
-      <plugin id="org.eclipse.mylar.monitor.usage"/>
-      <plugin id="org.eclipse.mylar.resources"/>
-      <plugin id="org.eclipse.mylar.tasks.core"/>
-      <plugin id="org.eclipse.mylar.tasks.ui"/>
-      <plugin id="org.eclipse.mylar.tasks.web"/>
-      <plugin id="org.eclipse.mylar.team"/>
-      <plugin id="org.eclipse.mylar.trac.core"/>
-      <plugin id="org.eclipse.mylar.trac.ui"/>
-      <plugin id="org.eclipse.mylar.web"/>
-      <plugin id="org.eclipse.mylyn"/>
-      <plugin id="org.eclipse.mylyn.compatibility"/>
-      <plugin id="org.eclipse.mylyn.context.core"/>
-      <plugin id="org.eclipse.mylyn.context.ui"/>
-      <plugin id="org.eclipse.mylyn.help.ui"/>
-      <plugin id="org.eclipse.mylyn.ide.ui"/>
-      <plugin id="org.eclipse.mylyn.java.ui"/>
-      <plugin id="org.eclipse.mylyn.monitor.core"/>
-      <plugin id="org.eclipse.mylyn.monitor.ui"/>
-      <plugin id="org.eclipse.mylyn.resources.ui"/>
-      <plugin id="org.eclipse.mylyn.tasks.core"/>
-      <plugin id="org.eclipse.mylyn.tasks.ui"/>
-      <plugin id="org.eclipse.mylyn.trac.core"/>
-      <plugin id="org.eclipse.mylyn.trac.ui"/>
-      <plugin id="org.eclipse.mylyn.web.core"/>
-      <plugin id="org.eclipse.mylyn.web.ui"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.eclipse.pde"/>
-      <plugin id="org.eclipse.pde.build"/>
-      <plugin id="org.eclipse.pde.core"/>
-      <plugin id="org.eclipse.pde.doc.user"/>
-      <plugin id="org.eclipse.pde.junit.runtime"/>
-      <plugin id="org.eclipse.pde.runtime"/>
-      <plugin id="org.eclipse.pde.source"/>
-      <plugin id="org.eclipse.pde.ui"/>
-      <plugin id="org.eclipse.pde.ui.templates"/>
-      <plugin id="org.eclipse.platform"/>
-      <plugin id="org.eclipse.platform.doc.isv"/>
-      <plugin id="org.eclipse.platform.doc.user"/>
-      <plugin id="org.eclipse.platform.source"/>
-      <plugin id="org.eclipse.platform.source.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.rcp"/>
-      <plugin id="org.eclipse.rcp.source"/>
-      <plugin id="org.eclipse.rcp.source.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.sdk"/>
-      <plugin id="org.eclipse.sdk.examples"/>
-      <plugin id="org.eclipse.sdk.examples.source"/>
-      <plugin id="org.eclipse.sdk.examples.source.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.search"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.examples"/>
-      <plugin id="org.eclipse.swt.examples.browser"/>
-      <plugin id="org.eclipse.swt.examples.browser.demos"/>
-      <plugin id="org.eclipse.swt.examples.controls"/>
-      <plugin id="org.eclipse.swt.examples.launcher"/>
-      <plugin id="org.eclipse.swt.examples.layouts"/>
-      <plugin id="org.eclipse.swt.examples.ole.win32"/>
-      <plugin id="org.eclipse.swt.examples.paint"/>
-      <plugin id="org.eclipse.swt.layout.grouplayout"/>
-      <plugin id="org.eclipse.swt.widgets.baseline"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.team.core"/>
-      <plugin id="org.eclipse.team.cvs.core"/>
-      <plugin id="org.eclipse.team.cvs.ssh"/>
-      <plugin id="org.eclipse.team.cvs.ssh2"/>
-      <plugin id="org.eclipse.team.cvs.ui"/>
-      <plugin id="org.eclipse.team.examples.filesystem"/>
-      <plugin id="org.eclipse.team.ui"/>
-      <plugin id="org.eclipse.text"/>
-      <plugin id="org.eclipse.tomcat"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.browser"/>
-      <plugin id="org.eclipse.ui.cheatsheets"/>
-      <plugin id="org.eclipse.ui.console"/>
-      <plugin id="org.eclipse.ui.editors"/>
-      <plugin id="org.eclipse.ui.examples.contributions"/>
-      <plugin id="org.eclipse.ui.examples.fieldassist"/>
-      <plugin id="org.eclipse.ui.examples.javaeditor"/>
-      <plugin id="org.eclipse.ui.examples.multipageeditor"/>
-      <plugin id="org.eclipse.ui.examples.propertysheet"/>
-      <plugin id="org.eclipse.ui.examples.readmetool"/>
-      <plugin id="org.eclipse.ui.examples.undo"/>
-      <plugin id="org.eclipse.ui.examples.views.properties.tabbed.article"/>
-      <plugin id="org.eclipse.ui.externaltools"/>
-      <plugin id="org.eclipse.ui.forms"/>
-      <plugin id="org.eclipse.ui.forms.article"/>
-      <plugin id="org.eclipse.ui.ide"/>
-      <plugin id="org.eclipse.ui.ide.application"/>
-      <plugin id="org.eclipse.ui.intro"/>
-      <plugin id="org.eclipse.ui.intro.universal"/>
-      <plugin id="org.eclipse.ui.navigator"/>
-      <plugin id="org.eclipse.ui.navigator.resources"/>
-      <plugin id="org.eclipse.ui.net"/>
-      <plugin id="org.eclipse.ui.presentations.r21"/>
-      <plugin id="org.eclipse.ui.views"/>
-      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
-      <plugin id="org.eclipse.ui.win32" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.eclipse.ui.workbench.compatibility" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench.texteditor"/>
-      <plugin id="org.eclipse.update.configurator"/>
-      <plugin id="org.eclipse.update.core"/>
-      <plugin id="org.eclipse.update.core.win32" fragment="true"/>
-      <plugin id="org.eclipse.update.scheduler"/>
-      <plugin id="org.eclipse.update.ui"/>
-      <plugin id="org.eclipse.ve"/>
-      <plugin id="org.eclipse.ve.cde"/>
-      <plugin id="org.eclipse.ve.doc"/>
-      <plugin id="org.eclipse.ve.java.core"/>
-      <plugin id="org.eclipse.ve.jfc"/>
-      <plugin id="org.eclipse.ve.propertysheet"/>
-      <plugin id="org.eclipse.ve.sdk"/>
-      <plugin id="org.eclipse.ve.source"/>
-      <plugin id="org.eclipse.ve.swt"/>
-      <plugin id="org.eclipse.xsd"/>
-      <plugin id="org.eclipse.xsd.cheatsheets"/>
-      <plugin id="org.eclipse.xsd.doc"/>
-      <plugin id="org.eclipse.xsd.ecore.exporter"/>
-      <plugin id="org.eclipse.xsd.ecore.importer"/>
-      <plugin id="org.eclipse.xsd.edit"/>
-      <plugin id="org.eclipse.xsd.editor"/>
-      <plugin id="org.eclipse.xsd.example"/>
-      <plugin id="org.eclipse.xsd.source"/>
-      <plugin id="org.junit"/>
-      <plugin id="org.junit.source"/>
-      <plugin id="org.junit4"/>
-      <plugin id="org.mortbay.jetty"/>
-      <plugin id="org.mortbay.jetty.source"/>
-      <plugin id="org.tigris.subversion.javahl.win32"/>
-      <plugin id="org.tigris.subversion.subclipse.core"/>
-      <plugin id="org.tigris.subversion.subclipse.doc"/>
-      <plugin id="org.tigris.subversion.subclipse.ui"/>
-      <plugin id="testeroo"/>
-   </plugins>
-
-   <features>
-      <feature id="eu.etaxonomy.taxeditor.feature" version="1.0.0"/>
-   </features>
-
-</product>
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.4"?>
+
+<product name="%productName" id="eu.etaxonomy.taxeditor.product" application="eu.etaxonomy.taxeditor.application" useFeatures="true">
+
+   <aboutInfo>
+      <text>
+         %productBlurb
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+   </launcherArgs>
+
+   <windowImages i16="/eu.etaxonomy.taxeditor/icons/edit_16x16.gif"/>
+
+   <splash
+      startupProgressRect="0,280,455,15"
+      startupMessageRect="7,220,441,20"
+      startupForegroundColor="C8D5EA" />
+   <launcher name="Taxonomic Editor">
+      <solaris/>
+      <win useIco="false">
+         <bmp
+            winSmallLow="/eu.etaxonomy.taxeditor/icons/256color_16x16.bmp"/>
+      </win>
+   </launcher>
+
+
+   <vm>
+      <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)</macos>
+   </vm>
+
+   <plugins>
+      <plugin id="ExampleViewer"/>
+      <plugin id="com.ibm.etools.emf.event"/>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="com.ibm.icu.source"/>
+      <plugin id="com.instantiations.common.core"/>
+      <plugin id="com.instantiations.common.help"/>
+      <plugin id="com.instantiations.common.ui"/>
+      <plugin id="com.instantiations.css"/>
+      <plugin id="com.instantiations.designer.databinding"/>
+      <plugin id="com.instantiations.eclipse.debug"/>
+      <plugin id="com.instantiations.eclipse.startup"/>
+      <plugin id="com.instantiations.eclipse.ui"/>
+      <plugin id="com.instantiations.eclipse.util"/>
+      <plugin id="com.instantiations.j2ee"/>
+      <plugin id="com.instantiations.tools"/>
+      <plugin id="com.jcraft.jsch"/>
+      <plugin id="com.opnworks.tableviewer.example"/>
+      <plugin id="com.picosoft.keytool"/>
+      <plugin id="com.swtdesigner"/>
+      <plugin id="com.swtdesigner.fragment.jdt.core"/>
+      <plugin id="com.swtdesigner.gwt"/>
+      <plugin id="com.swtdesigner.gwt.ie"/>
+      <plugin id="com.swtdesigner.gwt.moz"/>
+      <plugin id="com.swtdesigner.gwt.saf"/>
+      <plugin id="com.swtdesigner.gwt.saf.browser"/>
+      <plugin id="com.swtdesigner.help"/>
+      <plugin id="com.swtdesigner.layout.group"/>
+      <plugin id="com.swtdesigner.layout.group.designer"/>
+      <plugin id="com.swtdesigner.properties.java5"/>
+      <plugin id="eu.etaxonomy.cdmLibrary"/>
+      <plugin id="eu.etaxonomy.taxeditor"/>
+      <plugin id="eu.etaxonomy.taxeditor.designproposal1"/>
+      <plugin id="eu.etaxonomy.taxeditor.webstarttest"/>
+      <plugin id="javax.servlet"/>
+      <plugin id="javax.servlet.jsp"/>
+      <plugin id="javax.servlet.jsp.source"/>
+      <plugin id="javax.servlet.source"/>
+      <plugin id="mview"/>
+      <plugin id="org.apache.ant"/>
+      <plugin id="org.apache.ant.source"/>
+      <plugin id="org.apache.commons.el"/>
+      <plugin id="org.apache.commons.el.source"/>
+      <plugin id="org.apache.commons.logging"/>
+      <plugin id="org.apache.commons.logging.source"/>
+      <plugin id="org.apache.jasper"/>
+      <plugin id="org.apache.jasper.source"/>
+      <plugin id="org.apache.lucene"/>
+      <plugin id="org.apache.lucene.analysis"/>
+      <plugin id="org.apache.lucene.analysis.source"/>
+      <plugin id="org.apache.lucene.source"/>
+      <plugin id="org.eclipse.ant.core"/>
+      <plugin id="org.eclipse.ant.ui"/>
+      <plugin id="org.eclipse.compare"/>
+      <plugin id="org.eclipse.compare.examples"/>
+      <plugin id="org.eclipse.compare.examples.xml"/>
+      <plugin id="org.eclipse.core.boot"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.beans"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filebuffers"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.net"/>
+      <plugin id="org.eclipse.core.resources"/>
+      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
+      <plugin id="org.eclipse.core.resources.win32"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.runtime.compatibility"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.auth"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+      <plugin id="org.eclipse.core.variables"/>
+      <plugin id="org.eclipse.cvs"/>
+      <plugin id="org.eclipse.cvs.source"/>
+      <plugin id="org.eclipse.debug.core"/>
+      <plugin id="org.eclipse.debug.ui"/>
+      <plugin id="org.eclipse.draw2d"/>
+      <plugin id="org.eclipse.draw2d.doc.isv"/>
+      <plugin id="org.eclipse.emf"/>
+      <plugin id="org.eclipse.emf.activities"/>
+      <plugin id="org.eclipse.emf.ant"/>
+      <plugin id="org.eclipse.emf.cheatsheets"/>
+      <plugin id="org.eclipse.emf.codegen"/>
+      <plugin id="org.eclipse.emf.codegen.ecore"/>
+      <plugin id="org.eclipse.emf.codegen.ecore.ui"/>
+      <plugin id="org.eclipse.emf.codegen.ui"/>
+      <plugin id="org.eclipse.emf.common"/>
+      <plugin id="org.eclipse.emf.common.ui"/>
+      <plugin id="org.eclipse.emf.commonj.sdo"/>
+      <plugin id="org.eclipse.emf.converter"/>
+      <plugin id="org.eclipse.emf.doc"/>
+      <plugin id="org.eclipse.emf.ecore"/>
+      <plugin id="org.eclipse.emf.ecore.change"/>
+      <plugin id="org.eclipse.emf.ecore.change.edit"/>
+      <plugin id="org.eclipse.emf.ecore.edit"/>
+      <plugin id="org.eclipse.emf.ecore.editor"/>
+      <plugin id="org.eclipse.emf.ecore.sdo"/>
+      <plugin id="org.eclipse.emf.ecore.sdo.doc"/>
+      <plugin id="org.eclipse.emf.ecore.sdo.edit"/>
+      <plugin id="org.eclipse.emf.ecore.sdo.editor"/>
+      <plugin id="org.eclipse.emf.ecore.sdo.source"/>
+      <plugin id="org.eclipse.emf.ecore.xmi"/>
+      <plugin id="org.eclipse.emf.edit"/>
+      <plugin id="org.eclipse.emf.edit.ui"/>
+      <plugin id="org.eclipse.emf.examples"/>
+      <plugin id="org.eclipse.emf.examples.library"/>
+      <plugin id="org.eclipse.emf.examples.library.edit"/>
+      <plugin id="org.eclipse.emf.examples.library.editor"/>
+      <plugin id="org.eclipse.emf.exporter"/>
+      <plugin id="org.eclipse.emf.exporter.html"/>
+      <plugin id="org.eclipse.emf.importer"/>
+      <plugin id="org.eclipse.emf.importer.ecore"/>
+      <plugin id="org.eclipse.emf.importer.java"/>
+      <plugin id="org.eclipse.emf.importer.rose"/>
+      <plugin id="org.eclipse.emf.java"/>
+      <plugin id="org.eclipse.emf.java.edit"/>
+      <plugin id="org.eclipse.emf.java.editor"/>
+      <plugin id="org.eclipse.emf.mapping"/>
+      <plugin id="org.eclipse.emf.mapping.ecore2ecore"/>
+      <plugin id="org.eclipse.emf.mapping.ecore2ecore.editor"/>
+      <plugin id="org.eclipse.emf.mapping.ecore2xml"/>
+      <plugin id="org.eclipse.emf.mapping.ecore2xml.ui"/>
+      <plugin id="org.eclipse.emf.mapping.ui"/>
+      <plugin id="org.eclipse.emf.mapping.xsd2ecore"/>
+      <plugin id="org.eclipse.emf.mapping.xsd2ecore.editor"/>
+      <plugin id="org.eclipse.emf.source"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.http.jetty"/>
+      <plugin id="org.eclipse.equinox.http.registry"/>
+      <plugin id="org.eclipse.equinox.http.servlet"/>
+      <plugin id="org.eclipse.equinox.jsp.jasper"/>
+      <plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
+      <plugin id="org.eclipse.equinox.launcher"/>
+      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.gef"/>
+      <plugin id="org.eclipse.gef.doc.isv"/>
+      <plugin id="org.eclipse.gef.examples.flow"/>
+      <plugin id="org.eclipse.gef.examples.logic"/>
+      <plugin id="org.eclipse.gef.examples.shapes"/>
+      <plugin id="org.eclipse.gef.examples.source"/>
+      <plugin id="org.eclipse.gef.examples.text"/>
+      <plugin id="org.eclipse.gef.source"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.help.appserver"/>
+      <plugin id="org.eclipse.help.base"/>
+      <plugin id="org.eclipse.help.ui"/>
+      <plugin id="org.eclipse.help.webapp"/>
+      <plugin id="org.eclipse.jdt"/>
+      <plugin id="org.eclipse.jdt.apt.core"/>
+      <plugin id="org.eclipse.jdt.apt.pluggable.core"/>
+      <plugin id="org.eclipse.jdt.apt.ui"/>
+      <plugin id="org.eclipse.jdt.compiler.apt" fragment="true"/>
+      <plugin id="org.eclipse.jdt.compiler.tool" fragment="true"/>
+      <plugin id="org.eclipse.jdt.core"/>
+      <plugin id="org.eclipse.jdt.core.manipulation"/>
+      <plugin id="org.eclipse.jdt.debug"/>
+      <plugin id="org.eclipse.jdt.debug.ui"/>
+      <plugin id="org.eclipse.jdt.doc.isv"/>
+      <plugin id="org.eclipse.jdt.doc.user"/>
+      <plugin id="org.eclipse.jdt.junit"/>
+      <plugin id="org.eclipse.jdt.junit.runtime"/>
+      <plugin id="org.eclipse.jdt.junit4.runtime"/>
+      <plugin id="org.eclipse.jdt.launching"/>
+      <plugin id="org.eclipse.jdt.source"/>
+      <plugin id="org.eclipse.jdt.ui"/>
+      <plugin id="org.eclipse.jdt.ui.examples.projects"/>
+      <plugin id="org.eclipse.jem"/>
+      <plugin id="org.eclipse.jem.beaninfo"/>
+      <plugin id="org.eclipse.jem.proxy"/>
+      <plugin id="org.eclipse.jem.sdk"/>
+      <plugin id="org.eclipse.jem.source"/>
+      <plugin id="org.eclipse.jem.ui"/>
+      <plugin id="org.eclipse.jem.util"/>
+      <plugin id="org.eclipse.jem.workbench"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.jface.examples.databinding"/>
+      <plugin id="org.eclipse.jface.text"/>
+      <plugin id="org.eclipse.jsch.core"/>
+      <plugin id="org.eclipse.jsch.ui"/>
+      <plugin id="org.eclipse.ltk.core.refactoring"/>
+      <plugin id="org.eclipse.ltk.ui.refactoring"/>
+      <plugin id="org.eclipse.mylar"/>
+      <plugin id="org.eclipse.mylar.bugzilla.core"/>
+      <plugin id="org.eclipse.mylar.bugzilla.ui"/>
+      <plugin id="org.eclipse.mylar.context.core"/>
+      <plugin id="org.eclipse.mylar.context.ui"/>
+      <plugin id="org.eclipse.mylar.doc"/>
+      <plugin id="org.eclipse.mylar.ide"/>
+      <plugin id="org.eclipse.mylar.java"/>
+      <plugin id="org.eclipse.mylar.jira.core"/>
+      <plugin id="org.eclipse.mylar.jira.ui"/>
+      <plugin id="org.eclipse.mylar.monitor.core"/>
+      <plugin id="org.eclipse.mylar.monitor.ui"/>
+      <plugin id="org.eclipse.mylar.monitor.usage"/>
+      <plugin id="org.eclipse.mylar.resources"/>
+      <plugin id="org.eclipse.mylar.tasks.core"/>
+      <plugin id="org.eclipse.mylar.tasks.ui"/>
+      <plugin id="org.eclipse.mylar.tasks.web"/>
+      <plugin id="org.eclipse.mylar.team"/>
+      <plugin id="org.eclipse.mylar.trac.core"/>
+      <plugin id="org.eclipse.mylar.trac.ui"/>
+      <plugin id="org.eclipse.mylar.web"/>
+      <plugin id="org.eclipse.mylyn"/>
+      <plugin id="org.eclipse.mylyn.compatibility"/>
+      <plugin id="org.eclipse.mylyn.context.core"/>
+      <plugin id="org.eclipse.mylyn.context.ui"/>
+      <plugin id="org.eclipse.mylyn.help.ui"/>
+      <plugin id="org.eclipse.mylyn.ide.ui"/>
+      <plugin id="org.eclipse.mylyn.java.ui"/>
+      <plugin id="org.eclipse.mylyn.monitor.core"/>
+      <plugin id="org.eclipse.mylyn.monitor.ui"/>
+      <plugin id="org.eclipse.mylyn.resources.ui"/>
+      <plugin id="org.eclipse.mylyn.tasks.core"/>
+      <plugin id="org.eclipse.mylyn.tasks.ui"/>
+      <plugin id="org.eclipse.mylyn.trac.core"/>
+      <plugin id="org.eclipse.mylyn.trac.ui"/>
+      <plugin id="org.eclipse.mylyn.web.core"/>
+      <plugin id="org.eclipse.mylyn.web.ui"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.util"/>
+      <plugin id="org.eclipse.pde"/>
+      <plugin id="org.eclipse.pde.build"/>
+      <plugin id="org.eclipse.pde.core"/>
+      <plugin id="org.eclipse.pde.doc.user"/>
+      <plugin id="org.eclipse.pde.junit.runtime"/>
+      <plugin id="org.eclipse.pde.runtime"/>
+      <plugin id="org.eclipse.pde.source"/>
+      <plugin id="org.eclipse.pde.ui"/>
+      <plugin id="org.eclipse.pde.ui.templates"/>
+      <plugin id="org.eclipse.platform"/>
+      <plugin id="org.eclipse.platform.doc.isv"/>
+      <plugin id="org.eclipse.platform.doc.user"/>
+      <plugin id="org.eclipse.platform.source"/>
+      <plugin id="org.eclipse.platform.source.win32.win32.x86"/>
+      <plugin id="org.eclipse.rcp"/>
+      <plugin id="org.eclipse.rcp.source"/>
+      <plugin id="org.eclipse.rcp.source.win32.win32.x86"/>
+      <plugin id="org.eclipse.sdk"/>
+      <plugin id="org.eclipse.sdk.examples"/>
+      <plugin id="org.eclipse.sdk.examples.source"/>
+      <plugin id="org.eclipse.sdk.examples.source.win32.win32.x86"/>
+      <plugin id="org.eclipse.search"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.examples"/>
+      <plugin id="org.eclipse.swt.examples.browser"/>
+      <plugin id="org.eclipse.swt.examples.browser.demos"/>
+      <plugin id="org.eclipse.swt.examples.controls"/>
+      <plugin id="org.eclipse.swt.examples.launcher"/>
+      <plugin id="org.eclipse.swt.examples.layouts"/>
+      <plugin id="org.eclipse.swt.examples.ole.win32"/>
+      <plugin id="org.eclipse.swt.examples.paint"/>
+      <plugin id="org.eclipse.swt.layout.grouplayout"/>
+      <plugin id="org.eclipse.swt.widgets.baseline"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86"/>
+      <plugin id="org.eclipse.team.core"/>
+      <plugin id="org.eclipse.team.cvs.core"/>
+      <plugin id="org.eclipse.team.cvs.ssh"/>
+      <plugin id="org.eclipse.team.cvs.ssh2"/>
+      <plugin id="org.eclipse.team.cvs.ui"/>
+      <plugin id="org.eclipse.team.examples.filesystem"/>
+      <plugin id="org.eclipse.team.ui"/>
+      <plugin id="org.eclipse.text"/>
+      <plugin id="org.eclipse.tomcat"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.browser"/>
+      <plugin id="org.eclipse.ui.cheatsheets"/>
+      <plugin id="org.eclipse.ui.console"/>
+      <plugin id="org.eclipse.ui.editors"/>
+      <plugin id="org.eclipse.ui.examples.contributions"/>
+      <plugin id="org.eclipse.ui.examples.fieldassist"/>
+      <plugin id="org.eclipse.ui.examples.javaeditor"/>
+      <plugin id="org.eclipse.ui.examples.multipageeditor"/>
+      <plugin id="org.eclipse.ui.examples.propertysheet"/>
+      <plugin id="org.eclipse.ui.examples.readmetool"/>
+      <plugin id="org.eclipse.ui.examples.undo"/>
+      <plugin id="org.eclipse.ui.examples.views.properties.tabbed.article"/>
+      <plugin id="org.eclipse.ui.externaltools"/>
+      <plugin id="org.eclipse.ui.forms"/>
+      <plugin id="org.eclipse.ui.forms.article"/>
+      <plugin id="org.eclipse.ui.ide"/>
+      <plugin id="org.eclipse.ui.ide.application"/>
+      <plugin id="org.eclipse.ui.intro"/>
+      <plugin id="org.eclipse.ui.intro.universal"/>
+      <plugin id="org.eclipse.ui.navigator"/>
+      <plugin id="org.eclipse.ui.navigator.resources"/>
+      <plugin id="org.eclipse.ui.net"/>
+      <plugin id="org.eclipse.ui.presentations.r21"/>
+      <plugin id="org.eclipse.ui.views"/>
+      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
+      <plugin id="org.eclipse.ui.win32"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.eclipse.ui.workbench.compatibility" fragment="true"/>
+      <plugin id="org.eclipse.ui.workbench.texteditor"/>
+      <plugin id="org.eclipse.update.configurator"/>
+      <plugin id="org.eclipse.update.core"/>
+      <plugin id="org.eclipse.update.core.win32"/>
+      <plugin id="org.eclipse.update.scheduler"/>
+      <plugin id="org.eclipse.update.ui"/>
+      <plugin id="org.eclipse.ve"/>
+      <plugin id="org.eclipse.ve.cde"/>
+      <plugin id="org.eclipse.ve.doc"/>
+      <plugin id="org.eclipse.ve.java.core"/>
+      <plugin id="org.eclipse.ve.jfc"/>
+      <plugin id="org.eclipse.ve.propertysheet"/>
+      <plugin id="org.eclipse.ve.sdk"/>
+      <plugin id="org.eclipse.ve.source"/>
+      <plugin id="org.eclipse.ve.swt"/>
+      <plugin id="org.eclipse.xsd"/>
+      <plugin id="org.eclipse.xsd.cheatsheets"/>
+      <plugin id="org.eclipse.xsd.doc"/>
+      <plugin id="org.eclipse.xsd.ecore.exporter"/>
+      <plugin id="org.eclipse.xsd.ecore.importer"/>
+      <plugin id="org.eclipse.xsd.edit"/>
+      <plugin id="org.eclipse.xsd.editor"/>
+      <plugin id="org.eclipse.xsd.example"/>
+      <plugin id="org.eclipse.xsd.source"/>
+      <plugin id="org.junit"/>
+      <plugin id="org.junit.source"/>
+      <plugin id="org.junit4"/>
+      <plugin id="org.mortbay.jetty"/>
+      <plugin id="org.mortbay.jetty.source"/>
+      <plugin id="org.tigris.subversion.javahl.win32"/>
+      <plugin id="org.tigris.subversion.subclipse.core"/>
+      <plugin id="org.tigris.subversion.subclipse.doc"/>
+      <plugin id="org.tigris.subversion.subclipse.ui"/>
+      <plugin id="testeroo"/>
+   </plugins>
+
+   <features>
+      <feature id="eu.etaxonomy.taxeditor.feature" version="1.0.0"/>
+   </features>
+
+</product>
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/log4j.properties b/eclipseprojects/eu.etaxonomy.taxeditor/log4j.properties
index 4bb0b328d..2f29d728e 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/log4j.properties
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/log4j.properties
@@ -19,6 +19,6 @@ log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 log4j.rootLogger=FATAL, stdout
 
 ### set directory-specific levels below
-log4j.logger.eu.etaxonomy.taxeditor = ERROR 
+log4j.logger.eu.etaxonomy.taxeditor = DEBUG 
 
 
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml b/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml
index e6f85726d..3f8bbd291 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml
@@ -5,7 +5,11 @@
    <extension
          id="application"
          point="org.eclipse.core.runtime.applications">
-      <application>
+      <application
+            cardinality="singleton-global"
+            icon="icons/256color_48x48.bmp"
+            thread="main"
+            visible="true">
          <run
                class="eu.etaxonomy.taxeditor.Application">
          </run>
@@ -83,10 +87,12 @@
       </editor>
    </extension>
    <extension
-         id="product"
+         id="eu.etaxonomy.taxeditor.product"
+         name="Taxonomic Editor"
          point="org.eclipse.core.runtime.products">
       <product
             application="eu.etaxonomy.taxeditor.application"
+            description="Taxonomic Editor"
             name="EDIT Taxonomic Editor">
          <property
                name="appName"
@@ -431,6 +437,74 @@
          </with>
       </definition>
    </extension>
+   <extension
+         id="TaxEditorProduct"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="eu.etaxonomy.taxeditor.application"
+            name="%productName">
+         <property
+               name="windowImages"
+               value="icons/edit_16x16.gif">
+         </property>
+         <property
+               name="aboutText"
+               value="%productBlurb">
+         </property>
+         <property
+               name="startupForegroundColor"
+               value="C8D5EA">
+         </property>
+         <property
+               name="startupProgressRect"
+               value="0,280,455,15">
+         </property>
+         <property
+               name="startupMessageRect"
+               value="7,220,441,20">
+         </property>
+         <property
+               name="preferenceCustomization"
+               value="plugin_customization.ini">
+         </property>
+         <property
+               name="appName"
+               value="%productName">
+         </property>
+      </product>
+   </extension>
+   <extension
+         id="product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="eu.etaxonomy.taxeditor.application"
+            name="%productName">
+         <property
+               name="windowImages"
+               value="icons/edit_16x16.gif">
+         </property>
+         <property
+               name="aboutText"
+               value="%productBlurb">
+         </property>
+         <property
+               name="startupForegroundColor"
+               value="C8D5EA">
+         </property>
+         <property
+               name="startupProgressRect"
+               value="0,280,455,15">
+         </property>
+         <property
+               name="startupMessageRect"
+               value="7,220,441,20">
+         </property>
+         <property
+               name="preferenceCustomization"
+               value="plugin_customization.ini">
+         </property>
+      </product>
+   </extension>
    <!--extension
          point="org.eclipse.ui.commands">
       <command
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
index 33a03568b..004c8c469 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
@@ -9,7 +9,6 @@
 
 package eu.etaxonomy.taxeditor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -22,10 +21,8 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 
-import eu.etaxonomy.cdm.io.common.ImportWrapper;
 import eu.etaxonomy.taxeditor.actions.TaxEditorActionFactory;
 import eu.etaxonomy.taxeditor.actions.io.ExportAction;
-import eu.etaxonomy.taxeditor.actions.io.ImportAction;
 import eu.etaxonomy.taxeditor.controller.GlobalController;
 
 /**
@@ -108,13 +105,13 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 
 	private void makeImportActions() {
 		
-		importActionList = new ArrayList<IAction>();
-		
-		for (ImportWrapper wrapper : ImportWrapper.list()) {
-			IAction importAction = new ImportAction(wrapper);
-			register(importAction);
-			importActionList.add(importAction);		
-		}
+//		importActionList = new ArrayList<IAction>();
+//		
+//		for (ImportWrapper wrapper : ImportWrapper.list()) {
+//			IAction importAction = new ImportAction(wrapper);
+//			register(importAction);
+//			importActionList.add(importAction);		
+//		}
 	}
 	
 	private MenuManager FILE_MENU(){
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
index c7f2c22ad..48233e70c 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
@@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
+import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
 import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
 import eu.etaxonomy.taxeditor.datasource.CdmTransactionController;
@@ -169,6 +170,10 @@ public class TaxEditorPlugin extends AbstractUIPlugin {
 		CdmDataSourceRepository.getDefault().setCdmApplicationController(applicationController);
 		CdmSessionDataRepository.getDefault().setApplicationController(applicationController);
 		
+		// Terms have to be initialized explicitly as of now
+		DefaultTermInitializer vocabularyStore = new DefaultTermInitializer();
+		vocabularyStore.initialize();
+		
 		return applicationController;
 	}
 	
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ExportAction.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ExportAction.java
index a719b848d..7cf0ae7e8 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ExportAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ExportAction.java
@@ -13,14 +13,11 @@ import java.io.File;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
-import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator;
 import eu.etaxonomy.taxeditor.controller.GlobalController;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
 
@@ -75,18 +72,19 @@ public class ExportAction extends Action {
 //			destination = file.toURI().toURL().toString();
 		destination = file.toString();
 		
-		JaxbExportConfigurator configurator = JaxbExportConfigurator.NewInstance(source, destination);
-		CdmDefaultExport<JaxbExportConfigurator> jaxbExport = 
-				new CdmDefaultExport<JaxbExportConfigurator>();
+		// TODO i/o has changed drastically in cdmlib. 
+//		JaxbExportConfigurator configurator = JaxbExportConfigurator.NewInstance(source, destination);
+//		CdmDefaultExport<JaxbExportConfigurator> jaxbExport = 
+//				new CdmDefaultExport<JaxbExportConfigurator>();
 		
 		// Start export
-		boolean isSuccessfulExport = jaxbExport.invoke(configurator);
-		
-		// Tell user whether import was a success or a dismal failure
-		if (isSuccessfulExport) {
-			MessageDialog.openInformation(GlobalController.getShell(), title, "Export successful");
-		} else {
-			MessageDialog.openError(GlobalController.getShell(), title, "Export was unsuccessful.");
-		}
+//		boolean isSuccessfulExport = jaxbExport.invoke(configurator);
+//		
+//		// Tell user whether import was a success or a dismal failure
+//		if (isSuccessfulExport) {
+//			MessageDialog.openInformation(GlobalController.getShell(), title, "Export successful");
+//		} else {
+//			MessageDialog.openError(GlobalController.getShell(), title, "Export was unsuccessful.");
+//		}
 	}
 }
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ImportAction.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ImportAction.java
index 26a3d6c59..34e7d1b30 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ImportAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ImportAction.java
@@ -18,8 +18,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.widgets.FileDialog;
 
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.io.common.ImportWrapper;
-import eu.etaxonomy.taxeditor.controller.TreeController;
 import eu.etaxonomy.taxeditor.controller.GlobalController;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
 
@@ -37,7 +35,7 @@ public class ImportAction extends Action {
 
 	private FileDialog dialog;
 	private File file;
-	private ImportWrapper importWrapper;
+//	private ImportWrapper importWrapper;
 	
 	private ImportAction() {
 		super(text);
@@ -45,12 +43,14 @@ public class ImportAction extends Action {
 		setId(ID);
 	}
 
-	public ImportAction(ImportWrapper importWrapper) {
-		this();
-		
-		this.importWrapper = importWrapper;
-		setText(importWrapper.getLabel());
-	}
+//	public ImportAction(ImportWrapper importWrapper) {
+//		this();
+//		
+//		this.importWrapper = importWrapper;
+//		setText(importWrapper.getLabel());
+//	}
+
+	
 
 	public void run() {
 
@@ -89,15 +89,15 @@ public class ImportAction extends Action {
 		}
 		
 		// Start import
-		boolean isSuccessfulImport = importWrapper.invoke(source, destination, null);
-		
-		// Tell user whether import was a success or a dismal failure
-		if (isSuccessfulImport) {
-			MessageDialog.openInformation(GlobalController.getShell(), title, "Import successful");
-			TreeController.getTreeViewer().refresh();
-		} else {
-			MessageDialog.openError(GlobalController.getShell(), title, "Import was unsuccessful.");
-		}
+//		boolean isSuccessfulImport = importWrapper.invoke(source, destination, null);
+//		
+//		// Tell user whether import was a success or a dismal failure
+//		if (isSuccessfulImport) {
+//			MessageDialog.openInformation(GlobalController.getShell(), title, "Import successful");
+//			TreeController.getTreeViewer().refresh();
+//		} else {
+//			MessageDialog.openError(GlobalController.getShell(), title, "Import was unsuccessful.");
+//		}
 		
 	}
 }
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenTaxonEditorAction.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenTaxonEditorAction.java
index 9307c1581..a5be758f3 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenTaxonEditorAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenTaxonEditorAction.java
@@ -71,7 +71,6 @@ public class OpenTaxonEditorAction extends Action implements ActionFactory.IWork
 		taxon = null;
 	}
 
-	@Override
 	public void dispose() {
 	}
 }
\ No newline at end of file
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
index ebd31ac2b..e25df78a7 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
@@ -72,29 +72,29 @@ public class CdmDataSourceRepository implements ICdmDataSourceRepository {
 		return repository;
 	}
 
-	@Override
+	
 	public boolean add(ICdmDataSource dataSource) {
 		return getDataSources().add(dataSource);
 	}
 
 
-	@Override
+	
 	public boolean delete(CdmPersistentDataSource dataSource) {
 		CdmPersistentDataSource.delete(dataSource);
 		return remove(dataSource);
 	}
 
-	@Override
+	
 	public boolean remove(ICdmDataSource dataSource) {
 		return getDataSources().remove(dataSource);
 	}
 	
-	@Override
+	
 	public List<ICdmDataSource> getAll() {
 		return getDataSources();
 	}
 		
-	@Override
+	
 	public ICdmDataSource getCurrentDataSource() {
 		if (currentDataSource == null) {
 			throw new IllegalStateException("Current data source not set.");
@@ -102,7 +102,7 @@ public class CdmDataSourceRepository implements ICdmDataSourceRepository {
 		return currentDataSource;
 	}
 
-	@Override
+	
 	public boolean setCurrentDataSource(ICdmDataSource dataSource) {
 		if (currentDataSource != null) {
 			if (!changeDataSource(dataSource)) {
@@ -113,7 +113,7 @@ public class CdmDataSourceRepository implements ICdmDataSourceRepository {
 		return true;
 	}
 
-	@Override
+	
 	public void setCdmApplicationController(
 			CdmApplicationController cdmAppController) {
 		this.cdmAppController = cdmAppController;		
@@ -145,7 +145,7 @@ public class CdmDataSourceRepository implements ICdmDataSourceRepository {
 		try {
 			IRunnableWithProgress op = new IRunnableWithProgress() {
 
-				@Override
+				
 				public void run(IProgressMonitor monitor)
 						throws InvocationTargetException, InterruptedException {
 				
@@ -197,7 +197,7 @@ public class CdmDataSourceRepository implements ICdmDataSourceRepository {
 		return true;
 	}
 
-	@Override
+	
 	public CdmPersistentDataSource save(String dataSourceName, DatabaseTypeEnum databaseType,
 			String server, String database, int port, String username,
 			String password) {
@@ -207,7 +207,7 @@ public class CdmDataSourceRepository implements ICdmDataSourceRepository {
 		return dataSource;
 	}
 	
-	@Override
+	
 	public CdmPersistentDataSource save(String dataSourceName, DatabaseTypeEnum databaseType,
 			String server, String database, String username, String password) {
 		CdmPersistentDataSource dataSource = CdmPersistentDataSource.save(
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmTransactionController.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmTransactionController.java
index 970335d04..2564741a2 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmTransactionController.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmTransactionController.java
@@ -63,7 +63,7 @@ public class CdmTransactionController {
 		list.add(NomenclaturalStatusType.COMBINATION_INVALID());
 		list.add(NomenclaturalStatusType.VALID());
 		for (NomenclaturalStatusType status : list){
-			applicationController.getTermService().saveTerm(status);
+			//applicationController.getTermService().saveTerm(status);
 		}
 	}
 
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
index 43fccac9d..538d5a14e 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
@@ -255,48 +255,48 @@ public abstract class AbstractTaxonEditor extends EditorPart implements
 //	        IWorkbenchPart active = activePage.getActivePart();
 	        IPartListener2 partListener = new IPartListener2() {
 
-				@Override
+				
 				public void partActivated(IWorkbenchPartReference partRef) {
 					// Fires for every part
 //					logger.warn(partRef.getTitle());
 				}
 
-				@Override
+				
 				public void partBroughtToTop(IWorkbenchPartReference partRef) {
 					// TODO Auto-generated method stub
 					
 				}
 
-				@Override
+				
 				public void partClosed(IWorkbenchPartReference partRef) {
 					// TODO Auto-generated method stub
 					
 				}
 
-				@Override
+				
 				public void partDeactivated(IWorkbenchPartReference partRef) {
 					// TODO Auto-generated method stub
 					
 				}
 
-				@Override
+				
 				public void partHidden(IWorkbenchPartReference partRef) {
 					// TODO Auto-generated method stub
 					
 				}
 
-				@Override
+				
 				public void partInputChanged(IWorkbenchPartReference partRef) {
 //					logger.warn("part input changed");
 				}
 
-				@Override
+				
 				public void partOpened(IWorkbenchPartReference partRef) {
 					// TODO Auto-generated method stub
 					
 				}
 
-				@Override
+				
 				public void partVisible(IWorkbenchPartReference partRef) {
 					// TODO Auto-generated method stub
 					
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java
index 8f10d18bd..623fc8adf 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java
@@ -51,12 +51,12 @@ public class CompositeBorderDecorator implements FocusListener {
 		
 	}
 	
-	@Override
+	
 	public void focusGained(FocusEvent e) {
 		paintBorder();
 	}
 
-	@Override
+	
 	public void focusLost(FocusEvent e) {
 		if (doLoseFocus) {
 			unpaintBorder();
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java
index 85be27bef..3f9c55896 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java
@@ -95,7 +95,7 @@ public class EmptyTextViewerPrompt implements IDocumentListener {
 		textControl.addFocusListener(focusListener);
 		textControl.addDisposeListener(new DisposeListener() {
 
-			@Override
+			
 			public void widgetDisposed(DisposeEvent e) {
 				focusListener = null;
 			}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
index 6d046a3b3..07a4dcc49 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
@@ -64,7 +64,7 @@ public class ErrorAnnotation extends Annotation implements IAnnotationPresentati
         this.position = position;
     }
 
-	@Override
+	
 	public void paint(GC gc, Canvas canvas, Rectangle bounds) {
 		Point canvasSize= canvas.getSize();
 
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
index a56efd23c..65c9c080a 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
@@ -101,7 +101,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 		return synonymComposite;
 	}
 	
-	@Override
+	
 	public Composite createMisappliedName(Taxon taxon, Taxon misappliedName) {
 
 		// Get the taxon's form
@@ -172,7 +172,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 		return form.getForm().getBody();
 	}
 
-	@Override
+	
 	public Composite createConcept(Taxon taxon, TaxonRelationship relationship) {
 		// Get the taxon's form
 		IManagedForm form = getNameForm(taxon);
@@ -193,7 +193,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 		return composite;
 	}
 
-	@Override
+	
 	public Composite createConceptGroup(Taxon taxon) {
 		
 		// Get the taxon's form
@@ -215,7 +215,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 
 	}
 
-	@Override
+	
 	public Composite createDescriptionLabel(IManagedForm form, Taxon taxon,
 			TaxonDescription description) {
 		
@@ -234,7 +234,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 		return labelComposite;
 	}
 
-	@Override
+	
 	public Composite createDescriptionElement(Taxon taxon, TaxonDescription description,
 			DescriptionElementBase element) {
 		
@@ -260,7 +260,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 		return elementComposite;
 	}
 
-	@Override
+	
 	public Composite createDescriptionGroup(Taxon taxon,
 			TaxonDescription description) {
 		
@@ -276,7 +276,7 @@ public class FreeTextElementFactory implements IFreeTextElementFactory {
 		return groupComposite;
 	}
 		
-	@Override
+	
 	public Composite createDescriptionFeatureGroup(Taxon taxon,
 			TaxonDescription description, Feature feature) {
 
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
index 48ab3fc38..5a2f4f4f3 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
@@ -81,7 +81,7 @@ public class GroupComposite extends Composite {
 								
 								// Change parent at end of drag event
 								composite.getDragSource().addListener(DND.DragEnd, new Listener() {
-									@Override
+									
 									public void handleEvent(Event event) {
 										composite.setParent(GroupComposite.this);
 									}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
index b482c056a..50d1412e3 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
@@ -201,7 +201,7 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
 				.getFont(ITaxEditorConstants.DEFAULT_PROMPT_FONT);
 		setFocusListener(new FocusListener() {
 
-			@Override
+			
 			public void focusGained(FocusEvent e) {
 				if (document.get().equals(prompt)) {
 					textControl.setFont(getViewerFont());
@@ -209,7 +209,7 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
 				}
 			}
 
-			@Override
+			
 			public void focusLost(FocusEvent e) {
 				if (document.getLength() == 0) {
 					initEmptyText();
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/LineBreakListener.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
index 0e70a9693..0f63607cd 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
@@ -105,10 +105,10 @@ public abstract class LineBreakListener implements VerifyListener, KeyListener {
 		}
 	}
 	
-	@Override
+	
 	public void keyPressed(KeyEvent e) {}
 
-	@Override
+	
 	public void keyReleased(KeyEvent e) {
 		if (splitTexts != null) {
 			for (String text : splitTexts) {
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/MenuConstants.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/MenuConstants.java
index 085909c4c..129682681 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/MenuConstants.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/MenuConstants.java
@@ -40,12 +40,12 @@ public class MenuConstants {
 		taxonEditorMenu.add(new Separator());			
 		taxonEditorMenu.add(new CreateMisappliedNameAction());
 		
-		MenuManager subMenu = new MenuManager("Create concept relation");
-		for (TaxonRelationshipType type : 
-				CdmSessionDataRepository.getDefault().getConceptRelationshipTypes()) {
-			subMenu.add(new CreateConceptRelationAction(type));
-		}
-		taxonEditorMenu.add(subMenu);
+//		MenuManager subMenu = new MenuManager("Create concept relation");
+//		for (TaxonRelationshipType type : 
+//				CdmSessionDataRepository.getDefault().getConceptRelationshipTypes()) {
+//			subMenu.add(new CreateConceptRelationAction(type));
+//		}
+//		taxonEditorMenu.add(subMenu);
 		taxonEditorMenu.add(new Separator());
 		taxonEditorMenu.add(new MoveTaxonDialogAction());
 		taxonEditorMenu.add(new ChangeTaxonToSynonymAction());
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
index df2443f1a..c91300b53 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
@@ -133,7 +133,7 @@ public class DescriptionElementComposite extends GroupedComposite {
 		});
 	}
 
-	@Override
+	
 	public IPropertySource getPropertySource() {
 		return new DescriptionElementPropertySource(getElement());
 	}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
index 614ced172..fcd04f287 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
@@ -133,7 +133,6 @@ public class DescriptionLabelComposite extends GroupedComposite {
 		setDirty(true);		
 	}
 	
-	@Override
 	public IPropertySource getPropertySource() {
 		return new TaxonDescriptionPropertySource(getDescription());
 	}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
index e48e2a5c3..9f5edd632 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
@@ -143,7 +143,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
 		super.firePropertyChange(propertyId);
 	}
 	
-	@Override
+	
 	public Composite getDescriptionElement(DescriptionElementBase element) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof DescriptionElementComposite){
@@ -156,7 +156,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getDescriptionFeatureGroup(TaxonDescription description,
 			Feature feature) {
 		for(Composite c : getAllComposites()){
@@ -170,7 +170,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getDescriptionGroup(TaxonDescription description) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof DescriptionGroupComposite){
@@ -183,7 +183,7 @@ public class TaxonDescriptionEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getDescriptionLabel(TaxonDescription description) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof DescriptionLabelComposite){
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
index a93084fac..6a7f72b46 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
@@ -87,7 +87,7 @@ public class AcceptedNameComposite extends NameComposite {
 		textViewer.getTextWidget().setMenu(contextMenu.getMenu());
 	}
 
-	@Override
+	
 	public IPropertySource getPropertySource() {
 		return new TaxonBasePropertySource(taxon, "Accepted Name");
 	}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
index db213742b..163cc776c 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
@@ -120,7 +120,7 @@ public class ConceptComposite extends NameComposite {
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.editor.IHasPropertySource#getPropertySource()
 	 */
-	@Override
+	
 	public IPropertySource getPropertySource() {
 		return new TaxonBasePropertySource(relatedTaxon, "Concept Name");
 	}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
index 08aec33df..d36f0e358 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
@@ -163,12 +163,12 @@ public class SynonymComposite extends NameComposite {
 		contextMenu.addAction(new CreateNewTaxonFromSynonymAction(taxon, synonym));
 	}
 
-	@Override
+	
 	public IPropertySource getPropertySource() {
 		return new TaxonBasePropertySource(synonym, "Synonym Name");
 	}
 
-	@Override
+	
 	protected Font getViewerFont() {
 		return SYNONYM_FONT;
 	}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index 07d3037de..c24dd01cb 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -149,7 +149,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 						
 							// Execute operations at end of drag event
 							composite.getDragSource().addListener(DND.DragEnd, new Listener() {
-								@Override
+						
 								public void handleEvent(Event event) {
 									IUndoContext undoContext = EditorController.getUndoContext(getTaxon());
 									IUndoableOperation operation = null;
@@ -190,7 +190,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		composite.layout();
 	}
 		
-	@Override
+	
 	public Composite getAcceptedName() {
 		for(Composite c : getAllComposites()){
 			if(c instanceof AcceptedNameComposite){
@@ -200,7 +200,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getHomotypicGroup(HomotypicalGroup group) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof HomotypicalGroupComposite){
@@ -213,7 +213,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getMisappliedGroup() {
 		for(Composite c : getAllComposites()){
 			if(c instanceof MisappliedGroupComposite){
@@ -223,7 +223,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getMisappliedName(Taxon misappliedName) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof MisappliedNameComposite){
@@ -236,7 +236,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getSynonym(Synonym synonym) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof SynonymComposite){
@@ -249,7 +249,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getConceptGroup() {
 		for(Composite c : getAllComposites()){
 			if(c instanceof ConceptGroupComposite){
@@ -259,7 +259,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
 		return null;
 	}
 
-	@Override
+	
 	public Composite getConcept(Taxon relatedConcept) {
 		for(Composite c : getAllComposites()){
 			if(c instanceof ConceptComposite){
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/AddTaxonomicChildHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/AddTaxonomicChildHandler.java
index 2c46ff12e..ae9382440 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/AddTaxonomicChildHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/AddTaxonomicChildHandler.java
@@ -34,7 +34,6 @@ public class AddTaxonomicChildHandler extends AbstractHandler implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
 		Taxon parentTaxon = TreeController.getCurrentSelection(event);
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHeterotypicSynonymHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHeterotypicSynonymHandler.java
index 639ec900c..ce889cd47 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHeterotypicSynonymHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHeterotypicSynonymHandler.java
@@ -35,7 +35,6 @@ public class CreateHeterotypicSynonymHandler extends AbstractHandler implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		Taxon taxon = EditorController.getActiveEditor().getTaxon();
 		
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHomotypicSynonymHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHomotypicSynonymHandler.java
index 6ca1ec5f3..f5dc3c7bb 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHomotypicSynonymHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHomotypicSynonymHandler.java
@@ -36,7 +36,6 @@ public class CreateHomotypicSynonymHandler extends AbstractHandler implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		Taxon taxon = EditorController.getActiveEditor().getTaxon();
 		HomotypicalGroup group = taxon.getHomotypicGroup();
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/DeleteTaxonHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/DeleteTaxonHandler.java
index 531eb822c..cbfd75ac9 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/DeleteTaxonHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/DeleteTaxonHandler.java
@@ -35,7 +35,6 @@ public class DeleteTaxonHandler extends AbstractHandler implements IHandler {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		Taxon taxon = TreeController.getCurrentSelection(event);
 		
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/NewTaxonHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/NewTaxonHandler.java
index 832e6ace6..d2e9d4267 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/NewTaxonHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/NewTaxonHandler.java
@@ -30,7 +30,6 @@ public class NewTaxonHandler extends AbstractHandler implements IHandler {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
 		EditorController.openUnitializedRootTaxon();
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/OpenTaxonHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/OpenTaxonHandler.java
index 5f3cf6fda..cb84b324f 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/OpenTaxonHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/OpenTaxonHandler.java
@@ -29,7 +29,6 @@ public class OpenTaxonHandler extends AbstractHandler{
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		EditorController.open(TreeController.getCurrentSelection(event));
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/SaveAllHandler.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/SaveAllHandler.java
index 52288d367..94d7d71f8 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/SaveAllHandler.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/SaveAllHandler.java
@@ -35,7 +35,6 @@ public class SaveAllHandler extends AbstractHandler implements IHandler {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
-	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		logger.debug("Save all handler called.");
 		EditorController.setSaving(true);
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
index 5bfc0de3f..86229872e 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
@@ -97,13 +97,13 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		getObservableTaxa().addSetChangeListener(new observableTaxaListener());
 	}
 	
-	@Override
+	
 	public void clearAllData() {
 		clearTaxonData();
 		clearNonTaxonData();
 	}
 
-	@Override
+	
 	public void clearTaxonData() {
 		removeAllTaxa();
 		
@@ -111,7 +111,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		RecentNamesView.clearRecentNames();
 	}
 
-	@Override
+	
 	public void clearNonTaxonData() {
 		features = null;
 		ranks = null;
@@ -124,7 +124,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		CdmParserController.clearNonViralNameParser();
 	}
 
-	@Override
+	
 	public void setApplicationController(CdmApplicationController applicationController) {
 		this.applicationController = applicationController;
 	}
@@ -144,19 +144,19 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return applicationController;
 	}
 
-	@Override
+	
 	public ReferenceBase getDefaultSec() {
 		// TODO why is this returning null? and of course, replace w the real deal
 		return getApplicationController().getReferenceService().getReferenceByUuid(
 				UUID.fromString("f3593c18-a8d2-4e51-bdad-0befbf8fb2d1"));
 	}
 
-	@Override
+	
 	public Set<Taxon> getRootTaxa() {
 		return getTaxonomicChildren(null);
 	}
 	
-	@Override
+	
 	public Set<Taxon> getTaxonomicChildren(Taxon parentTaxon) {
 				
 		// Check whether the map contains children for parentTaxon
@@ -218,7 +218,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		getObservableTaxa().add(taxon);
 	}
 	
-	@Override
+	
 	public void addTaxon(Taxon taxon) {
 				
 		// Add taxon to its parent's child map
@@ -229,7 +229,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		addTaxonIntern(taxon);
 	}
 
-	@Override
+	
 	public IObservableSet getObservableTaxa() {
 		if (observableTaxonSet == null) {
 			Realm realm = SWTObservables.getRealm(Display.getDefault());
@@ -238,7 +238,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return observableTaxonSet;
 	}
 
-	@Override
+	
 	public boolean deleteTaxon(Taxon taxon) {
 		
 		// Remove taxon from repository collections
@@ -268,7 +268,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		}
 	}
 
-	@Override
+	
 	public void removeTaxon(Taxon taxon) {
 		
 		// Recursively remove all children, children's children, etc.
@@ -303,19 +303,19 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		}
 	}
 
-	@Override
+	
 	public Collection<Taxon> getAllTaxa() {
 		return getObservableTaxa();
 	}
 	
-	@Override
+	
 	public void removeAllTaxa() {
 		taxonomicChildrenMap.clear();
 		observableTaxonSet.clear();
 	}
 
 
-	@Override
+	
 	public boolean saveTaxon(Taxon taxon) {
 		
 		// If this is not in the list of observable taxa, add
@@ -337,7 +337,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return observableTaxonSet.contains(taxon);
 	}
 
-	@Override
+	
 	public void setTaxonomicParent(Taxon taxon, Taxon newParentTaxon) {
 		
 		// Get old taxonomic parent
@@ -358,7 +358,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		}
 	}
 	
-	@Override
+	
 	public TermVocabulary<Feature> getFeatures() {
 		if (features == null) {
 			features = getApplicationController().getDescriptionService().
@@ -367,7 +367,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return features;
 	}
 	
-	@Override
+	
 	public SortedSet<Rank> getRanks() {
 		if (ranks == null) {
 			
@@ -378,7 +378,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return ranks;
 	}
 
-	@Override
+	
 	public TermVocabulary<NomenclaturalStatusType> getNomStatus() {
 		if (nomStatus == null) {
 			nomStatus = getApplicationController().getNameService()
@@ -387,7 +387,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return nomStatus;
 	}
 	
-	@Override
+	
 	public SortedSet<NameRelationshipType> getNameRelationshipTypes() {
 		if (nameRelationshipTypes == null) {
 			TermVocabulary<NameRelationshipType> nameRelationshipTypesUnsorted = 
@@ -407,7 +407,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return nameRelationshipTypes;
 	}
 	
-	@Override
+	
 	public void addTaxonSetListener(ICdmTaxonSetListener listener) {
 		
 		if (listeners == null) { 
@@ -417,7 +417,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 	}
 	
 	class observableTaxaListener implements ISetChangeListener {
-		@Override
+		
 		public void handleSetChange(SetChangeEvent event) {
 			if (event.diff != null) {
 				Set<Taxon> additions = event.diff.getAdditions();
@@ -439,7 +439,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		}		
 	}
 
-	@Override
+	
 	public OrderedTermVocabulary<TaxonRelationshipType> getTaxonRelationshipTypes() {
 		if (taxonRelationshipTypes == null) {
 			taxonRelationshipTypes = getApplicationController().getTaxonService().
@@ -448,7 +448,7 @@ public class CdmSessionDataRepository implements ICdmSessionDataRepository {
 		return taxonRelationshipTypes;
 	}
 
-	@Override
+	
 	public Set<TaxonRelationshipType> getConceptRelationshipTypes() {
 		if (conceptRelationshipTypes == null) {
 			conceptRelationshipTypes = getTaxonRelationshipTypes().getTerms();
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResult.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResult.java
index f5ca0a16c..ae0b5d72d 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResult.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResult.java
@@ -28,67 +28,67 @@ public class SearchResult implements Collection<IdentifiableEntity> {
 
 	List<IdentifiableEntity> searchResult = new ArrayList<IdentifiableEntity>();
 	
-	@Override
+	
 	public boolean add(IdentifiableEntity e) {
 		return searchResult.add(e);
 	}
 
-	@Override
+	
 	public boolean addAll(Collection<? extends IdentifiableEntity> c) {
 		return searchResult.addAll(c);
 	}
 
-	@Override
+	
 	public void clear() {
 		searchResult.clear();
 	}
 
-	@Override
+	
 	public boolean contains(Object o) {
 		return searchResult.contains(o);
 	}
 
-	@Override
+	
 	public boolean containsAll(Collection<?> c) {
 		return searchResult.containsAll(c);
 	}
 
-	@Override
+	
 	public boolean isEmpty() {
 		return searchResult.isEmpty();
 	}
 
-	@Override
+	
 	public Iterator<IdentifiableEntity> iterator() {
 		return searchResult.iterator();
 	}
 
-	@Override
+	
 	public boolean remove(Object o) {
 		return searchResult.remove(o);
 	}
 
-	@Override
+	
 	public boolean removeAll(Collection<?> c) {
 		return searchResult.removeAll(c);
 	}
 
-	@Override
+	
 	public boolean retainAll(Collection<?> c) {
 		return searchResult.retainAll(c);
 	}
 
-	@Override
+	
 	public int size() {
 		return searchResult.size();
 	}
 
-	@Override
+	
 	public Object[] toArray() {
 		return searchResult.toArray();
 	}
 
-	@Override
+	
 	public <T> T[] toArray(T[] a) {
 		return searchResult.toArray(a);
 	}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
index a85eb5b44..e68c63fca 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
@@ -46,6 +46,7 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.taxeditor.ITaxEditorConstants;
 import eu.etaxonomy.taxeditor.TaxEditorPlugin;
 import eu.etaxonomy.taxeditor.actions.ui.OpenTaxonEditorAction;
+import eu.etaxonomy.taxeditor.controller.EditorController;
 import eu.etaxonomy.taxeditor.controller.GlobalController;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceDialog;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
@@ -148,7 +149,7 @@ public class TaxonomicTreeView extends ViewPart {
 
 				@Override
 				public void linkActivated(HyperlinkEvent e) {
-					new OpenTaxonEditorAction().run();
+					EditorController.openUnitializedRootTaxon();
 				}				
 			});
 			
@@ -267,6 +268,7 @@ public class TaxonomicTreeView extends ViewPart {
 		treeViewer = new TaxonomicTreeViewer(taxTreeComposite);
 		
 		((TaxonomicTreeViewer) treeViewer).createDoubleClickListener();
+		// TODO old menu implementation remove when the new one works well
 //		((TaxonomicTreeViewer) treeViewer).createMenu();
 		((TaxonomicTreeViewer) treeViewer).createQuickAdd();
 		((TaxonomicTreeViewer) treeViewer).createDragAndDrop();
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeViewer.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeViewer.java
index a003a5698..89189ea9d 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeViewer.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeViewer.java
@@ -341,7 +341,7 @@ public class TaxonomicTreeViewer extends TreeViewer{
 		CdmSessionDataRepository.getDefault().
 				addTaxonSetListener(new ICdmTaxonSetListener() {
 
-			@Override
+			
 			public void taxaAdded(Set<Taxon> taxa) {
 				Taxon lastTaxon = null;
 				for (Taxon taxon : taxa) {
@@ -353,14 +353,14 @@ public class TaxonomicTreeViewer extends TreeViewer{
 				expandToLevel(lastTaxon, 1);
 			}
 
-			@Override
+			
 			public void taxaRemoved(Set<Taxon> taxa) {
 				for (Taxon taxon : taxa) {
 					remove(taxon);
 				}
 			}
 
-			@Override
+			
 			public void taxonMoved(Taxon taxon, Taxon newParentTaxon) {
 				
 				// Save any selection and expansion info ...
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index b0241f822..3b302b7b0 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -64,9 +64,9 @@ public class PreferencesUtil {
 		String nameCodePreference = getNameCodePreference();
 				
 		if (nameCodePreference.equals(ITaxEditorConstants.CODE_PREFERENCE_ICBN)) {
-			return NomenclaturalCode.ICBN();
+			return NomenclaturalCode.ICBN;
 		} else if (nameCodePreference.equals(ITaxEditorConstants.CODE_PREFERENCE_ICZN)) {
-			return NomenclaturalCode.ICZN();
+			return NomenclaturalCode.ICZN;
 		}
 		return null;
 	}
@@ -244,9 +244,9 @@ public class PreferencesUtil {
 			setDefaultNomenclaturalCode();
 		}
 		
-		if (code.equals(NomenclaturalCode.ICBN())) {
+		if (code.equals(NomenclaturalCode.ICBN)) {
 			return BotanicalName.NewInstance(null);
-		} else if (code.equals(NomenclaturalCode.ICZN())) {
+		} else if (code.equals(NomenclaturalCode.ICZN)) {
 			return ZoologicalName.NewInstance(null);			
 		}
 		return NonViralName.NewInstance(null);
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
index 512735c92..d0bfe102c 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
@@ -23,7 +23,7 @@ public class DayValidator implements ICellEditorValidator {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ICellEditorValidator#isValid(java.lang.Object)
 	 */
-	@Override
+	
 	public String isValid(Object value) {
 		
 		String msg = "Value in day field must be an integer between 1-31."; 
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
index 71df0c229..95a6fd894 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
@@ -30,7 +30,6 @@ import eu.etaxonomy.taxeditor.controller.GlobalController;
 import eu.etaxonomy.taxeditor.propertysheet.reference.IReferenceSearch;
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferencePropertySource;
 import eu.etaxonomy.taxeditor.propertysheet.reference.ReferenceSearchDescriptor;
-import eu.etaxonomy.taxeditor.propertysheet.type.TypePropertyDescriptor;
 
 /**
  * @author p.ciardelli
@@ -78,15 +77,15 @@ public class TaxonBasePropertySource implements IPropertySource {
 				}
 			});
 		}
-		if (id.equals(P_ID_TYPES)) {
-			descriptors.addElement(
-				new TypePropertyDescriptor(P_ID_TYPES, P_TYPES, taxon.getName()) {
-					protected void saveTypes(Set set) {
-						setPropertyValue(P_ID_TYPES, set);
-					}
-				}
-			);
-		};
+//		if (id.equals(P_ID_TYPES)) {
+//			descriptors.addElement(
+//				new TypePropertyDescriptor(P_ID_TYPES, P_TYPES, taxon.getName()) {
+//					protected void saveTypes(Set set) {
+//						setPropertyValue(P_ID_TYPES, set);
+//					}
+//				}
+//			);
+//		};
 	}
 	
 	/* (non-Javadoc)
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
index 3eeb862dd..b7ed982d3 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
@@ -180,11 +180,11 @@ public class ListTypeWizardPage extends WizardPage {
 //			new OpenNameRelationWizardAction(name, relation).run();
 //		}
 		
-		Wizard wizard = new TypeDesignationWizard(typeDesignation, name);
-		
-		WizardDialog dialog = new WizardDialog(GlobalController.getShell(), wizard);
-		dialog.create();
-		dialog.open();
+//		Wizard wizard = new TypeDesignationWizard(typeDesignation, name);
+//		
+//		WizardDialog dialog = new WizardDialog(GlobalController.getShell(), wizard);
+//		dialog.create();
+//		dialog.open();
 	}
 
 	protected void setEnableTypeDesignationButtons(boolean enabled) {
-- 
2.34.1