X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;h=6024872fea41920d8dba722dfb299ccc2c2fd639;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=03f15d3ddccf4f1d084095d7bf38ef0b130dcf7e;hpb=8f49ecb042d47e8eda13869f7581fd340191f46b;p=jalview.git
diff --git a/src/jalview/appletgui/FeatureRenderer.java b/src/jalview/appletgui/FeatureRenderer.java
old mode 100755
new mode 100644
index 03f15d3..6024872
--- a/src/jalview/appletgui/FeatureRenderer.java
+++ b/src/jalview/appletgui/FeatureRenderer.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * 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;
@@ -23,10 +26,10 @@ import java.awt.*;
import java.awt.event.*;
-import jalview.appletgui.FeatureSettings.MyCheckbox;
import jalview.datamodel.*;
import jalview.schemes.AnnotationColourGradient;
import jalview.schemes.GraduatedColor;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -84,17 +87,19 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
featureGroups = fr.featureGroups;
featureColours = fr.featureColours;
transparency = fr.transparency;
- if (av!=null && fr.av!=null && fr.av!=av)
+ if (av != null && fr.av != null && fr.av != av)
{
- if (fr.av.featuresDisplayed!=null)
+ if (fr.av.featuresDisplayed != null)
{
- if (av.featuresDisplayed==null)
+ if (av.featuresDisplayed == null)
{
av.featuresDisplayed = new Hashtable();
- } else {
+ }
+ else
+ {
av.featuresDisplayed.clear();
}
- Enumeration en=fr.av.featuresDisplayed.keys();
+ Enumeration en = fr.av.featuresDisplayed.keys();
while (en.hasMoreElements())
{
av.featuresDisplayed.put(en.nextElement(), Boolean.TRUE);
@@ -146,7 +151,7 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
}
else
{
- throw new Error("Invalid color for MyCheckBox");
+ throw new Error(MessageManager.getString("error.invalid_colour_for_mycheckbox"));
}
if (col != null)
{
@@ -193,7 +198,7 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
g.setColor(Color.black);
Font f = new Font("Verdana", Font.PLAIN, 10);
g.setFont(f);
- g.drawString("Label", 0, 0);
+ g.drawString(MessageManager.getString("label.label"), 0, 0);
}
else
{
@@ -348,8 +353,8 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
}
}
- String title = newFeatures ? "Create New Sequence Feature(s)"
- : "Amend/Delete Features for " + sequences[0].getName();
+ String title = newFeatures ? MessageManager.getString("label.create_new_sequence_features")
+ : MessageManager.formatMessage("label.amend_delete_features", new String[]{sequences[0].getName()});
final JVDialog dialog = new JVDialog(ap.alignFrame, title, true, 385,
240);
@@ -363,7 +368,7 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
}
else
{
- dialog.ok.setLabel("Amend");
+ dialog.ok.setLabel(MessageManager.getString("label.amend"));
dialog.buttonPanel.add(deleteButton, 1);
deleteButton.addActionListener(new ActionListener()
{
@@ -786,10 +791,10 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
av.featuresDisplayed = new Hashtable();
Vector allfeatures = new Vector();
minmax = new Hashtable();
-
- for (int i = 0; i < av.alignment.getHeight(); i++)
+ AlignmentI alignment = av.getAlignment();
+ for (int i = 0; i < alignment.getHeight(); i++)
{
- SequenceFeature[] features = av.alignment.getSequenceAt(i)
+ SequenceFeature[] features = alignment.getSequenceAt(i)
.getSequenceFeatures();
if (features == null)
@@ -896,8 +901,7 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
return ((GraduatedColor) fc).getMaxColor();
}
}
- throw new Error("Implementation Error: Unrecognised render object "
- + fc.getClass() + " for features of type " + featureType);
+ throw new Error(MessageManager.formatMessage("error.implementation_error_unrecognised_render_object_for_features_type", new String[]{fc.getClass().getCanonicalName(),featureType}));
}
/**
@@ -1090,7 +1094,8 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
}
}
- ArrayList hiddenGroups=new ArrayList();
+ ArrayList hiddenGroups = new ArrayList();
+
/**
* analyse alignment for groups and hash tables (used to be embedded in
* FeatureSettings.setTableData)
@@ -1104,22 +1109,23 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
{
featureGroups = new Hashtable();
}
- hiddenGroups =new ArrayList();
+ hiddenGroups = new ArrayList();
hiddenGroups.addAll(featureGroups.keySet());
ArrayList allFeatures = new ArrayList();
ArrayList allGroups = new ArrayList();
SequenceFeature[] tmpfeatures;
String group;
- 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;
}
alignmentHasFeatures = true;
- tmpfeatures = av.alignment.getSequenceAt(i).getSequenceFeatures();
+ tmpfeatures = alignment.getSequenceAt(i).getSequenceFeatures();
int index = 0;
while (index < tmpfeatures.length)
{
@@ -1175,16 +1181,17 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
Vector allFeatures = new Vector();
SequenceFeature[] tmpfeatures;
String group;
- 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;
}
alignmentHasFeatures = true;
- tmpfeatures = av.alignment.getSequenceAt(i).getSequenceFeatures();
+ tmpfeatures = alignment.getSequenceAt(i).getSequenceFeatures();
int index = 0;
while (index < tmpfeatures.length)
{