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-2418 source formatting
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureRenderer.java
diff --git
a/src/jalview/gui/FeatureRenderer.java
b/src/jalview/gui/FeatureRenderer.java
index
55c4323
..
358798d
100644
(file)
--- a/
src/jalview/gui/FeatureRenderer.java
+++ b/
src/jalview/gui/FeatureRenderer.java
@@
-63,8
+63,8
@@
import javax.swing.event.DocumentListener;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
-public class FeatureRenderer extends
- jalview.renderer.seqfeatures.FeatureRenderer
+public class FeatureRenderer
+ extends jalview.renderer.seqfeatures.FeatureRenderer
{
/*
* defaults for creating a new feature are the last created
{
/*
* defaults for creating a new feature are the last created
@@
-239,14
+239,13
@@
public class FeatureRenderer extends
*/
gridPanel = new JPanel(new GridLayout(4, 1));
JPanel choosePanel = new JPanel();
*/
gridPanel = new JPanel(new GridLayout(4, 1));
JPanel choosePanel = new JPanel();
- choosePanel.add(new JLabel(MessageManager
- .getString("label.select_feature")
- + ":"));
+ choosePanel.add(new JLabel(
+ MessageManager.getString("label.select_feature") + ":"));
final JComboBox<String> overlaps = new JComboBox<String>();
for (SequenceFeature sf : features)
{
final JComboBox<String> overlaps = new JComboBox<String>();
for (SequenceFeature sf : features)
{
- String text = sf.getType() + "/" + sf.getBegin() + "-"
- + sf.getEnd() + " (" + sf.getFeatureGroup() + ")";
+ String text = sf.getType() + "/" + sf.getBegin() + "-" + sf.getEnd()
+ + " (" + sf.getFeatureGroup() + ")";
overlaps.addItem(text);
}
choosePanel.add(overlaps);
overlaps.addItem(text);
}
choosePanel.add(overlaps);
@@
-271,14
+270,15
@@
public class FeatureRenderer extends
highlight.addResult(sequences.get(0), sf.getBegin(),
sf.getEnd());
highlight.addResult(sequences.get(0), sf.getBegin(),
sf.getEnd());
- alignPanel.getSeqPanel().seqCanvas.highlightSearchResults(highlight);
+ alignPanel.getSeqPanel().seqCanvas
+ .highlightSearchResults(highlight);
}
FeatureColourI col = getFeatureStyle(name.getText());
if (col == null)
{
}
FeatureColourI col = getFeatureStyle(name.getText());
if (col == null)
{
- col = new FeatureColour(ColorUtils
- .createColourFromName(name.getText()));
+ col = new FeatureColour(
+ ColorUtils.createColourFromName(name.getText()));
}
oldcol = fcol = col;
updateColourButton(mainPanel, colour, col);
}
oldcol = fcol = col;
updateColourButton(mainPanel, colour, col);
@@
-315,9
+315,8
@@
public class FeatureRenderer extends
mainPanel.add(gridPanel, BorderLayout.NORTH);
JPanel descriptionPanel = new JPanel();
mainPanel.add(gridPanel, BorderLayout.NORTH);
JPanel descriptionPanel = new JPanel();
- descriptionPanel.add(new JLabel(MessageManager
- .getString("label.description:"),
- JLabel.RIGHT));
+ descriptionPanel.add(new JLabel(
+ MessageManager.getString("label.description:"), JLabel.RIGHT));
description.setFont(JvSwingUtils.getTextAreaFont());
description.setLineWrap(true);
descriptionPanel.add(new JScrollPane(description));
description.setFont(JvSwingUtils.getTextAreaFont());
description.setLineWrap(true);
descriptionPanel.add(new JScrollPane(description));
@@
-371,10
+370,11
@@
public class FeatureRenderer extends
MessageManager.getString("action.cancel") };
}
MessageManager.getString("action.cancel") };
}
- String title = create ? MessageManager
- .getString("label.create_new_sequence_features")
+ String title = create
+ ? MessageManager.getString("label.create_new_sequence_features")
: MessageManager.formatMessage("label.amend_delete_features",
: MessageManager.formatMessage("label.amend_delete_features",
- new String[] { sequences.get(0).getName() });
+ new String[]
+ { sequences.get(0).getName() });
/*
* show the dialog
/*
* show the dialog
@@
-426,8
+426,8
@@
public class FeatureRenderer extends
sf.type = enteredType;
sf.featureGroup = group.getText().trim();
sf.description = description.getText().replaceAll("\n", " ");
sf.type = enteredType;
sf.featureGroup = group.getText().trim();
sf.description = description.getText().replaceAll("\n", " ");
- boolean refreshSettings = (!featureType.equals(sf.type) || !featureGroup
- .equals(sf.featureGroup));
+ boolean refreshSettings = (!featureType.equals(sf.type)
+ || !featureGroup.equals(sf.featureGroup));
refreshSettings |= (fcol != oldcol);
setColour(sf.type, fcol);
refreshSettings |= (fcol != oldcol);
setColour(sf.type, fcol);
@@
-514,7
+514,8
@@
public class FeatureRenderer extends
{
String msg = MessageManager.formatMessage("label.warning_hidden",
MessageManager.getString("label.group"), group);
{
String msg = MessageManager.formatMessage("label.warning_hidden",
MessageManager.getString("label.group"), group);
- JvOptionPane.showMessageDialog(panel, msg, "", JvOptionPane.OK_OPTION);
+ JvOptionPane.showMessageDialog(panel, msg, "",
+ JvOptionPane.OK_OPTION);
}
}
}
}