fixes a bug that led to strange behavior when adding synonyms to a taxon

diff --git a/.gitattributes b/.gitattributes
index c90b180a5e100c4b4bfce30a83b043bdf31532ba..007c768e36f4e057ddac4089e0cdd92860ba8c06 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -728,7 +728,6 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEdito
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorAdapterFactory.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/Page.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java -text

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
index 9a655bbf98001bb31a3db89e6b102ec2f49e5568..1d32266bb20e5367ef8d1b61eeb38af8b5713506 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
@@ -86,7 +86,6 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
        private CompositeBorderDecorator borderDecorator;       \r
        private FocusListener focusListener;\r
        private LineBreakListener lineBreakListener;\r
-       private ParseListener parseListener;\r
 \r
        private String emptyViewerPrompt;\r
        \r
@@ -514,10 +513,6 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
                                textWidget.removeFocusListener(focusListener);\r
                        }\r
                        \r
-                       if (parseListener != null) {\r
-                               textWidget.removeModifyListener(parseListener);\r
-                       }\r
-                       \r
                        if (lineBreakListener != null) {\r
                                textWidget.removeVerifyListener(lineBreakListener);\r
                                textWidget.removeKeyListener(lineBreakListener);\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java
deleted file mode 100644 (file)
index b3ae9e4..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/ParseListener.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**\r
- * Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
- * http://www.e-taxonomy.eu\r
- * \r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-package eu.etaxonomy.taxeditor.editor;\r
-\r
-import org.eclipse.swt.custom.StyledText;\r
-import org.eclipse.swt.events.ModifyEvent;\r
-import org.eclipse.swt.events.ModifyListener;\r
-import org.eclipse.swt.widgets.Text;\r
-\r
-/**\r
- * Passes modified text to the method <code>parse</code>. \r
- * \r
- * @author p.ciardelli\r
- * @created 02.06.2008\r
- * @version 1.0\r
- */\r
-public abstract class ParseListener implements ModifyListener {\r
-\r
-       public void modifyText(ModifyEvent e) {\r
-               if (e.widget instanceof StyledText) {\r
-                       StyledText widget = (StyledText) e.widget;\r
-                       String text = widget.getText();\r
-                       parse(text);\r
-               }\r
-               if (e.widget instanceof Text) {\r
-                       String text = ((Text) e.widget).getText();\r
-                       parse(text);\r
-               }\r
-       }\r
-       \r
-       abstract public void parse(String text);\r
-}\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
index 4d40c4ec8eed16ba5e63770ecf5314e1ea4fe1cb..a72deebd5bd5421b44b68bc1515f4f5e9a409909 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
@@ -29,7 +29,6 @@ import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.editor.GroupedComposite;\r
-import eu.etaxonomy.taxeditor.editor.ParseListener;\r
 import eu.etaxonomy.taxeditor.editor.labels.ILabelImageStrategy;\r
 import eu.etaxonomy.taxeditor.editor.labels.LabelImageProvider;\r
 import eu.etaxonomy.taxeditor.model.ImageResources;\r
@@ -117,10 +116,7 @@ public abstract class NameComposite<T extends TaxonBase> extends GroupedComposit
        private boolean isUseParser = false;\r
 \r
        protected ParseHandler parseHandler;\r
-       \r
-       \r
-       private ParseListener parseListener;\r
-       \r
+               \r
        protected boolean isParsing;\r
        \r
        protected TaxonNameBase parsedName;\r