synchronizing current development

diff --git a/cdmlib-plugin/.classpath b/cdmlib-plugin/.classpath
index 4e5228e30d0e3f1c5d1f48e9e58ef33f8d1726c8..8718bed76dfcccecbae398421ea8a2d4f8b857bb 100644 (file)
--- a/cdmlib-plugin/.classpath
+++ b/cdmlib-plugin/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.aop-3.0.4.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.asm-3.0.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.0.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.0.4.RELEASE.jar"/>
@@ -9,9 +9,9 @@
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.core-3.0.4.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.0.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.0.4.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.0.4.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.0.4.RELEASE.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.0.4.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.0.4.RELEASE-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.0.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.0.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar"/>
@@ -27,14 +27,14 @@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-2.5.jar" sourcepath="lib/cdmlib-commons-2.5src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-2.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-2.5.jar" sourcepath="lib/cdmlib-io-2.5src.zip"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-2.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-2.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-2.5.jar" sourcepath="lib/cdmlib-model-2.5src.zip"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-2.5.jar" sourcepath="lib/cdmlib-persistence-2.5src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-2.5.jar" sourcepath="lib/cdmlib-print-2.5src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-2.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-2.5.jar" sourcepath="lib/cdmlib-services-2.5src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/cglib-2.1.3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar" sourcepath="lib/commons-collections-3.2src.zip"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar"/>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java
index 77d57f29600e0b3bd501aebcd04b68b35fbc0eab..7b4faec89074d6ff19746415f636947cc8149b96 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java
@@ -45,8 +45,8 @@ public class NumberWithLabelElement extends TextWithLabelElement {
        }
        
        public Integer getInteger() {
-               String text = super.getText();
-               return new Integer(text);
+               String text = super.getText().trim();
+               return text.equals("") ? 0 : new Integer(text);
        }
        
        public Float getFloat(){

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
index 48b8b4c4ccb209080876a2d5b9efb1b5f8c70ada..f8567cf653b8761575edae3548b98ef4817e3438 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
@@ -3,6 +3,7 @@
  */
 package eu.etaxonomy.taxeditor.forms;
 
+import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -10,6 +11,7 @@ import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
@@ -24,6 +26,9 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  *
  */
 public class TextWithLabelElement extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement{
+       
+       private static final Logger logger = Logger.getLogger(TextWithLabelElement.class);
+       
        protected Text text;
        private Label label;
        
@@ -58,8 +63,15 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
                        text.addKeyListener( new KeyAdapter(){
                                @Override
                                public void keyPressed(KeyEvent e) {
-                               if(e.character == SWT.CR)
-                                       e.doit = false;
+                                       if(e.character == SWT.CR){
+                                               // do nothing when return was hit
+                                               e.doit = false;
+                                       }else if(e.character == SWT.TAB){
+                                               // traverse is not working for wrapped text widgets so
+                                               // we reintroduce it here
+                                               e.doit = false;
+                                               TextWithLabelElement.this.text.traverse(SWT.TRAVERSE_TAB_NEXT);
+                                       }
                                }
                        });
                }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java
index 8f7fb4377aefb8236d53c5f3eef98cfacb692db0..dd7ee654ed6d399d4944fc2b2317b11b5cfe8761 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -67,8 +67,8 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
                try {
                        combo_preservationMethod = (PreservationMethodComboElement) formFactory.createTermComboElement(TermComboType.PRESERVATION_METHOD, formElement, "Preservation Method", facade.getPreservationMethod(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
-                       logger.error("MethodNotSupportedByDerivedUnitTypeException when trying to get preservation method for derive unit", e);
-                       //throw new RuntimeException("MethodNotSupportedByDerivedUnitTypeException when trying to get preservation method for derive unit");
+                       // we ignore this
+                       logger.debug(e.getMessage());
                }
                selection_storedUnder = (NameSelectionElement) formFactory.createSelectionElement(SelectionType.NAME, getConversationHolder(), formElement, "Stored Under", facade.getStoredUnder(), style);
                text_collectorsNumber = formFactory.createTextWithLabelElement(formElement, "Collectors Number", facade.getCollectorsNumber(), style);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java
index c91a1c627a8e990203c3a9cc71ba611df7e6cc35..fdac39de029f582d8fcf053659b9b89058600499 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java
@@ -23,6 +23,7 @@ import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.forms.TimePeriodElement;
 import eu.etaxonomy.taxeditor.forms.selection.AgentSelectionElement;
+import eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement;
 import eu.etaxonomy.taxeditor.forms.term.LanguageComboElement;
 import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
 
@@ -63,7 +64,7 @@ public class GatheringEventDetailElement extends AbstractCdmDetailElement<Gather
 
        private LanguageComboElement combo_localityLanguage;
        
-
+       private NamedAreaSelectionElement selection_namedArea;
 
        public GatheringEventDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
@@ -87,6 +88,9 @@ public class GatheringEventDetailElement extends AbstractCdmDetailElement<Gather
                // exactLocation
                text_gatheringEventDescription = formFactory.createTextWithLabelElement(formElement, "Gathering Event Description", facade.getGatheringEventDescription(), style);
                composite_gatheringPeriod = formFactory.createTimePeriodElement(formElement, "Gathering Period", facade.getGatheringPeriod(), style);
+               
+//             selection_namedArea = formFactory.createSelectionElement(SelectionType., conversation, parentElement, labelString, selection, style)
+               
                text_localityText = formFactory.createTextWithLabelElement(formElement, "Locality", facade.getLocalityText(), style);
                combo_localityLanguage = (LanguageComboElement) formFactory.createTermComboElement(TermComboType.LANGUAGE, formElement, "Language", facade.getLocalityLanguage(), style);
                

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
index 85df64c015e36c72125cb142c929bc2f5ee786e5..58d2613047e75126a3fb80ec956ada27244209ff 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
@@ -9,6 +9,7 @@
 
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
+import java.util.ConcurrentModificationException;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -134,7 +135,11 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
                                        
                                        // clear the session completely
                                        monitor.subTask("Clearing Taxon Navigators session");
-                                       source.getConversationHolder().clear();
+                                       display.asyncExec(new Runnable() {
+                                                public void run() {
+                                                        source.getConversationHolder().clear();
+                                                }
+                                       });                                     
                                        // FIXME completely clearing the session is a brute force approach. 
                                        // It would be much more elegant to clear only those elements that have been changed.
                                        // I could not get that to work but we should consider workin on this because we might

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java
index 7994df5a05583f952d539207a82cea58db1e2ffe..ba05eea47d810c5596fdd32d73a0e85f4402f7e5 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java
@@ -17,9 +17,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.progress.IProgressConstants;
 
-import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
 import eu.etaxonomy.cdm.database.update.CdmUpdater;
 import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
 import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
@@ -61,7 +60,6 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
                                                                view.getViewer().update(new CdmMetaDataAwareDataSourceContainer[]{container}, null);
                                                        }
                                                }
-                                               
                                        });
                                }
                                
@@ -71,6 +69,7 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler {
                };
                
                job.setPriority(Job.BUILD);
+               job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
                job.schedule();
                
                return false;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java
index 0abdc063bc35a74ca26135671f8172986442bb0b..fd4001bad89944d289030915c063d2f22d5ba8ae 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
+import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 /**\r
@@ -50,7 +51,11 @@ public class DeleteSynonymOperation extends AbstractPostOperation {
                monitor.worked(20);\r
                \r
                // Remove synonym from taxon\r
+               \r
                taxon.removeSynonym(synonym);\r
+//             CdmStore.getTaxonService().deleteSynonymRelationships(synonym);\r
+//             CdmStore.getTaxonService().delete(synonym);\r
+               \r
                monitor.worked(40);\r
 \r
                // Redraw editor if exists\r