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-3594 added BG and UoD logo and banner to splashscreens, and adjusted status text box
[jalview.git]
/
src
/
jalview
/
appletgui
/
FeatureRenderer.java
diff --git
a/src/jalview/appletgui/FeatureRenderer.java
b/src/jalview/appletgui/FeatureRenderer.java
index
8721ff4
..
df407d6
100644
(file)
--- a/
src/jalview/appletgui/FeatureRenderer.java
+++ b/
src/jalview/appletgui/FeatureRenderer.java
@@
-61,8
+61,8
@@
import java.util.List;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
-public class FeatureRenderer extends
- jalview.renderer.seqfeatures.FeatureRenderer
+public class FeatureRenderer
+ extends jalview.renderer.seqfeatures.FeatureRenderer
{
/*
* creating a new feature defaults to the type and group as
{
/*
* creating a new feature defaults to the type and group as
@@
-269,8
+269,8
@@
public class FeatureRenderer extends
FeatureColourI col = getFeatureStyle(name.getText());
if (col == null)
{
FeatureColourI col = getFeatureStyle(name.getText());
if (col == null)
{
- Color generatedColour = ColorUtils.createColourFromName(name
- .getText());
+ Color generatedColour = ColorUtils
+ .createColourFromName(name.getText());
col = new FeatureColour(generatedColour);
}
col = new FeatureColour(generatedColour);
}
@@
-285,17
+285,20
@@
public class FeatureRenderer extends
tmp = new Panel();
panel.add(tmp);
tmp = new Panel();
panel.add(tmp);
- tmp.add(new Label(MessageManager.getString("label.name:"), Label.RIGHT));
+ tmp.add(new Label(MessageManager.getString("label.name:"),
+ Label.RIGHT));
tmp.add(name);
tmp = new Panel();
panel.add(tmp);
tmp.add(name);
tmp = new Panel();
panel.add(tmp);
- tmp.add(new Label(MessageManager.getString("label.group:"), Label.RIGHT));
+ tmp.add(new Label(MessageManager.getString("label.group:"),
+ Label.RIGHT));
tmp.add(group);
tmp = new Panel();
panel.add(tmp);
tmp.add(group);
tmp = new Panel();
panel.add(tmp);
- tmp.add(new Label(MessageManager.getString("label.colour"), Label.RIGHT));
+ tmp.add(new Label(MessageManager.getString("label.colour"),
+ Label.RIGHT));
tmp.add(colourPanel);
bigPanel.add(panel, BorderLayout.NORTH);
tmp.add(colourPanel);
bigPanel.add(panel, BorderLayout.NORTH);
@@
-330,15
+333,16
@@
public class FeatureRenderer extends
*/
SequenceFeature firstFeature = features.get(0);
boolean useLastDefaults = firstFeature.getType() == null;
*/
SequenceFeature firstFeature = features.get(0);
boolean useLastDefaults = firstFeature.getType() == null;
- String featureType = useLastDefaults ? lastFeatureAdded : firstFeature
- .getType();
+ String featureType = useLastDefaults ? lastFeatureAdded
+ : firstFeature.getType();
String featureGroup = useLastDefaults ? lastFeatureGroupAdded
: firstFeature.getFeatureGroup();
String featureGroup = useLastDefaults ? lastFeatureGroupAdded
: firstFeature.getFeatureGroup();
- 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() });
final JVDialog dialog = new JVDialog(ap.alignFrame, title, true, 385,
240);
final JVDialog dialog = new JVDialog(ap.alignFrame, title, true, 385,
240);
@@
-489,7
+493,7
@@
public class FeatureRenderer extends
}
// findAllFeatures();
}
// findAllFeatures();
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
return true;
}
return true;
}