X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=9e09bfb2acadf6cee5b2ee9edfe48f6a0ec28e99;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=ccb8ad141f6fc1a55e5613d59912b1aabee84f7a;hpb=72b3f05a1157da32ada5aea139139996dddea219;p=jalview.git

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index ccb8ad1..9e09bfb 100644
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,18 +20,35 @@
  */
 package jalview.gui;
 
-import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.*;
-
-import jalview.datamodel.*;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
 import jalview.schemes.GraduatedColor;
 import jalview.util.MessageManager;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JColorChooser;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+
 /**
  * DOCUMENT ME!
  * 
@@ -55,10 +72,10 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere
     super();
     this.ap = ap;
     this.av = ap.av;
-    if (ap != null && ap.seqPanel != null && ap.seqPanel.seqCanvas != null
-            && ap.seqPanel.seqCanvas.fr != null)
+    if (ap != null && ap.getSeqPanel() != null && ap.getSeqPanel().seqCanvas != null
+            && ap.getSeqPanel().seqCanvas.fr != null)
     {
-      transferSettings(ap.seqPanel.seqCanvas.fr);
+      transferSettings(ap.getSeqPanel().seqCanvas.fr);
     }
   }
 
@@ -106,7 +123,7 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere
         if (fcol instanceof Color)
         {
           Color col = JColorChooser.showDialog(Desktop.desktop,
-                  "Select Feature Colour", ((Color) fcol));
+                  MessageManager.getString("label.select_feature_colour"), ((Color) fcol));
           if (col != null)
           {
             fcol = col;
@@ -177,7 +194,7 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere
             highlight.addResult(sequences[0], features[index].getBegin(),
                     features[index].getEnd());
 
-            ap.seqPanel.seqCanvas.highlightSearchResults(highlight);
+            ap.getSeqPanel().seqCanvas.highlightSearchResults(highlight);
 
           }
           Object col = getFeatureStyle(name.getText());
@@ -298,12 +315,12 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere
       { "OK", "Cancel" };
     }
 
-    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()});
 
     int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop,
             bigPanel, title, JOptionPane.YES_NO_CANCEL_OPTION,
-            JOptionPane.QUESTION_MESSAGE, null, options, "OK");
+            JOptionPane.QUESTION_MESSAGE, null, options, MessageManager.getString("action.ok"));
 
     jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();
 
@@ -317,7 +334,9 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere
       lastDescriptionAdded = description.getText().replaceAll("\n", " ");
       // TODO: determine if the null feature group is valid
       if (lastFeatureGroupAdded.length() < 1)
+      {
         lastFeatureGroupAdded = null;
+      }
     }
 
     if (!newFeatures)
@@ -363,7 +382,6 @@ public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRendere
           ffile.parseDescriptionHTML(features[i], false);
         }
 
-        
         if (lastFeatureGroupAdded != null)
         {
           setGroupVisibility(lastFeatureGroupAdded, true);