From ae0ff09262d33c6f3be922fe1c6a624daebff6c2 Mon Sep 17 00:00:00 2001 From: "b.stoever" Date: Mon, 23 Mar 2015 18:03:02 +0000 Subject: [PATCH] OpenAlignmentEditorHandler marked as deprecated. equals() and hashCode() added to AlignmentEditorInput. Minor changes. --- .../editor/handler/EditSequenceHandler.java | 5 ---- .../handler/OpenAlignmentEditorHandler.java | 1 + .../editor/molecular/AlignmentEditor.java | 2 +- .../molecular/AlignmentEditorInput.java | 28 +++++++++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditSequenceHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditSequenceHandler.java index d6aa37d47..dc41cf1ff 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditSequenceHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditSequenceHandler.java @@ -1,11 +1,6 @@ package eu.etaxonomy.taxeditor.editor.handler; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditorHandler.java index 1daba07c2..4350fa29c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditorHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditorHandler.java @@ -28,6 +28,7 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils; * @author pplitzner * @date 04.08.2014 */ +@Deprecated public class OpenAlignmentEditorHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java index e0025ccad..b1537e9b3 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java @@ -279,7 +279,7 @@ public class AlignmentEditor extends EditorPart { readCDMData(); } else { - createTestContents(); //TODO What to do here instead in the final version? + createTestContents(); // This case will removed after the test phase and an exception should probably be thrown. } } else { diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java index 1664a0895..9d6201d20 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java @@ -102,4 +102,32 @@ public class AlignmentEditorInput implements IEditorInput { public Sequence getSequenceNode() { return sequenceNode; } + + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((sequenceNode == null) ? 0 : sequenceNode.hashCode()); + return result; + } + + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AlignmentEditorInput other = (AlignmentEditorInput) obj; + if (sequenceNode == null) { + if (other.sequenceNode != null) + return false; + } else if (!sequenceNode.equals(other.sequenceNode)) + return false; + return true; + } } -- 2.34.1