X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureEditor.java;fp=src%2Fjalview%2Fgui%2FFeatureEditor.java;h=b53e57c8609ec41deb1da31ca29f2fcf3ccf1337;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=a02ec361581711f62573ddec034d9e8f0f13193d;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/jalview/gui/FeatureEditor.java b/src/jalview/gui/FeatureEditor.java index a02ec36..b53e57c 100644 --- a/src/jalview/gui/FeatureEditor.java +++ b/src/jalview/gui/FeatureEditor.java @@ -1,3 +1,23 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.gui; import jalview.api.FeatureColourI; @@ -412,8 +432,9 @@ public class FeatureEditor * set dialog action handlers for OK (create/Amend) and Cancel options * also for Delete if applicable (when amending features) */ - JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane()) - .setResponseHandler(0, okAction).setResponseHandler(2, cancelAction); + JvOptionPane dialog = JvOptionPane.newOptionDialog(ap.alignFrame) + .setResponseHandler(0, okAction) + .setResponseHandler(2, cancelAction); if (!forCreate) { dialog.setResponseHandler(1, getDeleteAction()); @@ -482,6 +503,7 @@ public class FeatureEditor { boolean useLastDefaults = features.get(0).getType() == null; + @Override public void run() { final String enteredType = name.getText().trim(); @@ -538,6 +560,7 @@ public class FeatureEditor { Runnable deleteAction = new Runnable() { + @Override public void run() { SequenceFeature sf = features.get(featureIndex); @@ -645,7 +668,7 @@ public class FeatureEditor String featureType = name.getText(); String featureGroup = group.getText(); - + @Override public void run() { final String enteredType = name.getText().trim();