X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;h=e11f1b484f1aea73fa822b58b35a3a61b64063df;hb=dfa04e77181fccfa6229ffef1591fc9c622d9b39;hp=f5bc39b30acf074de565b9f2d85b19ef39f5e4b6;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git

diff --git a/src/jalview/appletgui/FeatureRenderer.java b/src/jalview/appletgui/FeatureRenderer.java
old mode 100755
new mode 100644
index f5bc39b..e11f1b4
--- a/src/jalview/appletgui/FeatureRenderer.java
+++ b/src/jalview/appletgui/FeatureRenderer.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -14,6 +14,7 @@
  * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.appletgui;
 
@@ -23,10 +24,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!
@@ -78,31 +79,41 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer
     }
   }
 
-  public void transferSettings(FeatureRenderer fr)
+  public void transferSettings(jalview.api.FeatureRenderer _fr)
   {
-    renderOrder = fr.renderOrder;
-    featureGroups = fr.featureGroups;
-    featureColours = fr.featureColours;
-    transparency = fr.transparency;
-    if (av != null && fr.av != null && fr.av != av)
+    if (_fr instanceof FeatureRenderer)
     {
-      if (fr.av.featuresDisplayed != null)
+      FeatureRenderer fr = (FeatureRenderer) _fr;
+      renderOrder = fr.renderOrder;
+      featureGroups = fr.featureGroups;
+      featureColours = fr.featureColours;
+      transparency = fr.transparency;
+      if (av != null && fr.av != null && fr.av != av)
       {
-        if (av.featuresDisplayed == null)
-        {
-          av.featuresDisplayed = new Hashtable();
-        }
-        else
+        if (fr.av.featuresDisplayed != null)
         {
-          av.featuresDisplayed.clear();
-        }
-        Enumeration en = fr.av.featuresDisplayed.keys();
-        while (en.hasMoreElements())
-        {
-          av.featuresDisplayed.put(en.nextElement(), Boolean.TRUE);
+          if (av.featuresDisplayed == null)
+          {
+            av.featuresDisplayed = new Hashtable();
+          }
+          else
+          {
+            av.featuresDisplayed.clear();
+          }
+          Enumeration en = fr.av.featuresDisplayed.keys();
+          while (en.hasMoreElements())
+          {
+            av.featuresDisplayed.put(en.nextElement(), Boolean.TRUE);
+          }
         }
       }
     }
+    else
+    {
+      throw new Error(
+              "Implementation error: cannot port feature settings from implementation of type "
+                      + _fr.getClass() + " to " + getClass());
+    }
   }
 
   static String lastFeatureAdded;
@@ -195,7 +206,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
         {
@@ -365,7 +376,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()
       {