xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into development_on_RHEL6

Browse source 
Former-commit-id: 6ea4ac62ed [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]
Former-commit-id: 560b0075cd
This commit is contained in:
Steve Harris 2013-10-28 15:58:12 -05:00
commit a103a0e8ac
173 changed files with 2262 additions and 1590 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.uf.viz.acarssounding/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.acarssounding.AcarsSndNSharpResourceData

33
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java
View file

@ -27,6 +27,8 @@ import java.util.Map;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseTrackAdapter;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Color;
@ -97,6 +99,7 @@ import com.raytheon.uf.viz.alertviz.ui.dialogs.ConfigurationFileDlg.Function;
* item update;
* 07 Feb 2013 15490 Xiaochuan Past this object to LayoutControlsComp.
* 26 Aug 2013 #2293 lvenable Fixed color memory leak and cleaned up some code.
* 23 Oct 2013 2303 bgonzale Old patch to fix tool tip layout.
*
* </pre>
*
@ -392,6 +395,11 @@ public class AlertVisConfigDlg extends Dialog implements
mttLayout = new MonitorToolTip(layoutGroup, true);
layoutControls = new LayoutControlsComp(layoutGroup, configData, this,
this);
layoutGroup.addMouseTrackListener(new MouseTrackAdapter() {
public void mouseHover(MouseEvent e) {
mttLayout.open();
}
});
}
/**
@ -409,6 +417,11 @@ public class AlertVisConfigDlg extends Dialog implements
mttCommonSetting = new MonitorToolTip(commonSettingsGroup, true);
commonSettingsGroup.addMouseTrackListener(new MouseTrackAdapter() {
public void mouseHover(MouseEvent e) {
mttCommonSetting.open();
}
});
createCommonSettingsControls(commonSettingsGroup);
}
@ -616,7 +629,13 @@ public class AlertVisConfigDlg extends Dialog implements
sourcesLbl.setData(MonitorToolTip.tooltipTextKey,
getSourcesToolTipText());
mttSource = new MonitorToolTip(sourcesLbl, true);
mttSource = new MonitorToolTip(sourcesLbl, false);
sourcesLbl.addMouseTrackListener(new MouseTrackAdapter() {
public void mouseHover(MouseEvent e) {
mttSource.open();
}
});
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
gd.widthHint = 125;
@ -842,13 +861,13 @@ public class AlertVisConfigDlg extends Dialog implements
priorityLbl.setData(MonitorToolTip.tooltipTextKey,
getPrioritiesToolTipText());
mttPriorities = new MonitorToolTip(priorityLbl, true);
mttPriorities = new MonitorToolTip(priorityLbl, false);
// priorityLbl.addMouseTrackListener(new MouseTrackAdapter() {
// public void mouseHover(MouseEvent e) {
// mttPriorities.open();
// }
// });
priorityLbl.addMouseTrackListener(new MouseTrackAdapter() {
public void mouseHover(MouseEvent e) {
mttPriorities.open();
}
});
// ---------------------------------------------------------
// Put the priority canvases on the display

63
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/MonitorToolTip.java
View file

@ -1,11 +1,7 @@
package com.raytheon.uf.viz.alertviz.ui.dialogs;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
@ -37,6 +33,7 @@ public class MonitorToolTip {
* 17Jan2011 5150 cjeanbap Adjusted tooltip location and fix IllegalArgumentException.
* 18Jan2011 5449 cjeanbap Fixed NullPointerException.
* 24Jan 2011 1978 cjeanbap Removed unused variables.
* 23Oct 2011 2303 bgonzale Old patch to fix tool tip layout.
*
* </pre>
*
@ -44,8 +41,6 @@ public class MonitorToolTip {
* @version 1.0
*/
private Pattern LinePattern = Pattern.compile("^(.*)$", Pattern.MULTILINE);
private Display display;
private Shell parentShell;
@ -54,7 +49,7 @@ public class MonitorToolTip {
public static final String tooltipTextKey = "tooltiptext";
private boolean useBorderWidth = true;
private boolean ignoreDisplayPos = true;
public MonitorToolTip(Control control) {
this.control = control;
@ -62,7 +57,7 @@ public class MonitorToolTip {
public MonitorToolTip(Control control, boolean ignoreDisplayPos) {
this.control = control;
this.useBorderWidth = ignoreDisplayPos;
this.ignoreDisplayPos = ignoreDisplayPos;
}
/**
@ -144,33 +139,7 @@ public class MonitorToolTip {
}
label.addListener(SWT.MouseExit, labelListener);
label.addListener(SWT.MouseDown, labelListener);
Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
Rectangle rect = Display.getCurrent().getBounds();
Point pt = Display.getCurrent()
.map(control, null, 0, 0);
final int borderEstimate = (useBorderWidth ? (control
.getBorderWidth() * 2 + 1) : 9);
String labelText = label.getText();
GC gc = new GC(control);
int fontHeight = gc.getFontMetrics().getHeight();
gc.dispose();
Matcher m = LinePattern.matcher(labelText);
int numberOfTextLines = 0; // m.groupCount();
while (m.find()) {
++numberOfTextLines;
}
numberOfTextLines = numberOfTextLines > 1 ? numberOfTextLines + 1
: numberOfTextLines;
int yAdj = fontHeight * numberOfTextLines
+ borderEstimate + (useBorderWidth ? 4 : 0);
if (pt.y + yAdj + fontHeight > rect.height) {
pt.y -= yAdj;
} else {
pt.y += control.getSize().y + borderEstimate;
}
tip.setBounds(pt.x, pt.y, size.x, size.y);
setToolTipBounds(label, tip);
tip.setVisible(true);
textFont.dispose();
}
@ -184,4 +153,28 @@ public class MonitorToolTip {
ctrl.addListener(SWT.MouseExit, tableListener);
ctrl.addListener(SWT.Paint, tableListener);
}
private void setToolTipBounds(Label label, Shell tip) {
// size of tool tip
Point tipSize = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
// bounds of the current display
Rectangle displayBounds = Display.getCurrent().getBounds();
// x screen coordinate
int xCoord = Display.getCurrent().map(control, null, 0, 0).x;
// y coordinate of widget that the tool tip is next to
Control widget = ignoreDisplayPos ? control : control.getParent();
int widgetYCoord = Display.getCurrent().map(widget, null, 0, 0).y;
Point widgetSize = widget.computeSize(SWT.DEFAULT,
SWT.DEFAULT);
int yCoord = widgetYCoord;
// check if the tip extends past the end of the display
if (yCoord + widgetSize.y + tipSize.y > displayBounds.height) {
yCoord = yCoord - tipSize.y - control.getParent().getBorderWidth();
} else {
yCoord = yCoord + widgetSize.y;
}
tip.setBounds(xCoord, yCoord, tipSize.x, tipSize.y);
}
}

7
cave/com.raytheon.uf.viz.aviation.advisory/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,7 +0,0 @@
com.raytheon.uf.viz.aviation.advisory.rsc.AdvisoryResourceData
com.raytheon.uf.viz.aviation.advisory.adapter.NonConvSigmetDataAdapter
com.raytheon.uf.viz.aviation.advisory.adapter.ConvSigmetOutlookDataAdapter
com.raytheon.uf.viz.aviation.advisory.adapter.ConvSigmetTextDataAdapter
com.raytheon.uf.viz.aviation.advisory.adapter.ConvSigmetCastDataAdapter
com.raytheon.uf.viz.aviation.advisory.adapter.AirmetDataAdapter
com.raytheon.uf.viz.aviation.advisory.adapter.IntlSigmetDataAdapter

12
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/adapter/AbstractAdvisoryDataAdapter.java
View file

@ -22,7 +22,6 @@ package com.raytheon.uf.viz.aviation.advisory.adapter;
import java.util.Collection;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.aviation.advisory.AdvisoryRecord;
import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
@ -34,17 +33,18 @@ import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 2, 2009 bsteffen Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 02, 2009 bsteffen Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/
public abstract class AbstractAdvisoryDataAdapter implements
ISerializableObject {
public abstract class AbstractAdvisoryDataAdapter {
public abstract Collection<AdvisoryRecord> convertRecords(
Collection<PluginDataObject> records);

1
cave/com.raytheon.uf.viz.bufrsigwx/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.bufrsigwx.rsc.SigWxResourceData

1
cave/com.raytheon.uf.viz.ccfp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.ccfp.rsc.CcfpResourceData

1
cave/com.raytheon.uf.viz.cloudheight/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.cloudheight.rsc.CloudHeightResourceData

13
cave/com.raytheon.uf.viz.cloudheight/src/com/raytheon/uf/viz/cloudheight/data/CloudHeightData.java
View file

@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -39,10 +38,12 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 16, 2009 mschenke Initial creation
* Jul 25, 2013 2190 mschenke Moved sounding configurations into popup skewt plugin
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Dec 16, 2009 mschenke Initial creation
* Jul 25, 2013 2190 mschenke Moved sounding configurations into popup
* skewt plugin
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -51,7 +52,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
public class CloudHeightData implements ISerializableObject {
public class CloudHeightData {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(CloudHeightData.class);

11
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/CollaborationResourceData.java
View file

@ -19,6 +19,8 @@
**/
package com.raytheon.uf.viz.collaboration.display.rsc;
import javax.xml.bind.annotation.XmlTransient;
import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
import com.raytheon.uf.viz.collaboration.display.editor.ICollaborationEditor;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
@ -35,16 +37,17 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 3, 2012 njensen Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 03, 2012 njensen Initial creation
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
*
* </pre>
*
* @author njensen
* @version 1.0
*/
@XmlTransient
public class CollaborationResourceData extends AbstractResourceData {
private ICollaborationEditor editor;

1
cave/com.raytheon.uf.viz.coopprecip/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.coopprecip.CoopPrecipPlotInfoRetriever

25
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
View file

@ -35,7 +35,6 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.localization.exception.LocalizationException;
import com.raytheon.uf.common.serialization.JAXBManager;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
@ -46,6 +45,7 @@ import com.raytheon.uf.viz.core.maps.scales.MapScales.MapScale;
import com.raytheon.uf.viz.core.maps.scales.MapScales.PartId;
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.actions.LoadSerializedXml;
/**
@ -56,9 +56,11 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 8, 2013 mschenke Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 08, 2013 mschenke Initial creation
* Oct 22, 2013 2491 bsteffen Change from SerializationUtil to
* ProcedureXmlManager
*
* </pre>
*
@ -119,13 +121,8 @@ public class MapScalesManager {
this.displayName = displayName;
this.partIds = new PartId[0];
this.scaleFile = null;
try {
this.bundleXml = SerializationUtil.getJaxbManager()
.marshalToXml(scaleBundle);
} catch (JAXBException e) {
throw new SerializationException(
"Error serializing bundle for scale, " + displayName);
}
this.bundleXml = ProcedureXmlManager.getInstance().marshal(
scaleBundle);
}
private void loadBundleXml() {
@ -146,10 +143,8 @@ public class MapScalesManager {
if (bundleXml != null) {
long t0 = System.currentTimeMillis();
try {
return (Bundle) SerializationUtil.getJaxbManager()
.unmarshalFromXml(bundleXml);
} catch (JAXBException e) {
throw new SerializationException(e);
return ProcedureXmlManager.getInstance().unmarshal(
Bundle.class, bundleXml);
} finally {
System.out.println("Time to create Bundle: "
+ (System.currentTimeMillis() - t0) + "ms");

2
cave/com.raytheon.uf.viz.core.rsc/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.uf.viz.core.rsc.FirstAvailableResourceData
com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData

3
cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF
View file

@ -42,7 +42,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.python;bundle-version="1.12.1174",
com.raytheon.uf.common.velocity;bundle-version="1.0.0",
ch.qos.logback;bundle-version="1.0.13",
com.raytheon.uf.common.style;bundle-version="1.0.0"
com.raytheon.uf.common.style;bundle-version="1.0.0",
org.reflections;bundle-version="0.9.9"
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: ext, registered, global
Eclipse-RegisterBuddy: org.apache.velocity, com.raytheon.uf.common.serialization, com.raytheon.uf.common.serialization.comm, com.raytheon.uf.common.status, com.raytheon.uf.common.dataplugin.level, com.raytheon.uf.common.comm, ch.qos.logback

26
cave/com.raytheon.uf.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,26 +0,0 @@
com.raytheon.uf.viz.core.alerts.DataCubeAlertMessageParser
com.raytheon.uf.viz.core.drawables.ResourcePair
com.raytheon.uf.viz.core.procedures.Bundle
com.raytheon.uf.viz.core.procedures.Procedure
com.raytheon.uf.viz.core.map.MapDescriptor
com.raytheon.uf.viz.core.rsc.capabilities.BlendableCapability
com.raytheon.uf.viz.core.rsc.capabilities.BlendedCapability
com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability
com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability
com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability
com.raytheon.uf.viz.core.rsc.capabilities.GroupNamingCapability
com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability
com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability
com.raytheon.uf.viz.core.rsc.capabilities.ShadeableCapability
com.raytheon.uf.viz.core.rsc.capabilities.LabelableCapability
com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability
com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability
com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability
com.raytheon.uf.viz.core.rsc.capabilities.PointCapability
com.raytheon.uf.viz.core.rsc.capabilities.TimeMatchBasisCapability
com.raytheon.uf.viz.core.rsc.GenericResourceData
com.raytheon.uf.viz.core.rsc.ResourceList
com.raytheon.uf.viz.core.rsc.ResourceProperties
com.raytheon.uf.viz.core.rsc.ProgressiveDisclosureProperties
com.raytheon.uf.viz.core.rsc.LoadProperties

2
cave/com.raytheon.uf.viz.core/res/spring/viz.xml
View file

@ -70,4 +70,6 @@
<property name="arguments" ref="recordFactory" />
</bean>
<bean id="procedureXmlManagerInit" class="com.raytheon.uf.viz.core.procedures.ProcedureXmlManager" factory-method="inititializeAsync"/>
</beans>

10
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractTimeMatcher.java
View file

@ -24,7 +24,6 @@ import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
@ -39,9 +38,10 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 10, 2009 chammack Initial creation
* Date Ticket# Engineer Description
* ------------ -------- ----------- --------------------------
* Feb 10, 2009 chammack Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -49,7 +49,7 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public abstract class AbstractTimeMatcher implements ISerializableObject {
public abstract class AbstractTimeMatcher {
/**
* Trigger the time matcher to update time information on this resource the

15
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/alerts/AbstractAlertMessageParser.java
View file

@ -19,7 +19,9 @@
**/
package com.raytheon.uf.viz.core.alerts;
import com.raytheon.uf.common.serialization.ISerializableObject;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
@ -29,17 +31,18 @@ import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 15, 2009 mschenke Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Sep 15, 2009 mschenke Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author mschenke
* @version 1.0
*/
public abstract class AbstractAlertMessageParser implements ISerializableObject {
@XmlAccessorType(XmlAccessType.NONE)
public abstract class AbstractAlertMessageParser {
/**
* Parse the alert message object into an object expected by the Resource

12
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/PerspectiveSpecificLoadProperties.java
View file

@ -22,8 +22,6 @@ package com.raytheon.uf.viz.core.comm;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Abstract Base Class for load properties that are specific to a perspective.
* Use as nested properties in LoadProperties.
@ -31,9 +29,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 6, 2009 bgonzale Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jul 06, 2009 bgonzale Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -41,6 +40,5 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public abstract class PerspectiveSpecificLoadProperties implements
ISerializableObject {
public abstract class PerspectiveSpecificLoadProperties {
}

11
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
View file

@ -26,8 +26,6 @@ import javax.xml.bind.annotation.XmlElement;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* This class is a container for the loop properties
*
@ -36,9 +34,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 30, 2007 randerso Initial Creation.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Aug 30, 2007 randerso Initial Creation.
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -47,7 +46,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
*/
@XmlAccessorType(XmlAccessType.NONE)
public class LoopProperties implements ISerializableObject {
public class LoopProperties {
public enum LoopMode {
Forward, Backward, Cycle

30
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractRenderableDisplay.java
View file

@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@ -33,7 +32,7 @@ import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.ui.PlatformUI;
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;
@ -46,6 +45,7 @@ import com.raytheon.uf.viz.core.IView;
import com.raytheon.uf.viz.core.VizConstants;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.preferences.ColorFactory;
import com.raytheon.uf.viz.core.procedures.ProcedureXmlManager;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IRefreshListener;
import com.raytheon.uf.viz.core.rsc.IResourceGroup;
@ -63,10 +63,11 @@ import com.raytheon.uf.viz.core.rsc.ResourceList.RemoveListener;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 06, 2009 bgonzale Initial creation
* Jun 24, 2013 2140 randerso Added paintResource method
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Feb 06, 2009 bgonzale Initial creation
* Jun 24, 2013 2140 randerso Added paintResource method
* Oct 22, 2013 2491 bsteffen Switch clone to ProcedureXmlManager
*
* </pre>
*
@ -502,8 +503,9 @@ public abstract class AbstractRenderableDisplay implements IRenderableDisplay {
@Override
public IRenderableDisplay createNewDisplay() {
try {
AbstractRenderableDisplay clonedDisplay = (AbstractRenderableDisplay) SerializationUtil
.unmarshalFromXml(SerializationUtil.marshalToXml(this));
ProcedureXmlManager jaxb = ProcedureXmlManager.getInstance();
AbstractRenderableDisplay clonedDisplay = jaxb.unmarshal(
AbstractRenderableDisplay.class, jaxb.marshal(this));
List<ResourcePair> rscsToRemove = new ArrayList<ResourcePair>();
for (ResourcePair rp : clonedDisplay.getDescriptor()
.getResourceList()) {
@ -518,21 +520,23 @@ public abstract class AbstractRenderableDisplay implements IRenderableDisplay {
}
clonedDisplay.setExtent(this.getExtent().clone());
return clonedDisplay;
} catch (JAXBException e) {
e.printStackTrace();
} catch (SerializationException e) {
statusHandler.handle(Priority.PROBLEM,
"Unable to create new display.", e);
}
return null;
}
public AbstractRenderableDisplay cloneDisplay() {
try {
AbstractRenderableDisplay clonedDisplay = (AbstractRenderableDisplay) SerializationUtil
.unmarshalFromXml(SerializationUtil.marshalToXml(this));
ProcedureXmlManager jaxb = ProcedureXmlManager.getInstance();
AbstractRenderableDisplay clonedDisplay = jaxb.unmarshal(
AbstractRenderableDisplay.class, jaxb.marshal(this));
if (getExtent() != null) {
clonedDisplay.setExtent(this.getExtent().clone());
}
return clonedDisplay;
} catch (JAXBException e) {
} catch (SerializationException e) {
statusHandler.handle(Priority.PROBLEM,
"Error cloning renderable display", e);
}

10
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ResourcePair.java
View file

@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang.Validate;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
@ -43,9 +42,10 @@ import com.raytheon.uf.viz.core.rsc.ResourceProperties;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 5, 2007 chammack Initial Creation.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Sep 05, 2007 chammack Initial Creation.
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -54,7 +54,7 @@ import com.raytheon.uf.viz.core.rsc.ResourceProperties;
*/
@XmlAccessorType(XmlAccessType.NONE)
@XmlType(name = "pair")
public class ResourcePair implements ISerializableObject {
public class ResourcePair {
protected AbstractVizResource<?, ?> resource;

16
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/map/MapDescriptor.java
View file

@ -42,7 +42,6 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.viz.core.IExtent;
@ -59,11 +58,13 @@ import com.vividsolutions.jts.geom.Envelope;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation.
* 1/12/09 randerso added getMapManager
* 10/22/09 #3348 bsteffen Moved getter/setters for numberOfFrames down to AbstractDescriptor
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jul 01, 2006 chammack Initial Creation.
* Jan 12, 2009 randerso added getMapManager
* Dec 22, 2009 3348 bsteffen Moved getter/setters for numberOfFrames down to AbstractDescriptor
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
@ -73,8 +74,7 @@ import com.vividsolutions.jts.geom.Envelope;
*/
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement
public class MapDescriptor extends AbstractDescriptor implements
IMapDescriptor, ISerializableObject {
public class MapDescriptor extends AbstractDescriptor implements IMapDescriptor {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(MapDescriptor.class);

21
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/Bundle.java
View file

@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileReader;
import java.util.Map;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@ -31,8 +30,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.viz.core.VariableSubstitutionUtil;
import com.raytheon.uf.viz.core.datastructure.LoopProperties;
import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay;
@ -45,9 +43,11 @@ import com.raytheon.uf.viz.core.exception.VizException;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 30, 2007 chammack Initial Creation.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Aug 30, 2007 chammack Initial Creation.
* Oct 22, 2013 2491 bsteffen Switch serialization to
* ProcedureXmlManager
*
* </pre>
*
@ -56,7 +56,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
public class Bundle implements ISerializableObject {
public class Bundle {
/** Contains the descriptors */
@XmlElement
@ -161,8 +161,8 @@ public class Bundle implements ISerializableObject {
public String toXML() throws VizException {
try {
return SerializationUtil.marshalToXml(this);
} catch (JAXBException e) {
return ProcedureXmlManager.getInstance().marshal(this);
} catch (SerializationException e) {
throw new VizException(e);
}
}
@ -275,7 +275,8 @@ public class Bundle implements ISerializableObject {
String substStr = VariableSubstitutionUtil.processVariables(
bundleStr, variables);
Bundle b = (Bundle) SerializationUtil.unmarshalFromXml(substStr);
Bundle b = ProcedureXmlManager.getInstance().unmarshal(
Bundle.class, substStr);
return b;
} catch (Exception e) {

31
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/Procedure.java
View file

@ -21,7 +21,6 @@ package com.raytheon.uf.viz.core.procedures;
import java.io.File;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@ -32,8 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.eclipse.ui.IMemento;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.viz.core.exception.VizException;
/**
@ -46,9 +44,11 @@ import com.raytheon.uf.viz.core.exception.VizException;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 5, 2007 chammack Initial Creation.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Sep 05, 2007 chammack Initial Creation.
* Oct 22, 2013 2491 bsteffen Switch serialization to
* ProcedureXmlManager
*
* </pre>
*
@ -57,7 +57,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
public class Procedure implements ISerializableObject {
public class Procedure {
@XmlAttribute
private String perspective;
@ -110,27 +110,26 @@ public class Procedure implements ISerializableObject {
public String toXML() throws VizException {
try {
return SerializationUtil.marshalToXml(this);
} catch (JAXBException e) {
return ProcedureXmlManager.getInstance().marshal(this);
} catch (SerializationException e) {
throw new VizException(e);
}
}
public static Procedure loadProcedure(File fileName) throws VizException {
try {
return (Procedure) SerializationUtil
.jaxbUnmarshalFromXmlFile(fileName.getAbsolutePath());
} catch (Exception e) {
e.printStackTrace();
return ProcedureXmlManager.getInstance().unmarshal(
Procedure.class, fileName);
} catch (SerializationException e) {
throw new VizException(e);
}
}
public static Procedure loadProcedure(String xml) throws VizException {
try {
return (Procedure) SerializationUtil.unmarshalFromXml(xml);
} catch (Exception e) {
e.printStackTrace();
return ProcedureXmlManager.getInstance().unmarshal(
Procedure.class, xml);
} catch (SerializationException e) {
throw new VizException(e);
}
}

193
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/ProcedureXmlManager.java Normal file
View file

@ -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.viz.core.procedures;
import java.io.File;
import java.util.Collection;
import javax.xml.bind.JAXBException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import com.raytheon.uf.common.serialization.JAXBManager;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.jaxb.JAXBClassLocator;
import com.raytheon.uf.common.serialization.jaxb.JaxbDummyObject;
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.IRenderableDisplay;
import com.raytheon.uf.viz.core.reflect.SubClassLocator;
import com.raytheon.uf.viz.core.rsc.ResourceGroup;
/**
* Centralized class for handling xml mapping of {@link Procedure}s,
* {@link Bundle}s, {@link IRenderableDisplay}s, {@link ResourceGroup}s, and
* anything else that might appear in a procedure.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 18, 2013 2491 bsteffen Initial creation
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/
public class ProcedureXmlManager {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ProcedureXmlManager.class);
private static ProcedureXmlManager instance;
private final JAXBManager manager;
/**
* Get the singleton instance.
*
* @return singleton ProcedureXmlManager
*/
public static synchronized ProcedureXmlManager getInstance() {
if (instance == null) {
instance = new ProcedureXmlManager();
}
return instance;
}
/**
* Start initializing singleton manager in a background thread.
*
* @return true
*/
public static boolean inititializeAsync() {
new Job("Preparing to parse procedure Xml.") {
@Override
protected IStatus run(IProgressMonitor monitor) {
getInstance();
return Status.OK_STATUS;
}
}.schedule();
return true;
}
private ProcedureXmlManager() {
this.manager = initManager();
}
private JAXBManager initManager() {
SubClassLocator locator = new SubClassLocator();
Collection<Class<?>> classes = JAXBClassLocator.getJAXBClasses(locator,
Procedure.class);
locator.save();
Class<?>[] jaxbClasses = new Class<?>[classes.size() + 1];
classes.toArray(jaxbClasses);
/*
* Add JaxbDummyObject at the begining so properties are loaded
* correctly
*/
jaxbClasses[jaxbClasses.length - 1] = jaxbClasses[0];
jaxbClasses[0] = JaxbDummyObject.class;
try {
return new JAXBManager(jaxbClasses);
} catch (JAXBException e) {
statusHandler.handle(Priority.PROBLEM,
ProcedureXmlManager.class.getSimpleName()
+ " Failed to initialize.", e);
}
return null;
}
private JAXBManager getManager() throws SerializationException {
if (manager == null) {
throw new SerializationException(
ProcedureXmlManager.class.getSimpleName()
+ " Failed to initialize.");
}
return manager;
}
/**
* Transform an object to XML using the internal procedure context and all
* its registered classes.
*
* @param obj
* something to marshal
* @return XML in a String
* @throws SerializationException
*/
public String marshal(Object obj) throws SerializationException {
try {
return getManager().marshalToXml(obj);
} catch (JAXBException je) {
throw new SerializationException(je);
}
}
/**
* Transform some xml in a String to an object of the specified class.
*
* @param clazz
* expected type of object
* @param xml
* string containing xml
* @return the object
* @throws SerializationException
*/
public <T> T unmarshal(Class<T> clazz, String xml)
throws SerializationException {
try {
return clazz.cast(getManager().unmarshalFromXml(xml));
} catch (ClassCastException cce) {
throw new SerializationException(cce);
} catch (JAXBException je) {
throw new SerializationException(je);
}
}
/**
* Transform some xml in a File to an object of the specified class.
*
* @param clazz
* expected type of object
* @param file
* file containing xml
* @return the object
* @throws SerializationException
*/
public <T> T unmarshal(Class<T> clazz, File file)
throws SerializationException {
return getManager().unmarshalFromXmlFile(clazz, file);
}
}

318
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleClassCache.java Normal file
View file

@ -0,0 +1,318 @@
/**
* 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.core.reflect;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
import org.osgi.framework.Bundle;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
/**
* Provides a file based cache of all types available for each installed plugin.
* Each type can either be a super class and all sub classes or an annotation
* class and all classes with that annotation.
*
* JAXB/XML was not used because it was 20x slower and every ms counts.
*
* The file format uses space separated fields. Each bundle is described on a
* Bundle line which includes the name, version, bundleId, and mod time. After a
* Bundle line there will be multiple "Type" lines, each describing one base
* class that has been searched within that bundle. When subclasses or annotated
* classes are found they will be appended to the type line, space separated.
* For must types/bundles there will be no subclasses but the type line is
* included so that the bundle is not rescanned and so the set of base classes
* can remain dynamic.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 21, 2013 2491 bsteffen Initial creation
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/
public class BundleClassCache {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(BundleClassCache.class);
private static final String BUNDLE = "Bundle";
private static final String TYPE = "Type";
private static final char SEPERATOR = ' ';
private static final Pattern SEPERATOR_SPLIT = Pattern.compile(" ");
private final File file;
private final Map<PluginKey, SubTypeNameMap> pluginMap = new HashMap<PluginKey, SubTypeNameMap>();
private boolean modified = false;
/**
* Create a new cache using the provided file. If the file exists it is read
* in to prepopulate the cache.
*
* @param file
*/
public BundleClassCache(File file) {
this.file = file;
if (file.exists()) {
try {
BufferedReader r = new BufferedReader(new FileReader(file));
PluginKey key = null;
SubTypeNameMap value = new SubTypeNameMap();
String line = r.readLine();
while (line != null) {
line = line.trim();
if (line.startsWith(BUNDLE)) {
key = new PluginKey(line);
value = new SubTypeNameMap();
pluginMap.put(key, value);
} else if (line.startsWith(TYPE)) {
value.addType(line);
}
line = r.readLine();
}
r.close();
} catch (IOException e) {
statusHandler.handle(Priority.VERBOSE, e.getLocalizedMessage(),
e);
}
}
}
/**
* Get all types in a bundles that extend the provided base class.
*
* @param bundle
* bundle to search
* @param baseClassName
* name of a base class
* @return names of all subclasses(possible empty), or null if the bundle
* does not have a cache entry for the base class.
*/
public String[] getTypes(Bundle bundle, String baseClassName) {
SubTypeNameMap map = pluginMap.get(new PluginKey(bundle));
if (map == null) {
return null;
}
return map.getSubTypes(baseClassName);
}
/**
* Add the type to the cache.
*
* @param bundle
* the bundle that was scanned.
* @param baseClassName
* name of base class
* @param subTypes
* all subtypes, can be length 0 but not null.
*/
public void putTypes(Bundle bundle, String baseClassName, String[] subTypes) {
modified = true;
PluginKey key = new PluginKey(bundle);
SubTypeNameMap map = pluginMap.get(key);
if (map == null) {
map = new SubTypeNameMap();
pluginMap.put(key, map);
}
map.putSubTypes(baseClassName, subTypes);
}
/**
* Peresist the contents of the cache to the file used during construction.
* If any {@link IOException}s occur they will be logged but not returned.
*/
public void save() {
if (modified) {
try {
File tmpFile = File.createTempFile("tmpClassCache", ".txt",
file.getParentFile());
Writer w = new BufferedWriter(new FileWriter(tmpFile));
for (Entry<PluginKey, SubTypeNameMap> e : pluginMap.entrySet()) {
e.getKey().save(w);
e.getValue().save(w);
}
w.close();
tmpFile.renameTo(file);
} catch (IOException e) {
statusHandler.handle(Priority.VERBOSE, e.getLocalizedMessage(),
e);
}
}
}
/**
* Cache entry, containing all base/subtype mappings.
*/
private static class SubTypeNameMap {
private final Map<String, String[]> typeMap = new HashMap<String, String[]>();
public void addType(String line) {
String[] parts = SEPERATOR_SPLIT.split(line);
String base = parts[1];
String[] subTypes = Arrays.copyOfRange(parts, 2, parts.length);
typeMap.put(base, subTypes);
}
public String[] getSubTypes(String className) {
return typeMap.get(className);
}
public void putSubTypes(String className, String[] subTypes) {
typeMap.put(className, subTypes);
}
public void save(Writer w) throws IOException {
for (Entry<String, String[]> e : typeMap.entrySet()) {
w.write(TYPE);
w.write(SEPERATOR);
w.write(e.getKey());
for (String val : e.getValue()) {
w.write(SEPERATOR);
w.write(val);
}
w.write('\n');
}
}
}
/**
* Key for uniquely identifing a plugin.
*/
private static class PluginKey {
/*
* On development boxes the modtime changes every time CAVE is run, so
* it is not used in comparisons by default.
*/
private static final boolean useModTime = false;
/*
* The unique ID is not strictly needed for comparisons since
* name/version should be unique already. It is kept in just in case
* there is an unaccounted for edge case.
*/
private static final boolean useUnique = true;
private final String name;
private final String version;
private final long unique;
private final long modTime;
public PluginKey(String line) {
String[] split = SEPERATOR_SPLIT.split(line);
name = split[1];
version = split[2];
unique = Long.parseLong(split[3]);
modTime = Long.parseLong(split[4]);
}
public PluginKey(Bundle bundle) {
name = bundle.getSymbolicName();
version = bundle.getVersion().toString();
unique = bundle.getBundleId();
modTime = bundle.getLastModified();
}
public void save(Writer w) throws IOException {
w.write(BUNDLE);
w.write(SEPERATOR);
w.write(name);
w.write(SEPERATOR);
w.write(version);
w.write(SEPERATOR);
w.write(Long.toString(unique));
w.write(SEPERATOR);
w.write(Long.toString(modTime));
w.write('\n');
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
if (useModTime)
result = prime * result + (int) (modTime ^ (modTime >>> 32));
if (useUnique)
result = prime * result + (int) (unique ^ (unique >>> 32));
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result
+ ((version == null) ? 0 : version.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
PluginKey other = (PluginKey) obj;
if (useModTime)
if (modTime != other.modTime)
return false;
if (name == null) {
if (other.name != null)
return false;
} else if (!name.equals(other.name))
return false;
if (useUnique)
if (unique != other.unique)
return false;
if (version == null) {
if (other.version != null)
return false;
} else if (!version.equals(other.version))
return false;
return true;
}
}
}

79
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java Normal file
View file

@ -0,0 +1,79 @@
/**
* 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.core.reflect;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.FileLocator;
import org.osgi.framework.Bundle;
import org.osgi.framework.wiring.BundleWiring;
import org.reflections.Reflections;
import org.reflections.scanners.Scanner;
import org.reflections.util.ConfigurationBuilder;
/**
* Provides the capabilities of {@link Reflections} for a single OSGi
* {@link Bundle}. Uses Reflections internally but populates URL and CLassLoader
* from the Bundle.
*
* In the future this can be expanded to expose more of the {@link Reflections}
* capabilities.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 21, 2013 2491 bsteffen Initial creation
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/
public class BundleReflections {
private Reflections reflections;
public BundleReflections(Bundle bundle, Scanner scanner) throws IOException {
ConfigurationBuilder cb = new ConfigurationBuilder();
BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
cb.addClassLoader(bundleWiring.getClassLoader());
cb.addUrls(FileLocator.getBundleFile(bundle).toURI().toURL());
cb.setScanners(scanner);
reflections = cb.build();
}
public <T> Set<Class<? extends T>> getSubTypesOf(final Class<T> type) {
return reflections.getSubTypesOf(type);
}
public Set<Class<?>> getSubTypesOf(Class<?>... types) {
Set<Class<?>> subTypes = new HashSet<Class<?>>();
for (Class<?> type : types) {
subTypes.addAll(getSubTypesOf(type));
}
return subTypes;
}
}

305
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java Normal file
View file

@ -0,0 +1,305 @@
/**
* 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.core.reflect;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.wiring.BundleWiring;
import org.reflections.scanners.SubTypesScanner;
import com.raytheon.uf.common.serialization.reflect.ISubClassLocator;
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.Activator;
/**
* Loads all subclasses of any class using all installed OSGi bundles and the
* Reflections package. Results are cached using a {@link BundleClassCache}. to
* save time on startup.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 18, 2013 2491 bsteffen Initial creation
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/
public class SubClassLocator implements ISubClassLocator {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(SubClassLocator.class);
private static final String CACHE_FILENAME = "subclassCache.txt";
private static final Pattern COMMA_SPLIT = Pattern.compile("[,]");
private static final Pattern SEMICOLON_SPLIT = Pattern.compile("[;]");
private final Map<String, BundleReflections> reflectionLookup = new HashMap<String, BundleReflections>();
private final Map<String, Bundle> bundleLookup = new HashMap<String, Bundle>();
private final Map<String, List<Bundle>> requiredBundles = new HashMap<String, List<Bundle>>();
private final BundleClassCache cache;
/**
* Create a new SubClassLocator.
*/
public SubClassLocator() {
Bundle[] bundles = Activator.getDefault().getBundle()
.getBundleContext().getBundles();
for (Bundle b : bundles) {
bundleLookup.put(b.getSymbolicName(), b);
}
File stateDir = Activator.getDefault().getStateLocation().toFile();
cache = new BundleClassCache(new File(stateDir, CACHE_FILENAME));
}
/**
* Locate all subclasses in all bundles of a given class
*
* @param base
* @return
*/
public Collection<Class<?>> locateSubClasses(Class<?> base) {
Map<String, Set<Class<?>>> recursiveClasses = new HashMap<String, Set<Class<?>>>(
bundleLookup.size(), 1.0f);
Set<Class<?>> result = new HashSet<Class<?>>(512);
for (Bundle bundle : bundleLookup.values()) {
result.addAll(lookupRecursiveSubClasses(base, bundle, true,
recursiveClasses));
}
return result;
}
/**
* Store the cache to disk.
*/
public void save() {
cache.save();
}
/**
* The lookup must occur recursively because otherwise sub classes of sub
* classes of base types are not correctly located.
*
* @param base
* base class
* @param bundle
* bundle to search
* @param includeRequiredSubclasses
* when false only subclasses of base found in this bundle are
* returned, when true subclasses found in other bundles required
* by this bundle are also returned.
* @param recursiveClasses
* map of already searched bundles to avoid recursing the same
* bundles multiple time.
* @return the sub classes contained in the bundle.
*/
private Set<Class<?>> lookupRecursiveSubClasses(Class<?> base,
Bundle bundle, boolean includeRequiredSubclasses,
Map<String, Set<Class<?>>> recursiveClasses) {
String bundleName = bundle.getSymbolicName();
if (bundleName.startsWith("org.eclipse")) {
/*
* org.eclipse.osgi has no class loader and must be skipped,
* skipping the rest of org.eclipse just saves time.
*/
return Collections.emptySet();
}
if (includeRequiredSubclasses) {
/* Short circut if we already did this. */
Set<Class<?>> result = recursiveClasses.get(bundleName);
if (result != null) {
return result;
}
}
String[] ownedNames = cache.getTypes(bundle, base.getName());
if (ownedNames == null) {
Set<Class<?>> dependencies = getRequiredSubclasses(base, bundle,
recursiveClasses);
/* Must pass dependencies in so type heirarchy is complete. */
Set<Class<?>> owned = loadSubClassesReflectively(bundle, dependencies);
/* populate the cache */
ownedNames = new String[owned.size()];
int index = 0;
for (Class<?> clazz : owned) {
ownedNames[index++] = clazz.getName();
}
cache.putTypes(bundle, base.getName(), ownedNames);
Set<Class<?>> all = new HashSet<Class<?>>(dependencies);
all.addAll(owned);
recursiveClasses.put(bundleName, all);
if (includeRequiredSubclasses) {
return all;
} else {
return owned;
}
} else {
Set<Class<?>> owned = loadClassesFromCache(bundle,
Arrays.asList(ownedNames));
if (includeRequiredSubclasses) {
Set<Class<?>> dependencies = getRequiredSubclasses(base,
bundle,
recursiveClasses);
Set<Class<?>> all = new HashSet<Class<?>>(dependencies);
all.addAll(owned);
recursiveClasses.put(bundleName, all);
return all;
} else {
return owned;
}
}
}
/**
* Locate all subclasses of base that are found in the bundles required by
* this bundle.
*
* @param base
* base class
* @param bundle
* bundle to search
* @param recursiveClasses
* map of already searched bundles to avoid recursing the same
* bundles multiple time.
* @return the sub classes contained in required bundles.
*/
private Set<Class<?>> getRequiredSubclasses(Class<?> base, Bundle bundle,
Map<String, Set<Class<?>>> recursiveClasses) {
Set<Class<?>> dependencies = new HashSet<Class<?>>();
dependencies.add(base);
for (Bundle reqBundle : getRequiredBundles(bundle)) {
dependencies.addAll(lookupRecursiveSubClasses(base, reqBundle,
true, recursiveClasses));
}
return dependencies;
}
/**
* Load all subclasses of a set of classes that are found within a bundle.
*
* @param bundle
* bundle to search
* @param baseClasses
* all base classes
* @return
*/
private Set<Class<?>> loadSubClassesReflectively(Bundle bundle,
Collection<Class<?>> baseClasses) {
String bundleName = bundle.getSymbolicName();
try {
BundleReflections reflections = reflectionLookup.get(bundleName);
if (reflections == null) {
reflections = new BundleReflections(bundle,
new SubTypesScanner());
reflectionLookup.put(bundleName, reflections);
}
return reflections.getSubTypesOf(baseClasses
.toArray(new Class<?>[0]));
} catch (Throwable e) {
statusHandler.handle(Priority.PROBLEM,
"Error loading classes in bundle(" + bundleName
+ "), some procedures may not load.", e);
}
return Collections.emptySet();
}
/**
* Load classes by name using a specific bundles class loader
*
* @param bundle
* the bundle to get a class loader from
* @param classNames
* names of classes to load.
* @return
*/
private Set<Class<?>> loadClassesFromCache(Bundle bundle,
Collection<String> classNames) {
BundleWiring bundleWiring = bundle.adapt(BundleWiring.class);
ClassLoader loader = bundleWiring.getClassLoader();
HashSet<Class<?>> result = new HashSet<Class<?>>(classNames.size(),
1.0f);
for (String className : classNames) {
try {
result.add(Class.forName(className, false, loader));
} catch (ClassNotFoundException e) {
statusHandler.handle(Priority.PROBLEM, "Error loading class("
+ className + "), some procedures may not load.", e);
}
}
return result;
}
/**
* Parse bundle header to get all required bundles
*
* @param bundle
* the bundle
* @return bundles required by bundle.
*/
private List<Bundle> getRequiredBundles(Bundle bundle) {
String bundleName = bundle.getSymbolicName();
List<Bundle> required = requiredBundles.get(bundle);
if (required == null) {
required = new ArrayList<Bundle>();
String requiredBundlesHeader = bundle.getHeaders().get(
Constants.REQUIRE_BUNDLE);
if (requiredBundlesHeader != null) {
String[] requiredBundles = COMMA_SPLIT
.split(requiredBundlesHeader);
for (String requiredBundleName : requiredBundles) {
String[] nameParts = SEMICOLON_SPLIT
.split(requiredBundleName);
Bundle reqBundle = bundleLookup.get(nameParts[0]);
if (reqBundle != null) {
required.add(reqBundle);
}
}
}
requiredBundles.put(bundleName, required);
}
return required;
}
}

11
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/AbstractResourceData.java
View file

@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException;
@ -40,9 +39,11 @@ import com.raytheon.uf.viz.core.exception.VizException;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 2, 2009 chammack Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Feb 02, 2009 chammack Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
@ -50,7 +51,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public abstract class AbstractResourceData implements ISerializableObject {
public abstract class AbstractResourceData {
/** The generator used to generate names for labels */
protected AbstractNameGenerator nameGenerator = null;

12
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/LoadProperties.java
View file

@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.core.comm.PerspectiveSpecificLoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.AbstractCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.Capabilities;
@ -39,10 +38,11 @@ import com.raytheon.uf.viz.core.rsc.capabilities.Capabilities;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 15, 2007 chammack Initial Creation.
* Feb 26, 2009 2032 jsanchez Added a loadWithoutData.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Aug 15, 2007 chammack Initial Creation.
* Feb 26, 2009 2032 jsanchez Added a loadWithoutData.
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -51,7 +51,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.Capabilities;
*/
@XmlType(name = "loadProperties")
@XmlAccessorType(XmlAccessType.NONE)
public class LoadProperties implements ISerializableObject {
public class LoadProperties {
private Capabilities capabilities;

11
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/ProgressiveDisclosureProperties.java
View file

@ -24,8 +24,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Defines the progressive disclosure properties
*
@ -33,9 +31,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/30/07 randerso Initial Creation.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jul 30, 2007 randerso Initial Creation.
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -43,7 +42,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ProgressiveDisclosureProperties implements ISerializableObject {
public class ProgressiveDisclosureProperties {
/**
* Minimum display width in meters for the associated resource to be
* displayed

16
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/ResourceList.java
View file

@ -36,7 +36,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import org.apache.commons.lang.Validate;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -55,11 +54,13 @@ import com.raytheon.uf.viz.core.rsc.capabilities.AbstractCapability;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 5, 2007 chammack Initial Creation.
* Apr 9, 2009 1288 rjpeter Added iterator implementation to fix remove.
* Apr 24, 2013 1950 bsteffen Sort resources before instantiation.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Sep 05, 2007 chammack Initial Creation.
* Apr 09, 2009 1288 rjpeter Added iterator implementation to fix
* remove.
* Apr 24, 2013 1950 bsteffen Sort resources before instantiation.
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -67,8 +68,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.AbstractCapability;
* @version 1
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ResourceList extends CopyOnWriteArrayList<ResourcePair> implements
ISerializableObject {
public class ResourceList extends CopyOnWriteArrayList<ResourcePair> {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ResourceList.class);

12
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/ResourceProperties.java
View file

@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.core.rsc.RenderingOrderFactory.ResourceOrder;
/**
@ -35,10 +34,11 @@ import com.raytheon.uf.viz.core.rsc.RenderingOrderFactory.ResourceOrder;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation.
* 3/5/08 2032 jsanchez Initialized pdProps.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jul 01, 2006 chammack Initial Creation.
* Mar 05, 2008 2032 jsanchez Initialized pdProps.
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -46,7 +46,7 @@ import com.raytheon.uf.viz.core.rsc.RenderingOrderFactory.ResourceOrder;
*
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ResourceProperties implements ISerializableObject {
public class ResourceProperties {
/** is the layer isVisible */
@XmlAttribute

11
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/capabilities/AbstractCapability.java
View file

@ -22,7 +22,6 @@ package com.raytheon.uf.viz.core.rsc.capabilities;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType;
@ -38,9 +37,11 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 2, 2009 chammack Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Feb 02, 2009 chammack Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
@ -48,7 +49,7 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public abstract class AbstractCapability implements ISerializableObject {
public abstract class AbstractCapability {
/**
* The resource pointer. Primarily useful for communication with the

177
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/status/VizStatusHandler.java
View file

@ -1,177 +0,0 @@
/**
* 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.core.status;
import org.eclipse.ui.statushandlers.StatusManager;
import com.raytheon.uf.common.status.AbstractHandlerFactory;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
/**
* Sends StatusMessages into the Eclipse Status Manager
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 6, 2008 1433 chammack Initial creation
* </pre>
*
* @author chammack
* @version 1.0
*/
public class VizStatusHandler implements IUFStatusHandler {
private final String category;
private String source;
private final String pluginId;
private final AbstractHandlerFactory factory;
public VizStatusHandler(AbstractHandlerFactory factory, String pluginId,
String category) {
this.factory = factory;
this.category = category;
this.pluginId = pluginId;
}
public VizStatusHandler(String pluginId, String category, String source) {
this.category = category;
this.source = source;
this.pluginId = pluginId;
this.factory = null;
}
@Override
public boolean isPriorityEnabled(Priority p) {
return true;
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus)
*/
@Override
public void handle(UFStatus status) {
handle(status, this.category);
}
@Override
public void handle(UFStatus status, String category) {
if (this.source == null) {
if (factory != null) {
this.source = factory.getSource(source, pluginId);
}
}
VizStatusInternal vizStatus = new VizStatusInternal(status, category,
source, pluginId);
StatusManager.getManager().handle(vizStatus);
}
@Override
public void handle(Priority p, String msg) {
handle(new UFStatus(p, msg));
}
@Override
public void handle(Priority priority, String category, String message) {
handle(priority, category, message, (Throwable) null);
}
@Override
public void handle(Priority p, String msg, Throwable t) {
handle(new UFStatus(p, msg, t));
}
@Override
public void handle(Priority p, String category, String msg, Throwable t) {
handle(new UFStatus(p, msg, t), category);
}
@Override
public void debug(String message) {
handle(Priority.DEBUG, message);
}
@Override
public void debug(String category, String message) {
handle(Priority.DEBUG, category, message);
}
@Override
public void info(String message) {
handle(Priority.INFO, message);
}
@Override
public void info(String category, String message) {
handle(Priority.INFO, category, message);
}
@Override
public void warn(String message) {
handle(Priority.WARN, message);
}
@Override
public void warn(String category, String message) {
handle(Priority.WARN, category, message);
}
@Override
public void error(String message) {
handle(Priority.ERROR, message);
}
@Override
public void error(String category, String message) {
handle(Priority.ERROR, category, message);
}
@Override
public void error(String message, Throwable throwable) {
handle(Priority.ERROR, message, throwable);
}
@Override
public void error(String message, String category, Throwable throwable) {
handle(Priority.ERROR, category, message, throwable);
}
@Override
public void fatal(String message, Throwable throwable) {
handle(Priority.FATAL, message, throwable);
}
@Override
public void fatal(String message, String category, Throwable throwable) {
handle(Priority.FATAL, category, message, throwable);
}
}

26
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/status/VizStatusHandlerFactory.java
View file

@ -25,6 +25,8 @@ import java.util.MissingResourceException;
import javax.xml.bind.JAXBException;
import org.eclipse.ui.statushandlers.StatusManager;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@ -34,6 +36,8 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.status.AbstractHandlerFactory;
import com.raytheon.uf.common.status.FilterPatternContainer;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.StatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
/**
@ -45,6 +49,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 25, 2010 rjpeter Initial creation
* Oct 23, 2013 2303 bgonzale Merged VizStatusHandler and SysErrStatusHandler into StatusHandler.
* Implemented log method from base class.
*
* </pre>
*
@ -56,8 +62,8 @@ public class VizStatusHandlerFactory extends AbstractHandlerFactory {
private static final String CATEGORY = "WORKSTATION";
private static final VizStatusHandler instance = new VizStatusHandler(
VizStatusHandler.class.getPackage().getName(), CATEGORY, CATEGORY);
private static final StatusHandler instance = new StatusHandler(
StatusHandler.class.getPackage().getName(), CATEGORY, CATEGORY);
public VizStatusHandlerFactory() {
super(CATEGORY);
@ -77,13 +83,14 @@ public class VizStatusHandlerFactory extends AbstractHandlerFactory {
@Override
public IUFStatusHandler createInstance(String pluginId, String category,
String source) {
return new VizStatusHandler(pluginId, category, source);
return new StatusHandler(pluginId, category, source);
}
@Override
public IUFStatusHandler createInstance(AbstractHandlerFactory factory,
String pluginId, String category) {
return new VizStatusHandler(factory, pluginId, category);
return new StatusHandler(pluginId, category, getSource(
null, pluginId));
}
@Override
@ -103,7 +110,7 @@ public class VizStatusHandlerFactory extends AbstractHandlerFactory {
if (locFile == null) {
throw new MissingResourceException(
"Unable to retrieve the localization file",
VizStatusHandler.class.getName(),
VizStatusHandlerFactory.class.getName(),
LocalizationType.COMMON_STATIC.name() + File.separator
+ LocalizationLevel.BASE.name() + File.separator
+ "configuredHandlers.xml");
@ -118,4 +125,13 @@ public class VizStatusHandlerFactory extends AbstractHandlerFactory {
}
return FilterPatternContainer.createDefault();
}
@Override
protected void log(Priority priority, String pluginId, String category,
String source, String message, Throwable throwable) {
VizStatusInternal vizStatus = new VizStatusInternal(new UFStatus(
priority, message, throwable), category, source, pluginId);
StatusManager.getManager().handle(vizStatus);
}
}

10
cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/HeightScale.java
View file

@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.adapters.UnitAdapter;
import com.raytheon.uf.common.style.level.Level.LevelType;
@ -39,9 +38,10 @@ import com.raytheon.uf.common.style.level.Level.LevelType;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 6, 2009 mschenke Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Nov 06, 2009 mschenke Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -49,7 +49,7 @@ import com.raytheon.uf.common.style.level.Level.LevelType;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public class HeightScale implements ISerializableObject {
public class HeightScale {
@XmlAccessorType(XmlAccessType.NONE)
public static enum ScaleType {

13
cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/HeightScales.java
View file

@ -33,20 +33,21 @@ import com.raytheon.uf.common.localization.ILocalizationFileObserver;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
/**
* TODO Add Description
* Collection of {@link HeightScale} objects used by the volume browser and
* several height displays to scale verticle data.
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 24, 2009 mschenke Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Nov 24, 2009 mschenke Initial creation
* Oct 22, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -55,7 +56,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
*/
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement
public class HeightScales implements ISerializableObject {
public class HeightScales {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(HeightScales.class);

6
cave/com.raytheon.uf.viz.cots.feature/feature.xml
View file

@ -81,10 +81,4 @@
install-size="0"
version="0.0.0"/>
<plugin
id="org.reflections"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature>

1
cave/com.raytheon.uf.viz.cwa/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.cwa.rsc.CWAResourceData

3
cave/com.raytheon.uf.viz.d2d.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.d2d.core.map.D2DMapRenderableDisplay
com.raytheon.uf.viz.d2d.core.time.D2DTimeMatcher
com.raytheon.uf.viz.d2d.core.D2DLoadProperties

12
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/D2DLoadProperties.java
View file

@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.comm.PerspectiveSpecificLoadProperties;
import com.raytheon.uf.viz.d2d.core.time.LoadMode;
@ -39,9 +38,11 @@ import com.raytheon.uf.viz.d2d.core.time.TimeMatchingConfiguration;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 1, 2009 bgonzale Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jul 01, 2009 bgonzale Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
@ -50,8 +51,7 @@ import com.raytheon.uf.viz.d2d.core.time.TimeMatchingConfiguration;
*/
@XmlType(name = "d2dLoadProperties")
@XmlAccessorType(XmlAccessType.NONE)
public class D2DLoadProperties extends PerspectiveSpecificLoadProperties
implements ISerializableObject {
public class D2DLoadProperties extends PerspectiveSpecificLoadProperties {
private transient TimeMatchingConfiguration timeConfig;

5
cave/com.raytheon.uf.viz.d2d.nsharp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,5 +0,0 @@
com.raytheon.uf.viz.d2d.nsharp.rsc.BufruaNSharpResourceData
com.raytheon.uf.viz.d2d.nsharp.rsc.GribNSharpResourceData
com.raytheon.uf.viz.d2d.nsharp.rsc.MdlSndNSharpResourceData
com.raytheon.uf.viz.d2d.nsharp.rsc.PoesSndNSharpResourceData
com.raytheon.uf.viz.d2d.nsharp.rsc.GoesSndNSharpResourceData

5
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CreateSubscriptionDlg.java
View file

@ -141,6 +141,7 @@ import com.raytheon.viz.ui.presenter.components.ComboBoxConf;
* Sept 30, 2013 1797 dhladky separated Time from GriddedTime
* Oct 11, 2013 2386 mpduff Refactor DD Front end.
* Oct 15, 2013 2477 mpduff Fix bug in group settings.
* Oct 23, 2013 2484 dhladky Unique ID for subscriptions updated.
*
* </pre>
*
@ -1545,6 +1546,10 @@ public class CreateSubscriptionDlg extends CaveSWTDialog {
* The subscription to get the registry id
*/
private void setSubscriptionId(Subscription sub) {
if (sub.getOriginatingSite() == null) {
LocalizationManager lm = LocalizationManager.getInstance();
sub.setOriginatingSite(lm.getCurrentSite());
}
String id = RegistryUtil.getRegistryObjectKey(sub);
sub.setId(id);
}

2
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
View file

@ -131,6 +131,7 @@ import com.raytheon.viz.ui.presenter.IDisplay;
* Jun 14, 2013 2108 mpduff Refactored DataSizeUtils.
* Oct 11, 2013 2386 mpduff Refactor DD Front end.
* Oct 15, 2013 2477 mpduff Remove debug code.
* Oct 23, 2013 2484 dhladky Unique ID for subscriptions updated.
* </pre>
*
* @author mpduff
@ -539,6 +540,7 @@ public abstract class SubsetManagerDlg extends CaveSWTDialog implements
sub.setOwner((create) ? LocalizationManager.getInstance()
.getCurrentUser() : this.subscription.getOwner());
sub.setOriginatingSite(LocalizationManager.getInstance().getCurrentSite());
return setupCommonSubscriptionAttributes(sub, defaultRoute);
}

18
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
View file

@ -308,6 +308,12 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.javassist"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.hibernate"
download-size="0"
@ -483,4 +489,16 @@
version="0.0.0"
unpack="false"/>
<plugin
id="com.google.guava"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.reflections"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature>

1
cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.monitor.ffmp.ui.rsc.FFMPResourceData

12
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPConfigBasinXML.java
View file

@ -29,8 +29,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Config Basin xml object.
*
@ -38,10 +36,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Initial creation
* Apr 12, 2013 1902 mpduff Return a FFMPTableColumnXML object.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 12, 2013 1902 mpduff Return a FFMPTableColumnXML object.
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -49,7 +47,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "FfmpConfigBasin")
@XmlAccessorType(XmlAccessType.NONE)
public class FFMPConfigBasinXML implements ISerializableObject {
public class FFMPConfigBasinXML {
/**
* When on, the Basin Table will use the time of the D2D frame that launched
* it. When off the Basin Table will either use the most recent time in the

18
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPTableColumnXML.java
View file

@ -23,10 +23,22 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Table column xml object.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
*/
@XmlAccessorType(XmlAccessType.NONE)
public class FFMPTableColumnXML implements ISerializableObject
public class FFMPTableColumnXML
{
@XmlElement(name = "ColumnName")
private String columnName;

1
cave/com.raytheon.uf.viz.monitor.fog/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.monitor.fog.ui.resource.FogResourceData

23
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/xml/FogMonitorAlgorithmXML.java
View file

@ -24,12 +24,27 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
*
* Class for serialization of xml describing a fog monitor algorithm.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author unknown
* @version 1.0
*/
@XmlRootElement(name = "FogMonitorAlgorithm")
@XmlAccessorType(XmlAccessType.NONE)
public class FogMonitorAlgorithmXML implements ISerializableObject
{
public class FogMonitorAlgorithmXML {
@XmlElement(name = "FogProductYLo")
private double fogProductYLo;

1
cave/com.raytheon.uf.viz.monitor.safeseas/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.monitor.safeseas.resources.SafeSeasResourceData

2
cave/com.raytheon.uf.viz.monitor.scan/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.uf.viz.monitor.scan.resource.ScanResourceData
com.raytheon.uf.viz.monitor.scan.resource.CWATLocalThreatResourceData

56
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDScanData.java
View file

@ -1,22 +1,24 @@
/**
* 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.monitor.scan.data;
/**
*
* DMDScanData
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 25, 2010 4288 dhladky Initial creation
* </pre>
*
* @author dhladky
* @version 1.0
*
*/
import java.util.Date;
import java.util.HashMap;
import java.util.Set;
import java.util.TreeMap;
@ -24,9 +26,25 @@ import java.util.TreeMap;
import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow;
import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData;
import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums;
import com.raytheon.uf.common.serialization.ISerializableObject;
public class DMDScanData implements ISerializableObject {
/**
*
* DMDScanData
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Mar 25, 2010 4288 dhladky Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author dhladky
* @version 1.0
*
*/
public class DMDScanData {
private HashMap<Long, ScanTableData<?>> data = null;

146
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDTimeHeight.java
View file

@ -1,146 +0,0 @@
/**
* 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.monitor.scan.data;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Contains the data used for the time-height graph.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 10, 2010 lvenable Initial creation
*
* </pre>
*
* @author lvenable
* @version 1.0
*/
public class DMDTimeHeight implements ISerializableObject{
/**
* The ident of the data.
*/
private String ident;
/**
* Time offset in milliseconds.
*/
public Long offset;
/**
* Value.
*/
public Double value;
/**
* Height in kft.
*/
public Double height;
/**
* Low level diameter.
*/
public Double llDiam;
/**
* Constructor.
*/
public DMDTimeHeight() {
}
/**
* Get the time offset.
* @return The time offset.
*/
public Long getOffset() {
return offset;
}
/**
* Set the time offset.
* @param offset The time offset.
*/
public void setOffset(Long offset) {
this.offset = offset;
}
/**
* Get the value.
* @return The value.
*/
public Double getValue() {
return value;
}
/**
* Set the value.
* @param value The value.
*/
public void setValue(Double value) {
this.value = value;
}
/**
* Get the height in kft.
* @return Height in kft.
*/
public Double getHeight() {
return height;
}
/**
* Set the height in kft.
* @param height Height in kft.
*/
public void setHeight(Double height) {
this.height = height;
}
/**
*
* @return
*/
public Double getLlDiam() {
return llDiam;
}
public void setLlDiam(Double llDiam) {
this.llDiam = llDiam;
}
/**
* @param ident the ident to set
*/
public void setIdent(String ident) {
this.ident = ident;
}
/**
* @return the ident
*/
public String getIdent() {
return ident;
}
}

11
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanRunConfigXML.java
View file

@ -24,8 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Scan Run Configuration accessor.
*
@ -33,9 +31,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -45,7 +44,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "scanRunConfig")
@XmlAccessorType(XmlAccessType.NONE)
public class ScanRunConfigXML implements ISerializableObject {
public class ScanRunConfigXML {
@XmlElement(name="vcpList")
private ScanVcpListXML vcpList;

11
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanSampleConfigXML.java
View file

@ -24,8 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* SCAN Sample Configuration XML.
*
@ -33,9 +31,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 5, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 5, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -45,7 +44,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "ScanSampleConfig")
@XmlAccessorType(XmlAccessType.NONE)
public class ScanSampleConfigXML implements ISerializableObject {
public class ScanSampleConfigXML {
@XmlElement(name="cellSampleConfig", type=CellXML.class)
private CellXML cellSampleConfig;

12
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpListXML.java
View file

@ -26,8 +26,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* VCP List.
*
@ -35,18 +33,18 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author mpduff
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ScanVcpListXML implements ISerializableObject {
public class ScanVcpListXML {
@XmlElements({ @XmlElement(name = "vcp", type = ScanVcpXML.class) })
private ArrayList<ScanVcpXML> vcpData;

11
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpXML.java
View file

@ -23,8 +23,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* SCAN VCP Configuration
*
@ -32,9 +30,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -43,7 +42,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ScanVcpXML implements ISerializableObject {
public class ScanVcpXML {
@XmlAttribute(name = "num")
private int number;

1
cave/com.raytheon.uf.viz.monitor.snow/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.monitor.snow.resources.SnowResourceData

2
cave/com.raytheon.uf.viz.ncwf/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.uf.viz.ncwf.rsc.NcwfPolygonResourceData
com.raytheon.uf.viz.ncwf.rsc.NcwfMovementResourceData

1
cave/com.raytheon.uf.viz.npp.nucaps/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.npp.nucaps.NucapsNSharpResourceData

1
cave/com.raytheon.uf.viz.npp.sounding/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.npp.sounding.rsc.NPPSoundingMapResourceData

2
cave/com.raytheon.uf.viz.objectiveanalysis/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.uf.viz.objectiveanalysis.rsc.OAAlertParser
com.raytheon.uf.viz.objectiveanalysis.rsc.OAResourceData

1
cave/com.raytheon.uf.viz.preciprate/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.preciprate.PrecipRateResourceData

13
cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/PrecipRateXML.java
View file

@ -20,15 +20,16 @@
package com.raytheon.uf.viz.preciprate.xml;
/**
* TODO Add Description
* Configuration file format for Precip Rate data.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 20, 2011 lvenable Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jan 20, 2011 lvenable Initial creation
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -40,10 +41,8 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlAccessorType(XmlAccessType.NONE)
public class PrecipRateXML implements ISerializableObject {
public class PrecipRateXML {
@XmlElement(name = "EnumID")
private String enumID;

11
cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/SCANConfigPrecipRateXML.java
View file

@ -27,8 +27,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Precip Rate Configuration analogous to legacy dhrParams.txt
*
@ -36,9 +34,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 18, 2011 6779 grichard Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Jan 18, 2011 6779 grichard Initial creation
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -48,7 +47,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "ScanConfigPrecipRate")
@XmlAccessorType(XmlAccessType.NONE)
public class SCANConfigPrecipRateXML implements ISerializableObject {
public class SCANConfigPrecipRateXML {
@XmlElements( { @XmlElement(name = "PrecipRate", type = PrecipRateXML.class) })
private ArrayList<PrecipRateXML> precipRates;

3
cave/com.raytheon.uf.viz.profiler/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.profiler.ProfilerResourceData
com.raytheon.uf.viz.profiler.ProfilerDescriptor
com.raytheon.uf.viz.profiler.ui.ProfilerDisplay

1
cave/com.raytheon.uf.viz.qpf/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.qpf.QPFResourceData

1
cave/com.raytheon.uf.viz.radarapps.fsi/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.radarapps.fsi.FSILauncherResourceData

1
cave/com.raytheon.uf.viz.radarapps.requests/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.radarapps.alertreq.AlertAreaResourceData

1
cave/com.raytheon.uf.viz.tcs/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.tcs.rsc.TCSResourceData

3
cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.truecolor.rsc.TrueColorResourceGroupData
com.raytheon.uf.viz.truecolor.rsc.ChannelInfo
com.raytheon.uf.viz.truecolor.rsc.ChannelResource

1
cave/com.raytheon.uf.viz.ui.popupskewt/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.ui.popupskewt.rsc.PopupSkewTResourceData

2
cave/com.raytheon.uf.viz.vaa/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.uf.viz.vaa.rsc.VAAResourceData
com.raytheon.uf.viz.vaa.rsc.ForecastAshCloudsResourceData

1
cave/com.raytheon.uf.viz.vil/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.vil.VILResourceData

45
cave/com.raytheon.uf.viz.xy.crosssection/META-INF/MANIFEST.MF
View file

@ -2,43 +2,28 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CrossSection
Bundle-SymbolicName: com.raytheon.uf.viz.xy.crosssection;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.raytheon.uf.viz.xy.crosssection.Activator
Bundle-Version: 1.0.1.qualifier
Bundle-Vendor: RAYTHEON
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
com.raytheon.uf.common.colormap,
com.raytheon.uf.common.wxmath,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.xy,
com.raytheon.uf.common.geospatial,
com.raytheon.viz.core.contours,
com.raytheon.viz.core.graphing,
com.raytheon.viz.ui,
org.geotools,
javax.measure
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: com.raytheon.uf.viz.core, com.raytheon.viz.core
Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataquery.requests,
com.raytheon.uf.common.localization,
com.raytheon.uf.common.status,
Require-Bundle: com.raytheon.uf.common.colormap,
com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.arrow,
com.raytheon.uf.common.style.contour,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.style.image,
com.raytheon.uf.common.style.level,
com.raytheon.uf.common.time,
com.raytheon.uf.common.topo,
com.raytheon.uf.viz.d2d.core.map,
com.raytheon.uf.common.wxmath,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.viz.core.imagery,
com.raytheon.uf.viz.xy,
com.raytheon.viz.core.contours,
com.raytheon.viz.core.graphing,
javax.measure,
org.eclipse.core.runtime,
org.eclipse.ui
Import-Package: com.raytheon.viz.core.imagery,
com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.jts,
com.raytheon.viz.core.slice.request
com.raytheon.viz.core.rsc.jts
Export-Package: com.raytheon.uf.viz.xy.crosssection,
com.raytheon.uf.viz.xy.crosssection.adapter,
com.raytheon.uf.viz.xy.crosssection.display,

3
cave/com.raytheon.uf.viz.xy.crosssection/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.xy.crosssection.rsc.CrossSectionResourceData
com.raytheon.uf.viz.xy.crosssection.display.CrossSectionRenderableDisplay
com.raytheon.uf.viz.xy.crosssection.display.CrossSectionDescriptor

56
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/Activator.java
View file

@ -1,56 +0,0 @@
package com.raytheon.uf.viz.xy.crosssection;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
public class Activator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "com.raytheon.uf.viz.xy.crosssection";
// The shared instance
private static Activator plugin;
/**
* The constructor
*/
public Activator() {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
* )
*/
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
* )
*/
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
/**
* Returns the shared instance
*
* @return the shared instance
*/
public static Activator getDefault() {
return plugin;
}
}

38
cave/com.raytheon.uf.viz.xy.timeheight/META-INF/MANIFEST.MF
View file

@ -2,38 +2,28 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Timeheight
Bundle-SymbolicName: com.raytheon.uf.viz.xy.timeheight;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.raytheon.uf.viz.xy.timeheight.Activator
Bundle-Version: 1.0.1.qualifier
Bundle-Vendor: RAYTHEON
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
com.raytheon.uf.common.colormap,
com.raytheon.uf.common.dataquery,
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Require-Bundle: com.raytheon.uf.common.colormap,
com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.style,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
com.raytheon.uf.viz.xy.varheight,
javax.measure
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Eclipse-RegisterBuddy: com.raytheon.uf.viz.core, com.raytheon.viz.core
Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style.image,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.viz.core.contours,
com.raytheon.viz.core.contours.util,
com.raytheon.viz.core.graphing.util,
com.raytheon.viz.core.graphing.xy,
com.raytheon.viz.core.imagery,
com.raytheon.viz.core.graphing,
com.raytheon.viz.grid,
javax.measure,
org.eclipse.core.runtime,
org.eclipse.ui
Import-Package: com.raytheon.viz.core.imagery,
com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.slice.request,
com.raytheon.viz.grid.rsc
Export-Package: com.raytheon.uf.viz.xy.timeheight,
com.raytheon.uf.viz.xy.timeheight.display,
com.raytheon.viz.core.rsc
Export-Package: com.raytheon.uf.viz.xy.timeheight.display,
com.raytheon.uf.viz.xy.timeheight.graph,
com.raytheon.uf.viz.xy.timeheight.rsc

3
cave/com.raytheon.uf.viz.xy.timeheight/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.xy.timeheight.rsc.TimeHeightResourceData
com.raytheon.uf.viz.xy.timeheight.display.TimeHeightRenderableDisplay
com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor

56
cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/Activator.java
View file

@ -1,56 +0,0 @@
package com.raytheon.uf.viz.xy.timeheight;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
public class Activator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "com.raytheon.uf.viz.xy.timeheight";
// The shared instance
private static Activator plugin;
/**
* The constructor
*/
public Activator() {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
* )
*/
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
* )
*/
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
/**
* Returns the shared instance
*
* @return the shared instance
*/
public static Activator getDefault() {
return plugin;
}
}

53
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
View file

@ -2,51 +2,26 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Timeseries Plug-in
Bundle-SymbolicName: com.raytheon.uf.viz.xy.timeseries;singleton:=true
Bundle-Version: 1.12.1174.qualifier
Bundle-Activator: com.raytheon.uf.viz.xy.timeseries.Activator
Bundle-Version: 1.13.0.qualifier
Bundle-Vendor: RAYTHEON
Eclipse-RegisterBuddy: com.raytheon.viz.core, com.raytheon.uf.viz.core
Eclipse-BuddyPolicy: ext, global
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Require-Bundle: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.style,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
com.raytheon.viz.core.graphing,
com.raytheon.viz.ui,
javax.measure,
org.eclipse.ui,
org.eclipse.core.runtime
Import-Package: com.raytheon.viz.core.rsc
Export-Package: com.raytheon.uf.viz.xy.timeseries,
com.raytheon.uf.viz.xy.timeseries.adapter,
com.raytheon.uf.viz.xy.timeseries.display,
com.raytheon.uf.viz.xy.timeseries.graph,
com.raytheon.uf.viz.xy.timeseries.rsc,
com.raytheon.uf.viz.xy.timeseries.util
Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataquery.requests,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.style.level,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.drawables,
com.raytheon.uf.viz.core.exception,
com.raytheon.uf.viz.core.map,
com.raytheon.uf.viz.core.rsc,
com.raytheon.uf.viz.core.rsc.capabilities,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
com.raytheon.uf.viz.xy.graph,
com.raytheon.uf.viz.xy.graph.axis,
com.raytheon.uf.viz.xy.graph.labeling,
com.raytheon.uf.viz.xy.map.rsc,
com.raytheon.viz.core.graphing.util,
com.raytheon.viz.core.graphing.xy,
com.raytheon.viz.core.rsc,
com.raytheon.viz.ui.cmenu,
com.raytheon.viz.ui.editor,
com.raytheon.viz.ui.input,
com.raytheon.viz.ui.input.preferences,
com.vividsolutions.jts.geom,
javax.measure.converter,
javax.measure.unit

3
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.xy.timeseries.rsc.TimeSeriesResourceData
com.raytheon.uf.viz.xy.timeseries.display.TimeSeriesRenderableDisplay
com.raytheon.uf.viz.xy.timeseries.display.TimeSeriesDescriptor

69
cave/com.raytheon.uf.viz.xy.timeseries/src/com/raytheon/uf/viz/xy/timeseries/Activator.java
View file

@ -1,69 +0,0 @@
/**
* 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.xy.timeseries;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
public class Activator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "com.raytheon.uf.viz.xy.timeseries";
// The shared instance
private static Activator plugin;
/**
* The constructor
*/
public Activator() {
}
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
/**
* Returns the shared instance
*
* @return the shared instance
*/
public static Activator getDefault() {
return plugin;
}
}

46
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
View file

@ -2,53 +2,25 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Varheight Plug-in
Bundle-SymbolicName: com.raytheon.uf.viz.xy.varheight;singleton:=true
Bundle-Version: 1.12.1174.qualifier
Bundle-Activator: com.raytheon.uf.viz.xy.varheight.Activator
Bundle-Version: 1.13.0.qualifier
Bundle-Vendor: RAYTHEON
Eclipse-RegisterBuddy: com.raytheon.viz.core, com.raytheon.uf.viz.core
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;bundle-version="3.4.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataquery.requests,
Require-Bundle: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.drawables,
com.raytheon.uf.viz.core.exception,
com.raytheon.uf.viz.core.globals,
com.raytheon.uf.viz.core.map,
com.raytheon.uf.viz.core.rsc,
com.raytheon.uf.viz.core.rsc.capabilities,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
com.raytheon.uf.viz.xy.graph,
com.raytheon.uf.viz.xy.graph.axis,
com.raytheon.uf.viz.xy.graph.labeling,
com.raytheon.uf.viz.xy.hodo,
com.raytheon.uf.viz.xy.map.rsc,
com.raytheon.viz.core.contours.util,
com.raytheon.viz.core.graphing.util,
com.raytheon.viz.core.graphing.xy,
com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.slice.request,
com.raytheon.viz.core.contours,
com.raytheon.viz.core.graphing,
com.raytheon.viz.ui,
com.raytheon.viz.ui.cmenu,
com.raytheon.viz.ui.editor,
com.raytheon.viz.ui.input,
com.raytheon.viz.ui.input.preferences,
com.raytheon.viz.ui.panes,
com.vividsolutions.jts.geom,
javax.measure.converter,
javax.measure.unit
javax.measure,
org.eclipse.core.runtime,
org.eclipse.ui
Import-Package: com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc
Export-Package: com.raytheon.uf.viz.xy.varheight,
com.raytheon.uf.viz.xy.varheight.adapter,
com.raytheon.uf.viz.xy.varheight.display,

4
cave/com.raytheon.uf.viz.xy.varheight/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,4 +0,0 @@
com.raytheon.uf.viz.xy.varheight.rsc.VarHeightResourceData
com.raytheon.uf.viz.xy.varheight.display.VarHeightRenderableDisplay
com.raytheon.uf.viz.xy.varheight.display.VarHeightDescriptor
com.raytheon.uf.viz.xy.varheight.hodo.VarHeightHodoDescriptor

50
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/Activator.java
View file

@ -1,50 +0,0 @@
package com.raytheon.uf.viz.xy.varheight;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "com.raytheon.uf.viz.xy.varheight";
// The shared instance
private static Activator plugin;
/**
* The constructor
*/
public Activator() {
}
/*
* (non-Javadoc)
* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
*/
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
/*
* (non-Javadoc)
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
/**
* Returns the shared instance
*
* @return the shared instance
*/
public static Activator getDefault() {
return plugin;
}
}

3
cave/com.raytheon.uf.viz.xy/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.uf.viz.xy.map.InsetMapRenderableDisplay
com.raytheon.uf.viz.xy.graph.XyGraphDescriptor
com.raytheon.uf.viz.xy.map.rsc.GraphResourceData

11
cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/XyGraphDescriptor.java
View file

@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import org.geotools.referencing.crs.DefaultEngineeringCRS;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
@ -43,9 +42,11 @@ import com.vividsolutions.jts.geom.Coordinate;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 29, 2009 mschenke Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Sep 29, 2009 mschenke Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
@ -54,7 +55,7 @@ import com.vividsolutions.jts.geom.Coordinate;
*/
@XmlAccessorType(XmlAccessType.NONE)
public class XyGraphDescriptor extends AbstractDescriptor implements
RemoveListener, ISerializableObject {
RemoveListener {
protected int verticalFrameCount = 0;

13
cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/hodo/HodographDescriptor.java
View file

@ -19,6 +19,8 @@
**/
package com.raytheon.uf.viz.xy.hodo;
import javax.xml.bind.annotation.XmlTransient;
import org.geotools.coverage.grid.GeneralGridGeometry;
import org.geotools.referencing.crs.DefaultEngineeringCRS;
@ -26,22 +28,23 @@ import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
/**
* TODO Add Description
* Descriptor for a hodograph display.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 17, 2011 bsteffen Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Nov 17, 2011 bsteffen Initial creation
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/
@XmlTransient
public class HodographDescriptor extends AbstractDescriptor {
// The max distance of the hodograph

30
cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/map/IInsetMapContainer.java
View file

@ -24,10 +24,12 @@ import java.io.File;
import org.eclipse.swt.layout.FormData;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.serialization.SerializationException;
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;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.procedures.Bundle;
/**
@ -36,9 +38,11 @@ import com.raytheon.uf.viz.core.procedures.Bundle;
* <pre>
*
* 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.
*
*
* </pre>
*
@ -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;
}

3
cave/com.raytheon.viz.awipstools/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.viz.awipstools.AwipsToolsResourceData
com.raytheon.viz.awipstools.capabilities.RangeRingsOverlayCapability
com.raytheon.viz.awipstools.capabilities.EAVCapability

1
cave/com.raytheon.viz.bcd/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.viz.bcd.BCDResourceData

1
cave/com.raytheon.viz.core.graphing/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.viz.core.graphing.GraphDescriptor

14
cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/GraphDescriptor.java
View file

@ -26,7 +26,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.geotools.referencing.crs.DefaultEngineeringCRS;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.adapters.CoordAdapter;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
@ -37,10 +36,12 @@ import com.vividsolutions.jts.geom.Coordinate;
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 5, 2007 njensen Initial creation.
* Oct 22, 2009 #3348 bsteffen Moved getter/setters for numberOfFrames down to AbstractDescriptor
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Nov 5, 2007 njensen Initial creation.
* Oct 22, 2009 3348 bsteffen Moved getter/setters for numberOfFrames
* down to AbstractDescriptor
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -48,8 +49,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public class GraphDescriptor extends AbstractDescriptor implements
ISerializableObject {
public class GraphDescriptor extends AbstractDescriptor {
protected double zoomLevel = 1.0f;

3
cave/com.raytheon.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,3 +0,0 @@
com.raytheon.viz.core.rsc.BestResResourceData
com.raytheon.viz.core.rsc.BlendedResourceData
com.raytheon.viz.core.topo.TopoResourceData

11
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
View file

@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
/**
@ -33,9 +32,11 @@ import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 2, 2010 mnash Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Mar 2, 2010 mnash Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
*
* </pre>
*
@ -43,7 +44,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public abstract class AbstractSpatialEnabler implements ISerializableObject {
public abstract class AbstractSpatialEnabler {
public void enable(PluginDataObject d, AbstractRequestableResourceData arrd) {
}

1
cave/com.raytheon.viz.geotiff/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.viz.geotiff.rsc.GeoTiffResourceData

Some files were not shown because too many files have changed in this diff Show more