X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=cd11a35ad92d3f6b0bb7c4fb3394194d11c8de3e;hb=cf82c19425ee457a01c3f1a04aabfb0d9817af6f;hp=bd82b9263e208b768e5dfaba6f60b8a0de839fc7;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index bd82b92..cd11a35 100755
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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.
- *
+ * 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 .
+ * 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.appletgui;
@@ -27,6 +30,7 @@ import jalview.commands.OrderCommand;
import jalview.datamodel.*;
import jalview.schemes.AnnotationColourGradient;
import jalview.schemes.GraduatedColor;
+import jalview.util.MessageManager;
public class FeatureSettings extends Panel implements ItemListener,
MouseListener, MouseMotionListener, ActionListener,
@@ -118,8 +122,10 @@ public class FeatureSettings extends Panel implements ItemListener,
if (groupPanel != null)
{
- groupPanel.setLayout(new GridLayout(fr.featureGroups.size() / 4 + 1,
- 4));
+ groupPanel
+ .setLayout(new GridLayout(
+ (fr.featureGroups.size() - fr.hiddenGroups.size()) / 4 + 1,
+ 4));
groupPanel.validate();
add(groupPanel, BorderLayout.NORTH);
@@ -144,16 +150,22 @@ public class FeatureSettings extends Panel implements ItemListener,
height = Math.max(200, height);
height = Math.min(400, height);
int width = 300;
- jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", width,
+ jalview.bin.JalviewLite.addFrame(frame,
+ MessageManager.getString("label.feature_settings"), width,
height);
}
public void paint(Graphics g)
{
g.setColor(Color.black);
- g.drawString("No Features added to this alignment!!", 10, 20);
- g.drawString("(Features can be added from searches or", 10, 40);
- g.drawString("from Jalview / GFF features files)", 10, 60);
+ g.drawString(MessageManager
+ .getString("label.no_features_added_to_this_alignment"), 10, 20);
+ g.drawString(MessageManager
+ .getString("label.features_can_be_added_from_searches_1"), 10,
+ 40);
+ g.drawString(MessageManager
+ .getString("label.features_can_be_added_from_searches_2"), 10,
+ 60);
}
protected void popupSort(final MyCheckbox check, final Hashtable minmax,
@@ -161,8 +173,11 @@ public class FeatureSettings extends Panel implements ItemListener,
{
final String type = check.type;
final Object typeCol = fr.getFeatureStyle(type);
- java.awt.PopupMenu men = new PopupMenu("Settings for " + type);
- java.awt.MenuItem scr = new MenuItem("Sort by Score");
+ java.awt.PopupMenu men = new PopupMenu(MessageManager.formatMessage(
+ "label.settings_for_type", new String[]
+ { type }));
+ java.awt.MenuItem scr = new MenuItem(
+ MessageManager.getString("label.sort_by_score"));
men.add(scr);
final FeatureSettings me = this;
scr.addActionListener(new ActionListener()
@@ -175,7 +190,8 @@ public class FeatureSettings extends Panel implements ItemListener,
}
});
- MenuItem dens = new MenuItem("Sort by Density");
+ MenuItem dens = new MenuItem(
+ MessageManager.getString("label.sort_by_density"));
dens.addActionListener(new ActionListener()
{
@@ -261,7 +277,8 @@ public class FeatureSettings extends Panel implements ItemListener,
rdrw = true;
groupPanel.removeAll();
}
-
+ // TODO: JAL-964 - smoothly incorporate new group entries if panel already
+ // displayed and new groups present
Enumeration gps = fr.featureGroups.keys();
while (gps.hasMoreElements())
{
@@ -273,6 +290,7 @@ public class FeatureSettings extends Panel implements ItemListener,
check.addMouseListener(this);
check.setFont(new Font("Serif", Font.BOLD, 12));
check.addItemListener(this);
+ check.setVisible(fr.hiddenGroups.contains(group));
groupPanel.add(check);
}
if (rdrw)
@@ -288,15 +306,15 @@ public class FeatureSettings extends Panel implements ItemListener,
SequenceFeature[] tmpfeatures;
String group = null, type;
Vector visibleChecks = new Vector();
-
- for (int i = 0; i < av.alignment.getHeight(); i++)
+ AlignmentI alignment = av.getAlignment();
+ for (int i = 0; i < alignment.getHeight(); i++)
{
- if (av.alignment.getSequenceAt(i).getSequenceFeatures() == null)
+ if (alignment.getSequenceAt(i).getSequenceFeatures() == null)
{
continue;
}
- tmpfeatures = av.alignment.getSequenceAt(i).getSequenceFeatures();
+ tmpfeatures = alignment.getSequenceAt(i).getSequenceFeatures();
int index = 0;
while (index < tmpfeatures.length)
{
@@ -445,8 +463,8 @@ public class FeatureSettings extends Panel implements ItemListener,
Checkbox source = (Checkbox) evt.getSource();
if (fr.featureGroups.containsKey(source.getLabel()))
{
- fr.featureGroups.put(source.getLabel(), new Boolean(source
- .getState()));
+ fr.featureGroups.put(source.getLabel(),
+ new Boolean(source.getState()));
ap.seqPanel.seqCanvas.repaint();
if (ap.overviewPanel != null)
{
@@ -574,8 +592,7 @@ public class FeatureSettings extends Panel implements ItemListener,
}
else
{
- throw new Error(
- "Implementation error: Unsupported feature colour object.");
+ throw new Error(MessageManager.getString("error.implementation_error_unsupported_feature_colour_object"));
}
refreshTable();
}
@@ -608,8 +625,8 @@ public class FeatureSettings extends Panel implements ItemListener,
{
evt.consume();
String link = fr.featureLinks.get(check.type).toString();
- ap.alignFrame.showURL(link.substring(link.indexOf("|") + 1), link
- .substring(0, link.indexOf("|")));
+ ap.alignFrame.showURL(link.substring(link.indexOf("|") + 1),
+ link.substring(0, link.indexOf("|")));
}
}
@@ -671,7 +688,7 @@ public class FeatureSettings extends Panel implements ItemListener,
}
else
{
- throw new Error("Invalid color for MyCheckBox");
+ throw new Error(MessageManager.getString("error.invalid_colour_for_mycheckbox"));
}
if (col != null)
{