migrated to library version 2.3 and fixed #998

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index 51c815aead633aeb6955b10b01d38ab352d432da..930aa29f816cc0336fd386d021a599123e8bb8ca 100644 (file)
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -1,18 +1,11 @@
-Manifest-Version: 1.0\r
-Bundle-ManifestVersion: 2\r
-Bundle-Name: EDIT Taxonomic Editor\r
-Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true\r
-Bundle-Version: 2.0.1.qualifier\r
-Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin\r
-Bundle-Vendor: EDIT\r
-Export-Package: eu.etaxonomy.taxeditor\r
-Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",\r
- org.eclipse.ui.ide;bundle-version="3.4.1",\r
- org.eclipse.core.runtime;bundle-version="3.4.0",\r
- eu.etaxonomy.cdmlib;bundle-version="2.1.0",\r
- eu.etaxonomy.taxeditor.store;bundle-version="1.0.0",\r
- eu.etaxonomy.taxeditor.editor;bundle-version="1.0.0",\r
- eu.etaxonomy.taxeditor.navigation;bundle-version="1.0.0",\r
- eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.0.1"\r
-Bundle-ActivationPolicy: lazy\r
-Bundle-Localization: plugin\r
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EDIT Taxonomic Editor
+Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
+Bundle-Version: 2.0.1.qualifier
+Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
+Bundle-Vendor: EDIT
+Bundle-Localization: plugin
+Export-Package: eu.etaxonomy.taxeditor
+Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.1",org.eclipse.core.runtime;bundle-version="3.4.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmlib;bundle-version="2.1.0",eu.etaxonomy.taxeditor.store;bundle-version="1.0.0",eu.etaxonomy.taxeditor.editor;bundle-version="1.0.0",eu.etaxonomy.taxeditor.navigation;bundle-version="1.0.0",eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.0.1"
+Bundle-ActivationPolicy: lazy

diff --git a/taxeditor-application/TaxEditor.product b/taxeditor-application/TaxEditor.product
index 4d201988a951266d38535caa16efb70db70b6b60..6c98689f78c0f93b38ad78581c6e3a9f5f2a3259 100644 (file)
--- a/taxeditor-application/TaxEditor.product
+++ b/taxeditor-application/TaxEditor.product
@@ -1,90 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?pde version="3.4"?>\r
-\r
-<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.1.qualifier" useFeatures="true">\r
-\r
-   <aboutInfo>\r
-      <text>\r
-         %productBlurb\r
-      </text>\r
-   </aboutInfo>\r
-\r
-   <configIni use="default">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
-      <vmArgs>-Xmx256M</vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
-   </launcherArgs>\r
-\r
-   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>\r
-\r
-   <splash\r
-      startupProgressRect="5,447,366,15"\r
-      startupMessageRect="7,432,360,20"\r
-      startupForegroundColor="000000" />\r
-   <launcher name="Taxonomic Editor">\r
-      <solaris/>\r
-      <win useIco="true">\r
-         <ico path="/taxeditor-application/icons/256color_48x48.ico"/>\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-\r
-   <vm>\r
-   </vm>\r
-\r
-   <plugins>\r
-      <plugin id="com.ibm.icu"/>\r
-      <plugin id="eu.etaxonomy.cdmLibrary"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.application"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.editor"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.navigation"/>\r
-      <plugin id="eu.etaxonomy.taxeditor.store"/>\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.resources"/>\r
-      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>\r
-      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.core.runtime"/>\r
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>\r
-      <plugin id="org.eclipse.equinox.app"/>\r
-      <plugin id="org.eclipse.equinox.common"/>\r
-      <plugin id="org.eclipse.equinox.preferences"/>\r
-      <plugin id="org.eclipse.equinox.registry"/>\r
-      <plugin id="org.eclipse.help"/>\r
-      <plugin id="org.eclipse.jface"/>\r
-      <plugin id="org.eclipse.jface.databinding"/>\r
-      <plugin id="org.eclipse.jface.text"/>\r
-      <plugin id="org.eclipse.osgi"/>\r
-      <plugin id="org.eclipse.pde.source"/>\r
-      <plugin id="org.eclipse.swt"/>\r
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.text"/>\r
-      <plugin id="org.eclipse.ui"/>\r
-      <plugin id="org.eclipse.ui.editors"/>\r
-      <plugin id="org.eclipse.ui.forms"/>\r
-      <plugin id="org.eclipse.ui.ide"/>\r
-      <plugin id="org.eclipse.ui.navigator"/>\r
-      <plugin id="org.eclipse.ui.navigator.resources"/>\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.texteditor"/>\r
-      <plugin id="org.junit4"/>\r
-   </plugins>\r
-\r
-   <features>\r
-      <feature id="eu.etaxonomy.taxeditor" version="2.0.1.qualifier"/>\r
-   </features>\r
-\r
-</product>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.1.qualifier" useFeatures="true" includeLaunchers="false">
+
+   <aboutInfo>
+      <text>
+         %productBlurb
+      </text>
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgs>-Xmx256M</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>
+
+   <splash
+      startupProgressRect="5,447,366,15"
+      startupMessageRect="7,432,360,20"
+      startupForegroundColor="000000" />
+   <launcher name="Taxonomic Editor">
+      <solaris/>
+      <win useIco="true">
+         <ico path="/taxeditor-application/icons/256color_48x48.ico"/>
+         <bmp/>
+      </win>
+   </launcher>
+
+
+   <vm>
+   </vm>
+
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="eu.etaxonomy.cdmLibrary" fragment=""/>
+      <plugin id="eu.etaxonomy.taxeditor.application"/>
+      <plugin id="eu.etaxonomy.taxeditor.editor"/>
+      <plugin id="eu.etaxonomy.taxeditor.navigation"/>
+      <plugin id="eu.etaxonomy.taxeditor.store"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.beans"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filebuffers"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.resources"/>
+      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
+      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.jface.text"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.pde.source"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.text"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.editors"/>
+      <plugin id="org.eclipse.ui.forms"/>
+      <plugin id="org.eclipse.ui.ide"/>
+      <plugin id="org.eclipse.ui.navigator"/>
+      <plugin id="org.eclipse.ui.navigator.resources"/>
+      <plugin id="org.eclipse.ui.views"/>
+      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
+      <plugin id="org.eclipse.ui.win32" fragment="true"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.eclipse.ui.workbench.texteditor"/>
+      <plugin id="org.junit4"/>
+   </plugins>
+
+   <features>
+      <feature id="eu.etaxonomy.taxeditor" version="2.1.0.qualifier"/>
+   </features>
+
+
+</product>

diff --git a/taxeditor-bulkeditor/.settings/org.eclipse.jdt.core.prefs b/taxeditor-bulkeditor/.settings/org.eclipse.jdt.core.prefs
index f1a887558fc3f1f51197275cd797f89489e42731..ec2cdbc3d9ec84eebe008daf1f90f549b9d0f8ce 100644 (file)
--- a/taxeditor-bulkeditor/.settings/org.eclipse.jdt.core.prefs
+++ b/taxeditor-bulkeditor/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Thu Jun 25 20:09:50 CEST 2009
+#Fri Oct 16 18:08:11 CEST 2009
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

diff --git a/taxeditor-bulkeditor/META-INF/MANIFEST.MF b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
index bf478e71ede1a89a2b7c004ef8dc5a78291798c8..3a4c6aadba8fdde672d147be425ef1afe1884f67 100644 (file)
--- a/taxeditor-bulkeditor/META-INF/MANIFEST.MF
+++ b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
@@ -5,19 +5,15 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
 Bundle-Version: 2.0.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jface.text;bundle-version="3.4.2",
- org.eclipse.ui.editors,
- org.eclipse.ui.ide,
- org.eclipse.core.resources;bundle-version="3.4.2",
- eu.etaxonomy.cdmlib;bundle-version="2.1.0",
- eu.etaxonomy.taxeditor.editor;bundle-version="2.0.0",
- eu.etaxonomy.taxeditor.store;bundle-version="2.0.0",
- org.eclipse.core.expressions
+Bundle-Vendor: EDIT
+Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
+ eu.etaxonomy.taxeditor.annotatedlineeditor.handler,
+ eu.etaxonomy.taxeditor.bulkeditor,
+ eu.etaxonomy.taxeditor.bulkeditor.command,
+ eu.etaxonomy.taxeditor.bulkeditor.handler,
+ eu.etaxonomy.taxeditor.bulkeditor.input,
+ eu.etaxonomy.taxeditor.bulkeditor.internal,
+ eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
+Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jface.text;bundle-version="3.4.2",org.eclipse.ui.editors,org.eclipse.ui.ide,org.eclipse.core.resources;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.1.0",eu.etaxonomy.taxeditor.editor;bundle-version="2.0.0",eu.etaxonomy.taxeditor.store;bundle-version="2.0.0",org.eclipse.core.expressions
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: eu.etaxonomy.taxeditor.bulkeditor,
- eu.etaxonomy.taxeditor.bulkeditor.handler,
- eu.etaxonomy.taxeditor.bulkeditor.internal
-Bundle-Vendor: EDIT

diff --git a/taxeditor-feature-dependencies/feature.xml b/taxeditor-feature-dependencies/feature.xml
index 8f63f5c86a85732dc1adc2763e08f1806b0e95b7..72b2967bdc7d276460dca3131ef9d962b11ce336 100644 (file)
--- a/taxeditor-feature-dependencies/feature.xml
+++ b/taxeditor-feature-dependencies/feature.xml
@@ -2,16 +2,8 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.dependencies"
       label="Taxeditor Dependencies"
-      version="2.0.1.qualifier"
-      os="macosx,win32">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
+      version="2.1.0.qualifier"
+      os="linux,macosx,win32">
 
    <license url="http://www.example.com/license">
       [Enter License Description here.]
@@ -25,63 +17,63 @@
          id="com.ibm.icu"
          download-size="0"
          install-size="0"
-         version="3.8.1.v20080530"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ant.core"
          download-size="0"
          install-size="0"
-         version="3.2.0.v20080529"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.commands"
          download-size="0"
          install-size="0"
-         version="3.4.0.I20080509-2000"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.contenttype"
          download-size="0"
          install-size="0"
-         version="3.3.0.v20080604-1400"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.databinding"
          download-size="0"
          install-size="0"
-         version="1.1.1.M20080827-0800b"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.databinding.beans"
          download-size="0"
          install-size="0"
-         version="1.1.1.M20080827-0800a"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.expressions"
          download-size="0"
          install-size="0"
-         version="3.4.1.r342_v20081203-0800"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.filebuffers"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080603-2000"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.filesystem"
          download-size="0"
          install-size="0"
-         version="1.2.0.v20080604-1400"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -89,7 +81,7 @@
          os="macosx"
          download-size="0"
          install-size="0"
-         version="1.0.0.v20080604-1400"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -97,28 +89,28 @@
          id="org.eclipse.core.jobs"
          download-size="0"
          install-size="0"
-         version="3.4.1.R34x_v20081128"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.net"
          download-size="0"
          install-size="0"
-         version="1.1.0.I20080604"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.resources"
          download-size="0"
          install-size="0"
-         version="3.4.2.R34x_v20090126"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.resources.compatibility"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080604-1400"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -126,63 +118,63 @@
          id="org.eclipse.core.runtime"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080512"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.runtime.compatibility.auth"
          download-size="0"
          install-size="0"
-         version="3.2.100.v20070502"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.core.runtime.compatibility.registry"
          download-size="0"
          install-size="0"
-         version="3.2.200.v20080610"
+         version="0.0.0"
          fragment="true"/>
 
    <plugin
          id="org.eclipse.core.variables"
          download-size="0"
          install-size="0"
-         version="3.2.100.v20080529-1300"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.app"
          download-size="0"
          install-size="0"
-         version="1.1.0.v20080421-2006"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.common"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080421-2006"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.preferences"
          download-size="0"
          install-size="0"
-         version="3.2.201.R34x_v20080709"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.registry"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080516-0950"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.equinox.security"
          download-size="0"
          install-size="0"
-         version="1.0.1.R34x_v20080721"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -190,7 +182,7 @@
          os="macosx"
          download-size="0"
          install-size="0"
-         version="1.0.0.v20080602-2000"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -198,188 +190,168 @@
          id="org.eclipse.help"
          download-size="0"
          install-size="0"
-         version="3.3.102.v20081014_34x"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.jface"
          download-size="0"
          install-size="0"
-         version="3.4.2.M20090107-0800"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.jface.databinding"
          download-size="0"
          install-size="0"
-         version="1.2.1.M20080827-0800a"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.jface.text"
          download-size="0"
          install-size="0"
-         version="3.4.2.r342_v20081119-0800"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.osgi"
          download-size="0"
          install-size="0"
-         version="3.4.3.R34x_v20081215-1030"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.osgi.services"
          download-size="0"
          install-size="0"
-         version="3.1.200.v20071203"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.pde.source"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080603"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.swt"
          download-size="0"
          install-size="0"
-         version="3.4.2.v3452b"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.swt.carbon.macosx"
-         os="macosx"
-         ws="carbon"
-         download-size="0"
-         install-size="0"
-         version="3.4.1.v3452b"
-         fragment="true"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.text"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080605-1800"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui"
          download-size="0"
          install-size="0"
-         version="3.4.2.M20090204-0800"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.carbon"
-         os="macosx"
-         ws="carbon"
-         download-size="0"
-         install-size="0"
-         version="4.0.0.I20080610-1200"
-         fragment="true"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.editors"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20080603-2000"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.forms"
          download-size="0"
          install-size="0"
-         version="3.3.103.v20081027_34x"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.ide"
          download-size="0"
          install-size="0"
-         version="3.4.2.M20090127-1700"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.navigator"
          download-size="0"
          install-size="0"
-         version="3.3.102.M20090127-1700"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.navigator.resources"
          download-size="0"
          install-size="0"
-         version="3.3.101.M20080910-0800"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.views"
          download-size="0"
          install-size="0"
-         version="3.3.1.M20081112-0800"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.views.properties.tabbed"
          download-size="0"
          install-size="0"
-         version="3.4.2.M20090127-1700"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.workbench"
          download-size="0"
          install-size="0"
-         version="3.4.2.M20090127-1700"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.ui.workbench.texteditor"
          download-size="0"
          install-size="0"
-         version="3.4.1.r341_v20080827-1100"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.update.configurator"
          download-size="0"
          install-size="0"
-         version="3.2.201.R34x_v20080819"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.update.core"
          download-size="0"
          install-size="0"
-         version="3.2.202.R34x_v20081128"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.update.ui"
          download-size="0"
          install-size="0"
-         version="3.2.101.R34x_v20081128"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.junit4"
          download-size="0"
          install-size="0"
-         version="4.3.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.update.core.win32"
          os="win32"
          download-size="0"
          install-size="0"
-         version="3.2.100.v20080107"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -389,7 +361,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="1.1.0.v20080604-1400"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -399,7 +371,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="1.0.0.I20080521"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -409,7 +381,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="3.4.0.v20071204"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -419,7 +391,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="1.0.0.v20080529-1600"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -429,7 +401,7 @@
          arch="x86"
          download-size="0"
          install-size="0"
-         version="3.4.1.v3452b"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -438,7 +410,7 @@
          os="win32"
          download-size="0"
          install-size="0"
-         version="3.2.100.v20080408-0800"
+         version="0.0.0"
          fragment="true"
          unpack="false"/>
 
@@ -465,6 +437,7 @@
    <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.x86"
          os="linux"
+         ws="gtk"
          arch="x86"
          download-size="0"
          install-size="0"
@@ -482,4 +455,176 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.launcher.cocoa.macosx"
+         os="macosx"
+         ws="cocoa"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.win32.win32.x86"
+         os="win32"
+         ws="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.swt.cocoa.macosx"
+         os="macosx"
+         ws="cocoa"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.cocoa"
+         os="macosx"
+         ws="cocoa"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding.property"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.databinding.observable"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.hamcrest.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.artifact.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.jarprocessor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.motif.linux.x86"
+         os="linux"
+         ws="motif"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher.motif.linux.x86"
+         os="linux"
+         ws="motif"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
 </feature>

diff --git a/taxeditor-feature/feature.xml b/taxeditor-feature/feature.xml
index 2a57b05637d1ec377819d25d813965a77c846275..c1b67be2b005d7d9ed314777ed2eff01d0042a5f 100644 (file)
--- a/taxeditor-feature/feature.xml
+++ b/taxeditor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor"
       label="Taxeditor Feature"
-      version="2.0.1.qualifier"
+      version="2.1.0.qualifier"
       provider-name="EDIT">
 
    <description url="http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditor">

diff --git a/taxeditor-navigation/META-INF/MANIFEST.MF b/taxeditor-navigation/META-INF/MANIFEST.MF
index 64cc50c5503b7f7fbb99d5350db6c35a5dd627b9..66f91f69445f3904c163105d79ec0caf1ac2a06c 100644 (file)
--- a/taxeditor-navigation/META-INF/MANIFEST.MF
+++ b/taxeditor-navigation/META-INF/MANIFEST.MF
@@ -5,11 +5,13 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
 Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
-Export-Package: eu.etaxonomy.taxeditor.navigation,
+Export-Package: eu.etaxonomy.cdm,
+ eu.etaxonomy.taxeditor.navigation,
  eu.etaxonomy.taxeditor.navigation.handler,
  eu.etaxonomy.taxeditor.navigation.internal,
  eu.etaxonomy.taxeditor.navigation.navigator,
- eu.etaxonomy.taxeditor.navigation.search
+ eu.etaxonomy.taxeditor.navigation.search,
+ eu.etaxonomy.taxeditor.newWizards
 Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.1",
  org.eclipse.core.runtime;bundle-version="3.4.0",
  org.eclipse.ui;bundle-version="3.4.1",

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/Root.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/Root.java
index 5d4712fbc8e71d068ac098d391a9516f7fcaec7b..c171eb823b0a5a785e33fc16f4217ed5f5cb579f 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/Root.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/Root.java
@@ -32,7 +32,7 @@ public class Root extends PlatformObject implements IAdaptable, IPersistableElem
        private static final Logger logger = Logger.getLogger(Root.class);\r
        \r
        public List<TaxonomicTree> getParentBeans() {\r
-               List<TaxonomicTree> trees = CdmStore.getTaxonTreeService().list(null, null).getRecords();\r
+               List<TaxonomicTree> trees = CdmStore.getTaxonTreeService().list(null, null, null, null, null);\r
                return trees;\r
        }\r
 \r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index e436e55884c8379df7efa6af7b1c0d46c82f3306..91b182c3b681de16aef6cc60b902d866e68c7aa1 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -176,7 +176,7 @@ public class TaxonNavigator extends CommonNavigator implements IConversationEnab
                DataChangeBridge.handleDataChange(changeEvents, dataChangeBehavior);\r
        }\r
        \r
-       protected String getFrameToolTipText(Object element) {\r
+       public String getFrameToolTipText(Object element) {\r
                if (element instanceof Root) {\r
                        return "Taxonomic Tree";\r
                }\r

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
index 5c34233bc6d852f8942f99edbb47eb0ec002059d..4242ccb40078461503bdcebcd6a995574e417501 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
@@ -70,8 +70,6 @@ public class SearchBar extends WorkbenchWindowControlContribution{
                layout.spacing = 0;
                composite.setLayout(layout);
                
-               // FIXME we have this here for debugging purposes, remove color once the layout of the search bar is correct
-               composite.setBackground(Resources.getColor(Resources.SEARCH_VIEW_FOREGROUND));
                
                // TODO for some reason the text_search composite has a margin when either SWT.BORDER or SWT.SEARCH
                // is applied. I am not sure how to get rid of this.

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizardPage.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizardPage.java
index a9aaf951377a5ec23621f4bb9008ba2f14d59886..51893dcecb29d5a97c62b6c954bfec245a84f1ca 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizardPage.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewTaxonNodeWizardPage.java
@@ -96,7 +96,10 @@ public class NewTaxonNodeWizardPage extends WizardPage implements ModifyListener
                                        taxonomicTree = (TaxonomicTree) parentNode;
                                }
                        }
+               }else{
+                       setPageComplete(false);
                }
+               
        }
        
        /* (non-Javadoc)
@@ -218,17 +221,6 @@ public class NewTaxonNodeWizardPage extends WizardPage implements ModifyListener
                getWizard().getContainer().updateButtons();
        }
        
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-        */
-       @Override
-       public boolean isPageComplete() {
-               if (text_taxonName == null || text_taxonomicTree == null) {
-                       return false;
-               }
-               return (text_taxonName.getText().length() > 0 && text_taxonomicTree.getText().length() > 0);
-       }
-       
        /*
         * SELECTION ADAPTERS
         */
@@ -246,6 +238,7 @@ public class NewTaxonNodeWizardPage extends WizardPage implements ModifyListener
                                text_parentTaxonNode.setText("");
                                parentTaxonNode = null;
                        }
+                       setPageComplete(true);
                }
        }
        
@@ -261,6 +254,8 @@ public class NewTaxonNodeWizardPage extends WizardPage implements ModifyListener
                                text_parentTaxonNode.setText(parentTaxonNode.getTaxon().getTitleCache());
                                text_taxonomicTree.setText(parentTaxonNode.getTaxonomicTree().getTitleCache());
                        }
+                       text_taxonomicTree.setText(parentTaxonNode.getTaxonomicTree().getTitleCache());
+                       setPageComplete(true);
                }
                
        }

diff --git a/taxeditor-store/.settings/org.eclipse.jdt.core.prefs b/taxeditor-store/.settings/org.eclipse.jdt.core.prefs
index cf17b22ea3020a361c503d6070cff2539264083b..ec2cdbc3d9ec84eebe008daf1f90f549b9d0f8ce 100644 (file)
--- a/taxeditor-store/.settings/org.eclipse.jdt.core.prefs
+++ b/taxeditor-store/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@
-#Wed Jun 10 13:53:16 CEST 2009\r
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
-org.eclipse.jdt.core.compiler.compliance=1.5\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.5\r
+#Fri Oct 16 18:08:11 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 549420010ccdf5e5deb4993d7c70516211d2cf02..4a69107eef019a7d974f5a233886e45778cbea22 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -5,28 +5,32 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
 Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
-Export-Package: eu.etaxonomy.taxeditor.datasource,
+Export-Package: dbscripts,
+ eu.etaxonomy.cdm,
+ eu.etaxonomy.cdm.database,
+ eu.etaxonomy.taxeditor.datasource,
  eu.etaxonomy.taxeditor.datasource.handler,
  eu.etaxonomy.taxeditor.datasource.view,
  eu.etaxonomy.taxeditor.datasource.wizard,
  eu.etaxonomy.taxeditor.dialogs,
  eu.etaxonomy.taxeditor.dialogs.filteredSelection,
  eu.etaxonomy.taxeditor.handler,
+ eu.etaxonomy.taxeditor.io,
+ eu.etaxonomy.taxeditor.io.wizard,
  eu.etaxonomy.taxeditor.labels,
  eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon",
  eu.etaxonomy.taxeditor.operations,
  eu.etaxonomy.taxeditor.parser,
  eu.etaxonomy.taxeditor.preference,
+ eu.etaxonomy.taxeditor.preference.wizards,
  eu.etaxonomy.taxeditor.store,
- eu.etaxonomy.taxeditor.store.internal
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="1.2.0",
- org.eclipse.core.resources;bundle-version="3.4.1",
- org.eclipse.ui.editors;bundle-version="3.4.0",
- org.eclipse.jface.text;bundle-version="3.4.1",
- org.eclipse.ui.ide;bundle-version="3.4.2",
- eu.etaxonomy.cdmlib;bundle-version="2.1.0"
+ eu.etaxonomy.taxeditor.store.internal,
+ eu.etaxonomy.taxeditor.store.operations,
+ eu.etaxonomy.taxeditor.user,
+ eu.etaxonomy.taxeditor.user.handler,
+ eu.etaxonomy.taxeditor.user.view,
+ eu.etaxonomy.taxeditor.user.wizard
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.filesystem;bundle-version="1.2.0",org.eclipse.core.resources;bundle-version="3.4.1",org.eclipse.ui.editors;bundle-version="3.4.0",org.eclipse.jface.text;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.2",eu.etaxonomy.cdmlib;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: junit.framework,org.junit
 Bundle-ActivationPolicy: lazy

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
index 37a68ffabfa02d048c3d2d911c25e93e38ee689b..e7e0b21590d577828b9f701270d13c0349cec9b8 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -28,6 +28,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IMemento;
 import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -72,6 +73,8 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends CdmBa
                ILabelProvider labelProvider = new FilteredCdmResourceLabelProvider();
                setListLabelProvider(labelProvider);
                setDetailsLabelProvider(labelProvider);
+               
+               setSelectionHistory(new ResourceSelectionHistory());
        }
        
        /**
@@ -159,11 +162,11 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends CdmBa
                        @Override
                        public boolean matchItem(Object item) {
                                String text = ((UuidAndTitleCache) item).getTitleCache();
-//                             if (text != null) {
-//                                     logger.info(text + " " + matches(text) + " " + model.size());
-//                             } else {
-//                                     logger.info("null");
-//                             }
+                               if (text != null) {
+                                       logger.info(text + " " + matches(text));// + " " + model.size());
+                               } else {
+                                       logger.info("null");
+                               }
                                return text != null ? matches(text) : false;
                        }
                        
@@ -236,10 +239,6 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends CdmBa
                return Status.OK_STATUS;
        }
        
-       protected void restoreDialog(IDialogSettings settings) {
-               
-       }
-       
        /**
        * @return
        */
@@ -255,6 +254,28 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends CdmBa
                return settings;
        }
        
+       /**
+        * 
+        * @author n.hoffmann
+        * @created Oct 19, 2009
+        * @version 1.0
+        */
+       private class ResourceSelectionHistory extends SelectionHistory {
+           /*
+           * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.SelectionHistory#restoreItemFromMemento(org.eclipse.ui.IMemento)
+               */
+               protected Object restoreItemFromMemento(IMemento element) {
+                       return element.getString("resource"); //$NON-NLS-1$
+               }
+               /*
+                * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.SelectionHistory#storeItemToMemento(java.lang.Object,
+                *      org.eclipse.ui.IMemento)
+                */
+               protected void storeItemToMemento(Object item, IMemento element) {
+                       element.putString("resource", item.toString()); //$NON-NLS-1$
+               }
+       }
+       
        public class FilteredCdmResourceLabelProvider extends LabelProvider {
                public String getText(Object element) {
                        if (element == null) {

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredAgentSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredAgentSelectionDialog.java
index 696a3f10609f276148a69bc608b363d6380fead6..7a74f76d7fcd4057a865e6e4892167b7c66aa4aa 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredAgentSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredAgentSelectionDialog.java
@@ -117,7 +117,7 @@ public class FilteredAgentSelectionDialog extends
         */
        @Override
        protected AgentBase getPersistentObject(UUID cdmUuid) {
-               return CdmStore.getAgentService().getAgentByUuid(cdmUuid);
+               return CdmStore.getAgentService().load(cdmUuid);
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredNameSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredNameSelectionDialog.java
index 0183db3d02e8623bfc0a168f88cba66f28dbbdd2..961d2dbf03139b97c93999e6481a547680d8c174 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredNameSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredNameSelectionDialog.java
@@ -37,9 +37,15 @@ public class FilteredNameSelectionDialog extends AbstractFilteredCdmResourceSele
                        .getLogger(FilteredNameSelectionDialog.class);
 
        /**
-       * @param taxon
-       * @return
-       */
+        * Creates a filtered selection dialog to select a name.
+        * 
+        * @param shell
+        *                              The shell for displaying this widget
+        * @param name
+        *                              A name that should be selected when the dialog opens
+        * @return
+        *                              A name object upon selection
+        */
        public static TaxonNameBase selectName(Shell shell, TaxonNameBase name) {
                FilteredNameSelectionDialog dialog = new FilteredNameSelectionDialog(shell, 
                                "Choose a name", false, name);
@@ -82,7 +88,7 @@ public class FilteredNameSelectionDialog extends AbstractFilteredCdmResourceSele
         */
        @Override
        protected TaxonNameBase getPersistentObject(UUID cdmUuid) {
-               return CdmStore.getNameService().getTaxonNameByUuid(cdmUuid);
+               return CdmStore.getNameService().load(cdmUuid);
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredPersonSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredPersonSelectionDialog.java
index e17a4e2a3f9c39ca5cea9ccde033784fb6f2b31f..df83d0fac7d283d8d1b8539a14558961bd848a2b 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredPersonSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredPersonSelectionDialog.java
@@ -55,7 +55,7 @@ public class FilteredPersonSelectionDialog extends
         */
        @Override
        protected Person getPersistentObject(UUID uuid) {
-               return (Person) CdmStore.getAgentService().getAgentByUuid(uuid);
+               return (Person) CdmStore.getAgentService().load(uuid);
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java
index a567879492818ede56c21341d8df32e2f46aebb5..d1fe4f7fd9d6b541340cf065cf38ca0e30a5a8ac 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredReferenceSelectionDialog.java
@@ -13,14 +13,25 @@ package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IMemento;
 
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.taxeditor.dialogs.NewReferenceInputDialog;
@@ -35,6 +46,17 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
        private static final Logger logger = Logger
                        .getLogger(FilteredReferenceSelectionDialog.class);
 
+       private static final String SHOW_AUTHORS = "ShowAuthors"; //$NON-NLS-1$
+       
+       private Button button_showAuthors;
+       private ShowReferencesWithAuthorAction showReferencesWithAuthorAction;
+       private String showAuthorsText = "Include authors in reference name";
+       private boolean showAuthors = false;
+
+       private AbstractContentProvider contentProviderTmp;
+
+       private ItemsFilter itemsFilterTmp;
+       
        /**
        * @param reference 
         * @param taxon
@@ -46,6 +68,28 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
                return getSelectionFromDialog(dialog);
        }
 
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#fillContentProvider(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.AbstractContentProvider, org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.ItemsFilter, org.eclipse.core.runtime.IProgressMonitor)
+        */
+       @Override
+       protected void fillContentProvider(AbstractContentProvider contentProvider,
+                       ItemsFilter itemsFilter, IProgressMonitor progressMonitor)
+                       throws CoreException {
+               super.fillContentProvider(contentProvider, itemsFilter, progressMonitor);
+               contentProviderTmp = contentProvider;
+               itemsFilterTmp = itemsFilter;
+       }
+       
+       protected void reloadModel(){
+               try {
+                       super.fillContentProvider(contentProviderTmp, itemsFilterTmp, null);
+               } catch (CoreException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       
        /**
        * @param shell
        * @param title
@@ -53,6 +97,7 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
        */
        protected FilteredReferenceSelectionDialog(Shell shell, String title, boolean multi, ReferenceBase reference) {
                super(shell, title, multi, FilteredReferenceSelectionDialog.class.getCanonicalName(), reference);
+               showReferencesWithAuthorAction = new ShowReferencesWithAuthorAction();
        }
        
        /* (non-Javadoc)
@@ -60,7 +105,23 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
        */
        @Override
        protected Control createExtendedContentArea(Composite parent) {
-               Link link = new Link(parent, SWT.NONE);
+               
+               Composite composite = new Composite(parent, SWT.NONE);
+               
+               composite.setLayout(new GridLayout());
+               
+               
+               button_showAuthors = new Button(composite, SWT.CHECK);
+               button_showAuthors.setText(showAuthorsText);
+               
+               button_showAuthors.addSelectionListener(new SelectionAdapter() {
+                       @Override
+                       public void widgetSelected(SelectionEvent e) {
+                               showReferencesWithAuthorAction.run();
+                       }
+               });
+               
+               Link link = new Link(composite, SWT.NONE);
                link.setText("Click <A>here</A> to create a new reference.");
                link.addListener (SWT.Selection, new Listener () {
                        public void handleEvent(Event event) {
@@ -76,7 +137,30 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
                                }
                        }
                });
-               return link;
+               return composite;
+       }
+       
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#restoreDialog(org.eclipse.jface.dialogs.IDialogSettings)
+        */
+       protected void restoreDialog(IDialogSettings settings) {
+               if (settings.get(SHOW_AUTHORS) != null) {
+                       showAuthors = settings.getBoolean(SHOW_AUTHORS);
+               }
+               setShowAuthorButtons(showAuthors);
+               super.restoreDialog(settings);
+               
+       }
+       
+       /* (non-Javadoc)
+        * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#storeDialog(org.eclipse.jface.dialogs.IDialogSettings)
+        */
+       @Override
+       protected void storeDialog(IDialogSettings settings) {
+               settings.put(SHOW_AUTHORS, showAuthors);
+               
+               super.storeDialog(settings);            
        }
 
        /* (non-Javadoc)
@@ -84,7 +168,7 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
         */
        @Override
        protected ReferenceBase getPersistentObject(UUID cdmUuid) {
-               return CdmStore.getReferenceService().getReferenceByUuid(cdmUuid);
+               return CdmStore.getReferenceService().load(cdmUuid);
        }
 
        /* (non-Javadoc)
@@ -92,6 +176,36 @@ public class FilteredReferenceSelectionDialog extends AbstractFilteredCdmResourc
         */
        @Override
        protected void initModel() {
-               model = CdmStore.getReferenceService().getUuidAndTitleCache();
+               if(showAuthors){
+                       model = CdmStore.getReferenceService().getUuidAndTitleCache();
+               }else{
+                       model = CdmStore.getReferenceService().getUuidAndTitle();
+               }
+       }
+       
+       private void setShowAuthorButtons(boolean showAuthors){
+               button_showAuthors.setSelection(showAuthors);
+               showReferencesWithAuthorAction.setChecked(showAuthors);
+       }
+       
+       /* (non-Javadoc)
+        * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#fillViewMenu(org.eclipse.jface.action.IMenuManager)
+        */
+       @Override
+       protected void fillViewMenu(IMenuManager menuManager) {
+               super.fillViewMenu(menuManager);
+               menuManager.add(showReferencesWithAuthorAction);
+       }
+       
+       private class ShowReferencesWithAuthorAction extends Action{
+               public ShowReferencesWithAuthorAction(){
+                       super(showAuthorsText, IAction.AS_CHECK_BOX);
+               }
+               
+               public void run(){
+                       showAuthors = showAuthors ? false : true;
+                       setShowAuthorButtons(showAuthors);
+                       initModel();
+               }
        }
 }
\ No newline at end of file

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonNodeSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonNodeSelectionDialog.java
index 7055f852f464b2cd7beaa77ebb1fa9e7814fad3b..b58a537d4b2d0637f42d0fece3ca05d2adf9cb7c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonNodeSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonNodeSelectionDialog.java
@@ -10,7 +10,6 @@ import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.CoreException;\r
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.jface.viewers.ILabelProvider;\r
-import org.eclipse.jface.window.Window;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r
@@ -22,7 +21,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Shell;\r
 \r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
@@ -71,17 +69,12 @@ public class FilteredTaxonNodeSelectionDialog extends AbstractFilteredCdmResourc
                super(shell, title, multi, FilteredTaxonNodeSelectionDialog.class.getCanonicalName(), node);\r
                \r
                this.excludeTaxa = excludeTaxa;\r
-               taxonomicTrees = CdmStore.getTaxonTreeService().list(null, null).getRecords();\r
-               // default to first tree \r
-               // TODO this will be problematic and can only be seen as workaround \r
-               selectedTaxonomicTree = taxonomicTrees.iterator().next();\r
                \r
                ILabelProvider labelProvider = new FilteredCdmResourceLabelProvider();\r
 \r
                setListLabelProvider(labelProvider);\r
                setDetailsLabelProvider(labelProvider);\r
                \r
-               allTaxonBases = CdmStore.getTaxonTreeService().getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByTaxonomicTree(selectedTaxonomicTree);\r
        }\r
 \r
        /* (non-Javadoc)\r
@@ -93,11 +86,11 @@ public class FilteredTaxonNodeSelectionDialog extends AbstractFilteredCdmResourc
                        throws CoreException {\r
                progressMonitor.beginTask("Looking for taxa", 1000); // Why no progres monitor?\r
                if(excludeTaxa == null){\r
-                       for(UuidAndTitleCache taxon : allTaxonBases){\r
+                       for(UuidAndTitleCache taxon : model){\r
                                contentProvider.add(taxon, itemsFilter);\r
                        }\r
                }else{\r
-                       for(UuidAndTitleCache taxon : allTaxonBases){\r
+                       for(UuidAndTitleCache taxon : model){\r
                                if( ! excludeTaxa.contains(taxon.getUuid())){\r
                                        contentProvider.add(taxon, itemsFilter);\r
                                }\r
@@ -168,7 +161,10 @@ public class FilteredTaxonNodeSelectionDialog extends AbstractFilteredCdmResourc
         */\r
        @Override\r
        protected void initModel() {\r
-               // TODO Auto-generated method stub\r
-               \r
+               // default to first tree \r
+               // TODO this will be problematic and can only be seen as workaround \r
+               taxonomicTrees = CdmStore.getTaxonTreeService().list(null, null, null, null, null);\r
+               selectedTaxonomicTree = taxonomicTrees.iterator().next();\r
+               model = CdmStore.getTaxonTreeService().getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByTaxonomicTree(selectedTaxonomicTree);\r
        }\r
 }
\ No newline at end of file

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonSelectionDialog.java
index d0ce259771599b7f2507d775b5aa123343909f29..0be696d7080170706d3d4c3790e200a9276a940e 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTaxonSelectionDialog.java
@@ -65,7 +65,7 @@ public class FilteredTaxonSelectionDialog extends
         */
        @Override
        protected TaxonBase getPersistentObject(UUID uuid) {
-               return CdmStore.getTaxonService().getTaxonByUuid(uuid);
+               return CdmStore.getTaxonService().load(uuid);
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTeamOrPersonBaseSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTeamOrPersonBaseSelectionDialog.java
index 41bc1bf034a1b6e807bdfe467742fbccf7582d30..54f945079f8d2c0fc2444623b12fc2c729cdf407 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTeamOrPersonBaseSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FilteredTeamOrPersonBaseSelectionDialog.java
@@ -54,7 +54,7 @@ public class FilteredTeamOrPersonBaseSelectionDialog extends
         */
        @Override
        protected TeamOrPersonBase getPersistentObject(UUID uuid) {
-               return (TeamOrPersonBase) CdmStore.getAgentService().getAgentByUuid(uuid);
+               return (TeamOrPersonBase) CdmStore.getAgentService().load(uuid);
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateTaxonomicTreeOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateTaxonomicTreeOperation.java
index 74f36014b19b47a2eafa4ebdb8e1d78e042273ae..3424cf6a3a302f41c5a847a93f801132c4e4e83c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateTaxonomicTreeOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateTaxonomicTreeOperation.java
@@ -96,7 +96,7 @@ public class CreateTaxonomicTreeOperation extends AbstractPostOperation {
                        reference = Generic.NewInstance();
                        reference.setTitleCache(treeLabel);
                }else{
-                       reference = CdmStore.getReferenceService().getReferenceByUuid(referenceUuid);
+                       reference = CdmStore.getReferenceService().load(referenceUuid);
                }
                
                tree.setReference(reference);

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteUserOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteUserOperation.java
index c5965cb1aaa7ae73caec7efe4a1f8e3556306479..441079fd5aabacc6bfa5bfaaab30831da733bec0 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteUserOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteUserOperation.java
@@ -58,7 +58,7 @@ public class DeleteUserOperation extends AbstractPostOperation {
                        throws ExecutionException {
                
                ConversationHolder conversation = CdmStore.NewTransactionalConversation();
-               user = CdmStore.getUserService().findByUuid(userUuid);
+               user = CdmStore.getUserService().find(userUuid);
                CdmStore.getUserService().delete(user);
                conversation.commit();
                

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index 3c54954074d7fb48932531659e7352f392bbfb27..8b48860b95411fe848b92c1243188205c29e4a5c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -215,7 +215,15 @@ public class ParseHandler{
                duplicateBasionymAuthorTeams = findMatchingAuthors((TeamOrPersonBase) name.getBasionymAuthorTeam());
                duplicateExBasionymAuthorTeams = findMatchingAuthors((TeamOrPersonBase) name.getExBasionymAuthorTeam());
                
-               duplicateReferences = findMatchingNomenclaturalReference(name.getNomenclaturalReference());
+               ReferenceBase nomenclaturalReference = name.getNomenclaturalReference();
+               duplicateReferences = findMatchingNomenclaturalReference(nomenclaturalReference);
+               
+               // check if the reference has an inreference and also check if the inReference already exists
+//             // FIXME implement this once the transition to new reference model is complete (cdmlib 3.2) 
+//             if(nomenclaturalReference.getInReference()){
+//                     duplicateInReferences = findMatchingNomenclaturalReference(referenceBase.getInReference());
+//             }
+               
        }
        
        /**

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 9cda35361190884883d879be5f849b0329d581db..51b31495d9bd98f3e8aaf8f2a2b1903b180c980a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -30,8 +30,10 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITaxonTreeService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;
+import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.ext.IEditGeoService;
@@ -119,10 +121,11 @@ public class CdmStore{
                try {
                        cdmDatasource.testConnection();
                        instance = new CdmStore(cdmDatasource, dbSchemaValidation, applicationContextBean);
-               } catch (Exception e) {
+               } catch (DataSourceNotFoundException e) {
                        StoreUtil.errorDialog("Chosen Datasource is not available", "Could not connect to the chosen " +
                                        "datasource '" + cdmDatasource + "'. Please check setting in datasources.xml. If the datasource " +
-                                                       "is located on a remote machine, make sure your are connected to the network.");
+                                                       "is located on a remote machine, make sure you are connected to the network.");
+                       logger.error(e);
                        PlatformUI.getWorkbench().close();
                }
                
@@ -215,6 +218,8 @@ public class CdmStore{
        
        public static ITermService getTermService() { return getDefault().getApplicationController().getTermService(); }
        
+       public static IVocabularyService getVocabularyService() { return getDefault().getApplicationController().getVocabularyService(); }
+       
        public static IEditGeoService getGeoService(){
                return (IEditGeoService) getDefault().getApplicationController().getBean("editGeoService");
        }
@@ -257,7 +262,7 @@ public class CdmStore{
                // FIXME use proper method once it is implemented in the library
                String titleSearchString = configurator.getTitleSearchString().replace("*", "%");
                
-               return getReferenceService().getReferencesByTitle(titleSearchString);
+               return getReferenceService().findByTitle(null, titleSearchString, null, null, null, null, null, null).getRecords();
        }
        
        /**
@@ -271,7 +276,7 @@ public class CdmStore{
                // FIXME use proper method once it is implemented in the library
                String titleSearchString = configurator.getTitleSearchString().replace("*", "%");
                
-               return getAgentService().findAgentsByTitle(titleSearchString);
+               return getAgentService().findByTitle(null, titleSearchString, null, null, null, null, null, null).getRecords();
        }
 
        public static List<TeamOrPersonBase> findTeamOrPersons(IIdentifiableEntityServiceConfigurator configurator){

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/VocabularyStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/VocabularyStore.java
index ac40dd8b513c8d4baf5567aae96099abcc5c782f..eaab9bf1437abee202e7c734a1a91a2fd33c6a34 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/VocabularyStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/VocabularyStore.java
@@ -192,7 +192,7 @@ public class VocabularyStore {
                TermVocabulary<DefinedTermBase> vocabulary = getTermVocabulary(vocabularyType);         
                vocabulary.addTerm(term);
                
-               CdmStore.getTermService().saveTermVocabulary(vocabulary);
+               CdmStore.getVocabularyService().save(vocabulary);
        }
        
        /**
@@ -201,7 +201,7 @@ public class VocabularyStore {
         * @param feature
         */
        public static void updateVocabulary(DefinedTermBase term) {
-               CdmStore.getTermService().saveTerm(term);
+               CdmStore.getTermService().save(term);
        }
        
        
@@ -218,7 +218,7 @@ public class VocabularyStore {
        }
        
        public static TermVocabulary<DefinedTermBase> getTermVocabulary(VocabularyEnum vocabularyType){
-               return CdmStore.getTermService().getVocabulary(vocabularyType);
+               return CdmStore.getVocabularyService().getVocabulary(vocabularyType);
        }
 
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerView.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerView.java
index 77287bed64a379d91dff5385304cd819dc1bb615..1e788b6861e1b0cf448546d7c388ce3d5e027bc3 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerView.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/user/view/UserManagerView.java
@@ -102,7 +102,7 @@ public class UserManagerView extends ViewPart implements IConversationEnabled, I
         * @return
         */
        private List<User> getAllUser(){
-               return CdmStore.getUserService().list(100000, 0);
+               return CdmStore.getUserService().list(null, 100000, 0, null, null);
        }
 
        /* (non-Javadoc)