13.1.2-8 baseline

Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f

cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java

@@ -93,6 +93,9 @@ public class TimeRangeLevelNode extends AbstractAliasLevelNode {
         Set<AbstractRequestableData> records = new HashSet<AbstractRequestableData>();
         for (TimeAndSpace ast : availability) {
             Set<TimeAndSpace> needed = calculateNeededAvailability(ast);
+            if (needed.isEmpty()) {
+                continue;
+            }
             Map<TimeAndSpace, MatchResult> matched = matcher.match(needed,
                     dataMap.keySet());
             if (TimeAndSpaceMatcher.getAll1(matched).containsAll(needed)) {
@@ -123,12 +126,13 @@ public class TimeRangeLevelNode extends AbstractAliasLevelNode {
         Set<TimeAndSpace> goodAvail = new HashSet<TimeAndSpace>();
         for (TimeAndSpace ast : allAvail) {
             Set<TimeAndSpace> needed = calculateNeededAvailability(ast);
-            Set<TimeAndSpace> matchedNeeded = TimeAndSpaceMatcher
+            if (!needed.isEmpty()) {
-                    .getAll1(matcher.match(needed, allAvail));
+                Set<TimeAndSpace> matchedNeeded = TimeAndSpaceMatcher
-            if (matchedNeeded.containsAll(needed)) {
+                        .getAll1(matcher.match(needed, allAvail));
-                goodAvail.add(ast);
+                if (matchedNeeded.containsAll(needed)) {
+                    goodAvail.add(ast);
+                }
             }
-
         }
         return goodAvail;
     }
@@ -139,14 +143,10 @@ public class TimeRangeLevelNode extends AbstractAliasLevelNode {
             AvailabilityContainer availabilityContainer) {
         TimeAndSpaceMatcher matcher = new TimeAndSpaceMatcher();
         matcher.setIgnoreRange(true);
-        Set<TimeAndSpace> sourceAvailability = new HashSet<TimeAndSpace>(
+        Set<TimeAndSpace> sourceAvailability = new HashSet<TimeAndSpace>();
-                availability);
         for (TimeAndSpace ast : availability) {
             Set<TimeAndSpace> needed = calculateNeededAvailability(ast);
-            Set<TimeAndSpace> matchedAvail = TimeAndSpaceMatcher
+            sourceAvailability.addAll(needed);
-                    .getAll1(matcher.match(needed, availability));
-            sourceAvailability.addAll(matchedAvail);
-
         }
         Map<AbstractRequestableNode, Set<TimeAndSpace>> result = new HashMap<AbstractRequestableNode, Set<TimeAndSpace>>();
         result.put(sourceNode, sourceAvailability);

cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml

@@ -29,6 +29,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.nasa.gsfc.fits"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.convsigmet"
          download-size="0"

cave/com.raytheon.uf.viz.productbrowser/src/com/raytheon/uf/viz/productbrowser/ProductBrowserView.java

@@ -752,13 +752,18 @@ public class ProductBrowserView extends ViewPart {
             AbstractProductBrowserDataDefinition<?> prod = (AbstractProductBrowserDataDefinition<?>) ti
                     .getData("class");
             String[] info = getProductURI(ti, false);
-            for (int i = 0; i < info.length; i++) {
+            if (prod instanceof AbstractRequestableProductBrowserDataDefinition<?>) {
-                if (i != 0) {
+                AbstractRequestableProductBrowserDataDefinition<?> aProd = (AbstractRequestableProductBrowserDataDefinition<?>) prod;
-                    stringBuilder.append("\n");
+                stringBuilder.append(aProd.PLUGIN_NAME + " = "
-                }
+                        + aProd.productName);
+            } else {
+                stringBuilder.append(prod.displayName);
+            }
+            for (int i = 1; i < info.length; i++) {
+                stringBuilder.append("\n");
                 if (prod instanceof AbstractRequestableProductBrowserDataDefinition<?>) {
                     stringBuilder
-                            .append(((AbstractRequestableProductBrowserDataDefinition<?>) prod).order[i]
+                            .append(((AbstractRequestableProductBrowserDataDefinition<?>) prod).order[i - 1]
                                     + " = " + info[i]);
                 } else {
                     stringBuilder.append(info[i]);

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java

@@ -54,19 +54,19 @@ public class ShowISCGridsAction extends AbstractHandler {
 	/*
 	 * non-active Image
 	 */
-	private static Image orgImg = null;
+	private Image orgImg = null;
 	/*
 	 * active Image
 	 */
-	private static Image actImg = null;
+	private Image actImg = null;
 	/*
 	 * ImageDescriptor 
 	 */
-	private static ImageDescriptor id = null;
+	private ImageDescriptor id = null;
 	/*
 	 * Tool item
 	 */
-	private static ToolItem ti = null;
+	private ToolItem ti = null;
 	
     @Override
     public Object execute(ExecutionEvent arg0) throws ExecutionException {
@@ -74,37 +74,38 @@ public class ShowISCGridsAction extends AbstractHandler {
         /*
          * Get toolItem
          */
-        if(ti == null) {
+        if (arg0.getTrigger() instanceof Event) {
-        	if (arg0.getTrigger() instanceof Event) {
+        	Event e = (Event) arg0.getTrigger();
-            	Event e = (Event) arg0.getTrigger();
+        	if ( e.widget instanceof ToolItem) {
-                if ( e.widget instanceof ToolItem) {
+        			ti = (ToolItem) e.widget;                	
-                	ti = (ToolItem) e.widget;                	
+        	}
-                }
-            }
         }
         
         /*
          * Get Image when it is not activated
          */
-        if (orgImg == null) orgImg = ti.getImage();
+        if (orgImg == null) {
-        
+        	id = Activator.imageDescriptorFromPlugin(
+        		Activator.PLUGIN_ID, "icons/isc0.gif" );    	
+        	orgImg = id.createImage();
+        }
         /*
          * Get Image when it is activated
          */
-        if ( actImg == null ){
+        if (actImg == null) {
-        	if (id == null) {
+        	id = Activator.imageDescriptorFromPlugin(
-    			id = Activator.imageDescriptorFromPlugin(
+        		Activator.PLUGIN_ID, "icons/isc1.gif" );    	
-    					Activator.PLUGIN_ID, "icons/isc1.gif" );    	
-    		}
         	actImg = id.createImage();
         }
-    
         /*
          * Change the image when it is active and 
          * change it back when it is not activated
          */
-        if (!current) ti.setImage(actImg);
+        if (ti != null) {
-        else ti.setImage(orgImg);
+        	if (!current) 
+        		ti.setImage(actImg);
+        	else ti.setImage(orgImg);
+        }
         
         new ShowISCGridsMsg(!current).send();
         return null;

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java

@@ -225,7 +225,7 @@ public class WeatherElementGroupDialog extends CaveJFACEDialog {
                     + FileUtil.VALID_FILENAME_CHARS);
             mb.open();
             ok = false;
-        } else if (!protectedNames.contains(groupName)){
+        } else if (protectedNames.contains(groupName)){
         	statusHandler.handle(Priority.SIGNIFICANT, "Weather Element Group "
                     + getSelectedItem() + " is protected or an invalid name.");
             ok = false;

cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java

@@ -266,8 +266,7 @@ public class GridProductBrowserDataDefinition extends
                                 parameters[i]));
                     } else {
                         labels.add(new ProductBrowserLabel(info.getTitle()
-                                + " (" + " (" + parameters[i] + ")",
+                                + " (" + parameters[i] + ")", parameters[i]));
-                                parameters[i]));
                     }
                 }
                 Collections.sort(labels);

edexOsgi/com.raytheon.uf.edex.cots.feature/build.xml

@@ -16,6 +16,13 @@
 			<property name="ws" value="gtk"/>
 			<property name="os" value="linux"/>
 		</ant>
+
+                <ant antfile="build.xml" dir="../../ncep/gov.nasa.gsfc.fits" target="${target}">
+                        <property name="arch" value="x86"/>
+                        <property name="ws" value="gtk"/>
+                        <property name="os" value="linux"/>
+                </ant>
+
 		<ant antfile="build.xml" dir="../../cots/org.eclipse.jetty" target="${target}">
 			<property name="arch" value="x86"/>
 			<property name="ws" value="gtk"/>

edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py

@@ -42,19 +42,27 @@ from ufpy.UsageOptionParser import UsageOptionParser
 
 def main():
     (options, args) = validateArgs()
+    for i in range(1,4):
+        print >> sys.stderr, "Attempt number: ", i
+        
+        try:
+            netCdfRequest = createRequest()
+            netCdfRequest.setArgString(netCdfRequest.getArgString() + " -h " + options.host + " -r " + str(options.port))
+            thriftClient = ThriftClient.ThriftClient(options.host, options.port, "/services")
+            serverResponse = thriftClient.sendRequest(netCdfRequest)
+        except Exception, e:
+            print >> sys.stderr, "Unhandled exception thrown during ifpnetCDF processing: \n", str(e)
+            sys.exit(1)
     
-    try:
+        if (serverResponse.isOkay()):
-        netCdfRequest = createRequest()
+            break
-        netCdfRequest.setArgString(netCdfRequest.getArgString() + " -h " + options.host + " -r " + str(options.port))
+        else:
-        thriftClient = ThriftClient.ThriftClient(options.host, options.port, "/services")
+            print >> sys.stderr, "Errors occurred during ifpnetCDF processing: ", serverResponse.message()
-        serverResponse = thriftClient.sendRequest(netCdfRequest)
+ 
-    except Exception, e:
+            if (i == 3):
-        print >> sys.stderr, "Unhandled exception thrown during ifpnetCDF processing: \n", str(e)
+                print >> sys.stderr, "Final attempt failed - exiting"
-        sys.exit(1)
+                sys.exit(1)
-    
+ 
-    if (not serverResponse.isOkay()):
-        print >> sys.stderr, "Errors occurred during ifpnetCDF processing: ", serverResponse.message()
-        sys.exit(1)
 
 def validateArgs():
     parser = UsageOptionParser(conflict_handler="resolve")
@@ -134,4 +142,4 @@ def createRequest():
 
 if __name__ == '__main__':
     main()
-    
+    

ncep/com.raytheon.uf.edex.ncep.feature/feature.xml

@@ -24,6 +24,14 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="gov.nasa.gsfc.fits"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+
    <plugin
          id="gov.noaa.nws.ncep.common.dataplugin.airmet"
          download-size="0"

rpms/build/i386/build.sh

@@ -339,6 +339,8 @@ fi
 
 if [ "${1}" = "-edex" ]; then
    buildRPM "awips2"
+   buildRPM "awips2-gfesuite-client"
+   buildRPM "awips2-gfesuite-server"
    buildRPM "Installer.ncep-database"
    buildEDEX
    if [ $? -ne 0 ]; then