Correct for develop reset

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties
index 8858bb121ccd79d440c8170cb27ea1905d011d0a..f77e70cbb39ffefe75a6f1b5ac860d7d5e888509 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties
@@ -15,7 +15,7 @@ command.label.1 = Set as Candidate(s) for Duplicate Removal
 command.label.2 = Remove as Candidate(s) for Duplicate Removal
 command.label.3 = De-Duplicate Group
 command.label.4 = Delete
-command.label.5 = Convert Team to Person
+command.label.5 = Convert to Person
 command.name = Merge Group
 command.name.0 = Set as Target for Group Merge
 command.name.1 = Dynamic Open Bulk Editor
@@ -26,9 +26,9 @@ command.name.4 = Set as Candidate for Group Merge
 command.name.5 = Remove as Candidate for Group Merge
 command.name.6 = Set Marker Flag
 command.name.7 = delete
-command.name.8 = convert Team to Person
-command.name.9 = convert Person to Team
+command.name.8 = convert to Person
+command.name.9 = convert to Team
 specification.label = Merge Candidate Annotation
 specification.label.0 = Merge Target Annotation
-command.label.6 = Convert Person to Team
+command.label.6 = Convert to Team
 command.name.10 = convert Person to Team
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties
index c05c77c3cc42f8beb24491db59a09b531c96403d..1365dd13911261d9b8a7479a48d32a0e1b51fd47 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties
@@ -14,4 +14,6 @@ command.label.0 = Markiere Zeile als Ziel f\u00fcr Duplikatenentfernung
 command.label.1 = Markiere als Kandidat(en) f\u00fcr Duplikatenentfernung
 command.label.2 = Entferne Kandidat f\u00fcr Duplikatenentfernung
 command.label.3 = Dedupliziere Gruppe
-command.label.4 = L\u00f6schen
\ No newline at end of file
+command.label.4 = L\u00f6schen
+command.label.5 = Umwandeln in Person
+command.label.6 = Umwandeln in Team
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
index cb3a610edd667d001572a5b70e125f53384a4e97..ee587aaa601eb440f9336f4fc9c8ec959bee1d50 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/ConvertPerson2TeamHandler.java
@@ -29,6 +29,7 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;\r
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;\r
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;\r
+import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;\r
 import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
@@ -79,12 +80,12 @@ public class ConvertPerson2TeamHandler extends AbstractHandler {
                                        try {\r
                                                team = CdmStore.getService(IAgentService.class).convertPerson2Team(person);\r
                                        } catch (IllegalArgumentException e) {\r
-                                               MessagingUtils.errorDialog("Can not convert Team to Person", null, e.getMessage(), null,e, true);\r
+                                               MessagingUtils.errorDialog("Can not convert Person into a Team", null, e.getLocalizedMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID,e, true);\r
                                        } catch (MergeException e) {\r
-                                               MessagingUtils.errorDialog("Can not convert Team to Person", null, e.getMessage(), null,e, true);\r
+                                               MessagingUtils.errorDialog("Can not convert Person into a Team", null, e.getMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID,e, true);\r
                                        }\r
                                }else{\r
-                                       MessagingUtils.informationDialog("Can not convert Team to Person", "convertTeam2Person can only be called on a team.");\r
+                                       MessagingUtils.informationDialog("Can not convert Person into a Team", "convert Person to Team can only be called on a person.");\r
                                }\r
                                \r
                                if (team != null){\r

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index a34d7c5d1ce0f0d7cc4b40ed6a0a4357d841a6a2..041359836ef7622d6406aa264a7cd826bf50e314 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -44,7 +44,6 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.User;
-
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -57,9 +56,8 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
+import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
 import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView;
-
-
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -158,19 +156,30 @@ public class DeleteHandler extends AbstractHandler {
                                                result = service.delete((TeamOrPersonBase)object);
                                        }
                                } catch (Exception e){
-                                       MessagingUtils.messageDialog("Exception occured. Could not delete", getClass(), e.getMessage(), null);
+                                       MessagingUtils.errorDialog("Exception occured. Delete not possible", getClass(), e.getMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID, null, true);
                                }
                                if (result.isError() || result.isAbort()){
                                        if (!result.getExceptions().isEmpty()) {
-                                               MessagingUtils.messageDialog("Could not delete", getClass(), result.getExceptions().toString(), null);
+                                               String message = null;
+                                               int i = result.getExceptions().size();
+                                               for (Exception e:result.getExceptions()){
+                                                       i--;
+                                                       message+= e.getMessage();
+                                                       if (i>0){
+                                                               message+= ", ";
+                                                       }
+                                               }
+                                               
+                                               
+                                               MessagingUtils.messageDialog("Delete not possible", getClass(), result.getExceptions().toString(), null);
                                        }else{
-                                               MessagingUtils.messageDialog("Could not delete", getClass(), "The object could not be deleted. An exception occured.", null);
+                                               MessagingUtils.messageDialog("Delete not possible", getClass(), "The object could not be deleted. An exception occured.", null);
                                                
                                        }
                                }
                                if (result.isOk() ){
                                        ((BulkEditor) editor).removeAnnotatedLine(annotation);
-                                       if(result.getUpdatedObjects().size() != 0 && !result.getExceptions().isEmpty()){
+                                       if(result.getUpdatedObjects().size() != 0 || !result.getExceptions().isEmpty()){
                                                MessagingUtils.informationDialog("Delete successfull", "The object is deleted but there are updated objects: " + result.toString());
                                        }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index 813701c91f55f4c041d29d407b69d3f6bd54f40e..273d9ad36383f11750f991bcafab80a3f7fcc5aa 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -32,9 +32,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-
 import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
-import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.model.taxon.TaxonNodeByRankAndNameComparator;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.DataChangeBridge;
 import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
@@ -80,11 +80,11 @@ public class TaxonNavigator extends CommonNavigator implements
        /** {@inheritDoc} */
        @Override
        protected IAdaptable getInitialInput() {
-               Comparator comparator;
+               Comparator<TaxonNode> comparator;
                if (PreferencesUtil.getSortNodesNaturally()){
                        comparator = new TaxonNaturalComparator();
                } else{
-                       comparator = new TaxonNodeComparator();
+                       comparator = new TaxonNodeByRankAndNameComparator();
                }
                TaxonNodeNavigatorComparator viewerComparator = new TaxonNodeNavigatorComparator(comparator);
                this.getCommonViewer().setComparator(viewerComparator);

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 2e5da6688054bdff7871e99b02d146814ee2a024..ee6ecbc03c8dfab5e81fbae3fa36a4409fcfcf66 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
@@ -1,25 +1,18 @@
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
-import java.util.Arrays;
 import java.util.Comparator;
 
-
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 
-
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-
 import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement;
 
 public class TaxonNodeNavigatorComparator extends ViewerComparator{
 
        
-       public TaxonNodeNavigatorComparator(Comparator<TaxonBase> comparator){
+       public TaxonNodeNavigatorComparator(Comparator<TaxonNode> comparator){
                super(comparator);
        }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
index 1f17047020c0cb07cca4806cc6edb94b48364a27..b9c5e9dd38111a6106b3364f3cb6d892697ffbba 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
@@ -86,7 +86,7 @@ public class ChangeAcceptedTaxonToSynonymOperation extends
                                
                        MessagingUtils.informationDialog("Synonym created but taxon is not deleted.", exceptionString);                 
                    } else if (result.isAbort() || result.isError()){
-                       MessagingUtils.errorDialog("Synonym could not created", null, result.toString(), null, null, true);
+                       MessagingUtils.errorDialog("Synonym could not created", null, result.toString(), TaxeditorNavigationPlugin.PLUGIN_ID, null, true);
                    }
                } catch (IllegalArgumentException e) {
             MessagingUtils.errorDialog("Operation failed", this, e.getMessage(), TaxeditorNavigationPlugin.PLUGIN_ID, e, false);

diff --git a/pom.xml b/pom.xml
index abed873ce9d8cc196cc67b88eb321710b7ed60d6..7e6fc8626da7cec0514a1afb91d466b85d3b2e56 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,6 @@
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cdmlib.version>3.7.0</cdmlib.version>
-    <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
     <taxeditor.version>3.7.0</taxeditor.version>
     <update.dir>snapshot</update.dir>