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

Issue #2491 Fix alertviz and java 6 compatibility.

Browse source 
Former-commit-id: 2baf2fdd778b55b76be37503935510b057c5eb0e
This commit is contained in:
Ben Steffensmeier 2013-10-28 10:07:27 -05:00
parent cda57ce742
commit 44a6f05986
9 changed files with 76 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

@ -489,4 +489,16 @@
version="0.0.0" version="0.0.0"
unpack="false"/> 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> </feature>

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

17
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/ZoneDbResourceData.java
View file

@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.RGB;
@ -37,9 +38,23 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.viz.gfe.rsc.zones.ZoneDbResource; import com.raytheon.viz.gfe.rsc.zones.ZoneDbResource;
/** /**
* @author wldougher
* *
* Resource data for Zones in the database.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
*
* </pre>
*
* @author wldougher
* @version 1.0
*/ */
@XmlTransient
public class ZoneDbResourceData extends AbstractResourceData { public class ZoneDbResourceData extends AbstractResourceData {
public static final RGB DEFAULT_BACKGROUND_COLOR = new RGB(50, 50, 50); public static final RGB DEFAULT_BACKGROUND_COLOR = new RGB(50, 50, 50);

14
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/ArealFfgResourceData.java
View file

@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlTransient;
import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData; import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
@ -31,23 +33,23 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.viz.hydrocommon.data.ArealData; import com.raytheon.viz.hydrocommon.data.ArealData;
/** /**
* Displays the Areal FFG Data from the Contingency Value table * Displays the Areal FFG Data from the Contingency Value table in IHFS.
* in IHFS.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 22, 2011 mpduff Initial creation * Jan 22, 2011 mpduff Initial creation
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
* *
* </pre> * </pre>
* *
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@XmlTransient
public class ArealFfgResourceData extends AbstractResourceData { public class ArealFfgResourceData extends AbstractResourceData {
/** List of ArealData objects */ /** List of ArealData objects */
private List<ArealData> arealDataList = new ArrayList<ArealData>(); private List<ArealData> arealDataList = new ArrayList<ArealData>();

11
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/GriddedArealFFGResourceData.java
View file

@ -22,6 +22,8 @@ package com.raytheon.viz.hydrocommon.resource;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlTransient;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue; import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.common.mpe.util.XmrgFile; import com.raytheon.uf.common.mpe.util.XmrgFile;
import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.drawables.IDescriptor;
@ -39,16 +41,17 @@ import com.raytheon.viz.hydrocommon.constants.FFGConstants.ResolutionLevel;
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 18, 2011 mpduff Initial creation * Jan 18, 2011 mpduff Initial creation
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
* *
* </pre> * </pre>
* *
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@XmlTransient
public class GriddedArealFFGResourceData extends AbstractResourceData { public class GriddedArealFFGResourceData extends AbstractResourceData {
private ResolutionLevel resolution; private ResolutionLevel resolution;
private int duration; private int duration;

11
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/RFCGriddedBasinFFGResourceData.java
View file

@ -22,6 +22,8 @@ package com.raytheon.viz.hydrocommon.resource;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlTransient;
import com.raytheon.uf.common.dataplugin.grid.GridRecord; import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue; import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.drawables.IDescriptor;
@ -39,16 +41,17 @@ import com.raytheon.viz.hydrocommon.constants.FFGConstants.ResolutionLevel;
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 24, 2011 mpduff Initial creation * Jan 24, 2011 mpduff Initial creation
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
* *
* </pre> * </pre>
* *
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@XmlTransient
public class RFCGriddedBasinFFGResourceData extends AbstractResourceData { public class RFCGriddedBasinFFGResourceData extends AbstractResourceData {
private ResolutionLevel resolution; private ResolutionLevel resolution;

4
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/JAXBClassLocator.java
View file

@ -34,6 +34,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@ -85,6 +86,9 @@ public class JAXBClassLocator {
processClass(clazz.getComponentType()); processClass(clazz.getComponentType());
return; return;
} }
if (clazz.isAnnotationPresent(XmlTransient.class)) {
return;
}
if (clazz.getName().contains("$") if (clazz.getName().contains("$")
&& !clazz.isAnnotationPresent(XmlType.class)) { && !clazz.isAnnotationPresent(XmlType.class)) {
return; return;

11
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/CombinedDataTime.java
View file

@ -5,6 +5,7 @@ import java.util.Iterator;
import java.util.TimeZone; import java.util.TimeZone;
import javax.persistence.Transient; import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlTransient;
/** /**
* A single DataTime object representing 2 DataTimes, useful for products which * A single DataTime object representing 2 DataTimes, useful for products which
@ -14,16 +15,18 @@ import javax.persistence.Transient;
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 10, 2011 rgeorge Initial creation * Jan 10, 2011 rgeorge Initial creation
* Aug 08, 2013 2245 bsteffen Make all DataTime comparisons consistent. * Aug 08, 2013 2245 bsteffen Make all DataTime comparisons consistent.
* Oct 28, 2013 2491 bsteffen Add @XmlTransient
* *
* </pre> * </pre>
* *
* @author rgeorge * @author rgeorge
* @version 1.0 * @version 1.0
*/ */
@XmlTransient
public class CombinedDataTime extends DataTime { public class CombinedDataTime extends DataTime {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;