git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3210 Barebones gradle/buildship/eclipse. See README
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureEditor.java
diff --git
a/src/jalview/gui/FeatureEditor.java
b/src/jalview/gui/FeatureEditor.java
index
4fe9a65
..
d547c58
100644
(file)
--- a/
src/jalview/gui/FeatureEditor.java
+++ b/
src/jalview/gui/FeatureEditor.java
@@
-99,12
+99,7
@@
public class FeatureEditor
*
* @param alignPanel
* @param seqs
*
* @param alignPanel
* @param seqs
- * one or more Sequence if create is true; a singleton if create is
- * false
* @param feats
* @param feats
- * a list of new SequenceFeature instances if create is true,
- * otherwise a list of known features for this sequence at this
- * position
* @param create
* if true create a new feature, else amend or delete an existing
* feature
* @param create
* if true create a new feature, else amend or delete an existing
* feature
@@
-227,7
+222,7
@@
public class FeatureEditor
updateColourButton(mainPanel, colour, featureColour);
};
};
updateColourButton(mainPanel, colour, featureColour);
};
};
- JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(),
+ JalviewColourChooser.showColourChooser(Desktop.getDesktop(),
title, featureColour.getColour(), listener);
}
else
title, featureColour.getColour(), listener);
}
else
@@
-417,7
+412,7
@@
public class FeatureEditor
* set dialog action handlers for OK (create/Amend) and Cancel options
* also for Delete if applicable (when amending features)
*/
* 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())
+ JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop)
.setResponseHandler(0, okAction).setResponseHandler(2, cancelAction);
if (!forCreate)
{
.setResponseHandler(0, okAction).setResponseHandler(2, cancelAction);
if (!forCreate)
{
@@
-487,7
+482,6
@@
public class FeatureEditor
{
boolean useLastDefaults = features.get(0).getType() == null;
{
boolean useLastDefaults = features.get(0).getType() == null;
- @Override
public void run()
{
final String enteredType = name.getText().trim();
public void run()
{
final String enteredType = name.getText().trim();
@@
-544,7
+538,6
@@
public class FeatureEditor
{
Runnable deleteAction = new Runnable()
{
{
Runnable deleteAction = new Runnable()
{
- @Override
public void run()
{
SequenceFeature sf = features.get(featureIndex);
public void run()
{
SequenceFeature sf = features.get(featureIndex);
@@
-653,7
+646,6
@@
public class FeatureEditor
String featureGroup = group.getText();
String featureGroup = group.getText();
- @Override
public void run()
{
final String enteredType = name.getText().trim();
public void run()
{
final String enteredType = name.getText().trim();