From 65a810f2dd78c44eef0f06bc0afbe3ad3e891848 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 24 Jun 2015 16:18:12 +0100 Subject: [PATCH] JAL-653 JAL-1780 JAL-1892 fix jalviewLite compilation --- src/jalview/appletgui/AnnotationColumnChooser.java | 11 +++++------ src/jalview/io/AppletFormatAdapter.java | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/jalview/appletgui/AnnotationColumnChooser.java b/src/jalview/appletgui/AnnotationColumnChooser.java index e25ff8f..0375de2 100644 --- a/src/jalview/appletgui/AnnotationColumnChooser.java +++ b/src/jalview/appletgui/AnnotationColumnChooser.java @@ -2,7 +2,6 @@ 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; @@ -192,11 +191,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 +204,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); @@ -657,7 +656,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); @@ -792,7 +791,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); diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java index b235bcc..d3d4d6e 100755 --- a/src/jalview/io/AppletFormatAdapter.java +++ b/src/jalview/io/AppletFormatAdapter.java @@ -26,7 +26,6 @@ import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AlignmentView; -import jalview.gui.AlignmentPanel; import jalview.util.MessageManager; import java.io.File; @@ -146,7 +145,7 @@ public class AppletFormatAdapter this.viewpanel = viewpanel; } - public AppletFormatAdapter(AlignmentPanel alignPanel, + public AppletFormatAdapter(AlignmentViewPanel alignPanel, AlignExportSettingI settings) { viewpanel = alignPanel; -- 1.7.10.2