JAL-1894 update year/version in copyright

[jalview.git] / src / jalview / appletgui / AnnotationColumnChooser.java

diff --git a/src/jalview/appletgui/AnnotationColumnChooser.java b/src/jalview/appletgui/AnnotationColumnChooser.java
index e25ff8f..9067656 100644 (file)
--- a/src/jalview/appletgui/AnnotationColumnChooser.java
+++ b/src/jalview/appletgui/AnnotationColumnChooser.java
@@ -1,8 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 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.
+ *  
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.appletgui;
 
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.ColumnSelection;
-import jalview.gui.JvSwingUtils;
 import jalview.schemes.AnnotationColourGradient;
 import jalview.util.MessageManager;
 import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
@@ -30,7 +49,7 @@ import java.awt.event.TextListener;
 import java.util.Iterator;
 import java.util.Vector;
 
-import javax.swing.JPanel;
+//import javax.swing.JPanel;
 
 //import net.miginfocom.swing.MigLayout;
 
@@ -192,11 +211,11 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     slider.setPreferredSize(new Dimension(100, 32));
 
     thresholdPanel.setBackground(Color.white);
-    thresholdPanel.setFont(JvSwingUtils.getLabelFont());
+    // thresholdPanel.setFont(JvSwingUtils.getLabelFont());
     // thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]"));
 
     actionPanel.setBackground(Color.white);
-    actionPanel.setFont(JvSwingUtils.getLabelFont());
+    // actionPanel.setFont(JvSwingUtils.getLabelFont());
 
     graphFilterView.setLayout(gBorderLayout);
     graphFilterView.setBackground(Color.white);
@@ -205,7 +224,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     noGraphFilterView.setBackground(Color.white);
 
     annotationComboBoxPanel.setBackground(Color.white);
-    annotationComboBoxPanel.setFont(JvSwingUtils.getLabelFont());
+    // annotationComboBoxPanel.setFont(JvSwingUtils.getLabelFont());
 
     gSearchPanel = new SearchPanel(this);
     ngSearchPanel = new SearchPanel(this);
@@ -222,7 +241,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     actionPanel.add(ok);
     actionPanel.add(cancel);
 
-    JPanel staticPanel = new JPanel();
+    Panel staticPanel = new Panel();
     staticPanel.setLayout(new BorderLayout());
     staticPanel.setBackground(Color.white);
 
@@ -570,8 +589,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
     updateView();
   }
 
-  public class FurtherActionPanel extends Panel implements
-          ItemListener
+  public class FurtherActionPanel extends Panel implements ItemListener
   {
     private AnnotationColumnChooser aColChooser;
 
@@ -657,7 +675,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
 
       this.setBackground(Color.white);
       this.setTitle("Structure Filter");
-      this.setFont(JvSwingUtils.getLabelFont());
+      // this.setFont(JvSwingUtils.getLabelFont());
 
       this.add(all);
       this.add(alphaHelix);
@@ -784,7 +802,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
 
       });
 
-      displayName.setLabel(MessageManager.getString("label.display_name"));
+      displayName.setLabel(MessageManager.getString("label.label"));
       displayName.setEnabled(false);
       displayName.addItemListener(this);
 
@@ -792,7 +810,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter implements
       description.setEnabled(false);
       description.addItemListener(this);
       this.setTitle("Search Filter");
-      this.setFont(JvSwingUtils.getLabelFont());
+      // this.setFont(JvSwingUtils.getLabelFont());
 
       syncState();
       this.add(searchBox);