X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FStructureFile.java;h=3025907fe46adc023add9e13001dddebcf85dae2;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=76281157dcebe3b4e966f8e4c91ad86d64ea00d1;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/io/StructureFile.java b/src/jalview/io/StructureFile.java index 7628115..3025907 100644 --- a/src/jalview/io/StructureFile.java +++ b/src/jalview/io/StructureFile.java @@ -191,11 +191,13 @@ public abstract class StructureFile extends AlignFile { // TODO: use the PDB ID of the structure if one is available, to save // bandwidth and avoid uploading the whole structure to the service - Object annotate3d = cl.getConstructor(new Class[] {}).newInstance( - new Object[] {}); - AlignmentI al = ((AlignmentI) cl.getMethod("getRNAMLFor", - new Class[] { FileParse.class }).invoke(annotate3d, - new Object[] { new FileParse(getDataName(), dataSourceType) })); + Object annotate3d = cl.getConstructor(new Class[] {}) + .newInstance(new Object[] {}); + AlignmentI al = ((AlignmentI) cl + .getMethod("getRNAMLFor", new Class[] + { FileParse.class }) + .invoke(annotate3d, new Object[] + { new FileParse(getDataName(), dataSourceType) })); for (SequenceI sq : al.getSequences()) { if (sq.getDatasetSequence() != null) @@ -222,8 +224,8 @@ public abstract class StructureFile extends AlignFile } @SuppressWarnings("unchecked") - protected void replaceAndUpdateChains(List prot, - AlignmentI al, String pep, boolean b) + protected void replaceAndUpdateChains(List prot, AlignmentI al, + String pep, boolean b) { List> replaced = AlignSeq .replaceMatchingSeqsWith(seqs, annotations, prot, al, pep, @@ -288,8 +290,8 @@ public abstract class StructureFile extends AlignFile processWithJmolParser(proteinSequences); } catch (Exception x) { - System.err - .println("Exceptions from Jmol when processing data in pdb file"); + System.err.println( + "Exceptions from Jmol when processing data in pdb file"); x.printStackTrace(); } } @@ -304,8 +306,11 @@ public abstract class StructureFile extends AlignFile Class cl = Class.forName("jalview.ext.jmol.JmolParser"); if (cl != null) { - final Constructor constructor = cl.getConstructor(new Class[] {FileParse.class }); - final Object[] args = new Object[] { new FileParse(getDataName(), dataSourceType) }; + final Constructor constructor = cl + .getConstructor(new Class[] + { FileParse.class }); + final Object[] args = new Object[] { + new FileParse(getDataName(), dataSourceType) }; StructureImportSettings.setShowSeqFeatures(false); StructureImportSettings.setVisibleChainAnnotation(false); @@ -314,8 +319,8 @@ public abstract class StructureFile extends AlignFile StructureImportSettings .setExternalSecondaryStructure(externalSecondaryStructure); Object jmf = constructor.newInstance(args); - AlignmentI al = new Alignment((SequenceI[]) cl.getMethod( - "getSeqsAsArray", new Class[] {}).invoke(jmf)); + AlignmentI al = new Alignment((SequenceI[]) cl + .getMethod("getSeqsAsArray", new Class[] {}).invoke(jmf)); cl.getMethod("addAnnotations", new Class[] { AlignmentI.class }) .invoke(jmf, al); for (SequenceI sq : al.getSequences()) @@ -418,7 +423,8 @@ public abstract class StructureFile extends AlignFile { dataName = dataName.substring(p + 1); } - if(dataName.indexOf(".") > -1){ + if (dataName.indexOf(".") > -1) + { dataName = dataName.substring(0, dataName.lastIndexOf(".")); } return dataName;