import jalview.api.FeaturesSourceI;
import jalview.bin.Cache;
import jalview.bin.Jalview;
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.AlignmentAnnotation.TFType;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.HiddenColumns;
import jalview.datamodel.PDBEntry;
private File selectedFile;
- private AlignmentAnnotation.TFType temperatureFactorType = null;
-
/**
* default constructor always raised errors in GUI dialog boxes
*/
public AlignFrame LoadFileWaitTillLoaded(String file,
DataSourceType sourceType, FileFormatI format)
{
- return LoadFileWaitTillLoaded(file, sourceType, format, null);
- }
-
- /**
- * Load alignment from (file, protocol) of type format with specified
- * temperature factor type and wait till loaded
- *
- * @param file
- * @param sourceType
- * @param format
- * @param tempfacType
- * @return alignFrame constructed from file contents
- */
- public AlignFrame LoadFileWaitTillLoaded(String file,
- DataSourceType sourceType, FileFormatI format, AlignmentAnnotation.TFType tempfacType)
- {
this.file = file;
this.protocol = sourceType;
this.format = format;
- this.temperatureFactorType = tempfacType;
return _LoadFileWaitTillLoaded();
}
{
if (selectedFile == null)
{
- al = fa.readFile(null, file, protocol, format,
- temperatureFactorType);
+ al = fa.readFile(null, file, protocol, format);
}
else
{
- al = fa.readFile(selectedFile, null, protocol, format,
- temperatureFactorType);
+ al = fa.readFile(selectedFile, null, protocol, format);
}
source = fa.getAlignFile(); // keep reference for later if