X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws1%2FAnnotate3D.java;h=022ae6d6ff399be4ee3f8a1a6bb03ef27c3eea06;hb=115a611d005faab33f978a469578bcacbcecc112;hp=9f5ad195167cd16659a5b2c24604cb0e642558f9;hpb=fb0704b01deb0caee842b5b3eefb86e24af97c96;p=jalview.git
diff --git a/src/jalview/ws/jws1/Annotate3D.java b/src/jalview/ws/jws1/Annotate3D.java
index 9f5ad19..022ae6d 100644
--- a/src/jalview/ws/jws1/Annotate3D.java
+++ b/src/jalview/ws/jws1/Annotate3D.java
@@ -1,27 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.jws1;
-import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
+import jalview.io.FileFormat;
import jalview.io.FileParse;
import jalview.io.FormatAdapter;
import jalview.io.InputStreamParser;
+import jalview.util.MessageManager;
import java.io.BufferedReader;
import java.io.FileReader;
@@ -31,6 +35,7 @@ import java.io.Reader;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
+import java.util.Iterator;
public class Annotate3D
{
@@ -59,6 +64,57 @@ public class Annotate3D
// } catch (IOException e) {
// }
}
+
+ public AlignmentI getRNAMLFor(final FileParse source) throws IOException
+ {
+ try
+ {
+ StringBuffer sb = new StringBuffer();
+
+ Reader fpr = source.getReader();
+ int p = 0;
+ char[] cbuff = new char[2048];
+ while ((p = fpr.read(cbuff)) > 0)
+ {
+ for (int i = 0; i < p; i++)
+ {
+ sb.append(cbuff[i]);
+ }
+ }
+ Iterator r = jalview.ext.paradise.Annotate3D
+ .getRNAMLForPDBFileAsString(sb.toString());
+ AlignmentI al = null;
+ while (r.hasNext())
+ {
+ FileParse fp = new InputStreamParser(r.next(),
+ source.getDataName());
+ AlignmentI nal = new FormatAdapter().readFromFile(fp,
+ FileFormat.Rnaml);
+ if (al == null)
+ {
+ al = nal;
+ }
+ else
+ {
+ al.append(nal);
+ }
+ }
+ return al;
+ } catch (Throwable x)
+ {
+ if (x instanceof IOException)
+ {
+ throw ((IOException) x);
+ }
+ else
+ {
+ throw new IOException(MessageManager.getString(
+ "exception.unexpected_handling_rnaml_translation_for_pdb"),
+ x);
+ }
+ }
+ }
+
public Annotate3D(String path) throws InterruptedException
{
System.out.println("Annotate3D");
@@ -124,8 +180,8 @@ public class Annotate3D
URL url = new URL(
"http://paradise-ibmc.u-strasbg.fr/webservices/annotate3d?data="
+ content);
- BufferedReader is = new BufferedReader(new InputStreamReader(
- url.openStream()));
+ BufferedReader is = new BufferedReader(
+ new InputStreamReader(url.openStream()));
String str4;
while ((str4 = is.readLine()) != null)
{