Merge branch 'rc' into dev

Author: loitly

src/firefly/java/edu/caltech/ipac/firefly/server/cache/resources/ignore_sizeof.txt

@@ -1,3 +1,2 @@
 # ignore these classes/packages when calculating object's size.
 # edu.caltech.ipac.visualize.plot.PlotView
-java.io.BufferedInputStream

src/firefly/java/edu/caltech/ipac/firefly/server/util/multipart/MultiPartPostBuilder.java

@@ -4,6 +4,7 @@
 package edu.caltech.ipac.firefly.server.util.multipart;
 
 import edu.caltech.ipac.firefly.data.Param;
+import edu.caltech.ipac.firefly.server.ServerContext;
 import edu.caltech.ipac.firefly.server.network.HttpServices;
 import edu.caltech.ipac.firefly.server.util.Logger;
 import edu.caltech.ipac.util.StringUtils;
@@ -22,10 +23,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Date: Jul 27, 2010
@@ -42,6 +45,7 @@ public class MultiPartPostBuilder {
     private List<Param> headers = new ArrayList<Param>();
     private String userId;
     private String passwd;
+    private Map<String, String> cookies;
 
     public MultiPartPostBuilder() {}
 
@@ -75,6 +79,11 @@ public void addHeader(String name, String value) {
         headers.add(new Param(name,value));
     }
 
+
+    public void setCookie(Map<String, String> Cookies) {
+        cookies = Cookies;
+    }
+
     public void addFile(String name, File file) {
         try {
             parts.add(new FilePart(name, file));
@@ -102,6 +111,7 @@ public MultiPartRespnse post(OutputStream responseBody) {
 
         for(Param p : headers) {
             filePost.addRequestHeader(p.getName(), p.getValue());
+
         }
 
         try {
@@ -111,7 +121,11 @@ public MultiPartRespnse post(OutputStream responseBody) {
                             filePost.getParams())
             );
 
-            HttpServices.executeMethod(filePost, userId, passwd);
+            if (cookies != null)  {
+                HttpServices.executeMethod(filePost,userId,passwd,cookies);
+            } else {
+                HttpServices.executeMethod(filePost, userId, passwd);
+            }
 
             MultiPartRespnse resp = new MultiPartRespnse(filePost.getResponseHeaders(),
                                                 filePost.getStatusCode(),

src/firefly/java/edu/caltech/ipac/firefly/visualize/FootprintFactory.java

@@ -122,11 +122,11 @@ public enum INSTRUMENTS {
                 "POLYGON  360.00175833  -0.02767222 359.97505000  -0.00110278 359.99865556   0.02345556 360.02604444  -0.00377500 360.00175833  -0.02767222 "),
 
         // Spitzer IRAC3.6/5.8um; FOV data are from SPOT Spitzer focal plane overlay SPOT when the telescope center is at (0, 0):
-        IRAC36(FOOTPRINT.SPITZER,
+        IRAC36("IRAC 3.6 micron", FOOTPRINT.SPITZER,
                 "POLYGON 359.98239  -0.00474  359.89576  -0.00408  359.89513  -0.09074  359.98176  -0.09140 "),
 
         // Spitzer IRAC4.5/8.0um; FOV data are from Spitzer focal plane overlay in SPOT when the telescope center is at (0, 0):
-        IRAC45(FOOTPRINT.SPITZER,
+        IRAC45("IRAC 4.5 micron", FOOTPRINT.SPITZER,
                 "POLYGON 0.09444  -0.00272  0.00778  -0.00215  0.00725  -0.08881  0.09393  -0.08938 ") ;
 
 		private String stc;
@@ -139,10 +139,11 @@ public enum INSTRUMENTS {
 			this.label = this.name();
 		}
 
-		INSTRUMENTS(String prefix, FOOTPRINT fp, String stcDef) {
+		INSTRUMENTS(String label, FOOTPRINT fp, String stcDef) {
 			this.stc = stcDef;
 			this.mission = fp;
-			this.label = prefix+this.name();
+			// Label is a prefix if contains '/' (HST)
+			this.label = label.trim() + (label.trim().endsWith("/") ? this.name() : "");
 		}
 		public String getStc() {
 			return this.stc;