merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 21 Jul 2014 08:35:38 +0000 (08:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 21 Jul 2014 08:35:38 +0000 (08:35 +0000)
26 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/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
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.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
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/combo/TermComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyStatementElement.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 231068b79d2cf07f3311cc7d1d46a74a6b8abca5..4d75b2ec5fd0c5175038690bcbe135b8c810d95c 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
index 01143c262e89cca0b63b225813b39a01d4d75bc9..c5a3ee774e417657d45f6d0f98c0070ae04c7884 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 6f7ec6cf6b409f9ff3ba4bdb74b49f56f227dbc4..4eb52dd89702ad547ec8289b089da5a08b89e021 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index c585e446efcedd279280f2dedec178cbe463a6e1..ed673f47eecc605b8b6aadd99630084e1e9eef75 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 02152c46454a1d78e044f25ee0a52f1f130eca43..ae9176e855516657f39f8d25162d1227acd24505 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
index 0d658e0f425537819b496e20b0c3665338b3ac8e..f373bb30aec8d6c4603805475c694e2368fe53f2 100644 (file)
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.3.6-SNAPSHOT</version>\r
+    <version>3.3.7-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 7e2cdd6807bbcf6236dfa5a24a24a95288e20a13..0c7bd01605402d4bb9cf9ac359d02ed48ca9ff1b 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
index 768869d46ca5597faa7af6ff8506f72b5b0ad4c5..48c3c247b2624b716147e0ca811edfd99a01b5fd 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.3.6-SNAPSHOT</version>
+    <version>3.3.7-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index e0439819c618982c711a5aacdcabddb4fd6d6551..533c4de908c517e624248245ae049a92f3922a5b 100644 (file)
@@ -839,9 +839,9 @@ public class TransientTermService implements ITermService {
     }
 
     @Override
-    public <TERM extends DefinedTermBase> TERM getDefinedTermByIdInVocabulary(String id, UUID vocabularyUuid,
-            Class<TERM> clazz, Integer pageSize, Integer pageNumber) {
-        return defaultTermService.getDefinedTermByIdInVocabulary(id, vocabularyUuid, clazz, pageSize, pageNumber);
+    public <TERM extends DefinedTermBase> TERM findByIdInVocabulary(String id, UUID vocabularyUuid,
+            Class<TERM> clazz) {
+        return defaultTermService.findByIdInVocabulary(id, vocabularyUuid, clazz);
     }
 
        @Override
index 77e2712962c7a6201a97981aa7c58cf2ed0e371d..0a6e1915e288ff92dc68a53583d0c88b0be0dfae 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.3.6.qualifier"
+      version="3.3.7.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index ffa63f48aa0c87409f7651b19c14e24f0f304d5c..b2378f7c11c1d9cd8545226fcc0c00260429b857 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 1740c07cdb14ebaa8db4fbff16ff7b11f802e3f8..b5d7fad9eefa185db78a8473d9c988a2e56e59a0 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.3.6.qualifier"
+      version="3.3.7.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index e68e318315765404c99626fa39306dbb182a56bd..a16b2d27431d7a3f84e8da7796c47f43cde1e3d2 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 4fc4b2d1e22791a216484591575ff1c36e67aada..d48e295989786609be96b9d3057505da50fe9d88 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index fee4f5fbe5c54e93c69c8fb1d706abe23ac76ff7..78f6505b5bd6f26716c6687ebaf2d2b9c89076d5 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index b0d79d46ae69806a805f733125080a9147fd89c5..b59b708e082face7f1b0208238ccddef52f4a441 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index cf68823c931b677e5f0392419701f496ad6b1cb3..25c7e307f9eba0d7f974c57508875dbe1a3fc106 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ac1ef8d2644a3e76735912880f8d2175741d324b..d18ec8c4f4830d6721c639ebb9012eacbc336eab 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 51aab612aceb25f729591ba4e0739ba4485cd3ff..e757dfefe4b3a0d98e3ba3401d6607f982eae993 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9344dffeabf5c66c3a341c302adff688881316be..b60fa04e1bda53470368fc4d50d534d2c6c0ab78 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: 3.3.6.qualifier
+Bundle-Version: 3.3.7.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 53ea10af8db93be25c725096e80aaf74f63c1edc..cce653e8ac34d3605e208d1c9ef4c4a889e7bcd2 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.3.6-SNAPSHOT</version>
+       <version>3.3.7-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 8323e62dc7280fe880371324039e4c88611355f3..42ead4bfcd703b90b12f6cc80127fa0319c48657 100644 (file)
@@ -104,7 +104,7 @@ public class TermComboElement<T extends DefinedTermBase>
         }
 
         // create combo
-        combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY | style);
+        combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY );//FIXME: removed this parameter seems break windows version: | style
         addControl(combo);
         combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
         combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);
index f6f088ccd0c6fee0e7adfdfb72fbad64913d836b..8ea5822190de05d2174eeb1792d35b19ab9a96f0 100644 (file)
@@ -64,13 +64,24 @@ public class KeyStatementElement extends MultilanguageTextElement {
                if (event == null) {
                        return;
                }
+                                               
                if (keyStatement == null) {
                        Object eventSource = event.getSource();
                        if (eventSource == element_languageString) {
-                               setKeyStatement(KeyStatement.NewInstance());
+                               
+                               if(element_languageString.getLanguageString() != null) {
+                                       // for the case when the user copy / pastes text into the 
+                                       // (LanguageStringWithLabelElement) element_languageString text field
+                                       setKeyStatement(KeyStatement.NewInstance(element_languageString.getLanguageString().getLanguage(),
+                                                       element_languageString.getLanguageString().getText()));
+                               } else {
+                                       setKeyStatement(KeyStatement.NewInstance());
+                               }
                        }
                }
+               
                super.propertyChange(event);
+               
        }
 
 }
index b37068396b2570f10eb852e4dad0d0173d7bb5b0..2cfd953455cdb1d5fd7f8c525ff8004a2ffe4141 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?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="3.3.6.SNAPSHOT">
+<?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="3.3.7.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index ba342c1fc8f7a811af56582cb2900f46b4b3cf7d..0205e416e9b58b1f89ea95e64047497b8fe08600 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.3.6-SNAPSHOT</version>
+               <version>3.3.7-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index b132fced50014d0c2eb2227c6da12d1f066ca8fe..86e67931cbccc11ccfdf70844a392d3183bf51f4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.3.6-SNAPSHOT</version>
+  <version>3.3.7-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/</url>
@@ -18,7 +18,7 @@
     <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.3.6-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.3.7-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>