X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FFeatureEditor.java;h=ba9da673551cf49a0de84fc1f5d4edfe87ad3cc4;hb=948828a5fed141e2ed319586687b80b6d0298268;hp=60f26e62cf9c63f6c130d2665bfe33c6625cd3e7;hpb=c8441b851dcd36fbbc1c6bc64e16a64bda1f8359;p=jalview.git
diff --git a/src/jalview/gui/FeatureEditor.java b/src/jalview/gui/FeatureEditor.java
index 60f26e6..ba9da67 100644
--- a/src/jalview/gui/FeatureEditor.java
+++ b/src/jalview/gui/FeatureEditor.java
@@ -1,17 +1,25 @@
+/*
+ * 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;
-import jalview.datamodel.SearchResults;
-import jalview.datamodel.SearchResultsI;
-import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceI;
-import jalview.gui.JalviewColourChooser.ColourChooserListener;
-import jalview.io.FeaturesFile;
-import jalview.schemes.FeatureColour;
-import jalview.util.ColorUtils;
-import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
@@ -25,6 +33,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Callable;
import javax.swing.JComboBox;
import javax.swing.JLabel;
@@ -33,10 +42,24 @@ import javax.swing.JScrollPane;
import javax.swing.JSpinner;
import javax.swing.JTextArea;
import javax.swing.JTextField;
+import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import jalview.api.FeatureColourI;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.SearchResultsI;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
+import jalview.io.FeaturesFile;
+import jalview.schemes.FeatureColour;
+import jalview.util.ColorUtils;
+import jalview.util.MessageManager;
+
/**
* Provides a dialog allowing the user to add new features, or amend or delete
* existing features
@@ -168,10 +191,34 @@ public class FeatureEditor
});
description = new JTextArea(3, 25);
+
start = new JSpinner();
end = new JSpinner();
start.setPreferredSize(new Dimension(80, 20));
end.setPreferredSize(new Dimension(80, 20));
+
+ /*
+ * ensure that start can never be more than end
+ */
+ start.addChangeListener(new ChangeListener()
+ {
+ @Override
+ public void stateChanged(ChangeEvent e)
+ {
+ Integer startVal = (Integer) start.getValue();
+ ((SpinnerNumberModel) end.getModel()).setMinimum(startVal);
+ }
+ });
+ end.addChangeListener(new ChangeListener()
+ {
+ @Override
+ public void stateChanged(ChangeEvent e)
+ {
+ Integer endVal = (Integer) end.getValue();
+ ((SpinnerNumberModel) start.getModel()).setMaximum(endVal);
+ }
+ });
+
final JLabel colour = new JLabel();
colour.setOpaque(true);
colour.setMaximumSize(new Dimension(30, 16));
@@ -266,6 +313,8 @@ public class FeatureEditor
group.setText(sf.getFeatureGroup());
start.setValue(new Integer(sf.getBegin()));
end.setValue(new Integer(sf.getEnd()));
+ ((SpinnerNumberModel) start.getModel()).setMaximum(sf.getEnd());
+ ((SpinnerNumberModel) end.getModel()).setMinimum(sf.getBegin());
SearchResultsI highlight = new SearchResults();
highlight.addResult(sequences.get(0), sf.getBegin(),
@@ -353,6 +402,11 @@ public class FeatureEditor
start.setValue(new Integer(firstFeature.getBegin()));
end.setValue(new Integer(firstFeature.getEnd()));
+ ((SpinnerNumberModel) start.getModel())
+ .setMaximum(firstFeature.getEnd());
+ ((SpinnerNumberModel) end.getModel())
+ .setMinimum(firstFeature.getBegin());
+
description.setText(firstFeature.getDescription());
featureColour = fr.getFeatureStyle(featureType);
oldColour = featureColour;
@@ -374,18 +428,20 @@ public class FeatureEditor
*/
public void showDialog()
{
- RunResponse okAction = forCreate ? getCreateAction() : getAmendAction();
- RunResponse cancelAction = getCancelAction();
+ Callable okAction = forCreate ? getCreateAction()
+ : getAmendAction();
+ Callable cancelAction = getCancelAction();
/*
* set dialog action handlers for OK (create/Amend) and Cancel options
* also for Delete if applicable (when amending features)
*/
- JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop)
- .response(okAction).response(cancelAction);
+ JvOptionPane dialog = JvOptionPane.newOptionDialog(ap.alignFrame)
+ .setResponseHandler(0, okAction)
+ .setResponseHandler(2, cancelAction);
if (!forCreate)
{
- dialog.response(getDeleteAction());
+ dialog.setResponseHandler(1, getDeleteAction());
}
String title = null;
@@ -408,9 +464,8 @@ public class FeatureEditor
}
dialog.showInternalDialog(mainPanel, title,
- JvOptionPane.YES_NO_CANCEL_OPTION,
- JvOptionPane.QUESTION_MESSAGE, null, options,
- MessageManager.getString("action.ok"));
+ JvOptionPane.YES_NO_CANCEL_OPTION, JvOptionPane.PLAIN_MESSAGE,
+ null, options, MessageManager.getString("action.ok"));
}
/**
@@ -421,16 +476,12 @@ public class FeatureEditor
*
* @return
*/
- protected RunResponse getCancelAction()
+ protected Callable getCancelAction()
{
- RunResponse okAction = new RunResponse(JvOptionPane.CANCEL_OPTION)
- {
- @Override
- public void run()
- {
- ap.highlightSearchResults(null);
- ap.paintAlignment(false, false);
- }
+ Callable okAction = () -> {
+ ap.highlightSearchResults(null);
+ ap.paintAlignment(false, false);
+ return null;
};
return okAction;
}
@@ -445,13 +496,14 @@ public class FeatureEditor
*
* @return
*/
- protected RunResponse getCreateAction()
+ protected Callable getCreateAction()
{
- RunResponse okAction = new RunResponse(JvOptionPane.OK_OPTION)
+ Callable okAction = new Callable()
{
boolean useLastDefaults = features.get(0).getType() == null;
- public void run()
+ @Override
+ public Void call()
{
final String enteredType = name.getText().trim();
final String enteredGroup = group.getText().trim();
@@ -491,6 +543,7 @@ public class FeatureEditor
repaintPanel();
}
+ return null;
}
};
return okAction;
@@ -503,18 +556,15 @@ public class FeatureEditor
*
* @return
*/
- protected RunResponse getDeleteAction()
+ protected Callable getDeleteAction()
{
- RunResponse deleteAction = new RunResponse(JvOptionPane.NO_OPTION)
- {
- public void run()
- {
- SequenceFeature sf = features.get(featureIndex);
- sequences.get(0).getDatasetSequence().deleteFeature(sf);
- fr.featuresAdded();
- ap.getSeqPanel().seqCanvas.highlightSearchResults(null);
- ap.paintAlignment(true, true);
- }
+ Callable deleteAction = () -> {
+ SequenceFeature sf = features.get(featureIndex);
+ sequences.get(0).getDatasetSequence().deleteFeature(sf);
+ fr.featuresAdded();
+ ap.getSeqPanel().seqCanvas.highlightSearchResults(null);
+ ap.paintAlignment(true, true);
+ return null;
};
return deleteAction;
}
@@ -605,17 +655,18 @@ public class FeatureEditor
*
* @return
*/
- protected RunResponse getAmendAction()
+ protected Callable getAmendAction()
{
- RunResponse okAction = new RunResponse(JvOptionPane.OK_OPTION)
+ Callable okAction = new Callable()
{
boolean useLastDefaults = features.get(0).getType() == null;
-
+
String featureType = name.getText();
-
+
String featureGroup = group.getText();
-
- public void run()
+
+ @Override
+ public Void call()
{
final String enteredType = name.getText().trim();
final String enteredGroup = group.getText().trim();
@@ -678,6 +729,7 @@ public class FeatureEditor
fr.featuresAdded();
}
repaintPanel();
+ return null;
}
};
return okAction;