migrating to cdmlib-plugin 2.0.0.20 including new term loading
authorn.hoffmann <n.hoffmann@localhost>
Tue, 24 Feb 2009 13:35:30 +0000 (13:35 +0000)
committern.hoffmann <n.hoffmann@localhost>
Tue, 24 Feb 2009 13:35:30 +0000 (13:35 +0000)
45 files changed:
.gitignore [new file with mode: 0644]
eclipseprojects/eu.etaxonomy.taxeditor/.classpath
eclipseprojects/eu.etaxonomy.taxeditor/META-INF/MANIFEST.MF
eclipseprojects/eu.etaxonomy.taxeditor/build.properties
eclipseprojects/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eclipseprojects/eu.etaxonomy.taxeditor/log4j.properties
eclipseprojects/eu.etaxonomy.taxeditor/plugin.xml
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/TaxEditorPlugin.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ExportAction.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/io/ImportAction.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenTaxonEditorAction.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/datasource/CdmTransactionController.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/CompositeBorderDecorator.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/EmptyTextViewerPrompt.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/ErrorAnnotation.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/FreeTextElementFactory.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/LineBreakListener.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/MenuConstants.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/TaxonDescriptionEditor.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/AcceptedNameComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/SynonymComposite.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/AddTaxonomicChildHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHeterotypicSynonymHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/CreateHomotypicSynonymHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/DeleteTaxonHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/NewTaxonHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/OpenTaxonHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/handlers/SaveAllHandler.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/CdmSessionDataRepository.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/SearchResult.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeView.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/navigation/TaxonomicTreeViewer.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/DayValidator.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java

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