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-JS/develop' into develop
[jalview.git]
/
src
/
jalview
/
io
/
StructureFile.java
diff --git
a/src/jalview/io/StructureFile.java
b/src/jalview/io/StructureFile.java
index
3025907
..
084f886
100644
(file)
--- a/
src/jalview/io/StructureFile.java
+++ b/
src/jalview/io/StructureFile.java
@@
-38,7
+38,7
@@
import java.lang.reflect.Constructor;
import java.util.List;
import java.util.Vector;
import java.util.List;
import java.util.Vector;
-import MCview.PDBChain;
+import mc_view.PDBChain;
public abstract class StructureFile extends AlignFile
{
public abstract class StructureFile extends AlignFile
{
@@
-68,7
+68,7
@@
public abstract class StructureFile extends AlignFile
private boolean pdbIdAvailable;
private boolean pdbIdAvailable;
- public StructureFile(String inFile, DataSourceType sourceType)
+ public StructureFile(Object inFile, DataSourceType sourceType)
throws IOException
{
super(inFile, sourceType);
throws IOException
{
super(inFile, sourceType);
@@
-98,7
+98,7
@@
public abstract class StructureFile extends AlignFile
}
}
- public StructureFile(boolean parseImmediately, String dataObject,
+ public StructureFile(boolean parseImmediately, Object dataObject,
DataSourceType sourceType) throws IOException
{
super(parseImmediately, dataObject, sourceType);
DataSourceType sourceType) throws IOException
{
super(parseImmediately, dataObject, sourceType);
@@
-341,8
+341,15
@@
public abstract class StructureFile extends AlignFile
}
StructureImportSettings.setShowSeqFeatures(true);
}
}
StructureImportSettings.setShowSeqFeatures(true);
}
-
- public PDBChain findChain(String id) throws Exception
+
+ /**
+ * Answers the first PDBChain found matching the given id, or null if none
+ * is found
+ *
+ * @param id
+ * @return
+ */
+ public PDBChain findChain(String id)
{
for (PDBChain chain : getChains())
{
{
for (PDBChain chain : getChains())
{
@@
-351,7
+358,7
@@
public abstract class StructureFile extends AlignFile
return chain;
}
}
return chain;
}
}
- throw new Exception("PDB chain not Found!");
+ return null;
}
public void makeResidueList()
}
public void makeResidueList()