git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-2154projectMappings
[jalview.git]
/
src
/
jalview
/
gui
/
SliderPanel.java
diff --git
a/src/jalview/gui/SliderPanel.java
b/src/jalview/gui/SliderPanel.java
index
48f09f8
..
c3fec4f
100755
(executable)
--- a/
src/jalview/gui/SliderPanel.java
+++ b/
src/jalview/gui/SliderPanel.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.
*
*
* This file is part of Jalview.
*
@@
-20,16
+20,20
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import java.util.*;
+import jalview.datamodel.SequenceGroup;
+import jalview.jbgui.GSliderPanel;
+import jalview.schemes.ColourSchemeI;
+import jalview.util.MessageManager;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Iterator;
-import jalview.datamodel.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
-import jalview.util.MessageManager;
+import javax.swing.JInternalFrame;
+import javax.swing.JLayeredPane;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-136,8
+140,10
@@
public class SliderPanel extends GSliderPanel
sp.cs = cs;
}
sp.cs = cs;
}
- conservationSlider.setTitle("Conservation Colour Increment (" + source
- + ")");
+ conservationSlider
+ .setTitle(MessageManager.formatMessage(
+ "label.conservation_colour_increment",
+ new String[] { source }));
if (ap.av.getAlignment().getGroups() != null)
{
if (ap.av.getAlignment().getGroups() != null)
{
@@
-213,7
+219,9
@@
public class SliderPanel extends GSliderPanel
pid.cs = cs;
}
pid.cs = cs;
}
- PIDSlider.setTitle("Percentage Identity Threshold (" + source + ")");
+ PIDSlider.setTitle(MessageManager
+ .formatMessage("label.percentage_identity_threshold",
+ new String[] { source }));
if (ap.av.getAlignment().getGroups() != null)
{
if (ap.av.getAlignment().getGroups() != null)
{
@@
-287,13
+295,15
@@
public class SliderPanel extends GSliderPanel
}
else
{
}
else
{
- toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
+ toChange.setThreshold(i, ap.av.isIgnoreGapsConsensus());
}
if (allGroups != null && allGroups.hasNext())
{
while ((toChange = allGroups.next().cs) == null
&& allGroups.hasNext())
}
if (allGroups != null && allGroups.hasNext())
{
while ((toChange = allGroups.next().cs) == null
&& allGroups.hasNext())
+ {
;
;
+ }
}
else
{
}
else
{
@@
-301,7
+311,7
@@
public class SliderPanel extends GSliderPanel
}
}
}
}
- ap.seqPanel.seqCanvas.repaint();
+ ap.getSeqPanel().seqCanvas.repaint();
}
/**
}
/**