Merge branch 'hotfix/4.5.1' 4.5.1
authorjenkins <jenkins-int@bgbm.org>
Wed, 25 Jan 2017 09:23:34 +0000 (10:23 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 25 Jan 2017 09:23:34 +0000 (10:23 +0100)
40 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.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java
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.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
eu.etaxonomy.taxeditor.feature.jre.linux64/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/.classpath
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/build.properties
eu.etaxonomy.taxeditor.molecular.lib/configAlternatives/dependenciesFromJARs/build.properties [deleted file]
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.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/CdmFormFactory.java
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/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 af5fc5c..d06acdf 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 3add2cf..cc9c8a0 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 03fe770..0c07282 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index f1677fd..0e68d40 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.5.0</version>
+               <version>4.5.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 298e182..33fb923 100644 (file)
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -40,13 +40,13 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  * @version 1.0
  */
 public class LineAnnotationModel extends AnnotationModel {
-       
+
        private Comparator<Annotation> comparator;
        private IEntityCreator<?> entityCreator;
        private Set<LineAnnotation> deletedAnnotations = new HashSet<LineAnnotation>();
 
        private ILineDisplayStrategy lineDisplayStrategy;
-       
+
        /**
         * <p>Constructor for LineAnnotationModel.</p>
         *
@@ -56,7 +56,7 @@ public class LineAnnotationModel extends AnnotationModel {
                super();
                this.lineDisplayStrategy = lineDisplayStrategy;
        }
-       
+
        /**
         * Changes the annotation's type and fires model changed
         * notification. Resulting redraw will cause any change
@@ -69,21 +69,20 @@ public class LineAnnotationModel extends AnnotationModel {
                annotation.setType(type);
                fireModelChanged(new AnnotationModelEvent(this));
        }
-       
+
        /* (non-Javadoc)
         * @see org.eclipse.jface.text.source.AnnotationModel#removeAnnotation(org.eclipse.jface.text.source.Annotation, boolean)
         */
        /** {@inheritDoc} */
-       protected void removeAnnotation(Annotation annotation,
+       @Override
+    protected void removeAnnotation(Annotation annotation,
                        boolean fireModelChanged) {
-               // Set data model element for deletion
-               annotation.markDeleted(true);
                if (annotation instanceof LineAnnotation) {
                        deletedAnnotations.add((LineAnnotation) annotation);
                }
                super.removeAnnotation(annotation, fireModelChanged);
        }
-               
+
        /**
         * <p>removeTypeFromAllAnnotations</p>
         *
@@ -98,7 +97,7 @@ public class LineAnnotationModel extends AnnotationModel {
                        }
                }
        }
-       
+
        /**
         * <p>getAllAnnotationsOfType</p>
         *
@@ -113,10 +112,10 @@ public class LineAnnotationModel extends AnnotationModel {
                        if (annotation.getType().equals(type)) {
                                candidates.add(annotation);
                        }
-               }       
-               return candidates;      
-       }       
-       
+               }
+               return candidates;
+       }
+
        /**
         * <p>getFirstAnnotationOfType</p>
         *
@@ -130,10 +129,10 @@ public class LineAnnotationModel extends AnnotationModel {
                        if (annotation.getType().equals(type)) {
                                return annotation;
                        }
-               }               
+               }
                return null;
        }
-       
+
        /**
         * Gets first LineAnnotation in line
         *
@@ -146,7 +145,7 @@ public class LineAnnotationModel extends AnnotationModel {
                try {
                        int offset = document.getLineOffset(line);
                        int length = document.getLineLength(line);
-                                               
+
                        Iterator<?> iterator = getAnnotationIterator(offset, length, true, true);
                        while (iterator.hasNext()) {
                                Object next = iterator.next();
@@ -160,7 +159,7 @@ public class LineAnnotationModel extends AnnotationModel {
                }
                return null;
        }
-               
+
        /**
         * <p>getOrderedAnnotations</p>
         *
@@ -175,7 +174,7 @@ public class LineAnnotationModel extends AnnotationModel {
                Collections.sort(list, getAnnotationComparator());
                return list;
        }
-               
+
        /**
         * <p>printAnnotations</p>
         */
@@ -185,7 +184,7 @@ public class LineAnnotationModel extends AnnotationModel {
                logger.debug("Active annotations");
                logger.debug("------------------------");
                List<Annotation> list = getOrderedAnnotations();
-               
+
                for (Annotation annotation : list) {
                        logger.debug(
                                        (annotation.isMarkedDeleted() ?  "DELETED " : "") +
@@ -193,7 +192,7 @@ public class LineAnnotationModel extends AnnotationModel {
                                        (((LineAnnotation) annotation).isDirty() ?  "DIRTY " : "") +
                                        (((LineAnnotation) annotation).isMarkedAsNew() ?  "NEW " : "") +
                                        annotation.getText() + ": o " +
-                                       getPosition(annotation).getOffset() + ", l " + 
+                                       getPosition(annotation).getOffset() + ", l " +
                                        getPosition(annotation).getLength());
                }
                logger.debug("------------------------");
@@ -202,13 +201,13 @@ public class LineAnnotationModel extends AnnotationModel {
                for (LineAnnotation annotation : deletedAnnotations) {
                        logger.debug(
                                        (annotation.isMarkedDeleted() ?  "DELETED " : "") +
-                                       (((LineAnnotation) annotation).isMarkedAsMerged() ?  "MERGED " : "") +
-                                       (((LineAnnotation) annotation).isDirty() ?  "DIRTY " : "") +
-                                       (((LineAnnotation) annotation).isMarkedAsNew() ?  "NEW " : "") +
-                                       annotation.getText() + ": o ");                 
+                                       (annotation.isMarkedAsMerged() ?  "MERGED " : "") +
+                                       (annotation.isDirty() ?  "DIRTY " : "") +
+                                       (annotation.isMarkedAsNew() ?  "NEW " : "") +
+                                       annotation.getText() + ": o ");
                }
        }
-       
+
        /**
         * <p>getUndeletedAnnotations</p>
         *
@@ -217,20 +216,20 @@ public class LineAnnotationModel extends AnnotationModel {
         * @return a {@link java.util.List} object.
         */
        public List<LineAnnotation> getUndeletedAnnotations(int offset, int length) {
-               
+
                List<LineAnnotation> list = new ArrayList<LineAnnotation>();
-               
+
                Iterator<?> iterator = getAnnotationIterator(offset, length, true, true);
                while (iterator.hasNext()) {
                        Object next = iterator.next();
                        if (next instanceof LineAnnotation && !((Annotation) next).isMarkedDeleted()) {
-                               list.add((LineAnnotation) next); 
+                               list.add((LineAnnotation) next);
                        }
                }
                Collections.sort(list, getAnnotationComparator());
                return list;
        }
-       
+
        /**
         * <p>Getter for the field <code>deletedAnnotations</code>.</p>
         *
@@ -239,27 +238,28 @@ public class LineAnnotationModel extends AnnotationModel {
        public Set<LineAnnotation> getDeletedAnnotations() {
                return deletedAnnotations;
        }
-       
+
        /**
         * <p>clearDeletedAnnotations</p>
         */
        public void clearDeletedAnnotations() {
                deletedAnnotations.clear();
        }
-       
+
        private Comparator<Annotation> getAnnotationComparator() {
                if (comparator == null) {
                        this.comparator = new AnnotationComparator();
                }
                return comparator;
        }
-       
+
        class AnnotationComparator implements Comparator<Annotation> {
 
                /* (non-Javadoc)
                 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
                 */
-               public int compare(Annotation annotation1, Annotation annotation2) {
+               @Override
+        public int compare(Annotation annotation1, Annotation annotation2) {
                        if (annotation1.isMarkedDeleted() && !annotation2.isMarkedDeleted()) {
                                return 1;
                        }
@@ -277,9 +277,9 @@ public class LineAnnotationModel extends AnnotationModel {
                        } else {
                                return 0;
                        }
-               }       
+               }
        }
-       
+
        /**
         * The annotation model is assigned responsibility for creating new containers
         * from blocks of text.
@@ -289,7 +289,7 @@ public class LineAnnotationModel extends AnnotationModel {
        public void setEntityCreator(IEntityCreator<?> entityCreator) {
                this.entityCreator = entityCreator;
        }
-       
+
        /**
         * Creates an annotation without adding it to the model.
         *
@@ -318,7 +318,7 @@ public class LineAnnotationModel extends AnnotationModel {
                annotation.markAsNew(true);
                return annotation;
        }
-       
+
        /* (non-Javadoc)
         * @see org.eclipse.jface.text.source.AnnotationModel#addAnnotation(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position)
         */
@@ -327,7 +327,7 @@ public class LineAnnotationModel extends AnnotationModel {
        public void addAnnotation(Annotation annotation, Position position) {
                super.addAnnotation(annotation, position);
        }
-       
+
        /**
         * <p>getAnnotation</p>
         *
index 890bf11..8ad395a 100644 (file)
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.5.0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.0-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.0-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.0-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.0.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.0.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.0-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.0.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.5.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.1-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.1-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.1-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.1.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.1-sources.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.1.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>\r
index fb1cc57..2daba24 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: 4.5.0
+Bundle-Version: 4.5.1
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -539,15 +539,15 @@ Bundle-ClassPath: .,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.5.2.jar,
- lib/cdmlib-commons-4.5.0.jar,
- lib/cdmlib-ext-4.5.0.jar,
- lib/cdmlib-io-4.5.0.jar,
- lib/cdmlib-model-4.5.0.jar,
- lib/cdmlib-persistence-4.5.0.jar,
- lib/cdmlib-print-4.5.0.jar,
- lib/cdmlib-remote-4.5.0.jar,
- lib/cdmlib-services-4.5.0.jar,
- lib/cdmlib-test-4.5.0.jar,
+ lib/cdmlib-commons-4.5.1.jar,
+ lib/cdmlib-ext-4.5.1.jar,
+ lib/cdmlib-io-4.5.1.jar,
+ lib/cdmlib-model-4.5.1.jar,
+ lib/cdmlib-persistence-4.5.1.jar,
+ lib/cdmlib-print-4.5.1.jar,
+ lib/cdmlib-remote-4.5.1.jar,
+ lib/cdmlib-services-4.5.1.jar,
+ lib/cdmlib-test-4.5.1.jar,
  lib/cglib-3.2.0.jar,
  lib/cglib-nodep-3.2.0.jar,
  lib/classmate-1.3.1.jar,
index b43dea1..5467e37 100644 (file)
@@ -25,15 +25,15 @@ bin.includes = META-INF/,\
                lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
                lib/c3p0-0.9.5.2.jar,\
-               lib/cdmlib-commons-4.5.0.jar,\
-               lib/cdmlib-ext-4.5.0.jar,\
-               lib/cdmlib-io-4.5.0.jar,\
-               lib/cdmlib-model-4.5.0.jar,\
-               lib/cdmlib-persistence-4.5.0.jar,\
-               lib/cdmlib-print-4.5.0.jar,\
-               lib/cdmlib-remote-4.5.0.jar,\
-               lib/cdmlib-services-4.5.0.jar,\
-               lib/cdmlib-test-4.5.0.jar,\
+               lib/cdmlib-commons-4.5.1.jar,\
+               lib/cdmlib-ext-4.5.1.jar,\
+               lib/cdmlib-io-4.5.1.jar,\
+               lib/cdmlib-model-4.5.1.jar,\
+               lib/cdmlib-persistence-4.5.1.jar,\
+               lib/cdmlib-print-4.5.1.jar,\
+               lib/cdmlib-remote-4.5.1.jar,\
+               lib/cdmlib-services-4.5.1.jar,\
+               lib/cdmlib-test-4.5.1.jar,\
                lib/cglib-3.2.0.jar,\
                lib/cglib-nodep-3.2.0.jar,\
                lib/classmate-1.3.1.jar,\
index 347ce27..01f3d53 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.5.0</version>\r
+    <version>4.5.1</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
 \r
   </dependencies>\r
 </project>\r
-
+\r
index 2380fa8..fe6879c 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 6208027..9665708 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 087cbd0..49ce24e 100644 (file)
@@ -113,7 +113,7 @@ public class DeleteHandler extends AbstractHandler {
 
 
 
-                    if (config.isOnlyRemoveFromGallery()){
+                    if (config.isOnlyRemoveFromGallery() || ((Media)object).getId() == 0){
                         operations.add(new RemoveImageFromDescriptionElementOperation(label, undoContext,  (Media) object, imageGallery, postOperationEnabled));
                     }else{
                         operations.add(new DeleteMediaOperation(label, undoContext, imageGallery, (Media) object, config, postOperationEnabled));
index ee9de66..b48681d 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.jre.linux64"
       label="Taxonomic Editor JRE Linux64"
-      version="4.5.0"
+      version="4.5.1"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux"
index 4d30d99..5b4e2e4 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
index e0d3a3e..1b9421d 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="4.5.0"
+      version="4.5.1"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index f400afa..3fffe0c 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.5.0</version>
+               <version>4.5.1</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index f8d7890..df074a5 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="4.5.0"
+      version="4.5.1"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 013d38c..e111a54 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 66ebb65..a6c3add 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 911ca54..ead08fd 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.5.0</version>
+               <version>4.5.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 6329dd1..3e29604 100644 (file)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-bio-2.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-core-2.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swing-2.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swt-2.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0.3.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0-preview-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0-preview-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/libralign-io-0.4.0-preview-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0-preview-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0-preview-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0-preview-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.5.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry exported="true" kind="lib" path="lib/owlapi-xmlutils-4.1.4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/core-1.9.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/sequencing-1.9.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-bio-2.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-core-2.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swing-2.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swt-2.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0.3.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/libralign-io-0.4.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>
index c30457f..57bab91 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
@@ -15,12 +15,12 @@ Bundle-ClassPath: .,
  lib/bioinfweb-commons-java-swing-2.2.0.jar,
  lib/bioinfweb-commons-java-swt-2.0.0.jar,
  lib/jphyloio-core-0.3.0.jar,
- lib/libralign-biojava1-0.4.0-preview-2.jar,
- lib/libralign-core-0.4.0-preview-2.jar,
- lib/libralign-io-0.4.0-preview-2.jar,
- lib/libralign-swt-0.4.0-preview-2.jar,
- lib/tic-core-2.0.0-preview-2.jar,
- lib/tic-swt-2.0.0-preview-2.jar
+ lib/tic-core-2.0.0.jar,
+ lib/tic-swt-2.0.0.jar,
+ lib/libralign-biojava1-0.4.0.jar,
+ lib/libralign-core-0.4.0.jar,
+ lib/libralign-io-0.4.0.jar,
+ lib/libralign-swt-0.4.0.jar
 Export-Package: info.bioinfweb.commons,
  info.bioinfweb.commons.appversion,
  info.bioinfweb.commons.beans,
@@ -70,7 +70,6 @@ Export-Package: info.bioinfweb.commons,
  info.bioinfweb.jphyloio.objecttranslation,
  info.bioinfweb.jphyloio.objecttranslation.implementations,
  info.bioinfweb.jphyloio.utils,
- info.bioinfweb.libralign,
  info.bioinfweb.libralign.actions,
  info.bioinfweb.libralign.alignmentarea,
  info.bioinfweb.libralign.alignmentarea.content,
index a4bf090..c625524 100644 (file)
@@ -9,11 +9,11 @@ bin.includes = META-INF/,\
                lib/bioinfweb-commons-java-swing-2.2.0.jar,\
                lib/bioinfweb-commons-java-swt-2.0.0.jar,\
                lib/jphyloio-core-0.3.0.jar,\
-               lib/libralign-biojava1-0.4.0-preview-2.jar,\
-               lib/libralign-core-0.4.0-preview-2.jar,\
-               lib/libralign-io-0.4.0-preview-2.jar,\
-               lib/libralign-swt-0.4.0-preview-2.jar,\
-               lib/tic-core-2.0.0-preview-2.jar,\
-               lib/tic-swt-2.0.0-preview-2.jar
+               lib/tic-core-2.0.0.jar,\
+               lib/tic-swt-2.0.0.jar,\
+               lib/libralign-biojava1-0.4.0.jar,\
+               lib/libralign-core-0.4.0.jar,\
+               lib/libralign-io-0.4.0.jar,\
+               lib/libralign-swt-0.4.0.jar
                lib/jphyloio-core-0-SNAPSHOT.jar,\
                lib/owlapi-xmlutils-4.1.4.jar
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/configAlternatives/dependenciesFromJARs/build.properties b/eu.etaxonomy.taxeditor.molecular.lib/configAlternatives/dependenciesFromJARs/build.properties
deleted file mode 100644 (file)
index 22e3c26..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-bin.includes = META-INF/,\
-               lib/tic-swt-2.0.0-preview-1.jar,\
-               lib/commons-collections4-4.1.jar,\
-               lib/core-1.9.2.jar,\
-               lib/sequencing-1.9.2.jar,\
-               lib/commons-lang3-3.5.jar,\
-               lib/commons-beanutils-1.9.2.jar,\
-               lib/bioinfweb-commons-java-bio-2.0.0.jar,\
-               lib/bioinfweb-commons-java-core-2.2.0.jar,\
-               lib/bioinfweb-commons-java-swing-2.2.0.jar,\
-               lib/bioinfweb-commons-java-swt-2.0.0.jar,\
-               lib/jphyloio-core-0.3.0.jar,\
-               lib/libralign-biojava1-0.4.0-preview-2.jar,\
-               lib/libralign-core-0.4.0-preview-2.jar,\
-               lib/libralign-io-0.4.0-preview-2.jar,\
-               lib/libralign-swt-0.4.0-preview-2.jar,\
-               lib/tic-core-2.0.0-preview-2.jar,\
-               lib/tic-swt-2.0.0-preview-2.jar
-               lib/jphyloio-core-0-SNAPSHOT.jar,\
-               lib/owlapi-xmlutils-4.1.4.jar
index 992a920..55d1033 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
 
   <build>
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-core</artifactId>
-      <version>2.0.0-preview-2</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-swt</artifactId>
-      <version>2.0.0-preview-2</version>
+      <version>2.0.0</version>
     </dependency>
     
     <!-- BioJava -->
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-core</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-swt</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-biojava1</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-io</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     
     <!-- JPhyloIO -->
index 3e30c6a..d9123c2 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index c6189b2..24c5695 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 8b2d5ba..03b6c6c 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 112c59c..b84288b 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.5.0</version>
+               <version>4.5.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 292aec6..0a30015 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: 4.5.0
+Bundle-Version: 4.5.1
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 95a5990..e4b725b 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.5.0</version>
+               <version>4.5.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ec1f047..3c018f3 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: 4.5.0
+Bundle-Version: 4.5.1
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 3782c06..e9237e4 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.5.0</version>
+       <version>4.5.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 2dea789..137e36a 100644 (file)
@@ -902,8 +902,7 @@ public class CdmFormFactory extends FormToolkit {
     @Deprecated
     public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType,
             ICdmFormElement parentElement, String labelString, T selection, int style) {
-        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString,
-                selection, true,  style);
+        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString, selection, true, style);
         adapt(element);
         parentElement.addElement(element);
         return element;
@@ -915,7 +914,7 @@ public class CdmFormFactory extends FormToolkit {
             String labelString,
             T selection,
             int style) {
-        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, false, style, true);
+        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, true, style, false);
     }
 
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
@@ -925,7 +924,7 @@ public class CdmFormFactory extends FormToolkit {
                        T selection,
                        boolean addEmptyElement,
                        int style) {
-        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, true);
+        return this.createDefinedTermComboElement(termType, null, parentElement, labelString, selection, addEmptyElement, style, false);
        }
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
                        TermType termType,
@@ -945,7 +944,7 @@ public class CdmFormFactory extends FormToolkit {
             String labelString,
             T selection,
             int style) {
-        return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, false, style, true);
+        return this.createDefinedTermComboElement(null, termVocabulary, parentElement, labelString, selection, true, style, false);
     }
 
        public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
index c9d36b8..17ef632 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: 4.5.0
+Bundle-Version: 4.5.1
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
index 5a1c82e..f886609 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
index 49e797d..8c9af5b 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="4.5.0">
+<?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="4.5.1">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index abfc8e6..26ab184 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<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="4.5.0" useFeatures="true" includeLaunchers="true">
+<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="4.5.1" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
index 97cd2fc..fc2f673 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.5.0</version>
+    <version>4.5.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 8bd42c3..fdc870d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.5.0</version>
+  <version>4.5.1</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   <properties>
     <java.codelevel>1.7</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>4.5.0</cdmlib.version>
+    <cdmlib.version>4.5.1</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>4.5.0</taxeditor.version>
+    <taxeditor.version>4.5.1</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>