*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Oct 8, 2009 mschenke Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 08, 2009 mschenke Initial creation
+ * Oct 22, 2013 2491 bsteffen Unmarshal with Bundle.unmarshalBundle.
+ *
*
*
*
@@ -58,22 +62,26 @@ public interface IInsetMapContainer {
/** Utility class for loading the inset map from a bundle */
public static class InsetMapUtil {
+
+ private static final transient IUFStatusHandler statusHandler = UFStatus
+ .getHandler(IInsetMapContainer.class);
+
public static IRenderableDisplay loadInsetMap(
IRenderableDisplay parentDisplay) {
File bundle = PathManagerFactory.getPathManager().getStaticFile(
"insetmap" + File.separator + "inset.xml");
try {
- Bundle b = (Bundle) SerializationUtil
- .jaxbUnmarshalFromXmlFile(bundle.getAbsolutePath());
+ Bundle b = Bundle.unmarshalBundle(bundle);
InsetMapRenderableDisplay display = (InsetMapRenderableDisplay) b
.getDisplays()[0];
- display.getDescriptor().getResourceList().instantiateResources(
- display.getDescriptor(), true);
+ display.getDescriptor().getResourceList()
+ .instantiateResources(display.getDescriptor(), true);
display.setExtent(new PixelExtent(0, 1000, 0, 1000));
display.setParentDisplay(parentDisplay);
return display;
- } catch (SerializationException e) {
- e.printStackTrace();
+ } catch (VizException e) {
+ statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
+ e);
}
return null;
}
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/perspective/MPEPerspectiveManager.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/perspective/MPEPerspectiveManager.java
index 2fa5d679a3..243201c797 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/perspective/MPEPerspectiveManager.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/perspective/MPEPerspectiveManager.java
@@ -35,7 +35,6 @@ import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.ohd.AppsDefaults;
import com.raytheon.uf.common.serialization.SerializationException;
-import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.DescriptorMap;
@@ -47,6 +46,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.maps.MapManager;
import com.raytheon.uf.viz.core.procedures.Bundle;
+import com.raytheon.uf.viz.core.procedures.ProcedureXmlManager;
import com.raytheon.uf.viz.core.rsc.IInputHandler;
import com.raytheon.viz.hydrocommon.actions.SetProjection;
import com.raytheon.viz.mpe.ui.MPEDisplayManager;
@@ -71,12 +71,14 @@ import com.vividsolutions.jts.geom.Coordinate;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 21, 2008 randerso Initial creation
- * Feb 18, 2010 4111 snaples Updated to support contexts
- * Apr 27, 2010 mschenke refactor for common perspective switching
- * Jan 29, 2013 1550 mpduff Add ability to preload maps on open.
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Aug 21, 2008 randerso Initial creation
+ * Feb 18, 2010 4111 snaples Updated to support contexts
+ * Apr 27, 2010 mschenke refactor for common perspective switching
+ * Jan 29, 2013 1550 mpduff Add ability to preload maps on open.
+ * Oct 22, 2013 2491 bsteffen Switch serialization to
+ * ProcedureXmlManager
*
*
* @author randerso
@@ -120,68 +122,57 @@ public class MPEPerspectiveManager extends AbstractCAVEPerspectiveManager {
public AbstractEditor openNewEditor() {
try {
// Unmarshal default bundle xml
- Object unmarshalled = SerializationUtil.getJaxbManager()
- .unmarshalFromXmlFile(
- PathManagerFactory.getPathManager().getStaticFile(
+ Bundle b = ProcedureXmlManager.getInstance().unmarshal(
+ Bundle.class,
+ PathManagerFactory.getPathManager()
+ .getStaticFile(
MPE + IPathManager.SEPARATOR
+ "default-bundle.xml"));
- if (unmarshalled instanceof Bundle) {
- // Load Bundle to perspective window in new editor
- Bundle b = (Bundle) unmarshalled;
- String editorId = b.getEditor();
- if (editorId != null) {
- IRenderableDisplay[] displays = b.getDisplays();
- if (displays.length > 0) {
- editorId = DescriptorMap.getEditorId(displays[0]
- .getDescriptor().getClass().getName());
- AbstractEditor editor = UiUtil.createEditor(
- perspectiveWindow, editorId, displays);
- if (editor != null) {
- initialize(editor);
+ // Load Bundle to perspective window in new editor
+ String editorId = b.getEditor();
+ if (editorId != null) {
+ IRenderableDisplay[] displays = b.getDisplays();
+ if (displays.length > 0) {
+ editorId = DescriptorMap.getEditorId(displays[0]
+ .getDescriptor().getClass().getName());
+ AbstractEditor editor = UiUtil.createEditor(
+ perspectiveWindow, editorId, displays);
+ if (editor != null) {
+ initialize(editor);
- String[] maps;
+ String[] maps;
- // Get the maps configured for display at startup
- String displayMaps = AppsDefaults.getInstance()
- .getToken("mpe_display_maps",
- "statesCounties");
+ // Get the maps configured for display at startup
+ String displayMaps = AppsDefaults.getInstance()
+ .getToken("mpe_display_maps", "statesCounties");
- if (displayMaps.contains(",")) {
- maps = displayMaps.split(",");
- } else {
- maps = new String[1];
- maps[0] = displayMaps;
- }
-
- IDisplayPaneContainer currentEditor = EditorUtil
- .getActiveVizContainer();
- MapManager mapMgr = MapManager
- .getInstance((IMapDescriptor) currentEditor
- .getActiveDisplayPane()
- .getDescriptor());
-
- // Load the configured maps
- for (String map : maps) {
- mapMgr.loadMapByBundleName(map.trim());
- }
-
- return editor;
+ if (displayMaps.contains(",")) {
+ maps = displayMaps.split(",");
} else {
- throw new VizException(
- "Failed to open new editor on window");
+ maps = new String[1];
+ maps[0] = displayMaps;
}
+
+ IDisplayPaneContainer currentEditor = EditorUtil
+ .getActiveVizContainer();
+ MapManager mapMgr = MapManager
+ .getInstance((IMapDescriptor) currentEditor
+ .getActiveDisplayPane().getDescriptor());
+
+ // Load the configured maps
+ for (String map : maps) {
+ mapMgr.loadMapByBundleName(map.trim());
+ }
+
+ return editor;
} else {
- throw new SerializationException(
- "No displays to load found in MPE default bundle XML");
+ throw new VizException(
+ "Failed to open new editor on window");
}
+ } else {
+ throw new SerializationException(
+ "No displays to load found in MPE default bundle XML");
}
- } else {
- throw new SerializationException(
- "Unexpected type deserialied from mpe bundle file. Expected "
- + Bundle.class.getSimpleName()
- + ", got "
- + (unmarshalled != null ? unmarshalled
- .getClass().getSimpleName() : null));
}
} catch (Exception e) {
UFStatus.getHandler().handle(Priority.PROBLEM,
diff --git a/cave/com.raytheon.viz.radar/build.properties b/cave/com.raytheon.viz.radar/build.properties
index e5eb50c213..1bab865885 100644
--- a/cave/com.raytheon.viz.radar/build.properties
+++ b/cave/com.raytheon.viz.radar/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
config.xml,\
- localization/
+ localization/,\
+ res/
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResourceFactory.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResourceFactory.java
index 1765ebf003..2600bf7bfb 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResourceFactory.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResourceFactory.java
@@ -19,21 +19,19 @@
**/
package com.raytheon.viz.radar.rsc.mosaic;
-import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import com.raytheon.uf.common.serialization.SerializationUtil;
+import com.raytheon.uf.common.serialization.SerializationException;
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.drawables.ResourcePair;
+import com.raytheon.uf.viz.core.procedures.ProcedureXmlManager;
import com.raytheon.uf.viz.core.rsc.ResourceGroup;
import com.raytheon.uf.viz.core.rsc.ResourceList;
-import com.raytheon.uf.viz.core.status.StatusConstants;
-import com.raytheon.viz.radar.Activator;
/**
* Use a base resource, a substitution key and a comma separated list of
@@ -49,9 +47,11 @@ import com.raytheon.viz.radar.Activator;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Sep 29, 2010 bsteffen Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Sep 29, 2010 bsteffen Initial creation
+ * Oct 22, 2013 2491 bsteffen Switch serialization to
+ * ProcedureXmlManager
*
*
*
@@ -78,20 +78,22 @@ public class RadarMosaicResourceFactory extends AbstractMosaicResourceFactory {
*/
@Override
public ResourceList getResourceList() {
+ ProcedureXmlManager jaxb = ProcedureXmlManager.getInstance();
+ ResourceList resourceList = new ResourceList();
+ // Put the base resource in a group so it can be serialized
+ ResourceGroup baseGroup = new ResourceGroup();
+ baseGroup.getResourceList().add(resource);
try {
- ResourceList resourceList = new ResourceList();
- // Put the base resource in a group so it can be serialized
- ResourceGroup baseGroup = new ResourceGroup();
- baseGroup.getResourceList().add(resource);
- String baseXml = SerializationUtil.marshalToXml(baseGroup);
+ String baseXml = jaxb.marshal(baseGroup);
resourceList.clear();
for (String icao : substitutionValues.split(",")) {
String xml = baseXml.replace(substitutionKey, icao);
- resourceList.add(((ResourceGroup) SerializationUtil
- .unmarshalFromXml(xml)).getResourceList().get(0));
+ resourceList.add(jaxb
+ .unmarshal(ResourceGroup.class, xml)
+ .getResourceList().get(0));
}
return resourceList;
- } catch (JAXBException e) {
+ } catch (SerializationException e) {
statusHandler.handle(Priority.PROBLEM, e
.getLocalizedMessage(), e);
}
diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/menu/SatBundleContributionItem.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/menu/SatBundleContributionItem.java
index 52477dc5f8..45180b77d4 100644
--- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/menu/SatBundleContributionItem.java
+++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/menu/SatBundleContributionItem.java
@@ -24,15 +24,13 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.JAXBException;
-
import org.eclipse.ui.IWorkbenchWindow;
import org.geotools.coverage.grid.GeneralGridGeometry;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.menus.xml.CommonBundleMenuContribution;
import com.raytheon.uf.common.menus.xml.VariableSubstitution;
-import com.raytheon.uf.common.serialization.SerializationUtil;
+import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -47,6 +45,7 @@ import com.raytheon.uf.viz.core.globals.IGlobalChangedListener;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.procedures.Bundle;
+import com.raytheon.uf.viz.core.procedures.ProcedureXmlManager;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.ResourceGroup;
import com.raytheon.uf.viz.core.rsc.URICatalog;
@@ -58,15 +57,19 @@ import com.raytheon.viz.ui.EditorUtil;
/**
*
- * TODO Add Description
+ * Custom bundle contribution item for satellite so it has the ability to
+ * determine available times differently depending on scale by using a
+ * {@link SatBestResResourceData} to determine which resources are best to load.
*
*
*
* SOFTWARE HISTORY
*
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Aug 26, 2011 bsteffen Initial creation
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Aug 26, 2011 bsteffen Initial creation
+ * Oct 22, 2013 2491 bsteffen Switch serialization to
+ * ProcedureXmlManager
*
*
*
@@ -102,8 +105,9 @@ public class SatBundleContributionItem extends BundleContributionItem {
pair.setResourceData(resourceData);
ResourceGroup group = new ResourceGroup();
group.getResourceList().add(pair);
- String xml = SerializationUtil.marshalToXml(group);
- group = (ResourceGroup) SerializationUtil.unmarshalFromXml(xml);
+ ProcedureXmlManager jaxb = ProcedureXmlManager.getInstance();
+ String xml = jaxb.marshal(group);
+ group = jaxb.unmarshal(ResourceGroup.class, xml);
resourceData = (AbstractRequestableResourceData) group
.getResourceList().get(0).getResourceData();
// get the available times
@@ -129,7 +133,7 @@ public class SatBundleContributionItem extends BundleContributionItem {
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
e);
- } catch (JAXBException e) {
+ } catch (SerializationException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
e);
}
diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/UiPlugin.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/UiPlugin.java
index a985402c38..2557a733f6 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/UiPlugin.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/UiPlugin.java
@@ -35,10 +35,13 @@ import com.raytheon.viz.ui.panes.DrawCoordinatorJob;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * 7/1/06 chammack Initial Creation.
- * Oct 27, 2009 #2354 bsteffen Added preferences to ui plugin
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Jul 01, 2006 chammack Initial Creation.
+ * Oct 27, 2009 2354 bsteffen Added preferences to ui plugin
+ * Oct 24, 2012 2491 bsteffen Do not start DrawCoordinatorJob during
+ * activation to allow activation before
+ * localization is set.
*
*
*
@@ -67,7 +70,6 @@ public class UiPlugin extends AbstractUIPlugin {
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- DrawCoordinatorJob.getInstance();
}
/**
diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
index c2f738efdf..1b9c067a5a 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
@@ -38,7 +38,6 @@ import org.eclipse.ui.internal.EditorAreaHelper;
import org.eclipse.ui.internal.EditorReference;
import org.eclipse.ui.internal.WorkbenchPage;
-import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -49,6 +48,7 @@ import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.core.procedures.Procedure;
+import com.raytheon.uf.viz.core.procedures.ProcedureXmlManager;
import com.raytheon.viz.ui.BundleLoader;
import com.raytheon.viz.ui.UiUtil;
import com.raytheon.viz.ui.VizWorkbenchManager;
@@ -60,10 +60,12 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
*
*
* SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Apr 6, 2010 mschenke Initial creation
- * Mar 21, 2013 1638 mschenke Added method to load procedure to window
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Apr 06, 2010 mschenke Initial creation
+ * Mar 21, 2013 1638 mschenke Added method to load procedure to window
+ * Oct 22, 2013 2491 bsteffen Switch serialization to
+ * ProcedureXmlManager
*
*
*
@@ -113,7 +115,8 @@ public class LoadSerializedXml extends AbstractHandler {
public static Object deserialize(File fileName) {
Object obj = null;
try {
- obj = SerializationUtil.jaxbUnmarshalFromXmlFile(fileName);
+ obj = ProcedureXmlManager.getInstance().unmarshal(
+ Object.class, fileName);
} catch (Exception e) {
String errMsg = "Error occurred during xml deserialization";
statusHandler.handle(Priority.CRITICAL, errMsg, e);
diff --git a/cots/org.hibernate/.classpath b/cots/org.hibernate/.classpath
index 783dbadf49..aeb471100d 100644
--- a/cots/org.hibernate/.classpath
+++ b/cots/org.hibernate/.classpath
@@ -3,7 +3,6 @@
-
diff --git a/cots/org.hibernate/META-INF/MANIFEST.MF b/cots/org.hibernate/META-INF/MANIFEST.MF
index e9f8a57777..362af709bf 100644
--- a/cots/org.hibernate/META-INF/MANIFEST.MF
+++ b/cots/org.hibernate/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: hibernate-spatial-1.0.jar,
hibernate-spatial-postgis-1.0.jar,
hibernate3.5.6-Final.jar,
- javassist-3.9.0.GA.jar,
jta-1.1.jar
Bundle-Vendor: Hibernate
Export-Package: org.hibernate,
@@ -184,4 +183,5 @@ Export-Package: org.hibernate,
org.hibernatespatial.postgis,
org.hibernatespatial.readers,
org.hibernatespatial.spi
-Require-Bundle: org.slf4j
+Require-Bundle: org.slf4j,
+ org.javassist;bundle-version="3.9.0"
diff --git a/cots/org.hibernate/build.properties b/cots/org.hibernate/build.properties
index 131e6678ba..55b69f5a8e 100644
--- a/cots/org.hibernate/build.properties
+++ b/cots/org.hibernate/build.properties
@@ -2,5 +2,4 @@ bin.includes = META-INF/,\
hibernate-spatial-1.0.jar,\
hibernate-spatial-postgis-1.0.jar,\
hibernate3.5.6-Final.jar,\
- javassist-3.9.0.GA.jar,\
jta-1.1.jar
diff --git a/cots/org.javassist/.classpath b/cots/org.javassist/.classpath
new file mode 100644
index 0000000000..937d4cc568
--- /dev/null
+++ b/cots/org.javassist/.classpath
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/cots/org.javassist/.project b/cots/org.javassist/.project
new file mode 100644
index 0000000000..d32d66355b
--- /dev/null
+++ b/cots/org.javassist/.project
@@ -0,0 +1,28 @@
+
+
+ org.javassist
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/cots/org.javassist/META-INF/MANIFEST.MF b/cots/org.javassist/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..cceab46e99
--- /dev/null
+++ b/cots/org.javassist/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Javassist
+Bundle-SymbolicName: org.javassist
+Bundle-Version: 3.9.0.GA
+Bundle-ClassPath: javassist-3.9.0.GA.jar
+Export-Package: javassist,
+ javassist.bytecode,
+ javassist.bytecode.analysis,
+ javassist.bytecode.annotation,
+ javassist.bytecode.stackmap,
+ javassist.compiler,
+ javassist.compiler.ast,
+ javassist.convert,
+ javassist.expr,
+ javassist.runtime,
+ javassist.scopedpool,
+ javassist.tools,
+ javassist.tools.reflect,
+ javassist.tools.rmi,
+ javassist.tools.web,
+ javassist.util,
+ javassist.util.proxy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/cots/org.javassist/build.properties b/cots/org.javassist/build.properties
new file mode 100644
index 0000000000..68fa07cd56
--- /dev/null
+++ b/cots/org.javassist/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+ javassist-3.9.0.GA.jar
diff --git a/cots/org.hibernate/javassist-3.9.0.GA.jar b/cots/org.javassist/javassist-3.9.0.GA.jar
similarity index 100%
rename from cots/org.hibernate/javassist-3.9.0.GA.jar
rename to cots/org.javassist/javassist-3.9.0.GA.jar
diff --git a/cots/org.reflections/META-INF/MANIFEST.MF b/cots/org.reflections/META-INF/MANIFEST.MF
index 460ae67b86..41ab7b4d8b 100644
--- a/cots/org.reflections/META-INF/MANIFEST.MF
+++ b/cots/org.reflections/META-INF/MANIFEST.MF
@@ -11,3 +11,5 @@ Export-Package: org.reflections,
org.reflections.util,
org.reflections.vfs
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: com.google.guava;bundle-version="1.0.0",
+ org.javassist;bundle-version="3.9.0"
diff --git a/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
index 621ee766b4..a6a13646d4 100644
--- a/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
@@ -277,6 +277,12 @@
install-size="0"
version="0.0.0"/>
+
+
+
+
diff --git a/edexOsgi/com.raytheon.uf.common.serialization/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.serialization/META-INF/MANIFEST.MF
index e54e2f2894..b2a3dbfb50 100644
--- a/edexOsgi/com.raytheon.uf.common.serialization/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.serialization/META-INF/MANIFEST.MF
@@ -16,5 +16,7 @@ Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.common.serialization,
com.raytheon.uf.common.serialization.adapters,
com.raytheon.uf.common.serialization.annotations,
+ com.raytheon.uf.common.serialization.jaxb,
+ com.raytheon.uf.common.serialization.reflect,
com.raytheon.uf.common.serialization.thrift
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/JAXBClassLocator.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/JAXBClassLocator.java
new file mode 100644
index 0000000000..93342b6d1f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/JAXBClassLocator.java
@@ -0,0 +1,193 @@
+/**
+ * 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.common.serialization.jaxb;
+
+import java.io.File;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import com.raytheon.uf.common.serialization.reflect.ISubClassLocator;
+
+/**
+ * Locate all classes that can be used in a JAXB contexts. This class uses an
+ * {@link ISubClassLocator} to dynamically find all possible subtypes of every
+ * class used in a JAXB context. For most xml types this would be overkill but
+ * for some advanced types that allow dynamic class types with the xsi:type
+ * field this can be useful for building a complete context.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 22, 2013 2491 bsteffen Initial creation
+ *
+ *
+ *
+ * @author bsteffen
+ * @version 1.0
+ */
+
+public class JAXBClassLocator {
+
+ private ISubClassLocator locator;
+
+ private Set> processed = new HashSet>(512);
+
+ private List> included = new ArrayList>(512);
+
+ private JAXBClassLocator(ISubClassLocator locator, Class rootClass) {
+ this.locator = locator;
+ processed.addAll(getBuiltinTypes());
+ processClass(rootClass);
+ }
+
+ private void processClass(Class clazz) {
+ if (!processed.add(clazz)) {
+ return;
+ }
+ if (clazz.isPrimitive() || clazz.isEnum() || clazz.isInterface()) {
+ return;
+ }
+ if (clazz.isArray()) {
+ processClass(clazz.getComponentType());
+ return;
+ }
+ if (clazz.getName().contains("$")
+ && !clazz.isAnnotationPresent(XmlType.class)) {
+ return;
+ }
+ included.add(clazz);
+ Class zuper = clazz.getSuperclass();
+ if (zuper == Object.class) {
+ /* Found a "base" class, search for subclasses */
+ if (!Modifier.isFinal(clazz.getModifiers())) {
+ for (Class sub : locator.locateSubClasses(clazz)) {
+ processClass(sub);
+ }
+ }
+ } else {
+ processClass(zuper);
+ }
+
+ for (Field field : clazz.getDeclaredFields()) {
+ processField(field);
+ }
+ for (Method method : clazz.getDeclaredMethods()) {
+ processMethod(method);
+ }
+ }
+
+ private void processField(Field field) {
+ if (isXmlElement(field)) {
+ Class type = field.getType();
+ if (Collection.class.isAssignableFrom(type)) {
+ handleCollectionType(field.getGenericType());
+ } else {
+ processClass(field.getType());
+ }
+ }
+ }
+
+ private void processMethod(Method method) {
+ if (isXmlElement(method)) {
+ Class returnType = method.getReturnType();
+ if (returnType != void.class) {
+ /* Getter */
+ processClass(returnType);
+ } else if (Collection.class.isAssignableFrom(returnType)) {
+ handleCollectionType(method.getGenericReturnType());
+ } else {
+ Class[] tp = method.getParameterTypes();
+ if (tp.length == 1) {
+ /* Setter */
+ if (Collection.class.isAssignableFrom(tp[0])) {
+ handleCollectionType(method.getGenericParameterTypes()[0]);
+ } else {
+ processClass(tp[0]);
+ }
+ }
+ }
+ }
+ }
+
+ private void handleCollectionType(Type type) {
+ if (type instanceof ParameterizedType) {
+ ParameterizedType ptype = (ParameterizedType) type;
+ Type[] args = ptype.getActualTypeArguments();
+ if (args.length == 1 && args[0] instanceof Class) {
+ processClass((Class) args[0]);
+ }
+ } else if (type instanceof Class) {
+ handleCollectionType(((Class) type).getGenericSuperclass());
+ }
+ }
+
+ private Collection> getResults() {
+ return included;
+ }
+
+ private static boolean isXmlElement(AnnotatedElement element) {
+ return element.isAnnotationPresent(XmlElement.class)
+ && !element.isAnnotationPresent(XmlJavaTypeAdapter.class);
+ }
+
+ /**
+ * A base set of classes for which we don't need to find subclasses or
+ * reflect on the fields.
+ *
+ * @return
+ */
+ private static Collection> getBuiltinTypes() {
+ return Arrays.> asList(Boolean.class, Byte.class, Short.class,
+ Integer.class, Long.class, Float.class, Double.class,
+ String.class, Object.class, Class.class, File.class);
+ }
+
+ /**
+ * Dynamically find all classes that can possibly appear in an xml document
+ * rooted in baseClass.
+ *
+ * @param locator
+ * used for finding subclasses
+ * @param rootClass
+ * the root cml object
+ * @return all classes that are can be in the xml.
+ */
+ public static Collection> getJAXBClasses(ISubClassLocator locator,
+ Class baseClass) {
+ return new JAXBClassLocator(locator, baseClass).getResults();
+ }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/reflect/ISubClassLocator.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/reflect/ISubClassLocator.java
new file mode 100644
index 0000000000..c41c673d44
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/reflect/ISubClassLocator.java
@@ -0,0 +1,53 @@
+/**
+ * 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.common.serialization.reflect;
+
+import java.util.Collection;
+
+/**
+ * Interface indicating an object is capable of looking up subclassed based off
+ * of a known parent class. Generally this must be implemented using advanced
+ * reflection mechanisms that are heavily dependendant on the type of runtime
+ * and will ned to be different on edex and cave.
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 23, 2013 2491 bsteffen Initial creation
+ *
+ *
+ *
+ * @author bsteffen
+ * @version 1.0
+ */
+public interface ISubClassLocator {
+
+ /**
+ * Determine all subclasses of a given class.
+ *
+ * @param base
+ * a class
+ * @return all subclasses of base.
+ */
+ public Collection> locateSubClasses(Class base);
+}
diff --git a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
index 7443958454..966774685b 100644
--- a/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.base.feature/feature.xml
@@ -189,10 +189,4 @@
install-size="0"
version="0.0.0"/>
-
-
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF
index e0497fa11a..6984f951dd 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
gov.noaa.nws.ncep.viz.common,
gov.noaa.nws.ncep.viz.localization,
gov.noaa.nws.ncep.viz.rsc.pgen;bundle-version="1.0.0",
- com.raytheon.uf.common.sounding
+ com.raytheon.uf.common.sounding,
+ com.raytheon.viz.core.graphing
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: com.raytheon.edex.plugin.modelsounding.common,
@@ -35,7 +36,6 @@ Import-Package: com.raytheon.edex.plugin.modelsounding.common,
com.raytheon.uf.viz.d2d.core.time,
com.raytheon.uf.viz.d2d.ui.perspectives,
com.raytheon.uf.viz.sounding,
- com.raytheon.viz.core.graphing,
com.vividsolutions.jts.geom,
gov.noaa.nws.ncep.common.dataplugin.ncuair,
gov.noaa.nws.ncep.edex.common.ncinventory,
diff --git a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/NsharpAbstractPaneDescriptor.java b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/NsharpAbstractPaneDescriptor.java
index 606bee640f..2bbad12a99 100644
--- a/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/NsharpAbstractPaneDescriptor.java
+++ b/ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/NsharpAbstractPaneDescriptor.java
@@ -12,6 +12,8 @@
* ------- ------- -------- -----------
* 05/02/2012 229 Chin Chen Initial coding for multiple display panes implementation
* 03/11/2013 972 Greg Hull rm paneNumber
+ * 03/11/2013 2491 bsteffen extend IDescriptor derictly for better serialization detection.
+
*
*
*
@@ -32,10 +34,12 @@ import org.geotools.referencing.crs.DefaultEngineeringCRS;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.datastructure.LoopProperties;
+import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.viz.core.graphing.GraphDescriptor;
@XmlAccessorType(XmlAccessType.NONE)
-public class NsharpAbstractPaneDescriptor extends GraphDescriptor {
+public class NsharpAbstractPaneDescriptor extends GraphDescriptor implements
+ IDescriptor {
// @XmlElement
// protected int paneNumber;
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/GridLoadProperties.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/GridLoadProperties.java
deleted file mode 100644
index 615fefe508..0000000000
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/GridLoadProperties.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*****************************************************************************************
- * COPYRIGHT (c), 2008, RAYTHEON COMPANY
- * ALL RIGHTS RESERVED, An Unpublished Work
- *
- * RAYTHEON PROPRIETARY
- * If the end user is not the U.S. Government or any agency thereof, use
- * or disclosure of data contained in this source code file is subject to
- * the proprietary restrictions set forth in the Master Rights File.
- *
- * U.S. GOVERNMENT PURPOSE RIGHTS NOTICE
- * If the end user is the U.S. Government or any agency thereof, this source
- * code is provided to the U.S. Government with Government Purpose Rights.
- * Use or disclosure of data contained in this source code file is subject to
- * the "Government Purpose Rights" restriction in the Master Rights File.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * Use or disclosure of data contained in this source code file is subject to
- * the export restrictions set forth in the Master Rights File.
- ******************************************************************************************/
-package gov.noaa.nws.ncep.viz.rsc.ncgrid.rsc;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
-import com.raytheon.uf.viz.core.rsc.DisplayType;
-import com.raytheon.uf.viz.core.rsc.LoadProperties;
-
-/**
- * Loads properties to have different display types (Image, Contour etc..) for
- * grid data.
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * July 18, 2008 #1280 S. Manoj Initial creation
- *
- *
- *
- * @author smanoj
- * @version 1.0
- */
-@XmlAccessorType(XmlAccessType.NONE)
-public class GridLoadProperties extends LoadProperties {
-
- /**
- * Display type for a grid data(Image, Contour etc...)
- */
- @XmlAttribute
- private DisplayType displayType;
-
- public GridLoadProperties() {
- this.displayType = DisplayType.CONTOUR;
- }
-
- /**
- * Constructor
- *
- * @param displayType
- */
- public GridLoadProperties(DisplayType displayType) {
- this.displayType = displayType;
- }
-
- /**
- * Returns the display type.
- *
- * @return displayType
- */
- public DisplayType getDisplayType() {
- return displayType;
- }
-
- /**
- * Sets the display type.
- *
- * @param displayType
- */
- public void setDisplayType(DisplayType displayType) {
- this.displayType = displayType;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result
- + ((displayType == null) ? 0 : displayType.hashCode());
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!super.equals(obj)) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- GridLoadProperties other = (GridLoadProperties) obj;
- if (displayType == null) {
- if (other.displayType != null) {
- return false;
- }
- } else if (!displayType.equals(other.displayType)) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF b/ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
index 111f0b57e3..eea1dd0915 100644
--- a/ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
+++ b/ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
@@ -14,15 +14,14 @@ Require-Bundle: org.eclipse.ui,
gov.noaa.nws.ncep.viz.common;bundle-version="1.0.0",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
gov.noaa.nws.ncep.viz.localization;bundle-version="1.0.0",
- com.raytheon.uf.common.style;bundle-version="1.0.0"
+ com.raytheon.uf.common.style;bundle-version="1.0.0",
+ com.raytheon.viz.core.graphing;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.core.maps;bundle-version="1.12.1174"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: gov.noaa.nws.ncep.viz.ui.display
Import-Package: com.raytheon.uf.common.topo,
- com.raytheon.uf.viz.core.maps,
- com.raytheon.uf.viz.core.maps.display,
com.raytheon.uf.viz.core.rsc.legend,
- com.raytheon.viz.core.graphing,
gov.noaa.nws.ncep.gempak.parameters.colorbar,
javax.measure.unit,
javax.vecmath