Merge branch 'release/5.0.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 17 May 2018 13:46:50 +0000 (15:46 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 17 May 2018 13:46:50 +0000 (15:46 +0200)
42 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/VerbatimDateDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/GfBioTerminologyImportComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/GfBioTerminologyImportPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/GfBioTerminologyImportPresenter.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/wrapper/OntologyTermWrapper.java
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/pom.xml
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/pom.xml
eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.workbench/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index a765c1e..17b27aa 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 9a67789..472ccb1 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index e3a5398..daabcd8 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 0dcc42c..6bba7ec 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>5.0.0</version>
+               <version>5.1.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 58f4692..7f1dda7 100644 (file)
        <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-5.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-cache-5.0.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-cache/4.15.0-SNAPSHOT/cdmlib-cache-5.0.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-5.0.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.15.0-SNAPSHOT/cdmlib-services-5.0.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-5.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-5.1.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-cache-5.1.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-cache/4.15.0-SNAPSHOT/cdmlib-cache-5.1.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-5.1.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.15.0-SNAPSHOT/cdmlib-services-5.1.0-SNAPSHOT-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-5.1.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
index b5d2722..233ef42 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -650,16 +650,16 @@ Bundle-ClassPath: .,
  lib/aspectjrt-1.8.8.jar,
  lib/aspectjweaver-1.8.8.jar,
  lib/batik-xml-1.7.jar,
- lib/cdmlib-commons-5.0.0.jar,
- lib/cdmlib-ext-5.0.0.jar,
- lib/cdmlib-io-5.0.0.jar,
- lib/cdmlib-model-5.0.0.jar,
- lib/cdmlib-persistence-5.0.0.jar,
- lib/cdmlib-print-5.0.0.jar,
- lib/cdmlib-remote-5.0.0.jar,
- lib/cdmlib-cache-5.0.0.jar,
- lib/cdmlib-services-5.0.0.jar,
- lib/cdmlib-test-5.0.0.jar,
+ lib/cdmlib-commons-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-io-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-model-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-print-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-cache-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-services-5.1.0-SNAPSHOT.jar,
+ lib/cdmlib-test-5.1.0-SNAPSHOT.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
  lib/commons-beanutils-1.9.2.jar,
index 2ccbbb7..d47f29c 100644 (file)
@@ -6,15 +6,15 @@ bin.includes = META-INF/,\
                lib/aspectjrt-1.8.8.jar,\
                lib/aspectjweaver-1.8.8.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/cdmlib-commons-5.0.0.jar,\
-               lib/cdmlib-ext-5.0.0.jar,\
-               lib/cdmlib-io-5.0.0.jar,\
-               lib/cdmlib-model-5.0.0.jar,\
-               lib/cdmlib-persistence-5.0.0.jar,\
-               lib/cdmlib-print-5.0.0.jar,\
-               lib/cdmlib-remote-5.0.0.jar,\
-               lib/cdmlib-services-5.0.0.jar,\
-               lib/cdmlib-test-5.0.0.jar,\
+               lib/cdmlib-commons-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-ext-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-io-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-model-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-print-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-remote-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-services-5.1.0-SNAPSHOT.jar,\
+               lib/cdmlib-test-5.1.0-SNAPSHOT.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
                lib/commons-beanutils-1.9.2.jar,\
@@ -221,7 +221,7 @@ bin.includes = META-INF/,\
                lib/lucene-analyzers-common-5.4.1.jar,\
                lib/lucene-sandbox-5.4.1.jar,\
                lib/lucene-suggest-5.4.1.jar,\
-               lib/cdmlib-cache-5.0.0.jar,\
+               lib/cdmlib-cache-5.1.0-SNAPSHOT.jar,\
                lib/redmine-java-api-3.1.0.jar
 
 jars.compile.order = .
index 0b72f35..f11e414 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>5.0.0</version>\r
+    <version>5.1.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index b969868..5243e2b 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index a019967..5e94ac2 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 23d95f8..64add38 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="5.0.0"
+      version="5.1.0"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index d6328fb..ffb9eef 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>5.0.0</version>
+               <version>5.1.0</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 2c37ec1..5dea265 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="5.0.0"
+      version="5.1.0"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 012b31e..4ef980e 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 9e38d31..1749d15 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index b3ee32a..09b446b 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>5.0.0</version>
+               <version>5.1.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ad9a040..f676b2d 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
index 39bc71f..343dbec 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
   
   <name>Molecular Library Dependencies Bundle</name>
index bf8f976..d2b1faf 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index f6bb37e..1a89802 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 0ecccff..552ae53 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 6d03608..694fb9d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>5.0.0</version>
+               <version>5.1.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 14272f7..893358d 100644 (file)
@@ -119,7 +119,7 @@ SearchResultView_STATUS=Status:
 SetSecundumForSubtreeOperation_CHANGE_SEC_OP=Secundum Referenz für alle Kinder ändern
 SetSecundumForSubtreeOperation_SET_SEC_TASK=Secundum Referenz für Teilbaum setzen
 SetSecundumForSubtreeHandler_CONFIG_DIALOG_TITLE=Setze Secundum Referenz für Teilbaum
-SetPublishFlagForSubtreeOperation_SET_SEC_TASK=Publish Flag für Teilbaum setzenS
+SetPublishFlagForSubtreeOperation_SET_SEC_TASK=Publish Flag für Teilbaum setzen
 TaxonLinkHelper_CREATE_FAIL=Konnte Taxon nicht erstellen
 TaxonNavigator_LOAD_DATASOURCE=Lade Datenquellen
 TaxonNavigator_RESTORE=Taxonnavigator wiederherstellen
index 124def0..118c9c2 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 408ba99..7536e41 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>5.0.0</version>
+               <version>5.1.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 21c27fa..d74e25b 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle
index 0858de9..36218f3 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>5.0.0</version>
+       <version>5.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index a030013..71e36d3 100755 (executable)
@@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.ui.element;
 
 import org.eclipse.swt.widgets.Text;
 
-import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
 import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 
@@ -62,38 +61,13 @@ public class VerbatimDateDetailSection extends DateDetailSectionBase<VerbatimTim
                return result;
        }
 
-//
-//    /**
-//     * <p>
-//     * Setter for the field <code>timePeriod</code>.
-//     * </p>
-//     *
-//     * @param timePeriod
-//     *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
-//     */
-//
-//    public void setEntity(VerbatimTimePeriod timePeriod) {
-//        setEntityInternally(timePeriod);
-//        updateTitle();
-//        getText_parseText().setText(timePeriod.toString());
-//
-//    }
     
     @Override
     protected void handleEvent(Object eventSource) {
 
         if (eventSource == text_VerbatimDate) {
-            TimePeriod entity = getEntity();
-            if(entity instanceof VerbatimTimePeriod){
-                ((VerbatimTimePeriod)entity).setVerbatimDate(text_VerbatimDate.getText());
-            }else{
-                VerbatimTimePeriod newEntity = newInstance();
-                newEntity.setEnd(entity.getEnd());
-                newEntity.setStart(entity.getStart());
-                newEntity.setFreeText(entity.getFreeText());
-                newEntity.setVerbatimDate(text_VerbatimDate.getText());
-                setEntity(newEntity);
-            }
+            VerbatimTimePeriod entity = getEntity();
+            entity.setVerbatimDate(text_VerbatimDate.getText());
         }
         super.handleEvent(eventSource);
 
@@ -108,7 +82,6 @@ public class VerbatimDateDetailSection extends DateDetailSectionBase<VerbatimTim
         super.setEntityInternally(timePeriod);
         ((Text) text_VerbatimDate.getMainControl()).setSelection(super.getCursorPosition());
         text_VerbatimDate.setText(timePeriod.getVerbatimDate());
-//        super.setEntity(timePeriod);
     }
 
 }
index 24828ff..0f8ab3a 100644 (file)
@@ -16,6 +16,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Tree;
 
@@ -33,6 +34,14 @@ public class GfBioTerminologyImportComposite extends Composite{
     private Composite composite;
     private Button btnRemoveTerminology;
     private ComboViewer comboTerminologies;
+    private Composite composite_1;
+    private Composite composite_2;
+    private Label lblNewLabel;
+    private Label lblNewLabel_1;
+    private Label lblNewLabel_2;
+    private Text txtLabel;
+    private Text txtUri;
+    private Text txtDescription;
 
     public GfBioTerminologyImportComposite(Composite parent, int style) {
         super(parent, style);
@@ -55,11 +64,38 @@ public class GfBioTerminologyImportComposite extends Composite{
         btnSearch = new Button(composite, SWT.NONE);
         btnSearch.setText("Search");
 
-        treeTermHierarchy = new TreeViewer(this, SWT.BORDER);
+        composite_2 = new Composite(this, SWT.NONE);
+        composite_2.setLayout(new GridLayout(2, false));
+        composite_2.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+
+        treeTermHierarchy = new TreeViewer(composite_2, SWT.BORDER);
         Tree tree = treeTermHierarchy.getTree();
-        GridData gd_tree = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1);
-        gd_tree.widthHint = 423;
-        tree.setLayoutData(gd_tree);
+        tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+
+        composite_1 = new Composite(composite_2, SWT.NONE);
+        composite_1.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+        composite_1.setLayout(new GridLayout(2, false));
+
+        lblNewLabel = new Label(composite_1, SWT.NONE);
+        lblNewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+        lblNewLabel.setText("Label");
+
+        txtLabel = new Text(composite_1, SWT.NONE);
+        txtLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+
+        lblNewLabel_1 = new Label(composite_1, SWT.NONE);
+        lblNewLabel_1.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+        lblNewLabel_1.setText("URI");
+
+        txtUri = new Text(composite_1, SWT.NONE);
+        txtUri.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+
+        lblNewLabel_2 = new Label(composite_1, SWT.NONE);
+        lblNewLabel_2.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+        lblNewLabel_2.setText("Description");
+
+        txtDescription = new Text(composite_1, SWT.NONE);
+        txtDescription.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
     }
     public TreeViewer getTreeTermHierarchy() {
         return treeTermHierarchy;
@@ -76,4 +112,13 @@ public class GfBioTerminologyImportComposite extends Composite{
     public ComboViewer getComboTerminologies() {
         return comboTerminologies;
     }
+    public Text getLblDescription() {
+        return txtDescription;
+    }
+    public Text getLblUri() {
+        return txtUri;
+    }
+    public Text getLblLabel() {
+        return txtLabel;
+    }
 }
index b2dca7a..327d213 100644 (file)
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite;
  */
 public class GfBioTerminologyImportPart {
 
+    @SuppressWarnings("unused")
     @PostConstruct
     public void create(Composite parent){
         GfBioTerminologyImportComposite composite = new GfBioTerminologyImportComposite(parent, SWT.NONE);
index dff94db..4959faa 100644 (file)
@@ -16,6 +16,7 @@ import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
@@ -122,6 +123,7 @@ public class GfBioTerminologyImportPresenter {
         composite.getTreeTermHierarchy().setLabelProvider(new OntologyTermLabelProvider());
 
         //tree results
+        composite.getTreeTermHierarchy().addSelectionChangedListener(e->updateDetails(e.getSelection()));
         composite.getTreeTermHierarchy().setContentProvider(new OntologyTermContentProvider());
         composite.getTreeTermHierarchy().setLabelProvider(new OntologyTermLabelProvider());
         Transfer[] transfers = new Transfer[] {LocalSelectionTransfer.getTransfer(),};
@@ -140,6 +142,29 @@ public class GfBioTerminologyImportPresenter {
             }
         });
     }
+    
+    private void clearDetails(){
+        composite.getLblLabel().setText("");
+        composite.getLblUri().setText("");
+        composite.getLblDescription().setText("");
+    }
+
+    private void updateDetails(ISelection s) {
+        StructuredSelection selection = (StructuredSelection)s;
+        if(selection.isEmpty()){
+            clearDetails();
+        }
+        Object next = selection.iterator().next();
+        if(next instanceof OntologyTermWrapper){
+            OntologyTermWrapper wrapper = (OntologyTermWrapper)next;
+            String label = wrapper.getLabel();
+            String uri = wrapper.getUri();
+            String description = wrapper.getDescription();
+            composite.getLblLabel().setText(label!=null?label:"");
+            composite.getLblUri().setText(uri!=null?uri:"");
+            composite.getLblDescription().setText(description!=null?description:"");
+        }
+    }
 
     private void search(){
         String searchString = composite.getTxtSearch().getText();
index 05a5271..eb8453d 100644 (file)
@@ -8,7 +8,11 @@
 */
 package eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper;
 
+import java.util.List;
+
 /**
+ * Wrapper for terms received from the GfBio terminology service.
+ *
  * @author pplitzner
  * @since Apr 23, 2018
  *
@@ -16,6 +20,9 @@ package eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper;
 public class OntologyTermWrapper extends TermWrapper{
 
     private String sourceTerminology;
+    private String description;
+    private List<String> synonyms;
+    private String comment;
     public OntologyTermWrapper(String uri, String label, String sourceTerminology) {
         super(uri, label);
         this.sourceTerminology = sourceTerminology;
@@ -23,4 +30,25 @@ public class OntologyTermWrapper extends TermWrapper{
     public String getSourceTerminology() {
         return sourceTerminology;
     }
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public List<String> getSynonyms() {
+        return synonyms;
+    }
+    public void setSynonyms(List<String> synonyms) {
+        this.synonyms = synonyms;
+    }
+    public String getComment() {
+        return comment;
+    }
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+    public void setSourceTerminology(String sourceTerminology) {
+        this.sourceTerminology = sourceTerminology;
+    }
 }
index ef5205e..cc3b459 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index abbb9c9..808c818 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
index 53ad27e..08e920a 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
index a8497a4..35b83b6 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
index cb2e1b2..da8a2e1 100644 (file)
@@ -4,7 +4,7 @@ Export-Package: eu.etaxonomy.taxeditor.bulkeditor,
  eu.etaxonomy.taxeditor.workbench,
  eu.etaxonomy.taxeditor.workbench.part
 Bundle-Name: Workbench Bundle
-Bundle-Version: 5.0.0
+Bundle-Version: 5.1.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench,
index 4c973d4..5493b6e 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index eb53111..434e6e4 100644 (file)
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-<product 
-name="EDIT Taxonomic Editor" 
-application="eu.etaxonomy.taxeditor.application.application" 
-id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" 
-uid="eu.etaxonomy.taxeditor.product" 
-version="5.0.0"
-useFeatures="true" 
-includeLaunchers="true"
->
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="5.1.0.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
@@ -25,11 +16,7 @@ includeLaunchers="true"
       </vmArgsMac>
   </launcherArgs>
   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-  <splash
-  location="eu.etaxonomy.taxeditor.application"
-  startupProgressRect="5,447,366,15"
-  startupMessageRect="7,432,360,20"
-  startupForegroundColor="000000"/>
+  <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>
   <launcher name="TaxonomicEditor">
     <solaris/>
     <win useIco="false">
index 57698da..ce34c0b 100644 (file)
@@ -1,60 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-<product 
-name="EDIT Taxonomic Editor" 
-application="eu.etaxonomy.taxeditor.application.application" 
-id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" 
-uid="eu.etaxonomy.taxeditor.product.jre" 
-version="5.0.0"
-useFeatures="true" 
-includeLaunchers="true"
->
-  <aboutInfo>
-    <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-    <text>
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="5.1.0.SNAPSHOT" useFeatures="true" includeLaunchers="true">
+   <aboutInfo>
+      <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
+      <text>
          %productBlurb
       </text>
-  </aboutInfo>
-  <configIni use="default"></configIni>
-  <launcherArgs>
-    <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080
+   </aboutInfo>
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080
       </programArgs>
-    <programArgsLin>-vm jre/bin
-    </programArgsLin>
-    <programArgsMac>-vm ../../../jre/Contents/Home/jre/lib/jli/libjli.dylib
-    </programArgsMac>
-    <programArgsSol>-vm jre/bin
-    </programArgsSol>
-    <programArgsWin>-vm jre/bin
-    </programArgsWin>
-    <vmArgs>-Xmx512M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow
+      <programArgsLin>-vm jre/bin
+      </programArgsLin>
+      <programArgsMac>-vm ../../../jre/Contents/Home/jre/lib/jli/libjli.dylib
+      </programArgsMac>
+      <programArgsSol>-vm jre/bin
+      </programArgsSol>
+      <programArgsWin>-vm jre/bin
+      </programArgsWin>
+      <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow
       </vmArgs>
-    <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-  </launcherArgs>
-  <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
-  <splash
-  location="eu.etaxonomy.taxeditor.application"
-  startupProgressRect="5,447,366,15"
-  startupMessageRect="7,432,360,20"
-  startupForegroundColor="000000"/>
-  <launcher name="TaxonomicEditor">
-    <solaris/>
-    <win useIco="false">
-      <bmp/>
-    </win>
-  </launcher>
-  <vm></vm>
-  <plugins></plugins>
-  <features>
-    <feature id="eu.etaxonomy.taxeditor.feature"/>
-  </features>
-  <configurations>
-    <plugin autoStart="true" id="eu.etaxonomy.taxeditor.application" startLevel="5"/>
-    <plugin autoStart="true" id="org.eclipse.core.runtime" startLevel="4"/>
-    <plugin autoStart="true" id="org.eclipse.equinox.common" startLevel="2"/>
-    <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>
-    <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>
-    <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>
-  </configurations>
+   </launcherArgs>
+
+   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
+
+   <splash
+      location="eu.etaxonomy.taxeditor.application"
+      startupProgressRect="5,447,366,15"
+      startupMessageRect="7,432,360,20"
+      startupForegroundColor="000000" />
+   <launcher name="TaxonomicEditor">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="eu.etaxonomy.taxeditor.feature"/>
+   </features>
+
+   <configurations>
+      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   </configurations>
+
 </product>
index 52747a0..8d5f83e 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 3825b54..8ce5e2b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>5.0.0</version>
+  <version>5.1.0</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   <properties>
     <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>5.0.0</cdmlib.version>
+    <cdmlib.version>5.1.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <!-- Increasing tycho above 0.22.0 will fail for the macosx build because 
       for higher version numbers tycho needs to be build against Eclipse Mars or 
       higher -->
     <tycho.version>1.0.0</tycho.version>
-    <taxeditor.version>5.0.0</taxeditor.version>
+    <taxeditor.version>5.1.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>