Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
index 04aa2f7b419a5e7e442f023d24a9c8df26a3a9cd..2e5da6688054bdff7871e99b02d146814ee2a024 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeNavigatorComparator.java
@@ -33,7 +33,7 @@ public class TaxonNodeNavigatorComparator extends ViewerComparator{
                        if (this.getComparator() instanceof TaxonNaturalComparator){
                                return this.getComparator().compare((TaxonNode)e1, (TaxonNode)e2);
                        }else{
-                               return this.getComparator().compare(((TaxonNode)e1).getTaxon(),((TaxonNode)e2).getTaxon());
+                               return this.getComparator().compare(e1,e2);
                        }
                }
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
index 5d666156c32630211fc70da4ae64f38e54874edf..d5f7b310542dc1212a42e43036f53a09078d8417 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
@@ -3,7 +3,6 @@
  */
 package eu.etaxonomy.taxeditor.ui.element;
 
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -152,11 +151,7 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
      * @return a {@link java.lang.String} object.
      */
     public String getText() {
-       if (StringUtils.isBlank(text.getText())){
-               return null;
-       }else{
-               return text.getText();
-       }
+        return text.getText();
     }
 
     /**