>();
for (PluginDataObject pdo : objects) {
String file = getFilename(pdo, pdo.getPluginName());
@@ -347,7 +347,8 @@ public class CubeUtil {
records[objects.indexOf(objs.get(i))] = dr[i];
}
} catch (Exception e) {
- throw new VizException("Error retrieving data for record.", e);
+ throw new DataCubeException(
+ "Error retrieving data for record.", e);
}
}
diff --git a/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DataCubeAdapters.java b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DataCubeAdapters.java
new file mode 100644
index 0000000000..d950098138
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DataCubeAdapters.java
@@ -0,0 +1,150 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.datacube;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
+
+/**
+ * Contains a registry of IDataCubeAdapter instances and provides the interface
+ * for registering new adapters
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Apr 1, 2014 ekladstrup Initial creation
+ *
+ *
+ *
+ * @author ekladstrup
+ * @version 1.0
+ */
+
+public class DataCubeAdapters {
+
+ private static final transient IUFStatusHandler statusHandler = UFStatus
+ .getHandler(DataCubeAdapters.class);
+
+ protected Map adapters = new HashMap();
+
+ protected Map initializedMap = new HashMap();
+
+ protected static DataCubeAdapters instance = new DataCubeAdapters();
+
+ /**
+ * Get singleton instance
+ *
+ * @return
+ */
+ public static DataCubeAdapters getInstance() {
+ return instance;
+ }
+
+ /**
+ * Internal constructor, use getInstance()
+ */
+ protected DataCubeAdapters() {
+
+ }
+
+ /**
+ * Add an adapter to the list of known adapters
+ *
+ * @param adapter
+ * @return the same adapter
+ */
+ public IDataCubeAdapter registerAdapter(IDataCubeAdapter adapter) {
+ synchronized (adapters) {
+ String[] supportedPlugins = adapter.getSupportedPlugins();
+ for (String plugin : supportedPlugins) {
+ IDataCubeAdapter registeredAdapter = adapters.get(plugin);
+ if (registeredAdapter != null) {
+ statusHandler.handle(Priority.PROBLEM,
+ "Already registered "
+ + registeredAdapter.getClass()
+ .getCanonicalName()
+ + " IDataCubeAdapter for plugin \""
+ + plugin + "\" ignoring "
+ + adapter.getClass().getCanonicalName());
+ } else {
+ adapters.put(plugin, adapter);
+ statusHandler
+ .handle(Priority.VERBOSE, "Registered "
+ + adapter.getClass().getCanonicalName()
+ + " IDataCubeAdapter for plugin \""
+ + plugin + "\"");
+ }
+ }
+ }
+ synchronized (initializedMap) {
+ initializedMap.put(adapter, false);
+ }
+ return adapter;
+ }
+
+ /**
+ * Initialize the adapters inventory if it has not already, return true if
+ * the inventory was initialized
+ *
+ * @param adapter
+ * @return true if the adapter was initialized false if it was not ( or is
+ * unknown to this service )
+ */
+ public boolean initIfNeeded(IDataCubeAdapter adapter) {
+ boolean wasInitialized = false;
+
+ if (adapter != null) {
+ synchronized (adapter) {
+ Boolean initialized = initializedMap.get(adapter);
+ if (initialized == null || !initialized) {
+ adapter.initInventory();
+ initializedMap.put(adapter, true);
+ wasInitialized = true;
+ }
+ }
+ }
+
+ return wasInitialized;
+ }
+
+ /**
+ * Search for an adapter for a given plugin
+ *
+ * @param plugin
+ * @return the first adapter that supports the plugin, null if none are
+ * found
+ */
+ public IDataCubeAdapter getAdapterForPlugin(String plugin) {
+ IDataCubeAdapter result = null;
+
+ synchronized (adapters) {
+ result = adapters.get(plugin);
+ }
+
+ return result;
+ }
+}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DataCubeContainer.java b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DataCubeContainer.java
similarity index 85%
rename from cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DataCubeContainer.java
rename to cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DataCubeContainer.java
index 5efaea01d1..fed7817833 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DataCubeContainer.java
+++ b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DataCubeContainer.java
@@ -17,19 +17,18 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
-package com.raytheon.uf.viz.core.datastructure;
+package com.raytheon.uf.viz.datacube;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.ServiceLoader;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
@@ -40,7 +39,6 @@ import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.time.BinOffset;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.exception.VizException;
/**
* The DataCubeContainer is responsible for handling requests for data times,
@@ -63,21 +61,6 @@ import com.raytheon.uf.viz.core.exception.VizException;
*/
public class DataCubeContainer {
- static List adapters = new ArrayList();
-
- private static Map initializedMap = new HashMap();
-
- static {
- Iterator itr = ServiceLoader.load(
- IDataCubeAdapter.class,
- DataCubeContainer.class.getClassLoader()).iterator();
- while (itr.hasNext()) {
- IDataCubeAdapter adapter = itr.next();
- adapters.add(adapter);
- initializedMap.put(adapter, false);
- }
- }
-
private static Map containers = new HashMap();
private IDataCubeAdapter adapter;
@@ -95,13 +78,7 @@ public class DataCubeContainer {
}
if (container.adapter != null) {
- synchronized (container.adapter) {
- Boolean initialized = initializedMap.get(container.adapter);
- if (initialized == null || !initialized) {
- container.adapter.initInventory();
- initializedMap.put(container.adapter, true);
- }
- }
+ DataCubeAdapters.getInstance().initIfNeeded(container.adapter);
}
return container;
@@ -109,14 +86,8 @@ public class DataCubeContainer {
private DataCubeContainer(String plugin) {
this.pluginName = plugin;
- for (IDataCubeAdapter adapter : adapters) {
- for (String p : adapter.getSupportedPlugins()) {
- if (p.equals(plugin)) {
- this.adapter = adapter;
- break;
- }
- }
- }
+ this.adapter = DataCubeAdapters.getInstance().getAdapterForPlugin(
+ plugin);
if (adapter == null) {
// Construct default adapter for plugin if none found
adapter = new DefaultDataCubeAdapter(plugin);
@@ -136,7 +107,7 @@ public class DataCubeContainer {
* @throws VizDataCubeException
*/
public static IDataRecord[] getDataRecord(PluginDataObject obj)
- throws VizDataCubeException {
+ throws DataCubeException {
return getInstance(obj.getPluginName()).adapter.getRecord(obj);
}
@@ -155,7 +126,7 @@ public class DataCubeContainer {
* @throws VizDataCubeException
*/
public static IDataRecord[] getDataRecord(PluginDataObject obj,
- Request req, String dataset) throws VizDataCubeException {
+ Request req, String dataset) throws DataCubeException {
return getInstance(obj.getPluginName()).adapter.getRecord(obj, req,
dataset);
}
@@ -172,7 +143,7 @@ public class DataCubeContainer {
* @throws VizDataCubeException
*/
public static void getDataRecords(List objs, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
if (objs == null || objs.isEmpty()) {
return;
}
@@ -192,14 +163,14 @@ public class DataCubeContainer {
public static PointDataContainer getPointData(String plugin,
String[] params, Map map)
- throws VizException {
+ throws DataCubeException {
DataCubeContainer container = getInstance(plugin);
return container.adapter.getPoints(container.pluginName, params, map);
}
public static PointDataContainer getPointData(String plugin,
String[] params, String levelKey, Map map)
- throws VizException {
+ throws DataCubeException {
DataCubeContainer container = getInstance(plugin);
if (levelKey == null) {
return getPointData(container.pluginName, params, map);
@@ -210,7 +181,7 @@ public class DataCubeContainer {
public static DataTime[] performTimeQuery(
Map queryParams, boolean latestOnly)
- throws VizException {
+ throws DataCubeException {
return performTimeQuery(queryParams, latestOnly, null);
}
@@ -226,7 +197,7 @@ public class DataCubeContainer {
*/
public static DataTime[] performTimeQuery(
Map queryParams, boolean latestOnly,
- BinOffset binOffset) throws VizException {
+ BinOffset binOffset) throws DataCubeException {
TimeQueryRequest request = new TimeQueryRequest();
request.setQueryTerms(queryParams);
request.setBinOffset(binOffset);
@@ -249,7 +220,7 @@ public class DataCubeContainer {
* @return
*/
public static List> performTimeQueries(String pluginName,
- List requests) throws VizException {
+ List requests) throws DataCubeException {
if (requests.isEmpty()) {
return Collections.emptyList();
}
@@ -264,7 +235,7 @@ public class DataCubeContainer {
* @return
*/
public static List> performTimeQueries(String pluginName,
- TimeQueryRequest... requests) throws VizException {
+ TimeQueryRequest... requests) throws DataCubeException {
return getInstance(pluginName).adapter.timeQuery(Arrays
.asList(requests));
}
@@ -278,7 +249,7 @@ public class DataCubeContainer {
* @return
*/
public static List> performTimeQueries(
- TimeQueryRequest... requests) throws VizException {
+ TimeQueryRequest... requests) throws DataCubeException {
return performTimeQueries(Arrays.asList(requests));
}
@@ -291,7 +262,7 @@ public class DataCubeContainer {
* @return
*/
public static List> performTimeQueries(
- List requests) throws VizException {
+ List requests) throws DataCubeException {
Map> requestMap = new HashMap>();
for (TimeQueryRequest request : requests) {
String pluginName = request.getPluginName();
@@ -330,7 +301,8 @@ public class DataCubeContainer {
* @throws VizException
*/
public static PluginDataObject[] getData(
- Map constraints) throws VizException {
+ Map constraints)
+ throws DataCubeException {
return getData(constraints, (DataTime[]) null);
}
@@ -344,7 +316,7 @@ public class DataCubeContainer {
*/
public static PluginDataObject[] getData(
Map constraints, DataTime time)
- throws VizException {
+ throws DataCubeException {
return getData(constraints, time != null ? new DataTime[] { time }
: null);
}
@@ -359,7 +331,7 @@ public class DataCubeContainer {
*/
public static PluginDataObject[] getData(
Map constraints, DataTime[] times)
- throws VizException {
+ throws DataCubeException {
String pluginName = constraints.get(PluginDataObject.PLUGIN_NAME_ID)
.getConstraintValue();
return getInstance(pluginName).adapter.getData(constraints, times);
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DefaultDataCubeAdapter.java b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DefaultDataCubeAdapter.java
similarity index 83%
rename from cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DefaultDataCubeAdapter.java
rename to cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DefaultDataCubeAdapter.java
index 166ef36e6a..12118390c0 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DefaultDataCubeAdapter.java
+++ b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/DefaultDataCubeAdapter.java
@@ -17,12 +17,13 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
-package com.raytheon.uf.viz.core.datastructure;
+package com.raytheon.uf.viz.datacube;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
@@ -33,9 +34,8 @@ import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.pointdata.PointDataContainer;
+import com.raytheon.uf.common.serialization.comm.RequestRouter;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.requests.ThriftClient;
/**
* Default implementation of IDataCubeAdapter, function implementations were
@@ -82,15 +82,19 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
* com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter#timeQuery(java
* .util.List)
*/
+ @SuppressWarnings("unchecked")
@Override
public List> timeQuery(List requests)
- throws VizException {
+ throws DataCubeException {
TimeQueryRequestSet set = new TimeQueryRequestSet();
set.setRequests(requests.toArray(new TimeQueryRequest[0]));
- @SuppressWarnings("unchecked")
- List> result = (List>) ThriftClient
- .sendRequest(set);
+ List> result;
+ try {
+ result = (List>) RequestRouter.route(set);
+ } catch (Exception e) {
+ throw new DataCubeException(e);
+ }
return result;
}
@@ -103,7 +107,8 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
*/
@Override
public PointDataContainer getPoints(String plugin, String[] parameters,
- Map queryParams) throws VizException {
+ Map queryParams)
+ throws DataCubeException {
return null;
}
@@ -117,7 +122,7 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
@Override
public PointDataContainer getPoints(String plugin, String[] parameters,
String levelKey, Map queryParams)
- throws VizException {
+ throws DataCubeException {
return null;
}
@@ -130,14 +135,9 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
*/
@Override
public IDataRecord[] getRecord(PluginDataObject obj)
- throws VizDataCubeException {
+ throws DataCubeException {
IDataRecord record = null;
- try {
- record = CubeUtil.retrieveData(obj, pluginName);
- } catch (VizException e) {
- throw new VizDataCubeException("Error retrieving 2D data record.",
- e);
- }
+ record = CubeUtil.retrieveData(obj, pluginName);
return new IDataRecord[] { record };
}
@@ -151,14 +151,9 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
*/
@Override
public IDataRecord[] getRecord(PluginDataObject obj, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
IDataRecord record = null;
- try {
- record = CubeUtil.retrieveData(obj, pluginName, req, dataset);
- } catch (VizException e) {
- throw new VizDataCubeException("Error retrieving 2D data record.",
- e);
- }
+ record = CubeUtil.retrieveData(obj, pluginName, req, dataset);
return new IDataRecord[] { record };
}
@@ -171,15 +166,10 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
*/
@Override
public void getRecords(List objs, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
for (PluginDataObject obj : objs) {
IDataRecord record = null;
- try {
- record = CubeUtil.retrieveData(obj, pluginName, req, dataset);
- } catch (VizException e) {
- throw new VizDataCubeException(
- "Error retrieving 2D grid record.", e);
- }
+ record = CubeUtil.retrieveData(obj, pluginName, req, dataset);
obj.setMessageData(record);
}
}
@@ -194,7 +184,7 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
@Override
public PluginDataObject[] getData(
Map constraints, DataTime[] selectedTimes)
- throws VizException {
+ throws DataCubeException {
DbQueryRequest request = new DbQueryRequest(constraints);
if (selectedTimes != null && selectedTimes.length > 0) {
RequestConstraint timeConstraint = new RequestConstraint();
@@ -211,8 +201,12 @@ public class DefaultDataCubeAdapter implements IDataCubeAdapter {
}
request.addConstraint(PluginDataObject.DATATIME_ID, timeConstraint);
}
- DbQueryResponse response = (DbQueryResponse) ThriftClient
- .sendRequest(request);
+ DbQueryResponse response;
+ try {
+ response = (DbQueryResponse) RequestRouter.route(request);
+ } catch (Exception e) {
+ throw new DataCubeException("Server data request failed.", e);
+ }
return response.getEntityObjects(PluginDataObject.class);
}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/IDataCubeAdapter.java b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/IDataCubeAdapter.java
similarity index 92%
rename from cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/IDataCubeAdapter.java
rename to cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/IDataCubeAdapter.java
index 8348c61f6e..dcd9f8a53c 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/IDataCubeAdapter.java
+++ b/cave/com.raytheon.uf.viz.datacube/src/com/raytheon/uf/viz/datacube/IDataCubeAdapter.java
@@ -17,11 +17,12 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
-package com.raytheon.uf.viz.core.datastructure;
+package com.raytheon.uf.viz.datacube;
import java.util.List;
import java.util.Map;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.TimeQueryRequest;
@@ -29,7 +30,6 @@ import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.exception.VizException;
/**
* The IDataCubeAdapter interface allows a class, once it implements this
@@ -72,7 +72,7 @@ public interface IDataCubeAdapter {
* @return
*/
public List> timeQuery(List requests)
- throws VizException;
+ throws DataCubeException;
/**
* Returns a point data container which contains the parameters specified.
@@ -88,7 +88,8 @@ public interface IDataCubeAdapter {
* @throws VizException
*/
public PointDataContainer getPoints(String plugin, String[] parameters,
- Map queryParams) throws VizException;
+ Map queryParams)
+ throws DataCubeException;
/**
* Returns a point data container which contains the parameters specified.
@@ -107,7 +108,7 @@ public interface IDataCubeAdapter {
*/
public PointDataContainer getPoints(String plugin, String[] parameters,
String levelKey, Map queryParams)
- throws VizException;
+ throws DataCubeException;
/**
* A call to getRecord will perform the specified derived parameter
@@ -121,13 +122,13 @@ public interface IDataCubeAdapter {
* @throws VizDataCubeException
*/
public IDataRecord[] getRecord(PluginDataObject obj)
- throws VizDataCubeException;
+ throws DataCubeException;
public IDataRecord[] getRecord(PluginDataObject obj, Request req,
- String dataset) throws VizDataCubeException;
+ String dataset) throws DataCubeException;
public void getRecords(List objs, Request req,
- String dataset) throws VizDataCubeException;
+ String dataset) throws DataCubeException;
/**
* Builds an array of {@link PluginDataObject}s for the specified metadata
@@ -143,7 +144,7 @@ public interface IDataCubeAdapter {
*/
public PluginDataObject[] getData(
Map constraints, DataTime[] selectedTimes)
- throws VizException;
+ throws DataCubeException;
/**
* If the inventory for a particular data type is large (for example, Grib),
diff --git a/cave/com.raytheon.uf.viz.derivparam.ui/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.derivparam.ui/META-INF/MANIFEST.MF
index edc27aded8..6815064c39 100644
--- a/cave/com.raytheon.uf.viz.derivparam.ui/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.derivparam.ui/META-INF/MANIFEST.MF
@@ -8,11 +8,10 @@ Bundle-Vendor: RAYTHEON
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;bundle-version="3.6.1",
com.raytheon.uf.viz.core;bundle-version="1.12.1174",
- com.raytheon.uf.viz.derivparam;bundle-version="1.12.1174",
- com.raytheon.uf.common.derivparam;bundle-version="1.12.1174",
com.raytheon.uf.viz.localization;bundle-version="1.12.1174",
com.raytheon.viz.ui;bundle-version="1.12.1174",
javax.measure;bundle-version="1.0.0",
- com.raytheon.uf.common.util;bundle-version="1.12.1174"
+ com.raytheon.uf.common.util;bundle-version="1.12.1174",
+ com.raytheon.uf.common.derivparam;bundle-version="1.14.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewDefinitionPage.java b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewDefinitionPage.java
index 61a6273335..a9152d8a35 100644
--- a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewDefinitionPage.java
+++ b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewDefinitionPage.java
@@ -41,16 +41,16 @@ import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
+import com.raytheon.uf.common.derivparam.library.DerivParamConstantField;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivParamField;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.library.IDerivParamField;
import com.raytheon.uf.common.serialization.JAXBManager;
import com.raytheon.uf.common.serialization.adapters.UnitAdapter;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.derivparam.library.DerivParamConstantField;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivParamField;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.library.IDerivParamField;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
import com.raytheon.viz.ui.dialogs.CaveSWTWizardPage;
diff --git a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewFunctionPage.java b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewFunctionPage.java
index bb55ecf341..66d589da67 100644
--- a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewFunctionPage.java
+++ b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamNewFunctionPage.java
@@ -41,9 +41,9 @@ import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import com.raytheon.uf.viz.derivparam.DerivParamFunctionType;
-import com.raytheon.uf.viz.derivparam.DerivParamFunctionType.FunctionArgument;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator;
+import com.raytheon.uf.common.derivparam.DerivParamFunctionType;
+import com.raytheon.uf.common.derivparam.DerivParamFunctionType.FunctionArgument;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
import com.raytheon.viz.ui.dialogs.CaveSWTWizardPage;
diff --git a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java
index 04aeb1124b..0c70175d33 100644
--- a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java
+++ b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java
@@ -21,6 +21,7 @@ package com.raytheon.uf.viz.derivparam.ui.dialogs;
import java.io.File;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -31,7 +32,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator;
import com.raytheon.uf.viz.localization.LocalizationPerspectiveUtils;
import com.raytheon.uf.viz.localization.service.ILocalizationService;
import com.raytheon.viz.ui.dialogs.CaveSWTWizard;
@@ -95,7 +95,7 @@ public class DerivedParamWizard extends CaveSWTWizard {
public boolean performFinish() {
IPathManager pm = PathManagerFactory.getPathManager();
LocalizationContext userCtx = pm.getContext(
- LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
+ LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
String functionContents = newFunctionPage.createFunction();
LocalizationFile functionFile = null, definitionFile = null;
if (functionContents != null) {
diff --git a/cave/com.raytheon.uf.viz.derivparam/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.derivparam/META-INF/MANIFEST.MF
deleted file mode 100644
index 03491ae63c..0000000000
--- a/cave/com.raytheon.uf.viz.derivparam/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Derived Parameter Plug-in
-Bundle-SymbolicName: com.raytheon.uf.viz.derivparam;singleton:=true
-Bundle-Version: 1.14.0.qualifier
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Require-Bundle: com.raytheon.uf.common.derivparam,
- com.raytheon.uf.common.time,
- com.raytheon.uf.common.dataplugin.level,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.datastorage,
- com.raytheon.uf.common.pointdata;bundle-version="1.13.0",
- com.raytheon.uf.viz.core;bundle-version="1.13.0",
- com.raytheon.uf.common.util,
- com.raytheon.uf.common.comm,
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.ui.workbench;bundle-version="3.8.0",
- javax.measure
-Export-Package: com.raytheon.uf.viz.derivparam,
- com.raytheon.uf.viz.derivparam.data,
- com.raytheon.uf.viz.derivparam.inv,
- com.raytheon.uf.viz.derivparam.library,
- com.raytheon.uf.viz.derivparam.tree
diff --git a/cave/com.raytheon.uf.viz.derivparam/build.properties b/cave/com.raytheon.uf.viz.derivparam/build.properties
deleted file mode 100644
index 73cf567d29..0000000000
--- a/cave/com.raytheon.uf.viz.derivparam/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- schema/,\
- plugin.xml,\
- localization/
diff --git a/cave/com.raytheon.uf.viz.derivparam/plugin.xml b/cave/com.raytheon.uf.viz.derivparam/plugin.xml
deleted file mode 100644
index 7f3d6f747b..0000000000
--- a/cave/com.raytheon.uf.viz.derivparam/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
index 7d9332ce12..3e56c1a329 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
@@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPAggregateRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasin;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPBasinData;
@@ -53,7 +54,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResourceData.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResourceData.java
index 342c11d514..c5f35775f9 100644
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResourceData.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResourceData.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.fog.FogRecord;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
@@ -35,7 +36,6 @@ import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.comm.Loader;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/resources/SafeSeasResourceData.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/resources/SafeSeasResourceData.java
index 3a99f433eb..9ba761fddd 100644
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/resources/SafeSeasResourceData.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/resources/SafeSeasResourceData.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.fog.FogRecord;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
@@ -34,7 +35,6 @@ import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
index ce7581875c..814202a4d9 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
@@ -42,6 +42,7 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.scan.ScanRecord;
import com.raytheon.uf.common.dataplugin.scan.data.CellTableDataRow;
import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow;
@@ -71,7 +72,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
index 862cf478f0..4e1d8a4694 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
@@ -35,6 +35,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.scan.ScanRecord;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
@@ -44,7 +45,6 @@ import com.raytheon.uf.common.datastorage.records.ByteDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
diff --git a/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF
index 15cc4f1de4..5105c66534 100644
--- a/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Export-Package: com.raytheon.uf.viz.monitor,
com.raytheon.uf.viz.monitor.ui.dialogs,
com.raytheon.uf.viz.monitor.util,
com.raytheon.uf.viz.monitor.xml
-Import-Package: com.raytheon.uf.common.dataplugin.fssobs,
+Import-Package: com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.common.dataplugin.fssobs,
com.raytheon.uf.common.dataplugin.obs.metar,
com.raytheon.uf.common.dataplugin.obs.metar.util,
com.raytheon.uf.common.dataplugin.sfcobs,
@@ -35,6 +36,7 @@ Import-Package: com.raytheon.uf.common.dataplugin.fssobs,
com.raytheon.uf.common.pointdata,
com.raytheon.uf.common.site,
com.raytheon.uf.viz.alertviz,
+ com.raytheon.uf.viz.datacube,
com.raytheon.uf.viz.monitor.data,
com.raytheon.uf.viz.monitor.util,
com.raytheon.viz.pointdata,
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java
index db32399705..960569b01d 100644
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
import org.eclipse.swt.widgets.Display;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.annotations.DataURIUtil;
import com.raytheon.uf.common.dataplugin.fssobs.FSSObsRecord;
@@ -38,10 +39,10 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.localization.LocalizationManager;
import com.raytheon.uf.viz.core.notification.NotificationMessage;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.monitor.data.MonitoringArea;
import com.raytheon.uf.viz.monitor.data.ObReport;
import com.raytheon.uf.viz.monitor.events.IMonitorConfigurationEvent;
@@ -283,7 +284,7 @@ public abstract class ObsMonitor extends Monitor {
}
}
}
- } catch (final VizException e) {
+ } catch (DataCubeException e) {
statusHandler.handle(Priority.PROBLEM,
"No data in database at startup. " + monitorUse);
}
@@ -296,10 +297,11 @@ public abstract class ObsMonitor extends Monitor {
* @param times
* @return FSSObsRecord[]
* @throws VizException
+ * @throws DataCubeException
*/
private FSSObsRecord[] requestFSSObs(
Map constraints, DataTime[] times)
- throws VizException {
+ throws DataCubeException {
if (times != null) {
String[] timeStrs = new String[times.length];
for (int i = 0; i < times.length; ++i) {
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.npp.viirs/META-INF/MANIFEST.MF
index 9a5c0d3a2f..244787887f 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.npp.viirs/META-INF/MANIFEST.MF
@@ -20,14 +20,18 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.productbrowser;bundle-version="1.12.1174",
com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
com.raytheon.viz.core;bundle-version="1.12.1174",
- com.raytheon.uf.viz.derivparam;bundle-version="1.12.1174",
- com.raytheon.uf.common.derivparam;bundle-version="1.12.1174",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.comm;bundle-version="1.12.1174",
com.raytheon.viz.alerts;bundle-version="1.12.1174",
com.raytheon.uf.viz.npp;bundle-version="1.0.0",
com.raytheon.uf.common.style;bundle-version="1.0.0",
- com.raytheon.uf.common.numeric;bundle-version="1.14.0"
+ com.raytheon.uf.common.numeric;bundle-version="1.14.0",
+ com.raytheon.uf.common.derivparam;bundle-version="1.14.0",
+ com.raytheon.uf.viz.datacube
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.npp.viirs.rsc
+Import-Package: com.raytheon.uf.common.inventory.data,
+ com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.common.inventory,
+ com.raytheon.uf.common.inventory.tree
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/META-INF/services/com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter b/cave/com.raytheon.uf.viz.npp.viirs/META-INF/services/com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter
deleted file mode 100644
index 9bf3ccea45..0000000000
--- a/cave/com.raytheon.uf.viz.npp.viirs/META-INF/services/com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter
+++ /dev/null
@@ -1 +0,0 @@
-com.raytheon.uf.viz.npp.viirs.data.VIIRSDataCubeAdapter
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/build.properties b/cave/com.raytheon.uf.viz.npp.viirs/build.properties
index 6e2f847b66..847bfa511f 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/build.properties
+++ b/cave/com.raytheon.uf.viz.npp.viirs/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- localization/
+ localization/,\
+ res/
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/res/spring/viirs-datacube-spring.xml b/cave/com.raytheon.uf.viz.npp.viirs/res/spring/viirs-datacube-spring.xml
new file mode 100644
index 0000000000..afc5e62b5e
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.npp.viirs/res/spring/viirs-datacube-spring.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataCubeAdapter.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataCubeAdapter.java
index 285dbd6e96..a410a82070 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataCubeAdapter.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataCubeAdapter.java
@@ -25,23 +25,22 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode.Dependency;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.tree.AbstractDerivedDataNode;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.CubeUtil;
-import com.raytheon.uf.viz.core.datastructure.VizDataCubeException;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractDataCubeAdapter;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.tree.AbstractDerivedDataNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode.Dependency;
+import com.raytheon.uf.viz.datacube.AbstractDataCubeAdapter;
+import com.raytheon.uf.viz.datacube.CubeUtil;
import com.raytheon.uf.viz.npp.viirs.Activator;
import com.raytheon.uf.viz.npp.viirs.data.VIIRSRequestableData.VIIRSRequest;
@@ -113,41 +112,36 @@ public class VIIRSDataCubeAdapter extends AbstractDataCubeAdapter {
*/
@Override
public IDataRecord[] getRecord(PluginDataObject pdo, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
if (dataset == null) {
dataset = VIIRSDataRecord.getDataSet(0);
}
- try {
- IDataRecord[] dataRecords = null;
- if (pdo instanceof VIIRSRequestableDataRecord) {
- VIIRSRequestableDataRecord vrdr = (VIIRSRequestableDataRecord) pdo;
- // Put VIIRSSpatialCoverage from pdo in VIIRSRequest and make
- // sure data records out of getData are in same coverage
- VIIRSRequest request = new VIIRSRequest(req, dataset,
- vrdr.getCoverage());
- AbstractRequestableData requestable = vrdr.getRequestableData();
- if (requestable instanceof VIIRSRequestableData) {
- dataRecords = ((VIIRSRequestableData) requestable)
- .getRawDataValue(request);
- } else {
- dataRecords = (IDataRecord[]) requestable
- .getDataValue(request);
- }
- } else if (pdo instanceof VIIRSDataRecord) {
- VIIRSDataRecord vdr = (VIIRSDataRecord) pdo;
- VIIRSRequestableData requester = new VIIRSRequestableData(vdr,
- inventory.getParameterLevel(vdr.getParameter()));
- dataRecords = getRecord(new VIIRSRequestableDataRecord(
- requester, Arrays.asList(vdr)), req, dataset);
+
+ IDataRecord[] dataRecords = null;
+ if (pdo instanceof VIIRSRequestableDataRecord) {
+ VIIRSRequestableDataRecord vrdr = (VIIRSRequestableDataRecord) pdo;
+ // Put VIIRSSpatialCoverage from pdo in VIIRSRequest and make
+ // sure data records out of getData are in same coverage
+ VIIRSRequest request = new VIIRSRequest(req, dataset,
+ vrdr.getCoverage());
+ AbstractRequestableData requestable = vrdr.getRequestableData();
+ if (requestable instanceof VIIRSRequestableData) {
+ dataRecords = ((VIIRSRequestableData) requestable)
+ .getRawDataValue(request);
} else {
- dataRecords = new IDataRecord[] { CubeUtil.retrieveData(pdo,
- pdo.getPluginName(), req, dataset) };
+ dataRecords = (IDataRecord[]) requestable.getDataValue(request);
}
- return dataRecords;
- } catch (VizException e) {
- throw new VizDataCubeException("Error requesting viirs data: "
- + e.getLocalizedMessage(), e);
+ } else if (pdo instanceof VIIRSDataRecord) {
+ VIIRSDataRecord vdr = (VIIRSDataRecord) pdo;
+ VIIRSRequestableData requester = new VIIRSRequestableData(vdr,
+ inventory.getParameterLevel(vdr.getParameter()));
+ dataRecords = getRecord(new VIIRSRequestableDataRecord(requester,
+ Arrays.asList(vdr)), req, dataset);
+ } else {
+ dataRecords = new IDataRecord[] { CubeUtil.retrieveData(pdo,
+ pdo.getPluginName(), req, dataset) };
}
+ return dataRecords;
}
/*
@@ -159,7 +153,7 @@ public class VIIRSDataCubeAdapter extends AbstractDataCubeAdapter {
*/
@Override
public void getRecords(List objs, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
// TODO: Need more advanced synchronizing for derived parameters
for (PluginDataObject pdo : objs) {
pdo.setMessageData(getRecord(pdo, req, dataset));
@@ -187,7 +181,7 @@ public class VIIRSDataCubeAdapter extends AbstractDataCubeAdapter {
*/
@Override
protected List timeAgnosticQuery(
- Map queryTerms) throws VizException {
+ Map queryTerms) throws DataCubeException {
return inventory.timeAgnosticQuery(queryTerms);
}
@@ -202,7 +196,7 @@ public class VIIRSDataCubeAdapter extends AbstractDataCubeAdapter {
protected List getData(
Map constraints,
DataTime[] selectedTimes, List requesters)
- throws VizException {
+ throws DataCubeException {
List results = new ArrayList(
requesters.size());
for (AbstractRequestableData requester : requesters) {
@@ -278,7 +272,8 @@ public class VIIRSDataCubeAdapter extends AbstractDataCubeAdapter {
*/
@Override
public PointDataContainer getPoints(String plugin, String[] parameters,
- Map queryParams) throws VizException {
+ Map queryParams)
+ throws DataCubeException {
throw new UnsupportedOperationException(
"getPoints is not supported by viirs");
}
@@ -293,7 +288,7 @@ public class VIIRSDataCubeAdapter extends AbstractDataCubeAdapter {
@Override
public PointDataContainer getPoints(String plugin, String[] parameters,
String levelKey, Map queryParams)
- throws VizException {
+ throws DataCubeException {
throw new UnsupportedOperationException(
"getPoints is not supported by viirs");
}
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataInventory.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataInventory.java
index 9784f2088a..445102994b 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataInventory.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDataInventory.java
@@ -29,16 +29,24 @@ import java.util.Map;
import java.util.Set;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.inventory.tree.DataTree;
+import com.raytheon.uf.common.inventory.tree.LevelNode;
+import com.raytheon.uf.common.inventory.tree.ParameterNode;
+import com.raytheon.uf.common.inventory.tree.SourceNode;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
-import com.raytheon.uf.common.derivparam.tree.DataTree;
-import com.raytheon.uf.common.derivparam.tree.LevelNode;
-import com.raytheon.uf.common.derivparam.tree.ParameterNode;
-import com.raytheon.uf.common.derivparam.tree.SourceNode;
+import com.raytheon.uf.common.derivparam.inv.AbstractInventory;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivParamField;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.tree.AbstractDerivedDataNode;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -46,13 +54,6 @@ import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.AbstractInventory;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivParamField;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.tree.AbstractDerivedDataNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
import com.raytheon.viz.alerts.IAlertObserver;
import com.raytheon.viz.alerts.observers.ProductAlertObserver;
@@ -376,7 +377,7 @@ public class VIIRSDataInventory extends AbstractInventory implements
*/
@Override
public List timeAgnosticQuery(Map query)
- throws VizException {
+ throws DataCubeException {
return null;
}
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDynamicParameters.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDynamicParameters.java
index eba4c10f57..2713f975b1 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDynamicParameters.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSDynamicParameters.java
@@ -29,10 +29,10 @@ import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivParamField;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod.MethodType;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivParamField;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod.MethodType;
/**
* Class for resolving viirs parameters dynamically. Parses parameter as
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableData.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableData.java
index 999cb7a774..3ef18872ba 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableData.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableData.java
@@ -30,6 +30,9 @@ import org.geotools.coverage.grid.GridEnvelope2D;
import org.geotools.coverage.grid.GridGeometry2D;
import org.opengis.geometry.Envelope;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord;
import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSSpatialCoverage;
@@ -51,9 +54,7 @@ import com.raytheon.uf.common.numeric.filter.FillValueFilter;
import com.raytheon.uf.common.numeric.filter.InverseFillValueFilter;
import com.raytheon.uf.common.numeric.filter.UnsignedFilter;
import com.raytheon.uf.common.numeric.source.DataSource;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
/**
* Object capable of requesting VIIRS data for base or derived displays. Can
@@ -122,7 +123,7 @@ public class VIIRSRequestableData extends AbstractRequestableData {
* @throws VizException
*/
public IDataRecord[] getRawDataValue(VIIRSRequest request)
- throws VizException {
+ throws DataCubeException {
IDataStore store = DataStoreFactory.getDataStore(HDF5Util
.findHDF5Location(dataRecord));
try {
@@ -249,7 +250,7 @@ public class VIIRSRequestableData extends AbstractRequestableData {
request.request) };
}
} catch (Exception e) {
- throw new VizException("Error retrieving viirs data: "
+ throw new DataCubeException("Error retrieving viirs data: "
+ e.getLocalizedMessage(), e);
}
}
@@ -262,7 +263,7 @@ public class VIIRSRequestableData extends AbstractRequestableData {
* (java.lang.Object)
*/
@Override
- public IDataRecord[] getDataValue(Object arg) throws VizException {
+ public IDataRecord[] getDataValue(Object arg) throws DataCubeException {
VIIRSRequest request = (VIIRSRequest) arg;
// Get raw data
IDataRecord[] records = getRawDataValue(request);
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableDataRecord.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableDataRecord.java
index 33419d81ac..0da2468f2d 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableDataRecord.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableDataRecord.java
@@ -21,9 +21,9 @@ package com.raytheon.uf.viz.npp.viirs.data;
import java.util.Collection;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
/**
* TODO Add Description
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableLevelNode.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableLevelNode.java
index 72a23784ef..cf89e74010 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableLevelNode.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/data/VIIRSRequestableLevelNode.java
@@ -25,15 +25,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
+import com.raytheon.uf.common.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
-import com.raytheon.uf.viz.derivparam.tree.AbstractBaseDataNode;
/**
* VIIRS Requestable level node
@@ -158,7 +158,7 @@ public class VIIRSRequestableLevelNode extends AbstractBaseDataNode {
@Override
public Set getAvailability(
Map originalConstraints, Object response)
- throws VizException {
+ throws DataCubeException {
Set result = new HashSet();
DbQueryResponse dbresponse = (DbQueryResponse) response;
for (Map map : dbresponse.getResults()) {
@@ -180,7 +180,7 @@ public class VIIRSRequestableLevelNode extends AbstractBaseDataNode {
public Set getData(
Map orignalConstraints,
Set availability, Object response)
- throws VizException {
+ throws DataCubeException {
DbQueryResponse queryResponse = (DbQueryResponse) response;
List> results = queryResponse.getResults();
Set data = new HashSet(
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java
index b721603957..50c0bad26e 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java
@@ -32,8 +32,8 @@ import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.datastorage.records.ShortDataRecord;
import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* VIIRS Colormap data callback, requests data for VIIRSDataRecord
diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java
index ee578cde12..414e5616fa 100644
--- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java
+++ b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java
@@ -65,7 +65,6 @@ import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.IGraphicsTarget.RasterMode;
import com.raytheon.uf.viz.core.IMesh;
import com.raytheon.uf.viz.core.PixelCoverage;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.drawables.IImage;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
@@ -82,6 +81,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.tile.Tile;
import com.raytheon.uf.viz.core.tile.TileSetRenderable;
import com.raytheon.uf.viz.core.tile.TileSetRenderable.TileImageCreator;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.npp.viirs.Activator;
import com.raytheon.uf.viz.npp.viirs.style.VIIRSDataRecordCriteria;
import com.vividsolutions.jts.geom.Coordinate;
diff --git a/cave/com.raytheon.uf.viz.npp/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.npp/META-INF/MANIFEST.MF
index 1afd385fcb..62e7d5ffb5 100644
--- a/cave/com.raytheon.uf.viz.npp/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.npp/META-INF/MANIFEST.MF
@@ -12,3 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.npp
+Import-Package: com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.viz.datacube
diff --git a/cave/com.raytheon.uf.viz.npp/src/com/raytheon/uf/viz/npp/AbstractNppResourceData.java b/cave/com.raytheon.uf.viz.npp/src/com/raytheon/uf/viz/npp/AbstractNppResourceData.java
index 4ac1d2c57c..eabbbec97c 100644
--- a/cave/com.raytheon.uf.viz.npp/src/com/raytheon/uf/viz/npp/AbstractNppResourceData.java
+++ b/cave/com.raytheon.uf.viz.npp/src/com/raytheon/uf/viz/npp/AbstractNppResourceData.java
@@ -33,14 +33,15 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* Abstract resource data for all NPP data. Groups frame times close together
@@ -104,7 +105,12 @@ public abstract class AbstractNppResourceData extends
.getValidPeriod().getStart()), TimeUtil
.formatToSqlTimestamp(last.getValidPeriod().getEnd())));
- PluginDataObject[] pdos = DataCubeContainer.getData(requestMap);
+ PluginDataObject[] pdos;
+ try {
+ pdos = DataCubeContainer.getData(requestMap);
+ } catch (DataCubeException e) {
+ throw new VizException(e);
+ }
List finalList = new ArrayList(
pdos != null ? pdos.length : 0);
diff --git a/cave/com.raytheon.uf.viz.objectiveanalysis/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.objectiveanalysis/META-INF/MANIFEST.MF
index c9585bddbd..dd11ae7bef 100644
--- a/cave/com.raytheon.uf.viz.objectiveanalysis/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.objectiveanalysis/META-INF/MANIFEST.MF
@@ -24,15 +24,17 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.11.17",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0",
- com.raytheon.uf.common.numeric;bundle-version="1.14.0"
+ com.raytheon.uf.common.numeric;bundle-version="1.14.0",
+ com.raytheon.uf.common.derivparam;bundle-version="1.14.0",
+ com.raytheon.uf.viz.datacube
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.objectiveanalysis.rsc
Import-Package: com.raytheon.uf.common.comm,
+ com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.common.inventory.tree,
com.raytheon.uf.common.dataplugin.radar,
com.raytheon.uf.common.gridcoverage,
com.raytheon.uf.common.wxmath,
- com.raytheon.uf.viz.derivparam.library,
- com.raytheon.uf.viz.derivparam.tree,
com.raytheon.viz.ui,
com.raytheon.viz.ui.editor
diff --git a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAGridTransformer.java b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAGridTransformer.java
index 5d80931da6..227ad55e45 100644
--- a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAGridTransformer.java
+++ b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAGridTransformer.java
@@ -32,6 +32,7 @@ import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.geospatial.MapUtil;
@@ -41,8 +42,8 @@ import com.raytheon.uf.common.pointdata.PointDataView;
import com.raytheon.uf.common.util.GridUtil;
import com.raytheon.uf.common.wxmath.DistFilter;
import com.raytheon.uf.common.wxmath.ScalelessAnalysis;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* Requests point data and performs objective analysis to map then data onto a
@@ -115,8 +116,13 @@ public class OAGridTransformer {
String[] parameters = { "latitude", "longitude", parameter };
- PointDataContainer pdc = DataCubeContainer.getPointData(pluginName,
- parameters, levelKey, constraints);
+ PointDataContainer pdc;
+ try {
+ pdc = DataCubeContainer.getPointData(pluginName, parameters,
+ levelKey, constraints);
+ } catch (DataCubeException e) {
+ throw new VizException(e);
+ }
if (pdc == null) {
return null;
}
diff --git a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OATiltGridTransformer.java b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OATiltGridTransformer.java
index a75a5fc7a1..f270cd96ff 100644
--- a/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OATiltGridTransformer.java
+++ b/cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OATiltGridTransformer.java
@@ -28,18 +28,19 @@ import org.geotools.coverage.grid.GeneralGridGeometry;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.tree.CubeLevel;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterRequest;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.pointdata.PointDataView;
import com.raytheon.uf.common.util.GridUtil;
import com.raytheon.uf.common.wxmath.DistFilter;
import com.raytheon.uf.common.wxmath.ScalelessAnalysis;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterRequest;
-import com.raytheon.uf.viz.derivparam.tree.CubeLevel;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.grid.util.TiltUtils;
/**
@@ -184,8 +185,13 @@ public class OATiltGridTransformer extends OAGridTransformer {
21);
String[] parameters = { "latitude", "longitude", "P", parameter };
- PointDataContainer pdc = DataCubeContainer.getPointData(pluginName,
- parameters, constraints);
+ PointDataContainer pdc;
+ try {
+ pdc = DataCubeContainer.getPointData(pluginName, parameters,
+ constraints);
+ } catch (DataCubeException e1) {
+ throw new VizException(e1);
+ }
if (pdc == null || pdc.getCurrentSz() < 1) {
return null;
diff --git a/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/VizPrecipRateRadarRecord.java b/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/VizPrecipRateRadarRecord.java
index 6e1ce3604d..56876ed3d8 100644
--- a/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/VizPrecipRateRadarRecord.java
+++ b/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/VizPrecipRateRadarRecord.java
@@ -3,13 +3,13 @@ package com.raytheon.uf.viz.preciprate;
import java.io.File;
import java.util.Map;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.preciprate.PrecipRateRecord;
import com.raytheon.uf.common.dataplugin.radar.RadarStoredData;
import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants.DHRValues;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.cache.CacheObject;
import com.raytheon.uf.viz.core.cache.CacheObject.IObjectRetriever;
import com.raytheon.viz.radar.VizRadarRecord;
diff --git a/cave/com.raytheon.uf.viz.profiler/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.profiler/META-INF/MANIFEST.MF
index ba7877121e..678076a3c4 100644
--- a/cave/com.raytheon.uf.viz.profiler/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.profiler/META-INF/MANIFEST.MF
@@ -21,10 +21,12 @@ Require-Bundle: com.raytheon.uf.common.pointdata;bundle-version="1.11.9",
com.raytheon.uf.common.colormap;bundle-version="1.11.4",
com.raytheon.uf.viz.sounding;bundle-version="1.11.16",
com.raytheon.uf.viz.xy,
- com.raytheon.uf.common.sounding;bundle-version="1.0.0"
+ com.raytheon.uf.common.sounding;bundle-version="1.0.0",
+ com.raytheon.uf.viz.datacube
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.profiler,
com.raytheon.uf.viz.profiler.ui
-Import-Package: com.raytheon.uf.common.dataplugin.profiler,
+Import-Package: com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.common.dataplugin.profiler,
com.raytheon.uf.common.dataplugin.profiler.dao
diff --git a/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResourceData.java b/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResourceData.java
index 02c94cdf6d..92bf67e797 100644
--- a/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResourceData.java
+++ b/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResourceData.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.profiler.ProfilerObs;
import com.raytheon.uf.common.dataplugin.profiler.dao.ProfilerDataTransform;
@@ -36,11 +37,11 @@ import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* ProfilerResourceData
@@ -91,9 +92,13 @@ public class ProfilerResourceData extends AbstractRequestableResourceData {
getMetadataMap());
constraints.put(PluginDataObject.DATATIME_ID, new RequestConstraint(
dataTimes));
- PointDataContainer pdc = DataCubeContainer.getPointData(
- ProfilerObs.PLUGIN_NAME, ProfilerDataTransform.MAN_PARAMS,
- constraints);
+ PointDataContainer pdc;
+ try {
+ pdc = DataCubeContainer.getPointData(ProfilerObs.PLUGIN_NAME,
+ ProfilerDataTransform.MAN_PARAMS, constraints);
+ } catch (DataCubeException e) {
+ throw new VizException(e);
+ }
if (pdc != null) {
return ProfilerDataTransform.toProfilerRecords(pdc);
}
diff --git a/cave/com.raytheon.uf.viz.qpf/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.qpf/META-INF/MANIFEST.MF
index c3062e5a25..47cf0fc537 100644
--- a/cave/com.raytheon.uf.viz.qpf/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.qpf/META-INF/MANIFEST.MF
@@ -18,8 +18,10 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.dataplugin.qpf;bundle-version="1.0.0",
com.raytheon.uf.viz.productbrowser;bundle-version="1.12.1153",
com.raytheon.uf.common.style;bundle-version="1.0.0",
- com.raytheon.uf.common.numeric;bundle-version="1.14.0"
+ com.raytheon.uf.common.numeric;bundle-version="1.14.0",
+ com.raytheon.uf.viz.datacube
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.qpf
-Import-Package: com.raytheon.uf.common.colormap.prefs
+Import-Package: com.raytheon.uf.common.colormap.prefs,
+ com.raytheon.uf.common.inventory.exception
diff --git a/cave/com.raytheon.uf.viz.qpf/src/com/raytheon/uf/viz/qpf/QPFResource.java b/cave/com.raytheon.uf.viz.qpf/src/com/raytheon/uf/viz/qpf/QPFResource.java
index 3d10923d94..01cd57a1da 100644
--- a/cave/com.raytheon.uf.viz.qpf/src/com/raytheon/uf/viz/qpf/QPFResource.java
+++ b/cave/com.raytheon.uf.viz.qpf/src/com/raytheon/uf/viz/qpf/QPFResource.java
@@ -29,6 +29,7 @@ import java.util.List;
import javax.measure.unit.Unit;
import javax.measure.unit.UnitFormat;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.qpf.QPFRecord;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
@@ -36,10 +37,10 @@ import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.grid.rsc.general.AbstractGridResource;
import com.raytheon.viz.grid.rsc.general.GeneralGridData;
@@ -102,7 +103,12 @@ public class QPFResource extends AbstractGridResource {
return Collections.emptyList();
}
QPFRecord rec = (QPFRecord) pdos.get(0);
- IDataRecord[] dataRecs = DataCubeContainer.getDataRecord(rec);
+ IDataRecord[] dataRecs;
+ try {
+ dataRecs = DataCubeContainer.getDataRecord(rec);
+ } catch (DataCubeException e) {
+ throw new VizException(e);
+ }
FloatDataRecord fdr = (FloatDataRecord) dataRecs[0];
FloatBuffer data = FloatBuffer.wrap(fdr.getFloatData());
Unit unit = UnitFormat.getInstance().parseObject(
diff --git a/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/FSILauncherLayer.java b/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/FSILauncherLayer.java
index fb9647b41c..580287e24a 100644
--- a/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/FSILauncherLayer.java
+++ b/cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/FSILauncherLayer.java
@@ -40,6 +40,7 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
import com.raytheon.uf.common.dataplugin.radar.util.RadarDataRetriever;
import com.raytheon.uf.common.dataplugin.radar.util.TerminalRadarUtils;
@@ -54,7 +55,6 @@ import com.raytheon.uf.common.message.response.ResponseMessageGeneric;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.catalog.DbQuery;
import com.raytheon.uf.viz.core.comm.Connector;
diff --git a/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
index 4d8b6270bb..42796d69d8 100644
--- a/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
@@ -20,3 +20,5 @@ Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: registered
Export-Package: com.raytheon.uf.viz.sounding,
com.raytheon.uf.viz.sounding.providers
+Import-Package: com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.viz.datacube
diff --git a/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/job/SoundingDataLoadJob.java b/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/job/SoundingDataLoadJob.java
index e5507d3f15..a401eb12df 100644
--- a/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/job/SoundingDataLoadJob.java
+++ b/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/job/SoundingDataLoadJob.java
@@ -27,13 +27,13 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.sounding.VerticalSounding;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
-import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.sounding.Activator;
/**
@@ -127,7 +127,7 @@ public class SoundingDataLoadJob extends Job {
size = data.length;
pdo.setMessageData(data);
}
- } catch (VizException e) {
+ } catch (DataCubeException e) {
e.printStackTrace();
}
System.out.println("loadData: " + (System.currentTimeMillis() - t0));
diff --git a/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/BufruaSoundingProvider.java b/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/BufruaSoundingProvider.java
index bfeb805065..269f189010 100644
--- a/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/BufruaSoundingProvider.java
+++ b/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/BufruaSoundingProvider.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.geotools.geometry.jts.JTS;
import org.opengis.referencing.operation.TransformException;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.bufrua.UAObs;
import com.raytheon.uf.common.dataplugin.bufrua.UAObsAdapter;
@@ -41,9 +42,9 @@ import com.raytheon.uf.common.sounding.adapter.IVerticalSoundingProvider;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.BinOffset;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.sounding.Activator;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
@@ -109,7 +110,7 @@ public class BufruaSoundingProvider extends
UAObs.PLUGIN_NAME, BufrUAPointDataTransform.MAN_PARAMS,
constraints);
return BufrUAPointDataTransform.toUAObsRecords(pdc);
- } catch (VizException e) {
+ } catch (DataCubeException e) {
throw new RuntimeException("Error querying for sounding records: "
+ constraints, e);
}
diff --git a/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/GridSoundingProvider.java b/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/GridSoundingProvider.java
index 632294a128..7b55f14a4e 100644
--- a/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/GridSoundingProvider.java
+++ b/cave/com.raytheon.uf.viz.sounding/src/com/raytheon/uf/viz/sounding/providers/GridSoundingProvider.java
@@ -29,6 +29,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
@@ -47,9 +48,7 @@ import com.raytheon.uf.common.sounding.VerticalSounding;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
-import com.raytheon.uf.viz.core.datastructure.VizDataCubeException;
-import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.core.map.GeoUtil;
import com.vividsolutions.jts.geom.Coordinate;
@@ -106,7 +105,7 @@ public class GridSoundingProvider extends
try {
DataCubeContainer.getDataRecords(Arrays.asList(records),
Request.ALL, null);
- } catch (VizDataCubeException e) {
+ } catch (DataCubeException e) {
UFStatus.getHandler().handle(Priority.PROBLEM,
"Error requesting model data for sounding", e);
}
@@ -188,7 +187,7 @@ public class GridSoundingProvider extends
Coordinate location) {
try {
return DataCubeContainer.getData(constraints, time);
- } catch (VizException e) {
+ } catch (DataCubeException e) {
throw new RuntimeException("Error querying for sounding records: "
+ constraints, e);
}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
index 1cbdc5b975..a6b8a6047a 100644
--- a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
+++ b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
@@ -3,6 +3,7 @@ package com.raytheon.uf.viz.spring.dm;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -17,7 +18,6 @@ import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
/**
*
@@ -100,6 +100,7 @@ public class Activator implements BundleActivator {
Map bundles,
Map contextMap, Bundle bundle,
Set processing) {
+ BundleResolver bundleResolver = new BundleResolver();
String bundleName = bundle.getSymbolicName();
OSGIXmlApplicationContext appCtx = contextMap.get(bundleName);
if (contextMap.containsKey(bundleName) == false
@@ -129,27 +130,16 @@ public class Activator implements BundleActivator {
}
if (files.size() > 0) {
// Files found, check for dependencies
- String requiredBundlesHeader = (String) bundle.getHeaders()
- .get(Constants.REQUIRE_BUNDLE);
- // Split comma separated string from MANIFEST
- String[] requiredBundles = COMMA_SPLIT
- .split(requiredBundlesHeader);
+ Collection requiredBundles = bundleResolver
+ .getRequiredBundles(bundle);
List parentContexts = new ArrayList();
- for (String requiredBndl : requiredBundles) {
- // Extract bundle name which is first item in
- // semicolon
- // split list
- String[] bndlParts = SEMICOLON_SPLIT
- .split(requiredBndl);
- Bundle reqBndl = bundles.get(bndlParts[0]);
- if (reqBndl != null) {
- // Found bundle, process context for bundle
- OSGIXmlApplicationContext parent = createContext(
- bundles, contextMap, reqBndl, processing);
- if (parent != null) {
- // Context found, add to list
- parentContexts.add(parent);
- }
+ for (Bundle requiredBundle : requiredBundles) {
+ // Found bundle, process context for bundle
+ OSGIXmlApplicationContext parent = createContext(
+ bundles, contextMap, requiredBundle, processing);
+ if (parent != null) {
+ // Context found, add to list
+ parentContexts.add(parent);
}
}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/BundleResolver.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/BundleResolver.java
new file mode 100644
index 0000000000..cf38ae1134
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/BundleResolver.java
@@ -0,0 +1,91 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.spring.dm;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.namespace.BundleNamespace;
+import org.osgi.framework.namespace.PackageNamespace;
+import org.osgi.framework.wiring.BundleWire;
+import org.osgi.framework.wiring.BundleWiring;
+
+/**
+ * Resolve required bundles. Adapted from
+ * com.raytheon.uf.viz.core.reflect.SubClassLocator
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Apr 3, 2014 ekladstrup Initial creation
+ *
+ *
+ *
+ * @author ekladstrup
+ * @version 1.0
+ */
+public class BundleResolver {
+
+ protected final Map> requiredBundles = new HashMap>();
+
+ public BundleResolver() {
+
+ }
+
+ /**
+ * Get back all the bundles this bundle depends on.
+ *
+ * @param bundle
+ * the bundle
+ * @return bundles required by bundle.
+ */
+ public Collection getRequiredBundles(Bundle bundle) {
+ String bundleName = bundle.getSymbolicName();
+ Collection required = requiredBundles.get(bundleName);
+ if (required == null) {
+ required = new HashSet();
+ BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
+ if (bundleWiring != null) {
+ /* Get Required bundles */
+ for (BundleWire bw : bundleWiring
+ .getRequiredWires(BundleNamespace.BUNDLE_NAMESPACE)) {
+ required.add(bw.getProviderWiring().getBundle());
+ }
+ /* Get Bundles through import package */
+ for (BundleWire bw : bundleWiring
+ .getRequiredWires(PackageNamespace.PACKAGE_NAMESPACE)) {
+ required.add(bw.getProviderWiring().getBundle());
+ }
+ }
+ /* Avoid recursion */
+ required.remove(bundle);
+ requiredBundles.put(bundleName, required);
+
+ }
+ return required;
+ }
+
+}
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.thinclient.cave/META-INF/MANIFEST.MF
index 7510bc3505..ebfa2f5b61 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/META-INF/MANIFEST.MF
@@ -16,8 +16,10 @@ Require-Bundle: com.raytheon.uf.viz.core,
com.raytheon.uf.viz.thinclient;bundle-version="1.0.0",
com.raytheon.viz.grid;bundle-version="1.12.1174"
Import-Package: com.raytheon.uf.common.comm,
+ com.raytheon.uf.common.inventory.exception,
com.raytheon.uf.common.datastorage,
com.raytheon.uf.viz.core.maps.rsc,
+ com.raytheon.uf.viz.datacube,
com.vividsolutions.jts.geom,
com.vividsolutions.jts.index.strtree,
com.vividsolutions.jts.io,
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
index 6a0ad5bd3d..fc92f9b3a0 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
@@ -40,12 +41,12 @@ import com.raytheon.uf.common.time.msgs.GetServerTimeRequest;
import com.raytheon.uf.common.time.msgs.GetServerTimeResponse;
import com.raytheon.uf.viz.core.RecordFactory;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.updater.DataUpdateTree;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.grid.inv.RadarUpdater;
import com.raytheon.viz.grid.util.RadarAdapter;
@@ -119,6 +120,9 @@ public class ThinClientDataUpdateTree extends DataUpdateTree {
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
e);
+ } catch (DataCubeException e) {
+ statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
+ e);
}
}
getRadarUpdates(time, messages);
@@ -157,6 +161,8 @@ public class ThinClientDataUpdateTree extends DataUpdateTree {
}
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
+ } catch (DataCubeException e) {
+ statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}
}
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java
index 69d9961b26..6b0d9975cf 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientURICatalog.java
@@ -29,15 +29,15 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.dataquery.requests.TimeQueryRequest;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
-import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.URICatalog;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.thinclient.Activator;
import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
@@ -158,7 +158,7 @@ public class ThinClientURICatalog extends URICatalog implements
try {
times = DataCubeContainer.performTimeQueries(entry.getKey(),
requestList);
- } catch (VizException e) {
+ } catch (DataCubeException e) {
statusHandler.error("Error getting menu green times", e);
continue;
}
diff --git a/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResourceData.java b/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResourceData.java
index ac9ca555f8..a3ae789ac0 100644
--- a/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResourceData.java
+++ b/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResourceData.java
@@ -26,12 +26,12 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.vil.VILRecord;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
diff --git a/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
index da05b17e42..4dc0011135 100644
--- a/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.application;bundle-version="1.0.0",
com.raytheon.uf.common.tafqueue;bundle-version="1.0.0",
org.apache.commons.lang;bundle-version="2.3.0",
- com.raytheon.uf.common.auth;bundle-version="1.12.1174"
+ com.raytheon.uf.common.auth;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.datacube
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Export-Package: com.raytheon.viz.aviation,
@@ -41,6 +42,7 @@ Export-Package: com.raytheon.viz.aviation,
com.raytheon.viz.aviation.xml
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.edex.plugin.bufrmos.common,
+ com.raytheon.uf.common.inventory.exception,
com.raytheon.uf.common.dataplugin.acarssounding,
com.raytheon.uf.common.dataplugin.gfe.point,
com.raytheon.uf.common.dataplugin.gfe.request,
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
index d094bcfa47..d0a5047f57 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
@@ -54,8 +54,8 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.localization.LocalizationManager;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.aviation.climatology.ClimateMenuDlg;
import com.raytheon.viz.aviation.model.ForecastModel;
import com.raytheon.viz.aviation.observer.TafMonitorDlg;
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LlwsManager.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LlwsManager.java
index da7e8f7807..38f0b5004a 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LlwsManager.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LlwsManager.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.acarssounding.ACARSSoundingRecord;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants;
@@ -32,7 +33,6 @@ import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants.MapValues;
import com.raytheon.uf.common.dataplugin.radar.util.RadarDataRetriever;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
-import com.raytheon.uf.viz.core.HDF5Util;
/**
* TODO Add Description
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LtgDataMgr.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LtgDataMgr.java
index 4fddab771c..69ff3ceed2 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LtgDataMgr.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LtgDataMgr.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.binlightning.BinLightningRecord;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
@@ -38,7 +39,6 @@ import com.raytheon.uf.common.datastorage.records.LongDataRecord;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.viz.avnconfig.ITafSiteConfig;
import com.raytheon.viz.avnconfig.TafSiteConfigFactory;
import com.raytheon.viz.avnconfig.TafSiteData;
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/MonitorDataUtil.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/MonitorDataUtil.java
index b2fc7318e3..fbe8e104f7 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/MonitorDataUtil.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/MonitorDataUtil.java
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.TimeZone;
import com.raytheon.edex.plugin.ccfp.CcfpRecord;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.acarssounding.ACARSSoundingRecord;
import com.raytheon.uf.common.dataplugin.binlightning.BinLightningRecord;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
@@ -41,9 +42,9 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* Utility functions for data requesting.
@@ -189,7 +190,13 @@ public class MonitorDataUtil {
return records;
} catch (VizException e) {
statusHandler.handle(Priority.ERROR,
- "Error retrieving radar vertical wind profile data", e);
+ "Error making server request for radar vertical wind profile data",
+ e);
+ } catch (DataCubeException e) {
+ statusHandler
+ .handle(Priority.ERROR,
+ "Error performing time query for radar vertical wind profile data",
+ e);
}
return null;
}
@@ -231,7 +238,13 @@ public class MonitorDataUtil {
return records;
} catch (VizException e) {
statusHandler.handle(Priority.ERROR,
- "Error retrieving Acars Sounding Records data", e);
+ "Error making server request for Acars Sounding Records data",
+ e);
+ } catch (DataCubeException e) {
+ statusHandler
+ .handle(Priority.ERROR,
+ "Error performing time query for Acars Sounding Records data",
+ e);
}
return null;
}
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/TafUtil.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/TafUtil.java
index bb4c46baa7..d691657a2c 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/TafUtil.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/TafUtil.java
@@ -28,14 +28,14 @@ import java.util.Map;
import java.util.TimeZone;
import com.raytheon.edex.plugin.taf.common.TafRecord;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
-import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* Utility functions related to TAFs
@@ -140,7 +140,7 @@ public class TafUtil {
}));
return tafs;
- } catch (VizException e) {
+ } catch (DataCubeException e) {
statusHandler.handle(Priority.PROBLEM, "Error retrieving TAFs", e);
}
return null;
diff --git a/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF
index 8f1c6c42af..143b45b810 100644
--- a/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.datastorage,
com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.util
+ com.raytheon.uf.common.util,
+ com.raytheon.uf.viz.datacube
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.awipstools,
com.raytheon.viz.awipstools.capabilities,
@@ -32,7 +33,8 @@ Export-Package: com.raytheon.viz.awipstools,
com.raytheon.viz.awipstools.ui.display,
com.raytheon.viz.awipstools.ui.layer
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.viz.core,
+Import-Package: com.raytheon.uf.common.inventory.exception,
+ com.raytheon.viz.core,
com.raytheon.viz.core.interval,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.jts
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/ChooseByIdDialog.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/ChooseByIdDialog.java
index 5e65f83fce..ab73430ddf 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/ChooseByIdDialog.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/ChooseByIdDialog.java
@@ -51,6 +51,7 @@ import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
import com.raytheon.uf.common.dataplugin.radar.util.RadarDataRetriever;
@@ -65,13 +66,12 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.VizConstants;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.requests.ThriftClient;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.points.IPointChangedListener;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.viz.awipstools.IToolChangedListener;
diff --git a/cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF
index 1fc48c67d8..050675ec9e 100644
--- a/cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",
com.raytheon.uf.common.dataplugin.radar;bundle-version="1.14.0",
com.raytheon.uf.viz.points,
com.raytheon.uf.common.colormap,
- com.raytheon.uf.viz.derivparam;bundle-version="1.14.0",
com.raytheon.uf.common.style,
com.raytheon.uf.common.localization;bundle-version="1.14.0",
com.raytheon.uf.common.status,
@@ -30,19 +29,24 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.8.0",
com.raytheon.uf.common.serialization.comm,
com.raytheon.uf.common.dataquery,
com.raytheon.uf.common.comm,
- com.raytheon.uf.common.derivparam,
+ com.raytheon.uf.common.derivparam;bundle-version="1.14.0",
com.raytheon.uf.common.pointdata;bundle-version="1.13.0",
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.common.topo;bundle-version="1.14.0",
com.raytheon.uf.common.numeric;bundle-version="1.14.0",
- javax.measure
+ javax.measure,
+ com.raytheon.uf.viz.datacube;bundle-version="1.14.0"
Export-Package: com.raytheon.viz.grid,
com.raytheon.viz.grid.inv,
com.raytheon.viz.grid.rsc,
com.raytheon.viz.grid.rsc.general,
com.raytheon.viz.grid.util,
com.raytheon.viz.grid.xml
-Import-Package: com.raytheon.viz.alerts,
+Import-Package: com.raytheon.uf.common.inventory.data,
+ com.raytheon.uf.common.inventory.exception,
+ com.raytheon.uf.common.inventory,
+ com.raytheon.uf.common.inventory.tree,
+ com.raytheon.viz.alerts,
com.raytheon.viz.alerts.observers,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.units
diff --git a/cave/com.raytheon.viz.grid/META-INF/services/com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter b/cave/com.raytheon.viz.grid/META-INF/services/com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter
deleted file mode 100644
index 9df436d24f..0000000000
--- a/cave/com.raytheon.viz.grid/META-INF/services/com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter
+++ /dev/null
@@ -1 +0,0 @@
-com.raytheon.viz.grid.util.GridDataCubeAdapter
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.grid/build.properties b/cave/com.raytheon.viz.grid/build.properties
index 6e2f847b66..847bfa511f 100644
--- a/cave/com.raytheon.viz.grid/build.properties
+++ b/cave/com.raytheon.viz.grid/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- localization/
+ localization/,\
+ res/
diff --git a/cave/com.raytheon.viz.grid/res/spring/grid-datacube-spring.xml b/cave/com.raytheon.viz.grid/res/spring/grid-datacube-spring.xml
new file mode 100644
index 0000000000..095c151697
--- /dev/null
+++ b/cave/com.raytheon.viz.grid/res/spring/grid-datacube-spring.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
index 53892aa640..c3e03d6180 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
@@ -43,12 +43,12 @@ import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.rsc.ResourceProperties;
import com.raytheon.uf.viz.core.rsc.ResourceType;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.uf.viz.productbrowser.AbstractRequestableProductBrowserDataDefinition;
import com.raytheon.uf.viz.productbrowser.ProductBrowserLabel;
import com.raytheon.uf.viz.productbrowser.ProductBrowserPreference;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java
index ca9016b769..5aa1e52a81 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataFormatter.java
@@ -32,8 +32,8 @@ import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
import com.raytheon.uf.common.dataplugin.level.MasterLevel;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
import com.raytheon.uf.viz.productbrowser.ProductBrowserLabel;
import com.raytheon.viz.grid.inv.GridInventory;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/GridRequestableData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/GridRequestableData.java
index 1af247ccbb..995481cd95 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/GridRequestableData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/GridRequestableData.java
@@ -24,14 +24,14 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
* A requestable data object for which wraps a GridRecord.
@@ -111,7 +111,7 @@ public class GridRequestableData extends AbstractRequestableData {
}
@Override
- public IDataRecord[] getDataValue(Object arg) throws VizException {
+ public IDataRecord[] getDataValue(Object arg) throws DataCubeException {
if (arg instanceof Request) {
Request request = (Request) arg;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/ImportRequestableData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/ImportRequestableData.java
index cdbb1669f1..a9b36d9315 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/ImportRequestableData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/ImportRequestableData.java
@@ -24,14 +24,15 @@ import java.util.List;
import javax.media.jai.Interpolation;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.data.AliasRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.data.AliasRequestableData;
import com.raytheon.viz.grid.util.CoverageUtils;
import com.raytheon.viz.grid.util.SliceUtil;
@@ -68,7 +69,7 @@ public class ImportRequestableData extends AliasRequestableData {
this.dataTime = dataTime;
}
- public Object getDataValue(Object arg) throws VizException {
+ public Object getDataValue(Object arg) throws DataCubeException {
Request req = Request.ALL;
if (arg instanceof Request) {
req = (Request) arg;
@@ -119,27 +120,33 @@ public class ImportRequestableData extends AliasRequestableData {
GridCoverage destGrid = (GridCoverage) getSpace();
Interpolation interpolation = Interpolation
.getInstance(Interpolation.INTERP_BICUBIC);
- if (rval instanceof FloatDataRecord) {
- FloatDataRecord fdr = covUtil.remapGrid(sourceGrid, destGrid,
- (FloatDataRecord) rval, interpolation).getFloatDataRecord();
- rval = SliceUtil.slice(fdr, req);
- } else if (rval instanceof FloatDataRecord[]) {
- FloatDataRecord[] recs = (FloatDataRecord[]) rval;
- for (int i = 0; i < recs.length; i++) {
+ try {
+ if (rval instanceof FloatDataRecord) {
FloatDataRecord fdr = covUtil.remapGrid(sourceGrid, destGrid,
- recs[i], interpolation).getFloatDataRecord();
- recs[i] = SliceUtil.slice(fdr, req);
- }
- } else if (rval instanceof IDataRecord[]) {
- IDataRecord[] recs = (IDataRecord[]) rval;
- for (int i = 0; i < recs.length; i++) {
- if (recs[i] instanceof FloatDataRecord) {
+ (FloatDataRecord) rval, interpolation)
+ .getFloatDataRecord();
+ rval = SliceUtil.slice(fdr, req);
+ } else if (rval instanceof FloatDataRecord[]) {
+ FloatDataRecord[] recs = (FloatDataRecord[]) rval;
+ for (int i = 0; i < recs.length; i++) {
FloatDataRecord fdr = covUtil.remapGrid(sourceGrid,
- destGrid, (FloatDataRecord) recs[i], interpolation)
+ destGrid, recs[i], interpolation)
.getFloatDataRecord();
recs[i] = SliceUtil.slice(fdr, req);
}
+ } else if (rval instanceof IDataRecord[]) {
+ IDataRecord[] recs = (IDataRecord[]) rval;
+ for (int i = 0; i < recs.length; i++) {
+ if (recs[i] instanceof FloatDataRecord) {
+ FloatDataRecord fdr = covUtil.remapGrid(sourceGrid,
+ destGrid, (FloatDataRecord) recs[i],
+ interpolation).getFloatDataRecord();
+ recs[i] = SliceUtil.slice(fdr, req);
+ }
+ }
}
+ } catch (VizException e) {
+ throw new DataCubeException(e);
}
return rval;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/RadarRequestableData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/RadarRequestableData.java
index 0f0e3bc2f3..95d64bd5ad 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/RadarRequestableData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/RadarRequestableData.java
@@ -27,6 +27,8 @@ import javax.measure.unit.Unit;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
@@ -42,7 +44,6 @@ import com.raytheon.uf.common.parameter.Parameter;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.HDF5Util;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.grid.util.RadarAdapter;
import com.raytheon.viz.grid.util.SliceUtil;
@@ -116,7 +117,7 @@ public class RadarRequestableData extends GridRequestableData {
}
@Override
- public IDataRecord[] getDataValue(Object arg) throws VizException {
+ public IDataRecord[] getDataValue(Object arg) throws DataCubeException {
FloatDataRecord fdr = null;
if (cache != null) {
fdr = cache.get();
@@ -127,13 +128,17 @@ public class RadarRequestableData extends GridRequestableData {
try {
RadarDataRetriever.populateRadarRecord(dataStore, radarSource);
} catch (Exception e) {
- throw new VizException(
+ throw new DataCubeException(
"Error Retrieving Data from Radar Record", e);
}
// Call radar tiler to get tile data, look up color map to translate
// to float
- ColorMapParameters cMapParams = RadarAdapter
- .getColorMap(radarSource);
+ ColorMapParameters cMapParams;
+ try {
+ cMapParams = RadarAdapter.getColorMap(radarSource);
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
cMapParams.setDataUnit(radarSource.getDataUnit());
/*
* UnitConverter dataToImage =
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/StaticGridRequestableData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/StaticGridRequestableData.java
index f720da3454..d931c27cc4 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/StaticGridRequestableData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/StaticGridRequestableData.java
@@ -22,6 +22,9 @@ package com.raytheon.viz.grid.data;
import javax.measure.unit.SI;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
import com.raytheon.uf.common.dataplugin.grid.util.StaticGridData;
@@ -33,9 +36,6 @@ import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
import com.raytheon.viz.grid.util.SliceUtil;
/**
@@ -87,7 +87,7 @@ public class StaticGridRequestableData extends AbstractRequestableData {
* @see com.raytheon.viz.grid.util.AbstractRequestableData#getDataValue()
*/
@Override
- public Object getDataValue(Object arg) throws VizException {
+ public Object getDataValue(Object arg) throws DataCubeException {
FloatDataRecord rval = null;
if (StaticGridDataType._dt.equals(dataType)) {
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TiltRequestableData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TiltRequestableData.java
index 3504c9c3d0..16f46583ee 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TiltRequestableData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TiltRequestableData.java
@@ -21,12 +21,12 @@ package com.raytheon.viz.grid.data;
import javax.measure.unit.SI;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
import com.raytheon.viz.grid.util.SliceUtil;
import com.raytheon.viz.grid.util.TiltUtils;
import com.vividsolutions.jts.geom.Coordinate;
@@ -69,7 +69,7 @@ public class TiltRequestableData extends AbstractRequestableData {
}
@Override
- public FloatDataRecord getDataValue(Object arg) throws VizException {
+ public FloatDataRecord getDataValue(Object arg) throws DataCubeException {
GridCoverage coverage = (GridCoverage) getSpace();
FloatDataRecord fdr = null;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TopoRequestableData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TopoRequestableData.java
index 3d444c6cae..4bfc11a0da 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TopoRequestableData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/data/TopoRequestableData.java
@@ -27,6 +27,8 @@ import javax.measure.unit.SI;
import org.geotools.coverage.grid.GridGeometry2D;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
@@ -35,8 +37,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.topo.TopoQuery;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
import com.raytheon.viz.grid.util.SliceUtil;
/**
@@ -83,7 +83,7 @@ public class TopoRequestableData extends AbstractRequestableData {
* @see com.raytheon.viz.grid.util.AbstractRequestableData#getDataValue()
*/
@Override
- public FloatDataRecord getDataValue(Object arg) throws VizException {
+ public FloatDataRecord getDataValue(Object arg) throws DataCubeException {
GridCoverage coverage = (GridCoverage) this.getSpace();
FloatDataRecord rval = topoCache.get(coverage);
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/CubeLevelNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/CubeLevelNode.java
index 45c68508dc..50da8f60b2 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/CubeLevelNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/CubeLevelNode.java
@@ -21,9 +21,9 @@ package com.raytheon.viz.grid.inv;
import java.util.List;
-import com.raytheon.uf.viz.derivparam.tree.AbstractCubeLevelNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
-import com.raytheon.uf.viz.derivparam.tree.CubeLevel;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.inventory.tree.CubeLevel;
+import com.raytheon.uf.common.derivparam.tree.AbstractCubeLevelNode;
/**
*
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GatherLevelNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GatherLevelNode.java
index e89e0602c3..ef729cd8b0 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GatherLevelNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GatherLevelNode.java
@@ -26,15 +26,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.data.AggregateRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
import com.raytheon.uf.common.dataplugin.level.Level;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.data.AggregateRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.tree.AbstractAliasLevelNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.tree.AbstractAliasLevelNode;
/**
*
@@ -68,7 +68,7 @@ public class GatherLevelNode extends AbstractAliasLevelNode {
public Set getData(
Set availability,
Map> dependencyData)
- throws VizException {
+ throws DataCubeException {
Map> availMap = new HashMap>();
for (AbstractRequestableData data : dependencyData.get(sourceNode)) {
TimeAndSpace ast = data.getTimeAndSpace();
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridInventory.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridInventory.java
index f282178ca1..66c8143ac3 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridInventory.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridInventory.java
@@ -34,6 +34,15 @@ import java.util.NavigableSet;
import java.util.Set;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.inventory.tree.CubeLevel;
+import com.raytheon.uf.common.inventory.tree.DataTree;
+import com.raytheon.uf.common.inventory.tree.LevelNode;
+import com.raytheon.uf.common.inventory.tree.ParameterNode;
+import com.raytheon.uf.common.inventory.tree.SourceNode;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode.Dependency;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridInfoConstants;
import com.raytheon.uf.common.dataplugin.grid.GridInfoRecord;
@@ -47,10 +56,13 @@ import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
-import com.raytheon.uf.common.derivparam.tree.DataTree;
-import com.raytheon.uf.common.derivparam.tree.LevelNode;
-import com.raytheon.uf.common.derivparam.tree.ParameterNode;
-import com.raytheon.uf.common.derivparam.tree.SourceNode;
+import com.raytheon.uf.common.derivparam.inv.AbstractInventory;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivParamField;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod.MethodType;
+import com.raytheon.uf.common.derivparam.tree.AbstractDerivedDataNode;
+import com.raytheon.uf.common.derivparam.tree.StaticDataLevelNode;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
@@ -61,17 +73,6 @@ import com.raytheon.uf.viz.core.catalog.DbQuery;
import com.raytheon.uf.viz.core.exception.VizCommunicationException;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.AbstractInventory;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivParamField;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod.MethodType;
-import com.raytheon.uf.viz.derivparam.tree.AbstractDerivedDataNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode.Dependency;
-import com.raytheon.uf.viz.derivparam.tree.CubeLevel;
-import com.raytheon.uf.viz.derivparam.tree.StaticDataLevelNode;
import com.raytheon.uf.viz.points.IPointChangedListener;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.viz.grid.data.ImportRequestableData;
@@ -134,7 +135,7 @@ public class GridInventory extends AbstractInventory implements
@Override
public void initTree(Map derParLibrary)
- throws VizException {
+ throws DataCubeException {
super.initTree(derParLibrary);
if (updater == null) {
updater = new GridUpdater(this);
@@ -160,7 +161,7 @@ public class GridInventory extends AbstractInventory implements
for (Map constraints : constraintsToTry) {
evaluateRequestConstraints(constraints);
}
- } catch (VizException e) {
+ } catch (DataCubeException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}
}
@@ -274,7 +275,7 @@ public class GridInventory extends AbstractInventory implements
return null;
}
- protected DataTree createBaseTree() throws VizException {
+ protected DataTree createBaseTree() throws DataCubeException {
DataTree newTree = getTreeFromEdex();
if (newTree == null) {
return newTree;
@@ -316,7 +317,7 @@ public class GridInventory extends AbstractInventory implements
@Override
public List timeAgnosticQuery(Map query)
- throws VizException {
+ throws DataCubeException {
List rval = null;
List sources = getSourcesToProcess(query);
boolean processRadar = sources != null && sources.contains("radar");
@@ -346,8 +347,13 @@ public class GridInventory extends AbstractInventory implements
}
if (times == null) {
// This should query all times for this model.
- DataTime[] timesArray = CatalogQuery.performTimeQuery(newQuery,
- false, null);
+ DataTime[] timesArray;
+ try {
+ timesArray = CatalogQuery.performTimeQuery(newQuery,
+ false, null);
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
times = Arrays.asList(timesArray);
if (modelName != null) {
GridTimeCache.getInstance().setModelTimes(modelName,
@@ -359,8 +365,12 @@ public class GridInventory extends AbstractInventory implements
}
}
if (processRadar) {
- Set times = RadarAdapter.getInstance()
- .timeInvariantQuery();
+ Set times;
+ try {
+ times = RadarAdapter.getInstance().timeInvariantQuery();
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
if (rval == null && times != null) {
rval = new ArrayList(times.size());
}
@@ -685,7 +695,7 @@ public class GridInventory extends AbstractInventory implements
@Override
protected LevelNode getCubeNode(SourceNode sNode, DerivParamField field,
Deque stack, Set nodata)
- throws VizCommunicationException {
+ throws CommunicationException {
StackEntry se = new StackEntry(sNode.getValue(), field.getParam(),
Long.MIN_VALUE);
if (stack.contains(se)) {
@@ -701,12 +711,7 @@ public class GridInventory extends AbstractInventory implements
boolean isRadar = sNode.getValue().equals(RadarAdapter.RADAR_SOURCE);
NavigableSet levels;
- try {
- levels = LevelUtilities
- .getOrderedSetOfStandardLevels(masterLevelName);
- } catch (CommunicationException e) {
- throw new VizCommunicationException(e);
- }
+ levels = LevelUtilities.getOrderedSetOfStandardLevels(masterLevelName);
List> cubeLevels = new ArrayList>(
levels.size());
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridMetadataContainer.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridMetadataContainer.java
index 4c66bcf2d3..265b7efbb9 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridMetadataContainer.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridMetadataContainer.java
@@ -26,6 +26,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataquery.DecisionTree;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
@@ -33,13 +36,11 @@ import com.raytheon.uf.common.dataquery.requests.DbQueryRequestSet;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponseSet;
+import com.raytheon.uf.common.derivparam.inv.AvailabilityContainer;
+import com.raytheon.uf.common.derivparam.inv.MetadataContainer;
import com.raytheon.uf.viz.core.RecordFactory;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.AvailabilityContainer;
-import com.raytheon.uf.viz.derivparam.inv.MetadataContainer;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
import com.raytheon.viz.grid.data.GridRequestableData;
import com.raytheon.viz.grid.data.GridRequestableDataFactory;
@@ -72,7 +73,7 @@ public class GridMetadataContainer extends MetadataContainer {
}
@Override
- protected void processRequests() throws VizException {
+ protected void processRequests() throws DataCubeException {
DecisionTree tree = new DecisionTree();
List> constraintMaps = new ArrayList>();
for (AbstractRequestableNode node : availCache.keySet()) {
@@ -106,8 +107,13 @@ public class GridMetadataContainer extends MetadataContainer {
}
DbQueryRequestSet requestSet = new DbQueryRequestSet();
requestSet.setQueries(requests.toArray(new DbQueryRequest[0]));
- DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
- .sendRequest(requestSet);
+ DbQueryResponseSet responseSet;
+ try {
+ responseSet = (DbQueryResponseSet) ThriftClient
+ .sendRequest(requestSet);
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
Map> dataCache = new HashMap>();
GridRequestableDataFactory grdf = GridRequestableDataFactory
@@ -116,8 +122,13 @@ public class GridMetadataContainer extends MetadataContainer {
for (DbQueryResponse response : responseSet.getResults()) {
for (Map result : response.getResults()) {
GridRecord record = (GridRecord) result.get(null);
- Map recordMap = RecordFactory.getInstance()
- .loadMapFromUri(record.getDataURI());
+ Map recordMap;
+ try {
+ recordMap = RecordFactory.getInstance().loadMapFromUri(
+ record.getDataURI());
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
GridRequestableData data = grdf.getGridRequestableData(record);
for (GridRequestableNode node : tree.searchTree(recordMap)) {
Set set = dataCache.get(node);
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridRequestableNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridRequestableNode.java
index 2eff0b93f0..56f1cf509d 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridRequestableNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridRequestableNode.java
@@ -26,13 +26,17 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
+import com.raytheon.uf.common.inventory.tree.LevelNode;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
-import com.raytheon.uf.common.derivparam.tree.LevelNode;
+import com.raytheon.uf.common.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.uf.common.geospatial.ISpatialObject;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.gridcoverage.lookup.GridCoverageLookup;
@@ -41,9 +45,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
-import com.raytheon.uf.viz.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.viz.grid.data.GridRequestableDataFactory;
import com.raytheon.viz.grid.util.CoverageUtils;
@@ -110,7 +111,7 @@ public class GridRequestableNode extends AbstractBaseDataNode {
public Set getData(
Map orignalConstraints,
Set availability, Object response)
- throws VizException {
+ throws DataCubeException {
DbQueryResponse dbresponse = (DbQueryResponse) response;
GridRequestableDataFactory grdf = GridRequestableDataFactory
.getInstance();
@@ -254,14 +255,18 @@ public class GridRequestableNode extends AbstractBaseDataNode {
@Override
public Set getAvailability(
Map originalConstraints, Object response)
- throws VizException {
+ throws DataCubeException {
Set result = new HashSet();
if (response == null) {
result = GridTimeCache.getInstance().getTimes(this);
if (result == null) {
// Oh No! the cache has been cleared since we made our request.
- response = ThriftClient
- .sendRequest(getAvailabilityRequest(originalConstraints));
+ try {
+ response = ThriftClient
+ .sendRequest(getAvailabilityRequest(originalConstraints));
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
return getAvailability(originalConstraints, response);
}
GridTimeCache.getInstance().setTimes(this, result);
@@ -276,8 +281,12 @@ public class GridRequestableNode extends AbstractBaseDataNode {
coverage = GridCoverageLookup.getInstance().getCoverage(
locationId.intValue());
} else {
- coverage = CoverageUtils.getInstance()
- .getCoverages(getSource()).iterator().next();
+ try {
+ coverage = CoverageUtils.getInstance()
+ .getCoverages(getSource()).iterator().next();
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
}
result.add(new TimeAndSpace(time, coverage));
}
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridTimeCache.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridTimeCache.java
index 01cc7a27e5..6004efb8dd 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridTimeCache.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridTimeCache.java
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
/**
* Cache times for grid data to avoid multiple trips to edex for the same data.
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java
index 2b169677c9..aecb9aeb78 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java
@@ -28,12 +28,16 @@ import java.util.Map;
import java.util.Set;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.tree.LevelNode;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode.Dependency;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
-import com.raytheon.uf.common.derivparam.tree.LevelNode;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.tree.AbstractDerivedDataNode;
+import com.raytheon.uf.common.derivparam.tree.OrLevelNode;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.parameter.Parameter;
import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -42,10 +46,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.tree.AbstractDerivedDataNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode.Dependency;
-import com.raytheon.uf.viz.derivparam.tree.OrLevelNode;
import com.raytheon.viz.alerts.IAlertObserver;
import com.raytheon.viz.alerts.observers.ProductAlertObserver;
import com.raytheon.viz.grid.util.RadarAdapter;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
index b4414afe9d..c58e6ce3c8 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
@@ -28,20 +28,21 @@ import java.util.NavigableSet;
import java.util.Set;
import java.util.TreeSet;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfoLookup;
import com.raytheon.uf.common.dataplugin.level.Level;
+import com.raytheon.uf.common.derivparam.inv.AvailabilityContainer;
+import com.raytheon.uf.common.derivparam.library.DerivParamDesc;
+import com.raytheon.uf.common.derivparam.library.DerivParamMethod;
+import com.raytheon.uf.common.derivparam.tree.AbstractAliasLevelNode;
import com.raytheon.uf.common.geospatial.ISpatialObject;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.AvailabilityContainer;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
-import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
-import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
-import com.raytheon.uf.viz.derivparam.tree.AbstractAliasLevelNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
import com.raytheon.viz.grid.data.ImportRequestableData;
import com.raytheon.viz.grid.util.CoverageUtils;
import com.raytheon.viz.grid.util.RadarAdapter;
@@ -85,7 +86,7 @@ public class ImportLevelNode extends AbstractAliasLevelNode {
public Set getData(
Set availability,
Map> dependencyData)
- throws VizException {
+ throws DataCubeException {
Set origs = dependencyData.get(sourceNode);
Set results = new HashSet(
origs.size());
@@ -114,8 +115,12 @@ public class ImportLevelNode extends AbstractAliasLevelNode {
Collection spaces = null;
ISpatialObject space = time.getSpace();
if (space.equals(TimeAndSpace.SPACE_AGNOSTIC)) {
- spaces = CoverageUtils.getInstance().getCoverages(
- sourceNodeModelName);
+ try {
+ spaces = CoverageUtils.getInstance().getCoverages(
+ sourceNodeModelName);
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
} else if (space instanceof GridCoverage) {
spaces = Arrays.asList((GridCoverage) space);
} else {
@@ -166,7 +171,7 @@ public class ImportLevelNode extends AbstractAliasLevelNode {
@Override
public Set getAvailability(
Map> availability)
- throws VizException {
+ throws DataCubeException {
boundingSourceTimes.clear();
// grab this source and discover all available times ala time agnostic,
@@ -187,8 +192,12 @@ public class ImportLevelNode extends AbstractAliasLevelNode {
sourceDt *= 3600000;
}
if (RadarAdapter.RADAR_SOURCE.equals(modelName)) {
- Set radarTimes = RadarAdapter.getInstance()
- .timeInvariantQuery();
+ Set radarTimes;
+ try {
+ radarTimes = RadarAdapter.getInstance().timeInvariantQuery();
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
for (DataTime radarTime : radarTimes) {
if (sourceDataTimes.contains(radarTime)) {
@@ -213,9 +222,13 @@ public class ImportLevelNode extends AbstractAliasLevelNode {
}
Set result = new HashSet();
for (DataTime time : boundingSourceTimes.keySet()) {
- for (GridCoverage coverage : CoverageUtils.getInstance()
- .getCoverages(modelName)) {
- result.add(new TimeAndSpace(time, coverage));
+ try {
+ for (GridCoverage coverage : CoverageUtils.getInstance()
+ .getCoverages(modelName)) {
+ result.add(new TimeAndSpace(time, coverage));
+ }
+ } catch (VizException e) {
+ throw new DataCubeException(e);
}
}
return result;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarCubeLevelNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarCubeLevelNode.java
index 0120c8f162..b0c401612a 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarCubeLevelNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarCubeLevelNode.java
@@ -21,10 +21,10 @@ package com.raytheon.viz.grid.inv;
import java.util.List;
-import com.raytheon.uf.viz.derivparam.library.DerivParamField;
-import com.raytheon.uf.viz.derivparam.tree.AbstractCubeLevelNode;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
-import com.raytheon.uf.viz.derivparam.tree.CubeLevel;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.inventory.tree.CubeLevel;
+import com.raytheon.uf.common.derivparam.library.DerivParamField;
+import com.raytheon.uf.common.derivparam.tree.AbstractCubeLevelNode;
/**
*
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarRequestableLevelNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarRequestableLevelNode.java
index a444771af0..c52bbc8d9f 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarRequestableLevelNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarRequestableLevelNode.java
@@ -25,18 +25,19 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
+import com.raytheon.uf.common.inventory.tree.LevelNode;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
-import com.raytheon.uf.common.derivparam.tree.LevelNode;
+import com.raytheon.uf.common.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.catalog.CatalogQuery;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
-import com.raytheon.uf.viz.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.viz.grid.data.RadarRequestableData;
import com.raytheon.viz.grid.util.RadarAdapter;
@@ -115,14 +116,19 @@ public class RadarRequestableLevelNode extends AbstractBaseDataNode {
@Override
public Set getAvailability(
Map originalConstraints, Object response)
- throws VizException {
+ throws DataCubeException {
Set resultsSet = RadarUpdater.getInstance()
.getTimes(this);
if (resultsSet != null) {
return resultsSet;
}
- DataTime[] results = CatalogQuery.performTimeQuery(rcMap, false, null);
+ DataTime[] results;
+ try {
+ results = CatalogQuery.performTimeQuery(rcMap, false, null);
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
if (results != null) {
resultsSet = new HashSet(results.length);
for (int i = 0; i < results.length; i++) {
@@ -158,7 +164,7 @@ public class RadarRequestableLevelNode extends AbstractBaseDataNode {
public Set getData(
Map orignalConstraints,
Set availability, Object response)
- throws VizException {
+ throws DataCubeException {
List> rows = ((DbQueryResponse) response)
.getResults();
Set rval = new HashSet(
@@ -167,8 +173,12 @@ public class RadarRequestableLevelNode extends AbstractBaseDataNode {
// record... won't work because of the get data call, can't be a
// GribRecord, needs to call getDataValue on Requestable
for (Map objMap : rows) {
- rval.add(new RadarRequestableData((RadarRecord) objMap.get(null),
- paramAbbrev));
+ try {
+ rval.add(new RadarRequestableData((RadarRecord) objMap
+ .get(null), paramAbbrev));
+ } catch (VizException e) {
+ throw new DataCubeException(e);
+ }
}
return rval;
}
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarUpdater.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarUpdater.java
index 90e9186064..f80d92d1eb 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarUpdater.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/RadarUpdater.java
@@ -8,6 +8,7 @@ import java.util.Map.Entry;
import java.util.Set;
import com.raytheon.uf.common.comm.CommunicationException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.level.Level;
@@ -21,7 +22,6 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
import com.raytheon.viz.alerts.IAlertObserver;
import com.raytheon.viz.alerts.observers.ProductAlertObserver;
import com.raytheon.viz.grid.util.RadarAdapter;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/StaticGridDataLevelNode.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/StaticGridDataLevelNode.java
index ea902e0428..91bfdc2033 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/StaticGridDataLevelNode.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/StaticGridDataLevelNode.java
@@ -23,15 +23,16 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.TimeAndSpace;
import com.raytheon.uf.common.dataplugin.grid.util.StaticGridDataType;
import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
+import com.raytheon.uf.common.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.TimeAndSpace;
-import com.raytheon.uf.viz.derivparam.tree.AbstractBaseDataNode;
import com.raytheon.viz.grid.data.StaticGridRequestableData;
import com.raytheon.viz.grid.data.TiltRequestableData;
import com.raytheon.viz.grid.util.CoverageUtils;
@@ -79,11 +80,15 @@ public class StaticGridDataLevelNode extends AbstractBaseDataNode {
@Override
public Set getAvailability(
Map originalConstraints, Object response)
- throws VizException {
+ throws DataCubeException {
Set result = new HashSet();
- for (GridCoverage coverage : CoverageUtils.getInstance().getCoverages(
- source)) {
- result.add(new TimeAndSpace(coverage));
+ try {
+ for (GridCoverage coverage : CoverageUtils.getInstance()
+ .getCoverages(source)) {
+ result.add(new TimeAndSpace(coverage));
+ }
+ } catch (VizException e) {
+ throw new DataCubeException(e);
}
return result;
}
@@ -99,7 +104,7 @@ public class StaticGridDataLevelNode extends AbstractBaseDataNode {
public Set getData(
Map orignalConstraints,
Set availability, Object response)
- throws VizException {
+ throws DataCubeException {
Set results = new HashSet();
for (TimeAndSpace ast : availability) {
if (ast.getSpace() instanceof GridCoverage) {
@@ -108,11 +113,15 @@ public class StaticGridDataLevelNode extends AbstractBaseDataNode {
data.setDataTime(ast.getTime());
results.add(data);
} else {
- for (GridCoverage coverage : CoverageUtils.getInstance()
- .getCoverages(source)) {
- AbstractRequestableData data = createRequestableData(coverage);
- data.setDataTime(ast.getTime());
- results.add(data);
+ try {
+ for (GridCoverage coverage : CoverageUtils.getInstance()
+ .getCoverages(source)) {
+ AbstractRequestableData data = createRequestableData(coverage);
+ data.setDataTime(ast.getTime());
+ results.add(data);
+ }
+ } catch (VizException e) {
+ throw new DataCubeException(e);
}
}
}
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/record/RequestableDataRecord.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/record/RequestableDataRecord.java
index aef53d86d3..f8663b5d2e 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/record/RequestableDataRecord.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/record/RequestableDataRecord.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.datastorage.Request;
@@ -31,7 +33,6 @@ import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
import com.raytheon.uf.common.parameter.Parameter;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
import com.raytheon.viz.grid.data.GridRequestableData;
import com.raytheon.viz.grid.data.TiltRequestableData.TiltCenterPoint;
import com.raytheon.viz.grid.util.TiltRequest;
@@ -98,11 +99,12 @@ public class RequestableDataRecord extends GridRecord {
this.requester = pdo.requester;
}
- public IDataRecord[] getDataRecord() throws VizException {
+ public IDataRecord[] getDataRecord() throws DataCubeException {
return getDataRecord(Request.ALL);
}
- public IDataRecord[] getDataRecord(Request request) throws VizException {
+ public IDataRecord[] getDataRecord(Request request)
+ throws DataCubeException {
Object obj = null;
if (request instanceof TiltRequest) {
obj = requester.getDataValue(new TiltCenterPoint(
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java
index 093bbf87cb..2151815928 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java
@@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
@@ -38,7 +39,6 @@ import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
@@ -51,6 +51,7 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.d2d.core.map.IDataScaleResource;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.core.rsc.ICombinedResourceData;
import com.raytheon.viz.grid.inv.GribDataCubeAlertMessageParser;
import com.raytheon.viz.grid.inv.GridInventory;
@@ -369,7 +370,12 @@ public class GridResourceData extends AbstractRequestableResourceData implements
TiltRequest request = new TiltRequest();
request.setType(Request.Type.ALL);
request.setTiltLocation(tiltLoc);
- return DataCubeContainer.getDataRecord(record, request, null);
+ try {
+ return DataCubeContainer.getDataRecord(record, request,
+ null);
+ } catch (DataCubeException e) {
+ throw new VizException(e);
+ }
}
}
return null;
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
index 94dea2351f..02cee51d26 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
@@ -34,6 +34,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.grid.dataset.DatasetInfo;
@@ -56,7 +57,6 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractNameGenerator;
import com.raytheon.uf.viz.core.rsc.DisplayType;
@@ -64,6 +64,7 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
import com.raytheon.viz.grid.rsc.GridNameGenerator;
import com.raytheon.viz.grid.rsc.GridNameGenerator.IGridNameResource;
import com.raytheon.viz.grid.rsc.GridNameGenerator.LegendParameters;
@@ -161,6 +162,7 @@ public class D2DGridResource extends GridResource implements
@Override
protected GeneralGridData getData(GridRecord gridRecord)
throws VizException {
+ try {
Unit dataUnit = gridRecord.getParameter().getUnit();
GridCoverage location = gridRecord.getLocation();
/*
@@ -259,6 +261,9 @@ public class D2DGridResource extends GridResource implements
}
data = GridMemoryManager.getInstance().manage(data);
return data;
+ } catch ( DataCubeException e ) {
+ throw new VizException(e);
+ }
}
public GeneralGridData reprojectData(GeneralGridData data) {
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridResource.java
index 5c47947194..73cd259f94 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridResource.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridResource.java
@@ -28,6 +28,7 @@ import javax.measure.unit.Unit;
import org.geotools.coverage.grid.GeneralGridGeometry;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.grid.util.GridStyleUtil;
@@ -35,10 +36,10 @@ import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
+import com.raytheon.uf.viz.datacube.DataCubeContainer;
/**
*
@@ -86,7 +87,12 @@ public class GridResource extends
protected GeneralGridData getData(GridRecord gridRecord)
throws VizException {
Unit dataUnit = gridRecord.getParameter().getUnit();
- IDataRecord[] dataRecs = DataCubeContainer.getDataRecord(gridRecord);
+ IDataRecord[] dataRecs;
+ try {
+ dataRecs = DataCubeContainer.getDataRecord(gridRecord);
+ } catch (DataCubeException e) {
+ throw new VizException(e);
+ }
if (dataRecs == null) {
return null;
}
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GridDataCubeAdapter.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GridDataCubeAdapter.java
index 15d1a7ce4e..93619ecca5 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GridDataCubeAdapter.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GridDataCubeAdapter.java
@@ -34,6 +34,10 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import com.raytheon.uf.common.inventory.data.AbstractRequestableData;
+import com.raytheon.uf.common.inventory.exception.DataCubeException;
+import com.raytheon.uf.common.inventory.tree.AbstractRequestableNode;
+import com.raytheon.uf.common.dataplugin.HDF5Util;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridPathProvider;
@@ -44,6 +48,9 @@ import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
+import com.raytheon.uf.common.derivparam.inv.AvailabilityContainer;
+import com.raytheon.uf.common.derivparam.inv.MetadataContainer;
+import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
import com.raytheon.uf.common.geospatial.ISpatialEnabled;
import com.raytheon.uf.common.geospatial.ISpatialObject;
import com.raytheon.uf.common.gridcoverage.GridCoverage;
@@ -51,16 +58,10 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.HDF5Util;
-import com.raytheon.uf.viz.core.datastructure.CubeUtil;
import com.raytheon.uf.viz.core.datastructure.VizDataCubeException;
import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.derivparam.data.AbstractDataCubeAdapter;
-import com.raytheon.uf.viz.derivparam.data.AbstractRequestableData;
-import com.raytheon.uf.viz.derivparam.inv.AvailabilityContainer;
-import com.raytheon.uf.viz.derivparam.inv.MetadataContainer;
-import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator;
-import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
+import com.raytheon.uf.viz.datacube.AbstractDataCubeAdapter;
+import com.raytheon.uf.viz.datacube.CubeUtil;
import com.raytheon.viz.grid.data.GridRequestableData;
import com.raytheon.viz.grid.inv.GridInventory;
import com.raytheon.viz.grid.inv.GridMetadataContainer;
@@ -102,7 +103,7 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
gridInventory.initTree(DerivedParameterGenerator
.getDerParLibrary());
this.gridInventory = gridInventory;
- } catch (VizException e) {
+ } catch (DataCubeException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
e);
}
@@ -118,56 +119,56 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
@Override
public IDataRecord[] getRecord(PluginDataObject obj, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
if (obj instanceof RequestableDataRecord) {
return super.getRecord(obj, req, dataset);
}
- try {
- IDataRecord record = null;
- if (GridPathProvider.STATIC_PARAMETERS.contains(((GridRecord) obj)
- .getParameter().getAbbreviation())) {
- GridRecord gridRec = (GridRecord) obj;
- IDataStore ds = DataStoreFactory.getDataStore(HDF5Util
- .findHDF5Location(obj));
- try {
- record = ds.retrieve("/" + gridRec.getLocation().getId(),
- gridRec.getParameter().getAbbreviation(), req);
- } catch (Exception e) {
- throw new VizException("Error retrieving staticTopo data!",
- e);
- }
- } else {
- record = CubeUtil.retrieveData(obj, obj.getPluginName(), req,
- dataset);
+ IDataRecord record = null;
+ if (GridPathProvider.STATIC_PARAMETERS.contains(((GridRecord) obj)
+ .getParameter().getAbbreviation())) {
+ GridRecord gridRec = (GridRecord) obj;
+ IDataStore ds = DataStoreFactory.getDataStore(HDF5Util
+ .findHDF5Location(obj));
+ try {
+ record = ds.retrieve("/" + gridRec.getLocation().getId(),
+ gridRec.getParameter().getAbbreviation(), req);
+ } catch (Exception e) {
+ throw new DataCubeException(
+ "Error retrieving staticTopo data!", e);
}
- return new IDataRecord[] { record };
-
- } catch (VizException e) {
- throw new VizDataCubeException("Error retrieving grid record.", e);
+ } else {
+ record = CubeUtil.retrieveData(obj, obj.getPluginName(), req,
+ dataset);
}
+ return new IDataRecord[] { record };
}
private IDataRecord[] getRecord(PluginDataObject obj, Request[] requests)
throws VizException {
- if (requests == null) {
- return ((RequestableDataRecord) obj).getDataRecord(Request.ALL);
- }
- Request retrieveRequest = requests[0];
- Request sliceRequest = requests[1];
-
- IDataRecord[] recs = ((RequestableDataRecord) obj)
- .getDataRecord(retrieveRequest);
- IDataRecord[] newRecs = new IDataRecord[recs.length];
- for (int i = 0; i < recs.length; i++) {
- if (recs[i] instanceof FloatDataRecord) {
- newRecs[i] = SliceUtil.slice((FloatDataRecord) recs[i],
- sliceRequest);
- } else {
- throw new VizDataCubeException("Error processing slab of type"
- + recs[i].getClass().getSimpleName());
+ try {
+ if (requests == null) {
+ return ((RequestableDataRecord) obj).getDataRecord(Request.ALL);
}
+ Request retrieveRequest = requests[0];
+ Request sliceRequest = requests[1];
+
+ IDataRecord[] recs = ((RequestableDataRecord) obj)
+ .getDataRecord(retrieveRequest);
+ IDataRecord[] newRecs = new IDataRecord[recs.length];
+ for (int i = 0; i < recs.length; i++) {
+ if (recs[i] instanceof FloatDataRecord) {
+ newRecs[i] = SliceUtil.slice((FloatDataRecord) recs[i],
+ sliceRequest);
+ } else {
+ throw new VizDataCubeException(
+ "Error processing slab of type"
+ + recs[i].getClass().getSimpleName());
+ }
+ }
+ return newRecs;
+ } catch (DataCubeException e) {
+ throw new VizException(e);
}
- return newRecs;
}
private Request[] generateRequests(Request req, ISpatialObject area) {
@@ -275,7 +276,7 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
*/
@Override
public void getRecords(List objs, Request req,
- String dataset) throws VizDataCubeException {
+ String dataset) throws DataCubeException {
Set realData = new HashSet();
ISpatialObject area = null;
for (PluginDataObject obj : objs) {
@@ -349,7 +350,7 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
data.setDataValue(request, value);
}
} catch (Exception e) {
- throw new VizDataCubeException(e);
+ throw new DataCubeException(e);
}
}
}
@@ -367,7 +368,7 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
records = getRecord(obj, requests);
}
} catch (VizException e) {
- throw new VizDataCubeException(e.getMessage(), e);
+ throw new DataCubeException(e.getMessage(), e);
}
} else {
records = getRecord(obj, req, dataset);
@@ -400,7 +401,7 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
*/
@Override
protected List timeAgnosticQuery(
- Map queryTerms) throws VizException {
+ Map queryTerms) throws DataCubeException {
return gridInventory.timeAgnosticQuery(queryTerms);
}
@@ -415,72 +416,78 @@ public class GridDataCubeAdapter extends AbstractDataCubeAdapter {
protected List getData(
Map constraints,
DataTime[] selectedTimes, List requesters)
- throws VizException {
- List results = new ArrayList(
- requesters.size());
- for (AbstractRequestableData requester : requesters) {
- List records = new ArrayList();
- if (requester.getDataTime() == null
- || requester.getTimeAndSpace().isTimeAgnostic()) {
- DataTime[] entryTime = selectedTimes;
- if (entryTime != null && entryTime.length > 0) {
- List entryTimes = new ArrayList(
- Arrays.asList(entryTime));
- for (DataTime time : entryTimes) {
- RequestableDataRecord rec = new RequestableDataRecord(
- requester);
- rec.setDataTime(time.clone());
- rec.setDataURI(null);
- boolean newRecord = true;
- for (PluginDataObject result : results) {
- if (result.getDataURI().equals(rec.getDataURI())) {
- newRecord = false;
- break;
+ throws DataCubeException {
+ try {
+ List