merge from 2_4_Release branch

[jalview.git] / src / jalview / ws / dbsources / EbiFileRetrievedProxy.java

diff --git a/src/jalview/ws/dbsources/EbiFileRetrievedProxy.java b/src/jalview/ws/dbsources/EbiFileRetrievedProxy.java
index dc73e74..de2a034 100644 (file)
--- a/src/jalview/ws/dbsources/EbiFileRetrievedProxy.java
+++ b/src/jalview/ws/dbsources/EbiFileRetrievedProxy.java
@@ -1,3 +1,21 @@
+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)\r
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * \r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * \r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ * GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ */\r
 package jalview.ws.dbsources;\r
 \r
 import java.io.BufferedReader;\r
@@ -19,17 +37,18 @@ public abstract class EbiFileRetrievedProxy extends DbSourceProxyImpl
 \r
   public StringBuffer getRawRecords()\r
   {\r
-    if (file==null)\r
+    if (file == null)\r
       return null;\r
-    StringBuffer bf=null;\r
-    try {\r
+    StringBuffer bf = null;\r
+    try\r
+    {\r
       File f = new File(file);\r
       if (f.exists())\r
       {\r
         bf = new StringBuffer();\r
         BufferedReader breader = new BufferedReader(new FileReader(f));\r
-        String line=null;\r
-        while (breader.ready() && (line = breader.readLine())!=null)\r
+        String line = null;\r
+        while (breader.ready() && (line = breader.readLine()) != null)\r
         {\r
           bf.append(line);\r
         }\r
@@ -37,7 +56,7 @@ public abstract class EbiFileRetrievedProxy extends DbSourceProxyImpl
       }\r
     } catch (Exception e)\r
     {\r
-      System.err.println("Warning: problems reading temp file "+file);\r
+      System.err.println("Warning: problems reading temp file " + file);\r
       return null;\r
     }\r
     return bf;\r