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
JAL-2277 bug fix for mis-alligned graphics output for scrolled annotations
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLite.java
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
64cf283
..
b30ad41
100644
(file)
--- a/
src/jalview/bin/JalviewLite.java
+++ b/
src/jalview/bin/JalviewLite.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 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.
*
@@
-100,6
+100,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getSelectedSequences()
*/
*
* @see jalview.bin.JalviewLiteJsApi#getSelectedSequences()
*/
+ @Override
public String getSelectedSequences()
{
return getSelectedSequencesFrom(getDefaultTargetFrame());
public String getSelectedSequences()
{
return getSelectedSequencesFrom(getDefaultTargetFrame());
@@
-110,6
+111,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getSelectedSequences(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#getSelectedSequences(java.lang.String)
*/
+ @Override
public String getSelectedSequences(String sep)
{
return getSelectedSequencesFrom(getDefaultTargetFrame(), sep);
public String getSelectedSequences(String sep)
{
return getSelectedSequencesFrom(getDefaultTargetFrame(), sep);
@@
-122,6
+124,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
* .AlignFrame)
*/
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
* .AlignFrame)
*/
+ @Override
public String getSelectedSequencesFrom(AlignFrame alf)
{
return getSelectedSequencesFrom(alf, separator); // ""+0x00AC);
public String getSelectedSequencesFrom(AlignFrame alf)
{
return getSelectedSequencesFrom(alf, separator); // ""+0x00AC);
@@
-134,6
+137,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
* .AlignFrame, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesFrom(jalview.appletgui
* .AlignFrame, java.lang.String)
*/
+ @Override
public String getSelectedSequencesFrom(AlignFrame alf, String sep)
{
StringBuffer result = new StringBuffer("");
public String getSelectedSequencesFrom(AlignFrame alf, String sep)
{
StringBuffer result = new StringBuffer("");
@@
-162,6
+166,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#highlight(java.lang.String,
* java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#highlight(java.lang.String,
* java.lang.String, java.lang.String)
*/
+ @Override
public void highlight(String sequenceId, String position,
String alignedPosition)
{
public void highlight(String sequenceId, String position,
String alignedPosition)
{
@@
-175,6
+180,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#highlightIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#highlightIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
+ @Override
public void highlightIn(final AlignFrame alf, final String sequenceId,
final String position, final String alignedPosition)
{
public void highlightIn(final AlignFrame alf, final String sequenceId,
final String position, final String alignedPosition)
{
@@
-231,6
+237,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#select(java.lang.String,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#select(java.lang.String,
* java.lang.String)
*/
+ @Override
public void select(String sequenceIds, String columns)
{
selectIn(getDefaultTargetFrame(), sequenceIds, columns, separator);
public void select(String sequenceIds, String columns)
{
selectIn(getDefaultTargetFrame(), sequenceIds, columns, separator);
@@
-242,6
+249,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#select(java.lang.String,
* java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#select(java.lang.String,
* java.lang.String, java.lang.String)
*/
+ @Override
public void select(String sequenceIds, String columns, String sep)
{
selectIn(getDefaultTargetFrame(), sequenceIds, columns, sep);
public void select(String sequenceIds, String columns, String sep)
{
selectIn(getDefaultTargetFrame(), sequenceIds, columns, sep);
@@
-253,6
+261,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#selectIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#selectIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String)
*/
+ @Override
public void selectIn(AlignFrame alf, String sequenceIds, String columns)
{
selectIn(alf, sequenceIds, columns, separator);
public void selectIn(AlignFrame alf, String sequenceIds, String columns)
{
selectIn(alf, sequenceIds, columns, separator);
@@
-264,6
+273,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#selectIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#selectIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
+ @Override
public void selectIn(final AlignFrame alf, String sequenceIds,
String columns, String sep)
{
public void selectIn(final AlignFrame alf, String sequenceIds,
String columns, String sep)
{
@@
-456,14
+466,11
@@
public class JalviewLite extends Applet implements
SequenceI rs = sel.getSequenceAt(0);
start = rs.findIndex(start);
end = rs.findIndex(end);
SequenceI rs = sel.getSequenceAt(0);
start = rs.findIndex(start);
end = rs.findIndex(end);
- if (csel != null)
+ List<Integer> cs = new ArrayList<Integer>(csel.getSelected());
+ csel.clear();
+ for (Integer selectedCol : cs)
{
{
- List<Integer> cs = csel.getSelected();
- csel.clear();
- for (Integer selectedCol : cs)
- {
- csel.addElement(rs.findIndex(selectedCol));
- }
+ csel.addElement(rs.findIndex(selectedCol));
}
}
sel.setStartRes(start);
}
}
sel.setStartRes(start);
@@
-486,6
+493,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesAsAlignment(java.lang.
* String, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesAsAlignment(java.lang.
* String, java.lang.String)
*/
+ @Override
public String getSelectedSequencesAsAlignment(String format, String suffix)
{
return getSelectedSequencesAsAlignmentFrom(getDefaultTargetFrame(),
public String getSelectedSequencesAsAlignment(String format, String suffix)
{
return getSelectedSequencesAsAlignmentFrom(getDefaultTargetFrame(),
@@
-499,6
+507,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesAsAlignmentFrom(jalview
* .appletgui.AlignFrame, java.lang.String, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getSelectedSequencesAsAlignmentFrom(jalview
* .appletgui.AlignFrame, java.lang.String, java.lang.String)
*/
+ @Override
public String getSelectedSequencesAsAlignmentFrom(AlignFrame alf,
String format, String suffix)
{
public String getSelectedSequencesAsAlignmentFrom(AlignFrame alf,
String format, String suffix)
{
@@
-528,6
+537,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getAlignmentOrder()
*/
*
* @see jalview.bin.JalviewLiteJsApi#getAlignmentOrder()
*/
+ @Override
public String getAlignmentOrder()
{
return getAlignmentOrderFrom(getDefaultTargetFrame());
public String getAlignmentOrder()
{
return getAlignmentOrderFrom(getDefaultTargetFrame());
@@
-540,6
+550,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getAlignmentOrderFrom(jalview.appletgui.AlignFrame
* )
*/
* jalview.bin.JalviewLiteJsApi#getAlignmentOrderFrom(jalview.appletgui.AlignFrame
* )
*/
+ @Override
public String getAlignmentOrderFrom(AlignFrame alf)
{
return getAlignmentOrderFrom(alf, separator);
public String getAlignmentOrderFrom(AlignFrame alf)
{
return getAlignmentOrderFrom(alf, separator);
@@
-552,6
+563,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getAlignmentOrderFrom(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getAlignmentOrderFrom(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
+ @Override
public String getAlignmentOrderFrom(AlignFrame alf, String sep)
{
AlignmentI alorder = alf.getAlignViewport().getAlignment();
public String getAlignmentOrderFrom(AlignFrame alf, String sep)
{
AlignmentI alorder = alf.getAlignViewport().getAlignment();
@@
-569,6
+581,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#orderBy(java.lang.String,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#orderBy(java.lang.String,
* java.lang.String)
*/
+ @Override
public String orderBy(String order, String undoName)
{
return orderBy(order, undoName, separator);
public String orderBy(String order, String undoName)
{
return orderBy(order, undoName, separator);
@@
-580,6
+593,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#orderBy(java.lang.String,
* java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#orderBy(java.lang.String,
* java.lang.String, java.lang.String)
*/
+ @Override
public String orderBy(String order, String undoName, String sep)
{
return orderAlignmentBy(getDefaultTargetFrame(), order, undoName, sep);
public String orderBy(String order, String undoName, String sep)
{
return orderAlignmentBy(getDefaultTargetFrame(), order, undoName, sep);
@@
-592,6
+606,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#orderAlignmentBy(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#orderAlignmentBy(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
+ @Override
public String orderAlignmentBy(AlignFrame alf, String order,
String undoName, String sep)
{
public String orderAlignmentBy(AlignFrame alf, String order,
String undoName, String sep)
{
@@
-648,6
+663,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getAlignment(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#getAlignment(java.lang.String)
*/
+ @Override
public String getAlignment(String format)
{
return getAlignmentFrom(getDefaultTargetFrame(), format, TRUE);
public String getAlignment(String format)
{
return getAlignmentFrom(getDefaultTargetFrame(), format, TRUE);
@@
-660,6
+676,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getAlignmentFrom(jalview.appletgui.AlignFrame,
* java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getAlignmentFrom(jalview.appletgui.AlignFrame,
* java.lang.String)
*/
+ @Override
public String getAlignmentFrom(AlignFrame alf, String format)
{
return getAlignmentFrom(alf, format, TRUE);
public String getAlignmentFrom(AlignFrame alf, String format)
{
return getAlignmentFrom(alf, format, TRUE);
@@
-671,6
+688,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#getAlignment(java.lang.String,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#getAlignment(java.lang.String,
* java.lang.String)
*/
+ @Override
public String getAlignment(String format, String suffix)
{
return getAlignmentFrom(getDefaultTargetFrame(), format, suffix);
public String getAlignment(String format, String suffix)
{
return getAlignmentFrom(getDefaultTargetFrame(), format, suffix);
@@
-683,6
+701,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getAlignmentFrom(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getAlignmentFrom(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String)
*/
+ @Override
public String getAlignmentFrom(AlignFrame alf, String format,
String suffix)
{
public String getAlignmentFrom(AlignFrame alf, String format,
String suffix)
{
@@
-705,6
+724,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#loadAnnotation(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#loadAnnotation(java.lang.String)
*/
+ @Override
public void loadAnnotation(String annotation)
{
loadAnnotationFrom(getDefaultTargetFrame(), annotation);
public void loadAnnotation(String annotation)
{
loadAnnotationFrom(getDefaultTargetFrame(), annotation);
@@
-717,6
+737,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#loadAnnotationFrom(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#loadAnnotationFrom(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
+ @Override
public void loadAnnotationFrom(AlignFrame alf, String annotation)
{
if (new AnnotationFile().annotateAlignmentView(alf.getAlignViewport(),
public void loadAnnotationFrom(AlignFrame alf, String annotation)
{
if (new AnnotationFile().annotateAlignmentView(alf.getAlignViewport(),
@@
-736,6
+757,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#loadAnnotation(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#loadAnnotation(java.lang.String)
*/
+ @Override
public void loadFeatures(String features, boolean autoenabledisplay)
{
loadFeaturesFrom(getDefaultTargetFrame(), features, autoenabledisplay);
public void loadFeatures(String features, boolean autoenabledisplay)
{
loadFeaturesFrom(getDefaultTargetFrame(), features, autoenabledisplay);
@@
-748,6
+770,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#loadAnnotationFrom(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#loadAnnotationFrom(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
+ @Override
public boolean loadFeaturesFrom(AlignFrame alf, String features,
boolean autoenabledisplay)
{
public boolean loadFeaturesFrom(AlignFrame alf, String features,
boolean autoenabledisplay)
{
@@
-760,6
+783,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getFeatures(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#getFeatures(java.lang.String)
*/
+ @Override
public String getFeatures(String format)
{
return getFeaturesFrom(getDefaultTargetFrame(), format);
public String getFeatures(String format)
{
return getFeaturesFrom(getDefaultTargetFrame(), format);
@@
-772,6
+796,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getFeaturesFrom(jalview.appletgui.AlignFrame,
* java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#getFeaturesFrom(jalview.appletgui.AlignFrame,
* java.lang.String)
*/
+ @Override
public String getFeaturesFrom(AlignFrame alf, String format)
{
return alf.outputFeatures(false, format);
public String getFeaturesFrom(AlignFrame alf, String format)
{
return alf.outputFeatures(false, format);
@@
-782,6
+807,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getAnnotation()
*/
*
* @see jalview.bin.JalviewLiteJsApi#getAnnotation()
*/
+ @Override
public String getAnnotation()
{
return getAnnotationFrom(getDefaultTargetFrame());
public String getAnnotation()
{
return getAnnotationFrom(getDefaultTargetFrame());
@@
-794,6
+820,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getAnnotationFrom(jalview.appletgui.AlignFrame
* )
*/
* jalview.bin.JalviewLiteJsApi#getAnnotationFrom(jalview.appletgui.AlignFrame
* )
*/
+ @Override
public String getAnnotationFrom(AlignFrame alf)
{
return alf.outputAnnotations(false);
public String getAnnotationFrom(AlignFrame alf)
{
return alf.outputAnnotations(false);
@@
-804,6
+831,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#newView()
*/
*
* @see jalview.bin.JalviewLiteJsApi#newView()
*/
+ @Override
public AlignFrame newView()
{
return newViewFrom(getDefaultTargetFrame());
public AlignFrame newView()
{
return newViewFrom(getDefaultTargetFrame());
@@
-814,6
+842,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#newView(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#newView(java.lang.String)
*/
+ @Override
public AlignFrame newView(String name)
{
return newViewFrom(getDefaultTargetFrame(), name);
public AlignFrame newView(String name)
{
return newViewFrom(getDefaultTargetFrame(), name);
@@
-824,6
+853,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#newViewFrom(jalview.appletgui.AlignFrame)
*/
*
* @see jalview.bin.JalviewLiteJsApi#newViewFrom(jalview.appletgui.AlignFrame)
*/
+ @Override
public AlignFrame newViewFrom(AlignFrame alf)
{
return alf.newView(null);
public AlignFrame newViewFrom(AlignFrame alf)
{
return alf.newView(null);
@@
-835,6
+865,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#newViewFrom(jalview.appletgui.AlignFrame,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#newViewFrom(jalview.appletgui.AlignFrame,
* java.lang.String)
*/
+ @Override
public AlignFrame newViewFrom(AlignFrame alf, String name)
{
return alf.newView(name);
public AlignFrame newViewFrom(AlignFrame alf, String name)
{
return alf.newView(name);
@@
-846,11
+877,12
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#loadAlignment(java.lang.String,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#loadAlignment(java.lang.String,
* java.lang.String)
*/
+ @Override
public AlignFrame loadAlignment(String text, String title)
{
AlignmentI al = null;
public AlignFrame loadAlignment(String text, String title)
{
AlignmentI al = null;
- String format = new IdentifyFile().Identify(text,
+ String format = new IdentifyFile().identify(text,
AppletFormatAdapter.PASTE);
try
{
AppletFormatAdapter.PASTE);
try
{
@@
-872,6
+904,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#setMouseoverListener(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#setMouseoverListener(java.lang.String)
*/
+ @Override
public void setMouseoverListener(String listener)
{
setMouseoverListener(currentAlignFrame, listener);
public void setMouseoverListener(String listener)
{
setMouseoverListener(currentAlignFrame, listener);
@@
-886,6
+919,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#setMouseoverListener(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#setMouseoverListener(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
+ @Override
public void setMouseoverListener(AlignFrame af, String listener)
{
if (listener != null)
public void setMouseoverListener(AlignFrame af, String listener)
{
if (listener != null)
@@
-918,6
+952,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#setSelectionListener(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#setSelectionListener(java.lang.String)
*/
+ @Override
public void setSelectionListener(String listener)
{
setSelectionListener(null, listener);
public void setSelectionListener(String listener)
{
setSelectionListener(null, listener);
@@
-930,6
+965,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#setSelectionListener(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#setSelectionListener(jalview.appletgui.AlignFrame
* , java.lang.String)
*/
+ @Override
public void setSelectionListener(AlignFrame af, String listener)
{
if (listener != null)
public void setSelectionListener(AlignFrame af, String listener)
{
if (listener != null)
@@
-968,6
+1004,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#setStructureListener(java.lang.String,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#setStructureListener(java.lang.String,
* java.lang.String)
*/
+ @Override
public void setStructureListener(String listener, String modelSet)
{
if (listener != null)
public void setStructureListener(String listener, String modelSet)
{
if (listener != null)
@@
-1001,6
+1038,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#removeJavascriptListener(jalview.appletgui
* .AlignFrame, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#removeJavascriptListener(jalview.appletgui
* .AlignFrame, java.lang.String)
*/
+ @Override
public void removeJavascriptListener(AlignFrame af, String listener)
{
if (listener != null)
public void removeJavascriptListener(AlignFrame af, String listener)
{
if (listener != null)
@@
-1050,12
+1088,14
@@
public class JalviewLite extends Applet implements
}
}
}
}
+ @Override
public void stop()
{
System.err.println("Applet " + getName() + " stop().");
tidyUp();
}
public void stop()
{
System.err.println("Applet " + getName() + " stop().");
tidyUp();
}
+ @Override
public void destroy()
{
System.err.println("Applet " + getName() + " destroy().");
public void destroy()
{
System.err.println("Applet " + getName() + " destroy().");
@@
-1112,6
+1152,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#mouseOverStructure(java.lang.String,
* java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#mouseOverStructure(java.lang.String,
* java.lang.String, java.lang.String)
*/
+ @Override
public void mouseOverStructure(final String pdbResNum,
final String chain, final String pdbfile)
{
public void mouseOverStructure(final String pdbResNum,
final String chain, final String pdbfile)
{
@@
-1149,6
+1190,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#scrollViewToIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String)
*/
* jalview.bin.JalviewLiteJsApi#scrollViewToIn(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String)
*/
+ @Override
public void scrollViewToIn(final AlignFrame alf, final String topRow,
final String leftHandColumn)
{
public void scrollViewToIn(final AlignFrame alf, final String topRow,
final String leftHandColumn)
{
@@
-1488,6
+1530,7
@@
public class JalviewLite extends Applet implements
add(launcher);
launcher.addActionListener(new java.awt.event.ActionListener()
{
add(launcher);
launcher.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
LoadingThread loader = new LoadingThread(file, file2,
public void actionPerformed(ActionEvent e)
{
LoadingThread loader = new LoadingThread(file, file2,
@@
-1610,6
+1653,7
@@
public class JalviewLite extends Applet implements
frame.setTitle(title);
frame.addWindowListener(new WindowAdapter()
{
frame.setTitle(title);
frame.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent e)
{
if (frame instanceof AlignFrame)
public void windowClosing(WindowEvent e)
{
if (frame instanceof AlignFrame)
@@
-1634,6
+1678,7
@@
public class JalviewLite extends Applet implements
frame.dispose();
}
frame.dispose();
}
+ @Override
public void windowActivated(WindowEvent e)
{
if (frame instanceof AlignFrame)
public void windowActivated(WindowEvent e)
{
if (frame instanceof AlignFrame)
@@
-1671,6
+1716,7
@@
public class JalviewLite extends Applet implements
* @param g
* graphics context
*/
* @param g
* graphics context
*/
+ @Override
public void paint(Graphics g)
{
if (!fileFound)
public void paint(Graphics g)
{
if (!fileFound)
@@
-1722,6
+1768,7
@@
public class JalviewLite extends Applet implements
{
private boolean running = false;
{
private boolean running = false;
+ @Override
public void run()
{
if (running || checkedForJmol)
public void run()
{
if (running || checkedForJmol)
@@
-1866,6
+1913,7
@@
public class JalviewLite extends Applet implements
applet = _applet;
}
applet = _applet;
}
+ @Override
public void run()
{
LoadJmolThread jmolchecker = new LoadJmolThread();
public void run()
{
LoadJmolThread jmolchecker = new LoadJmolThread();
@@
-1967,7
+2015,7
@@
public class JalviewLite extends Applet implements
return null;
}
String resolvedFile = resolveFileProtocol(fileParam);
return null;
}
String resolvedFile = resolveFileProtocol(fileParam);
- String format = new IdentifyFile().Identify(resolvedFile, protocol);
+ String format = new IdentifyFile().identify(resolvedFile, protocol);
dbgMsg("File identified as '" + format + "'");
AlignmentI al = null;
try
dbgMsg("File identified as '" + format + "'");
AlignmentI al = null;
try
@@
-2404,8
+2452,7
@@
public class JalviewLite extends Applet implements
return rtn;
} catch (Exception ex)
{
return rtn;
} catch (Exception ex)
{
- System.out.println("Exception checking resources: " + f + " "
- + ex);
+ System.out.println("Exception checking resources: " + f + " " + ex);
return false;
}
}
return false;
}
}
@@
-2567,6
+2614,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getFeatureGroups()
*/
*
* @see jalview.bin.JalviewLiteJsApi#getFeatureGroups()
*/
+ @Override
public String getFeatureGroups()
{
String lst = arrayToSeparatorList(getDefaultTargetFrame()
public String getFeatureGroups()
{
String lst = arrayToSeparatorList(getDefaultTargetFrame()
@@
-2581,6
+2629,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getFeatureGroupsOn(jalview.appletgui.AlignFrame
* )
*/
* jalview.bin.JalviewLiteJsApi#getFeatureGroupsOn(jalview.appletgui.AlignFrame
* )
*/
+ @Override
public String getFeatureGroupsOn(AlignFrame alf)
{
String lst = arrayToSeparatorList(alf.getFeatureGroups());
public String getFeatureGroupsOn(AlignFrame alf)
{
String lst = arrayToSeparatorList(alf.getFeatureGroups());
@@
-2592,6
+2641,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getFeatureGroupsOfState(boolean)
*/
*
* @see jalview.bin.JalviewLiteJsApi#getFeatureGroupsOfState(boolean)
*/
+ @Override
public String getFeatureGroupsOfState(boolean visible)
{
return arrayToSeparatorList(getDefaultTargetFrame()
public String getFeatureGroupsOfState(boolean visible)
{
return arrayToSeparatorList(getDefaultTargetFrame()
@@
-2605,6
+2655,7
@@
public class JalviewLite extends Applet implements
* jalview.bin.JalviewLiteJsApi#getFeatureGroupsOfStateOn(jalview.appletgui
* .AlignFrame, boolean)
*/
* jalview.bin.JalviewLiteJsApi#getFeatureGroupsOfStateOn(jalview.appletgui
* .AlignFrame, boolean)
*/
+ @Override
public String getFeatureGroupsOfStateOn(AlignFrame alf, boolean visible)
{
return arrayToSeparatorList(alf.getFeatureGroupsOfState(visible));
public String getFeatureGroupsOfStateOn(AlignFrame alf, boolean visible)
{
return arrayToSeparatorList(alf.getFeatureGroupsOfState(visible));
@@
-2616,6
+2667,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#setFeatureGroupStateOn(jalview.appletgui.
* AlignFrame, java.lang.String, boolean)
*/
* @see jalview.bin.JalviewLiteJsApi#setFeatureGroupStateOn(jalview.appletgui.
* AlignFrame, java.lang.String, boolean)
*/
+ @Override
public void setFeatureGroupStateOn(final AlignFrame alf,
final String groups, boolean state)
{
public void setFeatureGroupStateOn(final AlignFrame alf,
final String groups, boolean state)
{
@@
-2637,6
+2689,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#setFeatureGroupState(java.lang.String,
* boolean)
*/
* @see jalview.bin.JalviewLiteJsApi#setFeatureGroupState(java.lang.String,
* boolean)
*/
+ @Override
public void setFeatureGroupState(String groups, boolean state)
{
setFeatureGroupStateOn(getDefaultTargetFrame(), groups, state);
public void setFeatureGroupState(String groups, boolean state)
{
setFeatureGroupStateOn(getDefaultTargetFrame(), groups, state);
@@
-2647,6
+2700,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#getSeparator()
*/
*
* @see jalview.bin.JalviewLiteJsApi#getSeparator()
*/
+ @Override
public String getSeparator()
{
return separator;
public String getSeparator()
{
return separator;
@@
-2657,6
+2711,7
@@
public class JalviewLite extends Applet implements
*
* @see jalview.bin.JalviewLiteJsApi#setSeparator(java.lang.String)
*/
*
* @see jalview.bin.JalviewLiteJsApi#setSeparator(java.lang.String)
*/
+ @Override
public void setSeparator(String separator)
{
if (separator == null || separator.length() < 1)
public void setSeparator(String separator)
{
if (separator == null || separator.length() < 1)
@@
-2701,6
+2756,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#addPdbFile(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#addPdbFile(jalview.appletgui.AlignFrame,
* java.lang.String, java.lang.String, java.lang.String)
*/
+ @Override
public boolean addPdbFile(AlignFrame alFrame, String sequenceId,
String pdbEntryString, String pdbFile)
{
public boolean addPdbFile(AlignFrame alFrame, String sequenceId,
String pdbEntryString, String pdbFile)
{
@@
-2717,6
+2773,7
@@
public class JalviewLite extends Applet implements
return alignPdbStructures;
}
return alignPdbStructures;
}
+ @Override
public void start()
{
// callInitCallback();
public void start()
{
// callInitCallback();
@@
-2750,6
+2807,7
@@
public class JalviewLite extends Applet implements
* @see jalview.bin.JalviewLiteJsApi#getJsMessage(java.lang.String,
* java.lang.String)
*/
* @see jalview.bin.JalviewLiteJsApi#getJsMessage(java.lang.String,
* java.lang.String)
*/
+ @Override
public String getJsMessage(String messageclass, String viewId)
{
Hashtable<String, String[]> msgset = jsmessages.get(messageclass);
public String getJsMessage(String messageclass, String viewId)
{
Hashtable<String, String[]> msgset = jsmessages.get(messageclass);
@@
-2860,6
+2918,15
@@
public class JalviewLite extends Applet implements
URL localref)
{
String resolvedPath = "";
URL localref)
{
String resolvedPath = "";
+ if (targetPath.startsWith("/"))
+ {
+ String codebase = localref.toString();
+ String localfile = localref.getFile();
+ resolvedPath = codebase.substring(0,
+ codebase.length() - localfile.length())
+ + targetPath;
+ return resolvedPath;
+ }
/*
* get URL path and strip off any trailing file e.g.
/*
* get URL path and strip off any trailing file e.g.