JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob

[jalview.git] / src / jalview / ws / rest / HttpResultSet.java

diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java
index 1c87196..836ca09 100644 (file)
--- a/src/jalview/ws/rest/HttpResultSet.java
+++ b/src/jalview/ws/rest/HttpResultSet.java
@@ -1,11 +1,32 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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.
+ *  
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ws.rest;
 
 import jalview.bin.Cache;
 import jalview.io.FileParse;
 import jalview.io.packed.DataProvider;
+import jalview.io.packed.DataProvider.JvDataType;
 import jalview.io.packed.ParsePackedSet;
 import jalview.io.packed.SimpleDataProvider;
-import jalview.io.packed.DataProvider.JvDataType;
+import jalview.util.MessageManager;
 import jalview.ws.io.mime.JalviewMimeContentHandler;
 
 import java.io.BufferedReader;
@@ -20,7 +41,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.entity.mime.MultipartEntity;
 import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.ContentHandler;
 import org.apache.james.mime4j.parser.MimeStreamParser;
 
 /**
@@ -79,6 +99,7 @@ public class HttpResultSet extends FileParse
 
   /**
    * parses the results of the service output.
+   * 
    * @return the result of ParsePackedSet.getAlignment()
    * @throws Exception
    * @throws Error
@@ -91,7 +112,8 @@ public class HttpResultSet extends FileParse
     if (en == null)
     {
       throw new Error(
-              "Implementation Error: need to have an HttpResponse to process.");
+              MessageManager
+                      .getString("error.implementation_error_need_to_have_httpresponse"));
     }
     jalview.io.packed.JalviewDataset ds = restJob.newJalviewDataset();
     // Decide how we deal with content.
@@ -197,4 +219,20 @@ public class HttpResultSet extends FileParse
     super.finalize();
   }
 
+  /**
+   * 
+   * @return the URL that this result set read data from.
+   */
+  public String getUrl()
+  {
+    try
+    {
+      return cachedRequest.getURI().toURL().toString();
+    } catch (Exception x)
+    {
+      x.printStackTrace();
+      return null;
+    }
+  }
+
 }