fixed a bug where implementation of equals method yielded a CCE when no editor was...

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameEditorInput.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameEditorInput.java
index c2ce92646e3d1461428313bd0312d7459e093c6e..6edf7b1719af0bc588ade63c1432a36d835de771 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameEditorInput.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameEditorInput.java
@@ -1,5 +1,6 @@
 package eu.etaxonomy.taxeditor.model;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.ui.IEditorInput;\r
 import org.eclipse.ui.IPersistableElement;\r
@@ -14,6 +15,8 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
  */\r
 public class NameEditorInput implements IEditorInput {\r
 \r
+       private static final Logger logger = Logger.getLogger(NameEditorInput.class);\r
+       \r
        private Taxon taxon;\r
        \r
        public NameEditorInput (Taxon taxon) {\r
@@ -51,7 +54,7 @@ public class NameEditorInput implements IEditorInput {
        public Object getAdapter(Class adapter) {\r
 \r
                if (adapter == Taxon.class) {\r
-                       return this.taxon;\r
+                       return taxon;\r
                }\r
                \r
                return null;\r
@@ -62,9 +65,10 @@ public class NameEditorInput implements IEditorInput {
      *  one editor at a time.\r
      * \r
      * @return boolean\r
-     */\r
-       public boolean equals(Object obj) {             \r
-               if (this.taxon.equals(((NameEditorInput) obj).taxon))\r
+     */        \r
+       public boolean equals(Object obj) {\r
+               if (obj.getClass().equals(NameEditorInput.class) \r
+                               && taxon.equals(((NameEditorInput) obj).taxon))\r
                        return true;\r
                return false;\r
        }\r