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
apply jalview code style
[jalview.git]
/
src
/
jalview
/
gui
/
SeqPanel.java
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
8acdcc6
..
7502812
100755
(executable)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-198,8
+198,8
@@
public class SeqPanel extends JPanel implements MouseListener,
y -= hgap;
y -= hgap;
- seq = Math.min((y % cHeight) / av.getCharHeight(), av.alignment
- .getHeight() - 1);
+ seq = Math.min((y % cHeight) / av.getCharHeight(),
+ av.alignment.getHeight() - 1);
}
else
{
}
else
{
@@
-688,8
+688,9
@@
public class SeqPanel extends JPanel implements MouseListener,
if (av.showSequenceFeatures)
{
int rpos;
if (av.showSequenceFeatures)
{
int rpos;
- SequenceFeature[] features = findFeaturesAtRes(sequence
- .getDatasetSequence(), rpos = sequence.findPosition(res));
+ SequenceFeature[] features = findFeaturesAtRes(
+ sequence.getDatasetSequence(),
+ rpos = sequence.findPosition(res));
appendFeatures(tooltipText, linkImageURL.toString(), rpos, features,
this.ap.seqPanel.seqCanvas.fr.minmax);
}
appendFeatures(tooltipText, linkImageURL.toString(), rpos, features,
this.ap.seqPanel.seqCanvas.fr.minmax);
}
@@
-937,8
+938,7
@@
public class SeqPanel extends JPanel implements MouseListener,
// Which is bigger, left-right or up-down?
if (Math.abs(evt.getY() - lastMousePress.getY()) > Math.abs(evt
// Which is bigger, left-right or up-down?
if (Math.abs(evt.getY() - lastMousePress.getY()) > Math.abs(evt
- .getX()
- - lastMousePress.getX()))
+ .getX() - lastMousePress.getX()))
{
int fontSize = av.font.getSize();
{
int fontSize = av.font.getSize();
@@
-956,9
+956,7
@@
public class SeqPanel extends JPanel implements MouseListener,
fontSize = 1;
}
fontSize = 1;
}
- av
- .setFont(new Font(av.font.getName(), av.font.getStyle(),
- fontSize));
+ av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
av.charWidth = oldWidth;
ap.fontChanged();
}
av.charWidth = oldWidth;
ap.fontChanged();
}
@@
-1443,14
+1441,15
@@
public class SeqPanel extends JPanel implements MouseListener,
av.setSelectionGroup(null);
}
av.setSelectionGroup(null);
}
- SequenceFeature[] features = findFeaturesAtRes(sequence
- .getDatasetSequence(), sequence.findPosition(findRes(evt)));
+ SequenceFeature[] features = findFeaturesAtRes(
+ sequence.getDatasetSequence(),
+ sequence.findPosition(findRes(evt)));
if (features != null && features.length > 0)
{
SearchResults highlight = new SearchResults();
if (features != null && features.length > 0)
{
SearchResults highlight = new SearchResults();
- highlight.addResult(sequence, features[0].getBegin(), features[0]
- .getEnd());
+ highlight.addResult(sequence, features[0].getBegin(),
+ features[0].getEnd());
seqCanvas.highlightSearchResults(highlight);
}
if (features != null && features.length > 0)
seqCanvas.highlightSearchResults(highlight);
}
if (features != null && features.length > 0)
@@
-1554,8
+1553,8
@@
public class SeqPanel extends JPanel implements MouseListener,
if (javax.swing.SwingUtilities.isRightMouseButton(evt))
{
if (javax.swing.SwingUtilities.isRightMouseButton(evt))
{
- SequenceFeature[] allFeatures = findFeaturesAtRes(sequence
- .getDatasetSequence(), sequence.findPosition(res));
+ SequenceFeature[] allFeatures = findFeaturesAtRes(
+ sequence.getDatasetSequence(), sequence.findPosition(res));
Vector links = new Vector();
for (int i = 0; i < allFeatures.length; i++)
{
Vector links = new Vector();
for (int i = 0; i < allFeatures.length; i++)
{
@@
-1641,20
+1640,20
@@
public class SeqPanel extends JPanel implements MouseListener,
{
if (stretchGroup.cs instanceof ClustalxColourScheme)
{
{
if (stretchGroup.cs instanceof ClustalxColourScheme)
{
- ((ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup
- .getSequences(av.hiddenRepSequences), stretchGroup
- .getWidth());
+ ((ClustalxColourScheme) stretchGroup.cs).resetClustalX(
+ stretchGroup.getSequences(av.hiddenRepSequences),
+ stretchGroup.getWidth());
}
if (stretchGroup.cs.conservationApplied())
{
}
if (stretchGroup.cs.conservationApplied())
{
- SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup
- .getName());
+ SliderPanel.setConservationSlider(ap, stretchGroup.cs,
+ stretchGroup.getName());
}
else
{
}
else
{
- SliderPanel.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup
- .getName());
+ SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,
+ stretchGroup.getName());
}
}
PaintRefresher.Refresh(this, av.getSequenceSetId());
}
}
PaintRefresher.Refresh(this, av.getSequenceSetId());
@@
-1883,8
+1882,9
@@
public class SeqPanel extends JPanel implements MouseListener,
}
// do we want to thread this ? (contention with seqsel and colsel locks, I
// suspect)
}
// do we want to thread this ? (contention with seqsel and colsel locks, I
// suspect)
- // rules are: colsel is copied if there is a real intersection between sequence selection
- boolean repaint = false,copycolsel=true;
+ // rules are: colsel is copied if there is a real intersection between
+ // sequence selection
+ boolean repaint = false, copycolsel = true;
if (av.selectionGroup == null || !av.isSelectionGroupChanged())
{
SequenceGroup sgroup = null;
if (av.selectionGroup == null || !av.isSelectionGroupChanged())
{
SequenceGroup sgroup = null;
@@
-1899,10
+1899,11
@@
public class SeqPanel extends JPanel implements MouseListener,
}
sgroup = seqsel.intersect(av.alignment,
(av.hasHiddenRows) ? av.hiddenRepSequences : null);
}
sgroup = seqsel.intersect(av.alignment,
(av.hasHiddenRows) ? av.hiddenRepSequences : null);
- if ((sgroup==null || sgroup.getSize()==0) && (colsel==null || colsel.size()==0))
+ if ((sgroup == null || sgroup.getSize() == 0)
+ && (colsel == null || colsel.size() == 0))
{
// don't copy columns if the region didn't intersect.
{
// don't copy columns if the region didn't intersect.
- copycolsel=false;
+ copycolsel = false;
}
}
if (sgroup != null && sgroup.getSize() > 0)
}
}
if (sgroup != null && sgroup.getSize() > 0)