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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
io
/
FileParse.java
diff --git
a/src/jalview/io/FileParse.java
b/src/jalview/io/FileParse.java
index
7eba512
..
809bc8f
100755
(executable)
--- a/
src/jalview/io/FileParse.java
+++ b/
src/jalview/io/FileParse.java
@@
-20,7
+20,7
@@
*/
package jalview.io;
*/
package jalview.io;
-import jalview.api.AlignExportSettingI;
+import jalview.api.AlignExportSettingsI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.FeatureSettingsModelI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.FeatureSettingsModelI;
@@
-72,7
+72,7
@@
public class FileParse
/**
* specific settings for exporting data from the current context
*/
/**
* specific settings for exporting data from the current context
*/
- private AlignExportSettingI exportSettings;
+ private AlignExportSettingsI exportSettings;
/**
* sequence counter for FileParse object created from same data source
/**
* sequence counter for FileParse object created from same data source
@@
-380,7
+380,7
@@
public class FileParse
*
* @j2sNative
*
*
* @j2sNative
*
- * this.bytes = swingjs.JSToolkit.getFileAsBytes$S(fileStr);
+ * this.bytes = swingjs.JSUtil.getFileAsBytes$O(fileStr);
*
*/
*
*/
@@
-634,7
+634,7
@@
public class FileParse
/**
* @return the currently configured exportSettings for writing data.
*/
/**
* @return the currently configured exportSettings for writing data.
*/
- public AlignExportSettingI getExportSettings()
+ public AlignExportSettingsI getExportSettings()
{
return exportSettings;
}
{
return exportSettings;
}
@@
-645,7
+645,7
@@
public class FileParse
* @param exportSettings
* the exportSettings to set
*/
* @param exportSettings
* the exportSettings to set
*/
- public void setExportSettings(AlignExportSettingI exportSettings)
+ public void setExportSettings(AlignExportSettingsI exportSettings)
{
this.exportSettings = exportSettings;
}
{
this.exportSettings = exportSettings;
}