Merge "Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged" into development

Former-commit-id: 127feeb545 [formerly bad816a50e] [formerly 127feeb545 [formerly bad816a50e] [formerly 0fd6c7d56c [formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]]]
Former-commit-id: 0fd6c7d56c
Former-commit-id: abc8a39763 [formerly 33611406a4]
Former-commit-id: bc5e7cfa9f

cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java

@@ -178,7 +178,8 @@ public abstract class AbstractDataCubeAdapter implements IDataCubeAdapter {
             TimeQueryRequest myQ = req.getTimeQuery(originalRequest,
                     latestOnly, cache, latestOnlyCache);
             if (myQ != null) {
-                // no need to merge timeQueries
+                // Make sure simulated time gets set
+                myQ.setSimDate(originalRequest.getSimDate());
                 queries.put(req, myQ);
             }
         } else {

cave/com.raytheon.uf.viz.ui.menus/menus.xsd

@@ -158,6 +158,7 @@
     <xs:complexContent>
       <xs:extension base="abstractMenuContribution">
         <xs:sequence/>
+        <xs:attribute name="visible" type="xs:boolean"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>

cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java

@@ -226,8 +226,7 @@ public class BundleContributionItem extends ContributionItem {
 
         String dateStr = UNKNOWN;
 
-        boolean useReferenceTime = (this.menuContribution.xml.useReferenceTime != null) ? this.menuContribution.xml.useReferenceTime
+        boolean useReferenceTime = this.menuContribution.xml.useReferenceTime;
-                : true;
 
         if (lastUsedTime != null) {
             // We have a
@@ -261,8 +260,7 @@ public class BundleContributionItem extends ContributionItem {
         BundleContributionItem.this.queryPerformed = true;
 
         if (time != null) {
-            boolean useReferenceTime = (BundleContributionItem.this.menuContribution.xml.useReferenceTime != null) ? BundleContributionItem.this.menuContribution.xml.useReferenceTime
+            boolean useReferenceTime = BundleContributionItem.this.menuContribution.xml.useReferenceTime;
-                    : true;
 
             if (offset != null) {
                 time = offset.getNormalizedTime(time);

cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java

@@ -66,7 +66,9 @@ public class SeparatorMenuContribution extends
         if (removals.contains(item.id))
             return new IContributionItem[0];
 
-        return new IContributionItem[] { new Separator(item.id) };
+        Separator s = new Separator(item.id);
+        s.setVisible(item.visible);
+        return new IContributionItem[] { s };
     }
 
 }

cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java

@@ -204,6 +204,7 @@ public class GLCMTextureData implements IImageCacheable {
     }
 
     public double getValue(int x, int y) {
+        double value = Double.NaN;
         if (!isStaged() && isLoaded()) {
             GLContextBridge.makeMasterContextCurrent();
             GL gl = GLU.getCurrentGL();
@@ -223,8 +224,11 @@ public class GLCMTextureData implements IImageCacheable {
             data.setData(copybackBuffer);
             GLContextBridge.releaseMasterContext();
         }
+        if (data != null) {
             ImageCache.getInstance(CacheType.MEMORY).put(this);
-        return data.getValue(x, y).doubleValue();
+            value = data.getValue(x, y).doubleValue();
+        }
+        return value;
     }
 
     private static Map<IColorMapDataRetrievalCallback, GLCMTextureData> texMap = new HashMap<IColorMapDataRetrievalCallback, GLCMTextureData>();

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml

@@ -19,7 +19,6 @@
 		further_licensing_information.
 	-->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="Derived Products Plots">
 	<contribute xsi:type="subMenu" menuText="GOES High Density Winds">
 		<contribute xsi:type="titleItem"
 			titleText="------ Satellite-Derived Winds  ------" id="SatDerivedWindLine" />
@@ -306,6 +305,4 @@
         <substitute key="plotSource" value="POES Sounding Availability"/>
         <substitute key="offset" value="1800"/>
     </contribute>   
-   </contribute>
-<contribute xsi:type="separator" id="belowDerivedProductPlots" />
 </menuTemplate>

cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml

@@ -19,6 +19,7 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<contribute xsi:type="separator" id="beforeNHemisphere" />
 	<contribute xsi:type="titleItem" 
 		   titleText="------ NH/NA/US every image------" id="NHLine"/>
     <contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml" 

cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml

@@ -34,7 +34,7 @@
              fileName="menus/satellite/baseDerivedProductsImagery.xml">
     	<substitute key="sector" value="Supernational"/>
     </include>
-    <include installTo="menu:satellite?after=GROUP4" 
+    <include subMenu="Derived Products Plots" installTo="menu:satellite?after=GROUP4" 
              fileName="menus/satellite/baseDerivedProductPlots.xml"/>
     <include installTo="menu:satellite?after=GROUP5" 
              fileName="menus/satellite/baseNHemisphere.xml">

edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonBundleMenuContribution.java

@@ -95,10 +95,10 @@ public class CommonBundleMenuContribution extends
 
     /**
      * Indicates whether reference time should be used, instead of valid time
-     * (optional)
+     * (optional, defaults to true)
      */
     @XmlAttribute(name = "useReferenceTime", required = false)
-    public Boolean useReferenceTime;
+    public boolean useReferenceTime = true;
 
     /**
      * The product offset in seconds (optional)

edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonSeparatorMenuContribution.java

@@ -21,6 +21,7 @@ package com.raytheon.uf.common.menus.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -43,4 +44,8 @@ import javax.xml.bind.annotation.XmlType;
 public class CommonSeparatorMenuContribution extends
         CommonAbstractMenuContribution {
 
+    /** Specifies if the separator should be visible or not */
+    @XmlAttribute(name = "visible", required = false)
+    public boolean visible = true;
+
 }