From 5d972bc514ac9c78173432433b0404fda9730a75 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 19 Apr 2007 09:56:55 +0000 Subject: [PATCH] Only setDropTarget if Desktop is not null --- src/jalview/gui/AlignFrame.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index ee2f7fd..c9819a2 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -112,8 +112,6 @@ public class AlignFrame void init() { - this.setDropTarget(new java.awt.dnd.DropTarget(this, this)); - if (viewport.conservation == null) { BLOSUM62Colour.setEnabled(false); @@ -137,6 +135,7 @@ public class AlignFrame if (Desktop.desktop != null) { + this.setDropTarget(new java.awt.dnd.DropTarget(this, this)); addServiceListeners(); setGUINucleotide(viewport.alignment.isNucleotide()); } @@ -1477,7 +1476,7 @@ public class AlignFrame if (newAlignment) { - + if (Desktop.jalviewClipboard != null) { // dataset is inherited @@ -1501,10 +1500,10 @@ public class AlignFrame // an existing alignment Vector newDs = (importDs) ? new Vector() : null; // used to create // minimum dataset set - + for (int i = 0; i < sequences.length; i++) { - if (importDs) + if (importDs) { newDs.addElement(null); } @@ -1514,7 +1513,7 @@ public class AlignFrame { if (!newDs.contains(ds)) { - newDs.setElementAt(ds, i); + newDs.setElementAt(ds, i); ds = new Sequence(ds); // update with new dataset sequence sequences[i].setDatasetSequence(ds); @@ -1576,7 +1575,7 @@ public class AlignFrame alignment.setAnnotationIndex(sequences[i].getAnnotation()[a], a); } - + } } if (!newAlignment) { @@ -1605,7 +1604,7 @@ public class AlignFrame //>>>This is a fix for the moment, until a better solution is found!!<<< af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings( alignPanel.seqPanel.seqCanvas.getFeatureRenderer()); - + // TODO: maintain provenance of an alignment, rather than just make the title a concatenation of operations. if (!externalPaste) { if (title.startsWith("Copied sequences")) -- 1.7.10.2