Merge branch 'omaha_14.3.1' into omaha_14.4.1

Conflicts (updated in ufcore):
	cave/com.raytheon.uf.viz.application.feature/feature.xml
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
	edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java


Former-commit-id: a8d3f4d885 [formerly 73ed3251bd] [formerly 83368e4b4e [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]
Former-commit-id: 83368e4b4e
Former-commit-id: caadbd3dd9

cave/com.raytheon.uf.viz.archive.feature/feature.xml

@@ -40,7 +40,6 @@
          id="org.apache.commons.compress"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="0.0.0"/>
-         unpack="false"/>
 
 </feature>

cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationPaneManager.java

@@ -53,6 +53,7 @@ import com.raytheon.viz.ui.panes.VizDisplayPane;
  * ------------ ---------- ----------- --------------------------
  * Jun 07, 2012            mschenke    Initial creation
  * Apr 23, 2014 3060       njensen     Safety checks for SWT widgets disposed
+ * May 01, 2014 2956       njensen     More safety checks for SWT widgets disposed
  * 
  * </pre>
  * 
@@ -242,7 +243,9 @@ public class CollaborationPaneManager extends PaneManager {
 
     public void setCanvasSize(IRenderableDisplay display, Rectangle bounds) {
         DisplayData data = displayMap.get(display);
-        if (data == null) {
+        if (data == null || data.canvasComp.isDisposed()
+                || data.scrollable.isDisposed()
+                || data.wrapperComp.isDisposed()) {
             return;
         }
         data.canvasBounds = bounds;
@@ -273,9 +276,11 @@ public class CollaborationPaneManager extends PaneManager {
     }
 
     private void setExclude(DisplayData data, boolean exclude) {
+        if (!data.scrollable.isDisposed()) {
             GridData gd = (GridData) data.scrollable.getLayoutData();
             data.scrollable.setVisible(!exclude);
             gd.exclude = exclude;
         }
+    }
 
 }

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/TableDataManager.java

@@ -31,6 +31,7 @@ package com.raytheon.uf.viz.datadelivery.common.ui;
  * Jun 06, 2012            lvenable     Initial creation
  * Apr 10, 2013   1891     djohnson     Declare variable as List.
  * Feb 07, 2014   2453     mpduff       Added getSize().
+ * Apr 18, 2014  3012      dhladky      Null check.
  *
  * </pre>
  *
@@ -134,7 +135,11 @@ public class TableDataManager<T extends ITableData<T>> implements ISortTable {
         if (index >= 0 && index < tableData.size()) {
             return tableData.get(index);
         } else {
+            if (!tableData.isEmpty()) {
                 return tableData.get(0);
+            } else {
+                return null;
+            }
         }
     }
 

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java

@@ -85,6 +85,7 @@ import com.raytheon.uf.viz.datadelivery.utils.NotificationHandler;
  * Oct 15, 2013  2451      skorolev     Get highlighted rows after message update.
  * Nov 01, 2013  2431      skorolev     Changed labels on the table.
  * Feb 07, 2014  2453      mpduff       Refactored.
+ * Apr 18, 2014  3012      dhladky      Null check.
  * </pre>
  * 
  * @author lvenable
@@ -941,6 +942,9 @@ public class NotificationTableComp extends TableComp implements ITableFind {
             for (int index : indices) {
                 NotificationRowData rowData = filteredTableList
                         .getDataRow(index);
+                if (rowData == null) {
+                    continue;
+                }
                 selectedRowIds.add(rowData.getId());
             }
         }

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java

@@ -159,6 +159,7 @@ import com.raytheon.viz.ui.presenter.IDisplay;
  * Mar 24, 2014  #2951     lvenable     Added dispose checks for SWT widgets.
  * Mar 31, 2014 2889       dhladky      Added username for notification center tracking.
  * Apr 2,  2014 2974       dhladky      DD ID added to list for dropdowns in DD.
+ * Apr 18, 2014  3012      dhladky    Null check.
  * 
  * </pre>
  * 
@@ -1001,6 +1002,7 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements
                     SubscriptionManagerRowData removedItem = tableComp
                             .getSubscriptionData().getDataRow(idx);
                     Subscription sub = removedItem.getSubscription();
+                    if (sub != null) {
                         if (sub instanceof SharedSubscription) {
                             sub.getOfficeIDs().remove(CURRENT_SITE);
                             if (sub.getOfficeIDs().size() > 0) {
@@ -1014,6 +1016,7 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements
 
                         deleteList.add(removedItem);
                     }
+                }
 
                 String message = getMessage(subsToDelete, subsToUpdate);
                 int choice = DataDeliveryUtils.showMessage(shell, SWT.YES
@@ -1189,7 +1192,9 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements
                         int idx = selectionIndices[i];
                         SubscriptionManagerRowData rowData = tableComp
                                 .getSubscriptionData().getDataRow(idx);
-
+                        if (rowData == null) {
+                            continue;
+                        }
                         Subscription sub = rowData.getSubscription();
                         if (activate) {
                             sub.activate();

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java

@@ -113,7 +113,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils.TABLE_TYPE;
  * Feb 04, 2014  2722      mpduff       Add last update time.
  * Feb 11, 2014  2771      bgonzale     Use Data Delivery ID instead of Site.
  * Mar 24, 2014  #2951     lvenable     Added dispose checks for SWT widgets.
- * 
+ * Apr 18, 2014  3012      dhladky      Null check.
  * @version 1.0
  */
 
@@ -325,6 +325,9 @@ public class SubscriptionTableComp extends TableComp implements IGroupAction {
             SubscriptionManagerRowData rowData = subManagerData
                     .getDataRow(selectionIndices[i]);
 
+            if (rowData == null) {
+                continue;
+            }
             // get the subscription details to be displayed to the user
             printDetails.append(DataDeliveryUtils.formatDetails(rowData
                     .getSubscription()));

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubApprovalTableComp.java

@@ -74,6 +74,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils.TABLE_TYPE;
  *                                      denied pending messages.
  * Apr 05, 2013 1841       djohnson     Refresh entire table on receiving a notification of the correct type.
  * Apr 10, 2013 1891       djohnson     Move logic to get column display text to the column definition, fix sorting.
+ * Apr 18, 2014  3012      dhladky      Null check.
  * </pre>
  * 
  * @author lvenable
@@ -270,6 +271,9 @@ public class SubApprovalTableComp extends TableComp {
         SubscriptionApprovalRowData rowData = pendingSubData.getDataRow(table
                 .getSelectionIndex());
 
+        if (rowData == null) {
+            return;
+        }
         // Get the subscription object
         InitialPendingSubscription pendingSub = rowData.getSubscription();
         diffDetails.append("Subscription Name: ")

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java

@@ -96,6 +96,7 @@ import com.raytheon.viz.ui.presenter.IDisplay;
  * Sep 03, 2013 2315       mpduff      Add subscription name to denied approval message.
  * Oct 23, 2013 2292       mpduff      Move subscription overlap checks to edex.
  * Mar 31, 2014 2889       dhladky      Added username for notification center tracking.
+ * Apr 18, 2014  3012      dhladky      Null check.
  * 
  * </pre>
  * 
@@ -368,6 +369,7 @@ public class SubscriptionApprovalDlg extends CaveSWTDialog implements
             for (int idx : tableComp.getTable().getSelectionIndices()) {
                 SubscriptionApprovalRowData approvedItem = pendingSubData
                         .getDataRow(idx);
+                if (approvedItem != null) {
                     if (site) {
                         approveList.add(approvedItem);
                     } else {
@@ -378,6 +380,7 @@ public class SubscriptionApprovalDlg extends CaveSWTDialog implements
                         }
                     }
                 }
+            }
 
             if (approveList.size() > 0) {
                 approveSubs(approveList);
@@ -461,7 +464,7 @@ public class SubscriptionApprovalDlg extends CaveSWTDialog implements
                 for (int idx : tableComp.getTable().getSelectionIndices()) {
                     SubscriptionApprovalRowData removedItem = pendingSubData
                             .getDataRow(idx);
-
+                    if (removedItem != null) {
                         if (site) {
                             deleteList.add(removedItem);
                         } else {
@@ -470,6 +473,7 @@ public class SubscriptionApprovalDlg extends CaveSWTDialog implements
                             }
                         }
                     }
+                }
 
                 if (!deleteList.isEmpty()) {
                     pendingSubData.removeAll(deleteList);

cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java

@@ -35,8 +35,8 @@ import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.auth.resp.SuccessfulExecution;
-import com.raytheon.uf.common.datadelivery.bandwidth.IBandwidthRequest;
+import com.raytheon.uf.common.datadelivery.bandwidth.BandwidthRequest;
-import com.raytheon.uf.common.datadelivery.bandwidth.IBandwidthRequest.RequestType;
+import com.raytheon.uf.common.datadelivery.bandwidth.BandwidthRequest.RequestType;
 import com.raytheon.uf.common.datadelivery.registry.Coverage;
 import com.raytheon.uf.common.datadelivery.registry.DataLevelType;
 import com.raytheon.uf.common.datadelivery.registry.DataType;
@@ -47,9 +47,8 @@ import com.raytheon.uf.common.datadelivery.registry.PointTime;
 import com.raytheon.uf.common.datadelivery.registry.Subscription;
 import com.raytheon.uf.common.datadelivery.registry.Time;
 import com.raytheon.uf.common.datadelivery.request.DataDeliveryConstants;
+import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
 import com.raytheon.uf.common.serialization.comm.RequestRouter;
-import com.raytheon.uf.common.site.SiteData;
-import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.uf.common.util.CollectionUtil;
 import com.raytheon.uf.common.util.SizeUtil;
@@ -93,6 +92,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Nov 07, 2013 2291       skorolev     Added showText() method for messages with many lines.
  * Feb 11, 2014 2771       bgonzale     Added Data Delivery ID, getter, and retrieval method.
  * Apr 2,  2014 2974       dhladky      DD ID added to list for dropdowns in DD.
+ * Apr 22, 2014 2992       dhladky      Unique list of all registries with data in this node.
  * </pre>
  * 
  * @author mpduff
@@ -849,7 +849,7 @@ public class DataDeliveryUtils {
     }
 
     private static String retrieveDataDeliveryId() {
-        IBandwidthRequest request = new IBandwidthRequest();
+        BandwidthRequest request = new BandwidthRequest();
         request.setRequestType(RequestType.GET_DATADELIVERY_ID);
         try {
             SuccessfulExecution response = (SuccessfulExecution) RequestRouter
@@ -865,16 +865,28 @@ public class DataDeliveryUtils {
      * Gets the DD id containing site List.
      * @return
      */
+    @SuppressWarnings("unchecked")
     public static List<String> getDataDeliverySiteList() {
         
-        Map<String, SiteData> siteData = SiteMap.getInstance().getSiteData();
+        BandwidthRequest request = new BandwidthRequest();
-        Set<String> sites = siteData.keySet();
+        List<String> siteList = null;
-        List<String> siteList = new ArrayList<String>(sites);
+        request.setRequestType(RequestType.GET_DATADELIVERY_REGISTRIES);
-        String DDid = DataDeliveryUtils.getDataDeliveryId();
+        try {
+            SuccessfulExecution response = (SuccessfulExecution) RequestRouter
+                    .route(request, DataDeliveryConstants.DATA_DELIVERY_SERVER);
+            siteList = (List<String>) response.getResponse();
+        } catch (Exception e) {
+            throw new RuntimeException(
+                    "Unable to retrieve Data Delivery Registry list from EDEX.", e);
+        }
+        // Should return itself, but just in case.
+        String DDid = getDataDeliveryId();
         if (!siteList.contains(DDid)) {
             siteList.add(DDid);
             Collections.sort(siteList);
         }
+        // remove "NCF", CAVE users don't care about things owned by NCF
+        siteList.remove(RegistryUtil.defaultUser);
         
         return siteList;
     }

cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPRowGenerator.java

@@ -60,6 +60,7 @@ import com.raytheon.uf.viz.monitor.ffmp.ui.dialogs.FfmpTableConfigData;
  * ------------ ---------- ----------- --------------------------
  * Jun 11, 2013 2085       njensen     Initial creation
  * Jul 15, 2013 2184       dhladky     Remove all HUC's for storage except ALL
+ * Apr 30, 2014 2060       njensen     Safety checks for null guidance
  * 
  * </pre>
  * 
@@ -905,26 +906,25 @@ public class FFMPRowGenerator implements Runnable {
             forced = forceResult.isForced();
         }
 
+        FFMPRecord grec = guidRecords.get(guidType);
+        if (grec != null) {
             if (!forcedPfafs.isEmpty() || forced || !pfafList.isEmpty()) {
                 // Recalculate guidance using the forced value(s)
-            guidance = guidRecords
+                guidance = grec.getBasinData().getAverageGuidanceValue(
-                    .get(guidType)
+                        pfafList,
-                    .getBasinData()
-                    .getAverageGuidanceValue(pfafList,
                         resource.getGuidanceInterpolators().get(guidType),
                         guidance, forcedPfafs,
                         resource.getGuidSourceExpiration(guidType));
             } else {
-
+                FFMPGuidanceBasin ffmpGuidBasin = (FFMPGuidanceBasin) grec
-            FFMPGuidanceBasin ffmpGuidBasin = (FFMPGuidanceBasin) guidRecords
+                        .getBasinData().get(cBasinPfaf);
-                    .get(guidType).getBasinData().get(cBasinPfaf);
+                guidance = resource.getGuidanceValue(ffmpGuidBasin,
-            guidance = resource.getGuidanceValue(ffmpGuidBasin, paintRefTime,
+                        paintRefTime, guidType);
-                    guidType);
 
                 if (guidance < 0.0f) {
                     guidance = Float.NaN;
                 }
-
+            }
         }
 
         return new FFMPTableCellData(FIELDS.GUIDANCE, guidance, forced);

cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/inventory/DerivedSatelliteRecord.java

@@ -73,13 +73,9 @@ public class DerivedSatelliteRecord extends SatelliteRecord {
 
         Set<SatelliteRecord> base = findBaseRecords(requestableData);
         Set<String> creatingEntities = new HashSet<String>();
-        int interpolationLevels = 1;
         for (SatelliteRecord record : base) {
             creatingEntities.add(record.getCreatingEntity());
-            interpolationLevels = Math.max(interpolationLevels,
-                    record.getInterpolationLevels());
         }
-        setInterpolationLevels(interpolationLevels);
         if (creatingEntities.size() == 1) {
             setCreatingEntity(creatingEntities.iterator().next());
         } else {
@@ -92,6 +88,10 @@ public class DerivedSatelliteRecord extends SatelliteRecord {
             setCoverage(((ComparableSatMapCoverage) requestableData.getSpace())
                     .getCoverage());
         }
+        Rectangle[] levels = GridDownscaler
+                .getDownscaleSizes(getGridGeometry());
+        setInterpolationLevels(levels.length - 1);
+
     }
 
     /**

deltaScripts/14.3.1/datadelivery/README

@@ -0,0 +1,12 @@
+# README, DO NOT RUN THIS SCRIPT UNLESS YOU READ THIS!!!!!!!!!!!!!!!
+# This update needs to be performed with build 14.3.1.
+# This update is only for edex servers which have run DD and have subscriptions loaded.
+
+1.) Backup your subscriptions from the Registry Web Interface, 
+    http://$REGISTRY_HOST:8082/registry/RegistryInterface.html. 
+    hit the <Backup All Subscriptions> button.
+2.) Then run this update script, updateSubscriptionOwners.sh 
+3.) If you are satisfied the subs are correct, either clean up the backup files by running 
+    the deleteBackupSubs.sh or move them to a different directory for storage.
+3.) After script runs, hit the <Restore Subscriptions> button
+    That will update the subscriptions will reflect the correct ownership at the registry level.

deltaScripts/14.3.1/datadelivery/deleteBackupSubs.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Deletes the backuped up subscriptions *.bak files
+
+echo ""
+echo "Press Enter to perform the updates Ctrl-C to quit."
+read done
+
+rm -rf /awips2/edex/data/registrySubscriptionBackup/*.bak

deltaScripts/14.3.1/datadelivery/updateSubscriptionOwners.pl

@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+open (IN, $ARGV[0]);
+print $ARGV[0];
+@lines = <IN>;
+close IN;
+$site = "";
+foreach $line (@lines) {
+   if ($line =~ /originatingSite=&quot;([\w]+)&quot;/) {
+   $site = $1;
+   }
+}
+
+foreach $line (@lines) {
+if ($line =~ s/owner="([\w]+)"/owner="$site"/g) {
+print $line;
+}
+}
+$OUTFILE = "TEMP";
+open (OUT, ">>TEMP");
+foreach $line (@lines) {
+print OUT $line;
+}
+rename $OUTFILE, $ARGV[0]

deltaScripts/14.3.1/datadelivery/updateSubscriptionOwners.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# DO NOT RUN THIS SCRIPT UNLESS YOU READ THIS!!!!!!!!!!!!!!!
+# This update needs to be performed with build 14.3.1.
+# This update is only for edex servers which have run DD and have subscriptions loaded.
+# FIRST!  Backup your subscriptions from the Registry Web Interface, 
+# http://$REGISTRY_HOST:8082/registry/RegistryInterface.html. <Backup All Subscriptions>
+# Then run this update script, after script runs, <Restore Subscriptions>
+# That will update the subscriptions to reflect the correct ownership at the registry level.
+
+echo ""
+echo "Press Enter to perform the updates Ctrl-C to quit."
+read done
+
+files=`find /awips2/edex/data/registrySubscriptionBackup -iname \*-RECURRING`
+
+if [[ -z "$files" ]]; then
+echo "FATAL: Update Subscriptions has Failed, No subscription backup files found!"
+exit 1
+fi
+
+for f in $files; do
+    echo Updating $f
+    bf=$f.bak.`date +%m%d%y`
+    cp $f $bf
+    perl updateSubscriptionOwners.pl $f;
+    done
+