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
Jalview-JS/JAL-3253-applet adding more applet parameters and setting
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
ecd9155
..
bc08c4f
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-364,7
+364,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
// modifyPID.setEnabled(false);
}
// modifyPID.setEnabled(false);
}
- String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT",
+ String sortby = jalview.bin.Cache.getDefault(Preferences.SORT_ALIGNMENT,
"No sort");
if (sortby.equals("Id"))
"No sort");
if (sortby.equals("Id"))
@@
-1064,7
+1064,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
DataSourceType protocol = fileName.startsWith("http:")
? DataSourceType.URL
: DataSourceType.FILE;
DataSourceType protocol = fileName.startsWith("http:")
? DataSourceType.URL
: DataSourceType.FILE;
- loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
+ loader.loadFile(viewport, fileName, protocol, currentFileFormat);
}
else
{
}
else
{
@@
-1080,12
+1080,12
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
DataSourceType protocol = (fileName.startsWith("http:")
? DataSourceType.URL
: DataSourceType.FILE);
DataSourceType protocol = (fileName.startsWith("http:")
? DataSourceType.URL
: DataSourceType.FILE);
- newframe = loader.LoadFileWaitTillLoaded(fileName, protocol,
+ newframe = loader.loadFileWaitTillLoaded(fileName, protocol,
currentFileFormat);
}
else
{
currentFileFormat);
}
else
{
- newframe = loader.LoadFileWaitTillLoaded(fileObject,
+ newframe = loader.loadFileWaitTillLoaded(fileObject,
DataSourceType.FILE, currentFileFormat);
}
DataSourceType.FILE, currentFileFormat);
}
@@
-4428,7
+4428,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
if (Cache.getDefault(Preferences.ENABLE_SPLIT_FRAME, true))
{
final SequenceI[] seqs = viewport.getSelectionAsNewSequence();
if (Cache.getDefault(Preferences.ENABLE_SPLIT_FRAME, true))
{
final SequenceI[] seqs = viewport.getSelectionAsNewSequence();
- viewport.openSplitFrame(af, new Alignment(seqs));
+ AlignViewport.openSplitFrame(this, af, new Alignment(seqs));
}
else
{
}
else
{
@@
-4799,7
+4799,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
else
{
}
else
{
- new FileLoader().LoadFile(viewport, file, sourceType, format);
+ new FileLoader().loadFile(viewport, file, sourceType, format);
}
}
}
}
}
}