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

Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.

Browse source 
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 5c781f8ce5 [formerly 2da689223f] [formerly 07ae94c499] [formerly 07ae94c499 [formerly ea26d0de84]] [formerly 126be0cfe5 [formerly 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 69c4777bb7045c87905880528bcc478d0652d055 [formerly b81da1853ef8773cba40a9f1ed03ab5d498966c2] [formerly 850c8995cc [formerly d20958ae92]]
Former-commit-id: 850c8995cc
Former-commit-id: 44f5bd04b6
This commit is contained in:
Max Schenkelberg 2013-03-22 10:10:55 -05:00
parent 27b40aee4d
commit 6ccc10218f
76 changed files with 432 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,4 +28,5 @@ Export-Package: com.raytheon.uf.viz.core.maps,
com.raytheon.uf.viz.core.maps.actions,
com.raytheon.uf.viz.core.maps.display,
com.raytheon.uf.viz.core.maps.menus,
com.raytheon.uf.viz.core.maps.rsc
com.raytheon.uf.viz.core.maps.rsc,
com.raytheon.uf.viz.core.maps.scales

47
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/IMapScaleDisplay.java Normal file
View file

@ -0,0 +1,47 @@
/**
* 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.maps.scales;
/**
* Interface for display containing a scale
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 21, 2013 mschenke Initial creation
*
* </pre>
*
* @author mschenke
* @version 1.0
*/
public interface IMapScaleDisplay {
/**
* Returns the name of the scale to be used in
* {@link MapScales#getScaleByName(String)}
*/
public String getScaleName();
}

14
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/MapScalePopulator.java → cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalePopulator.java
View file

@ -17,7 +17,7 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.d2d.ui;
package com.raytheon.uf.viz.core.maps.scales;
import java.util.HashMap;
import java.util.Map;
@ -30,20 +30,20 @@ import org.eclipse.ui.menus.CommandContributionItem;
import org.eclipse.ui.menus.CommandContributionItemParameter;
import com.raytheon.uf.viz.core.IDisplayPaneContainer;
import com.raytheon.uf.viz.d2d.core.map.D2DMapRenderableDisplay;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.core.maps.scales.MapScales.MapScale;
import com.raytheon.viz.ui.EditorUtil;
/**
* TODO Add Description
* UI populator for map scales
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 7, 2010 mschenke Initial creation
* Oct 7, 2010 mschenke Initial creation
* Mar 21, 2013 1638 mschenke Made map scales not tied to d2d
*
*
* </pre>
*
@ -66,7 +66,7 @@ public class MapScalePopulator extends CompoundContributionItem {
// Load scales if we have d2d map renderable display on editor or, there
// is no editor opened in the d2d perspective
if ((cont != null && (cont.getActiveDisplayPane()
.getRenderableDisplay() instanceof D2DMapRenderableDisplay))
.getRenderableDisplay() instanceof IMapScaleDisplay))
|| EditorUtil.getActiveEditor() == null) {
for (MapScale scale : MapScales.getInstance().getScales()) {
Map<String, String> parms = new HashMap<String, String>();

53
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/MapScales.java → cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScales.java
View file

@ -17,9 +17,11 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.d2d.core.map;
package com.raytheon.uf.viz.core.maps.scales;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.JAXB;
import javax.xml.bind.annotation.XmlAccessType;
@ -28,14 +30,22 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.ui.IWorkbenchWindow;
import com.raytheon.uf.common.localization.FileUpdatedMessage;
import com.raytheon.uf.common.localization.ILocalizationFileObserver;
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.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.exception.VizException;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.core.procedures.Procedure;
import com.raytheon.viz.ui.actions.LoadSerializedXml;
/**
* Serializable object representation of map scales
@ -45,7 +55,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 7, 2010 mschenke Initial creation
* Oct 7, 2010 mschenke Initial creation
* Mar 21, 2013 1638 mschenke Made map scales not tied to d2d
*
* </pre>
*
@ -134,7 +145,7 @@ public class MapScales implements ISerializableObject {
private static final String SCALES_DIR = "bundles" + File.separator
+ "scales" + File.separator;
private static final String fileName = SCALES_DIR + "scalesInfo.xml";
public static final String FILE_NAME = SCALES_DIR + "scalesInfo.xml";
private static ILocalizationFileObserver listener = new ILocalizationFileObserver() {
@Override
@ -156,6 +167,36 @@ public class MapScales implements ISerializableObject {
return instance;
}
public static void loadScales(IWorkbenchWindow window) throws VizException {
Procedure procedure = new Procedure();
List<Bundle> bundles = new ArrayList<Bundle>();
for (MapScale scale : MapScales.getInstance().getScales()) {
String editorId = null;
for (PartId partId : scale.getPartIds()) {
if (partId.isView() == false) {
editorId = partId.getId();
break;
}
}
if (editorId != null) {
File file = scale.getFile();
try {
Bundle b = SerializationUtil.jaxbUnmarshalFromXmlFile(
Bundle.class, file);
b.setEditor(editorId);
bundles.add(b);
} catch (SerializationException e) {
statusHandler.handle(
Priority.PROBLEM,
"Error deserializing bundle: "
+ file.getAbsolutePath(), e);
}
}
}
procedure.setBundles(bundles.toArray(new Bundle[bundles.size()]));
LoadSerializedXml.loadProcedureToScreen(procedure, window);
}
private static synchronized void fileUpdated() {
instance = null;
}
@ -165,18 +206,18 @@ public class MapScales implements ISerializableObject {
locFile.removeFileUpdatedObserver(listener);
}
locFile = PathManagerFactory.getPathManager()
.getStaticLocalizationFile(fileName);
.getStaticLocalizationFile(FILE_NAME);
locFile.addFileUpdatedObserver(listener);
File file = locFile.getFile();
if (file == null) {
statusHandler.handle(Priority.PROBLEM,
"Could not find any version of scale file: " + fileName);
"Could not find any version of scale file: " + FILE_NAME);
} else {
try {
instance = JAXB.unmarshal(file, MapScales.class);
} catch (RuntimeException e) {
statusHandler.handle(Priority.PROBLEM,
"Could not parse scale file: " + fileName, e);
"Could not parse scale file: " + FILE_NAME, e);
}
}
}

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

@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.common.time;bundle-version="1.12.1174",
org.geotools;bundle-version="2.6.4",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
com.raytheon.viz.ui.tools.map;bundle-version="1.12.1174",
com.raytheon.viz.core;bundle-version="1.12.1174"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy

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

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

6
cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/AbstractMovableToolLayer.java
View file

@ -78,7 +78,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* &quot;right-click-to-move&quot; functionality will
* not allow the legend to change.
* 07-21-2010 bkowal We will now display the standard SWT &quot;hand&quot;
* cursor instead of the reversed arrow cursor.
* Mar 21, 2013 1638 mschenke Changed to use generic tool data
*
* </pre>
*
@ -129,13 +129,13 @@ public abstract class AbstractMovableToolLayer<T> extends
protected boolean rightClickMovesToCoord;
protected AbstractMovableToolLayer(
AwipsToolsResourceData<? extends AbstractMovableToolLayer<T>> resourceData,
GenericToolsResourceData<? extends AbstractMovableToolLayer<T>> resourceData,
LoadProperties loadProperties) {
this(resourceData, loadProperties, true);
}
protected AbstractMovableToolLayer(
AwipsToolsResourceData<? extends AbstractMovableToolLayer<T>> resourceData,
GenericToolsResourceData<? extends AbstractMovableToolLayer<T>> resourceData,
LoadProperties loadProperties, boolean editable) {
super(resourceData, loadProperties);
getCapability(EditableCapability.class).setEditable(editable);

18
cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/AwipsToolsResourceData.java → cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java
View file

@ -40,14 +40,14 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.viz.core.ColorUtil;
/**
* TODO Add Description
* Generic tool resource data, constructs resource using reflection
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
*
* Mar 21, 2013 1638 mschenke Renamed to better represent purpose
*
* </pre>
*
@ -55,10 +55,10 @@ import com.raytheon.viz.core.ColorUtil;
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public class AwipsToolsResourceData<T extends AbstractVizResource<AbstractResourceData, MapDescriptor>>
public class GenericToolsResourceData<T extends AbstractVizResource<?, ?>>
extends AbstractResourceData {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(AwipsToolsResourceData.class);
.getHandler(GenericToolsResourceData.class);
/**
* The name of the tools resource layer.
@ -71,7 +71,7 @@ public class AwipsToolsResourceData<T extends AbstractVizResource<AbstractResour
*/
private Class<? extends T> classT;
public AwipsToolsResourceData() {
public GenericToolsResourceData() {
this.nameGenerator = new AbstractNameGenerator() {
@Override
public String getName(AbstractVizResource<?, ?> resource) {
@ -83,7 +83,7 @@ public class AwipsToolsResourceData<T extends AbstractVizResource<AbstractResour
/**
*
*/
public AwipsToolsResourceData(String aName, Class<? extends T> classT) {
public GenericToolsResourceData(String aName, Class<? extends T> classT) {
this();
this.name = aName;
this.classT = classT;
@ -147,7 +147,7 @@ public class AwipsToolsResourceData<T extends AbstractVizResource<AbstractResour
*/
@Override
public void update(Object updateData) {
// TODO Auto-generated method stub
// Nothing to update
}
@Override
@ -155,11 +155,11 @@ public class AwipsToolsResourceData<T extends AbstractVizResource<AbstractResour
if (this == obj) {
return true;
}
if (obj == null || obj instanceof AwipsToolsResourceData == false) {
if (obj == null || obj instanceof GenericToolsResourceData == false) {
return false;
}
AwipsToolsResourceData other = (AwipsToolsResourceData) obj;
GenericToolsResourceData<?> other = (GenericToolsResourceData<?>) obj;
if (this.name != null && other.name == null) {
return false;

16
cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/action/AbstractMapToolAction.java → cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/action/AbstractGenericToolAction.java
View file

@ -32,10 +32,10 @@ import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.viz.ui.editor.IMultiPaneEditor;
import com.raytheon.viz.ui.tools.map.AbstractMapTool;
import com.raytheon.viz.ui.tools.AbstractTool;
/**
* A class which represents an action for loading a tool which is a single
@ -47,7 +47,7 @@ import com.raytheon.viz.ui.tools.map.AbstractMapTool;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
*
* Mar 21, 2013 1638 mschenke Renamed to better represent purpose
*
* </pre>
*
@ -55,12 +55,12 @@ import com.raytheon.viz.ui.tools.map.AbstractMapTool;
* @version 1.0
* @param <T>
*/
public abstract class AbstractMapToolAction<T extends AbstractVizResource<AbstractResourceData, MapDescriptor>>
extends AbstractMapTool {
public abstract class AbstractGenericToolAction<T extends AbstractVizResource<AbstractResourceData, MapDescriptor>>
extends AbstractTool {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(AbstractMapToolAction.class);
.getHandler(AbstractGenericToolAction.class);
protected AwipsToolsResourceData<T> data;
protected GenericToolsResourceData<T> data;
/*
* (non-Javadoc)
@ -107,7 +107,7 @@ public abstract class AbstractMapToolAction<T extends AbstractVizResource<Abstra
return data.construct(loadProperties, descriptor);
}
protected abstract AwipsToolsResourceData<T> getResourceData();
protected abstract GenericToolsResourceData<T> getResourceData();
protected IDisplayPane[] getSelectedPanes() {
if (this.editor == null) {

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

@ -68,6 +68,7 @@ Export-Package: com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.legend,
com.raytheon.uf.viz.core.level,
com.raytheon.uf.viz.core.localization,
com.raytheon.uf.viz.core.log,
com.raytheon.uf.viz.core.map,
com.raytheon.uf.viz.core.notification,
com.raytheon.uf.viz.core.notification.jobs,

4
cave/com.raytheon.uf.viz.core/log4j-viz-core.xml
View file

@ -19,7 +19,7 @@
</layout>
</appender>
<appender name="CaveLogAppender" class="com.raytheon.uf.viz.alertviz.EnvConfigurableRollingFileAppender">
<appender name="CaveLogAppender" class="com.raytheon.uf.viz.core.log.EnvConfigurableRollingFileAppender">
<param name="envLogVar" value="LOGFILE_CAVE" />
<param name="maxFileSize" value="2GB"/>
<param name="maxBackupIndex" value="5"/>
@ -29,7 +29,7 @@
</layout>
</appender>
<appender name="PerformanceLogAppender" class="com.raytheon.uf.viz.alertviz.EnvConfigurableRollingFileAppender">
<appender name="PerformanceLogAppender" class="com.raytheon.uf.viz.core.log.EnvConfigurableRollingFileAppender">
<param name="envLogVar" value="LOGFILE_PERFORMANCE" />
<param name="maxFileSize" value="2GB"/>
<param name="maxBackupIndex" value="5"/>

5
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/EnvConfigurableRollingFileAppender.java → cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/log/EnvConfigurableRollingFileAppender.java
View file

@ -17,7 +17,7 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.alertviz;
package com.raytheon.uf.viz.core.log;
import org.apache.log4j.RollingFileAppender;
import org.apache.log4j.helpers.LogLog;
@ -32,7 +32,8 @@ import org.apache.log4j.helpers.LogLog;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 10, 2012 bgonzale Initial creation
* Sep 10, 2012 bgonzale Initial creation
* Mar 21, 2013 1638 mschenke Moved from alertviz to core
*
* </pre>
*

21
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java
View file

@ -29,8 +29,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.VizConstants;
import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
@ -43,6 +41,8 @@ import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.uf.viz.core.maps.display.MapRenderableDisplay;
import com.raytheon.uf.viz.core.maps.scales.IMapScaleDisplay;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IResourceGroup;
@ -66,7 +66,8 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 9, 2009 njensen Initial creation
* Feb 9, 2009 njensen Initial creation
* Mar 21, 2013 1638 mschenke Made map scales not tied to d2d
*
* </pre>
*
@ -76,9 +77,7 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml;
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement
public class D2DMapRenderableDisplay extends MapRenderableDisplay implements
ID2DRenderableDisplay {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(D2DMapRenderableDisplay.class);
ID2DRenderableDisplay, IMapScaleDisplay {
private static final CloudHeightResourceData cloudHeightData = new CloudHeightResourceData();
@ -359,4 +358,14 @@ public class D2DMapRenderableDisplay extends MapRenderableDisplay implements
return combinerListener;
}
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.viz.core.maps.scales.IMapScaleDisplay#getScaleName()
*/
@Override
public String getScaleName() {
return getScale();
}
}

4
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
View file

@ -1378,8 +1378,8 @@
<menuContribution
locationURI="menu:com.raytheon.viz.ui.scale">
<dynamic
class="com.raytheon.uf.viz.d2d.ui.MapScalePopulator"
id="com.raytheon.uf.viz.d2d.ui.mapScalePopulator">
class="com.raytheon.uf.viz.core.maps.scales.MapScalePopulator"
id="com.raytheon.uf.viz.d2d.ui.mapScales">
</dynamic>
</menuContribution>
</extension>

5
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/DisplayPropertiesDialog.java
View file

@ -49,13 +49,13 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.globals.IGlobalChangedListener;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
import com.raytheon.uf.viz.core.maps.scales.MapScales.MapScale;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IResourceGroup;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.AbstractCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.d2d.core.time.LoadMode;
import com.raytheon.uf.viz.d2d.ui.DensityPopulator;
import com.raytheon.uf.viz.d2d.ui.MagnificationPopulator;
@ -77,6 +77,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 bgonzale Initial creation
* Oct 16, 2012 1229 rferrel Made dialog non-blocking.
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
*
* </pre>
*

7
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java
View file

@ -52,6 +52,9 @@ import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
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.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IInputHandler;
@ -60,9 +63,6 @@ import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.time.TimeMatchingJob;
import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource;
import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource.LegendMode;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.d2d.core.map.MapScales.PartId;
import com.raytheon.viz.ui.BundleLoader;
import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.viz.ui.HistoryList;
@ -95,6 +95,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* now include a legend
* Nov 20, 2012 DR 15524 M.Porricelli Changed so interactive screens still editable when
* swapped to side panel
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
*
* </pre>
*

13
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/NewMapEditor.java
View file

@ -29,12 +29,10 @@ import org.eclipse.core.commands.ExecutionException;
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.maps.scales.MapScales;
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.status.StatusConstants;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.d2d.core.map.MapScales.PartId;
import com.raytheon.uf.viz.d2d.ui.Activator;
import com.raytheon.viz.ui.UiUtil;
import com.raytheon.viz.ui.editor.AbstractEditor;
@ -46,6 +44,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 11, 2007 chammack Initial Creation.
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
*
* </pre>
*
@ -53,7 +52,9 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* @version 1.0
*/
public class NewMapEditor extends AbstractHandler {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(NewMapEditor.class);
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(NewMapEditor.class);
/*
* (non-Javadoc)

5
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/ScaleHandler.java
View file

@ -40,10 +40,10 @@ import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
import com.raytheon.uf.viz.core.maps.scales.MapScales.MapScale;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.d2d.core.map.D2DMapRenderableDisplay;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.viz.ui.EditorUtil;
/**
@ -55,6 +55,7 @@ import com.raytheon.viz.ui.EditorUtil;
* ------------ ---------- ----------- --------------------------
* Jul 24, 2007 randerso Initial Creation.
* Oct 21, 2008 #1450 randerso Fixed to support multipane editors
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
*
* </pre>
*

7
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
View file

@ -30,9 +30,9 @@ import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.d2d.core.map.MapScales.PartId;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
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.d2d.ui.actions.ChangeD2DLayoutAction;
import com.raytheon.uf.viz.d2d.ui.map.SideView;
import com.raytheon.viz.ui.UiUtil;
@ -49,6 +49,7 @@ import com.raytheon.viz.ui.UiUtil;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation.
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
*
* </pre>
*

40
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2DPerspectiveManager.java
View file

@ -19,8 +19,6 @@
**/
package com.raytheon.uf.viz.d2d.ui.perspectives;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -30,8 +28,6 @@ import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
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;
@ -43,8 +39,7 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor.FramesInfo;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.core.procedures.Procedure;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.BlendableCapability;
@ -55,9 +50,6 @@ import com.raytheon.uf.viz.core.rsc.sampling.actions.SampleAction;
import com.raytheon.uf.viz.d2d.core.legend.ChangeLegendModeAction;
import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource;
import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource.LegendMode;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.d2d.core.map.MapScales.PartId;
import com.raytheon.uf.viz.d2d.ui.actions.BlinkToggleAction;
import com.raytheon.uf.viz.d2d.ui.map.SideView;
import com.raytheon.uf.viz.d2d.ui.map.actions.AllPanelSampleAction;
@ -70,7 +62,6 @@ import com.raytheon.uf.viz.d2d.ui.map.actions.SinglePanelLayoutMenuAction;
import com.raytheon.uf.viz.d2d.ui.map.actions.SkipFramesAction;
import com.raytheon.uf.viz.d2d.ui.map.actions.SkipFramesAction.SkipFrameMode;
import com.raytheon.uf.viz.d2d.ui.map.actions.SwapWithLargePaneAction;
import com.raytheon.viz.ui.actions.LoadSerializedXml;
import com.raytheon.viz.ui.actions.SelectPaneAction;
import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
import com.raytheon.viz.ui.cmenu.LoopingAction;
@ -95,6 +86,7 @@ import com.raytheon.viz.ui.statusline.FrameCountDisplay;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 04/27/2010 mschenke Initial Creation.
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
* </pre>
*
* @author mschenke
@ -121,34 +113,8 @@ public class D2DPerspectiveManager extends AbstractCAVEPerspectiveManager {
@Override
public void open() {
contextActivator = new D2DContextActivator(page);
Procedure procedure = new Procedure();
List<Bundle> bundles = new ArrayList<Bundle>();
for (MapScale scale : MapScales.getInstance().getScales()) {
String editorId = null;
for (PartId partId : scale.getPartIds()) {
if (partId.isView() == false) {
editorId = partId.getId();
break;
}
}
if (editorId != null) {
File file = scale.getFile();
try {
Bundle b = (Bundle) SerializationUtil
.jaxbUnmarshalFromXmlFile(file);
b.setEditor(editorId);
bundles.add(b);
} catch (SerializationException e) {
statusHandler.handle(
Priority.PROBLEM,
"Error deserializing bundle: "
+ file.getAbsolutePath(), e);
}
}
}
procedure.setBundles(bundles.toArray(new Bundle[bundles.size()]));
try {
LoadSerializedXml.loadProcedureToScreen(procedure, true);
MapScales.loadScales(perspectiveWindow);
} catch (VizException e) {
statusHandler.handle(Priority.PROBLEM,
"Error loading bundles to screen", e);

1
cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF
View file

@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui,
org.geotools;bundle-version="2.6.4",
com.raytheon.uf.common.time,
com.raytheon.uf.common.datadelivery.registry;bundle-version="1.0.0",
com.raytheon.uf.viz.d2d.core;bundle-version="1.12.1174",
com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.0.0",
com.raytheon.uf.common.geospatial;bundle-version="1.11.9",
com.raytheon.uf.common.datadelivery.request;bundle-version="1.0.0",

5
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
View file

@ -55,9 +55,9 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.maps.scales.MapScales;
import com.raytheon.uf.viz.core.maps.scales.MapScales.MapScale;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.datadelivery.common.xml.AreaXML;
import com.raytheon.uf.viz.datadelivery.subscription.subset.IDataSize;
import com.raytheon.uf.viz.datadelivery.subscription.subset.ISubset;
@ -89,6 +89,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* to determine if starting in manual entry mode.
* Dec 10, 2012 1259 bsteffen Switch Data Delivery from LatLon to referenced envelopes.
* Dec 11, 2012 1264 mpduff Fix validaiton of lat/lon text fields.
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
*
* </pre>
*

1
cave/com.raytheon.uf.viz.gisdatastore/META-INF/MANIFEST.MF
View file

@ -21,4 +21,3 @@ Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.gisdatastore,
com.raytheon.uf.viz.gisdatastore.rsc,
com.raytheon.uf.viz.gisdatastore.ui
Import-Package: com.raytheon.uf.common.dataplugin.gfe.type

5
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/ui/AttributeViewer.java
View file

@ -59,7 +59,7 @@ import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
@ -78,7 +78,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 30, 2012 #1326 randerso Initial creation
* Oct 30, 2012 #1326 randerso Initial creation
* Mar 21, 2013 1638 mschenke Created Pair class internal so no dependencies on GFE
*
* </pre>
*

5
cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/ui/SortOrderDialog.java
View file

@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Shell;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
/**
@ -47,7 +47,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 29, 2012 randerso Initial creation
* Nov 29, 2012 randerso Initial creation
* Mar 21, 2013 1638 mschenke Created Pair class internal so no dependencies on GFE
*
* </pre>
*

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

@ -15,8 +15,7 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.core;bundle-version="1.12.1174",
com.raytheon.uf.common.awipstools;bundle-version="1.12.1174",
com.raytheon.viz.ui;bundle-version="1.12.1174",
com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0",
com.raytheon.viz.ui.tools.map;bundle-version="1.12.1174"
com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.points,

10
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointsToolAction.java
View file

@ -19,8 +19,8 @@
**/
package com.raytheon.uf.viz.points.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.uf.viz.points.ui.layer.PointsToolLayer;
/**
@ -41,7 +41,7 @@ import com.raytheon.uf.viz.points.ui.layer.PointsToolLayer;
* @author ebabin
* @version 1
*/
public class PointsToolAction extends AbstractMapToolAction<PointsToolLayer> {
public class PointsToolAction extends AbstractGenericToolAction<PointsToolLayer> {
/*
* (non-Javadoc)
@ -50,8 +50,8 @@ public class PointsToolAction extends AbstractMapToolAction<PointsToolLayer> {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<PointsToolLayer> getResourceData() {
return new AwipsToolsResourceData<PointsToolLayer>(
protected GenericToolsResourceData<PointsToolLayer> getResourceData() {
return new GenericToolsResourceData<PointsToolLayer>(
PointsToolLayer.DEFAULT_NAME, PointsToolLayer.class);
}

4
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
View file

@ -45,7 +45,7 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AbstractMovableToolLayer;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.points.IPointChangedListener;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.uf.viz.points.data.IPointNode;
@ -112,7 +112,7 @@ public class PointsToolLayer extends AbstractMovableToolLayer<Point> implements
Map<Integer, IFont> fonts;
public PointsToolLayer(
AwipsToolsResourceData<PointsToolLayer> resourceData,
GenericToolsResourceData<PointsToolLayer> resourceData,
LoadProperties loadProperties) {
super(resourceData, loadProperties);
this.dataManager = PointsDataManager.getInstance();

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

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

46
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/AwipsToolsResourceData.java Normal file
View file

@ -0,0 +1,46 @@
/*****************************************************************************************
* COPYRIGHT (c), 2007, RAYTHEON COMPANY
* ALL RIGHTS RESERVED, An Unpublished Work
*
* RAYTHEON PROPRIETARY
* If the end user is not the U.S. Government or any agency thereof, use
* or disclosure of data contained in this source code file is subject to
* the proprietary restrictions set forth in the Master Rights File.
*
* U.S. GOVERNMENT PURPOSE RIGHTS NOTICE
* If the end user is the U.S. Government or any agency thereof, this source
* code is provided to the U.S. Government with Government Purpose Rights.
* Use or disclosure of data contained in this source code file is subject to
* the "Government Purpose Rights" restriction in the Master Rights File.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* Use or disclosure of data contained in this source code file is subject to
* the export restrictions set forth in the Master Rights File.
******************************************************************************************/
package com.raytheon.viz.awipstools;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
/**
* {@link GenericToolsResourceData} was renamed. This class is here to maintain
* serialization compatibility
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 21, 2013 1638 mschenke Created for serialization purposes
*
* </pre>
*
* @author mschenke
* @version 1.0
*/
public class AwipsToolsResourceData<T extends AbstractVizResource<?, ?>>
extends GenericToolsResourceData<T> {
}

19
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/DistanceTool.java
View file

@ -37,10 +37,10 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
import com.raytheon.uf.viz.core.IGraphicsTarget.TextStyle;
import com.raytheon.uf.viz.core.IGraphicsTarget.VerticalAlignment;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.drawables.IFont;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.exception.VizException;
@ -49,9 +49,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.status.StatusConstants;
import com.raytheon.viz.awipstools.Activator;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
/**
* Tool to display the distance scale on the bottom left of the screen<br>
@ -73,7 +71,8 @@ import com.raytheon.viz.awipstools.Activator;
*/
public class DistanceTool extends
AbstractVizResource<AbstractResourceData, MapDescriptor> {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(DistanceTool.class);
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(DistanceTool.class);
private static final double[] scales = new double[] { 0.1, 0.2, 0.4, 1, 2,
4, 10, 20, 40, 100, 200, 400, 1000, 2000, 4000, 10000 };
@ -85,7 +84,7 @@ public class DistanceTool extends
private GeodeticCalculator gc;
public DistanceTool(AwipsToolsResourceData<DistanceTool> data,
public DistanceTool(GenericToolsResourceData<DistanceTool> data,
LoadProperties props) {
super(data, props);
}
@ -188,10 +187,10 @@ public class DistanceTool extends
target.drawLine(x0 + length, y0 - yOff, 0.0, x0 + length, y0 + yOff,
0.0, color, 1);
target.drawString(font, df.format(scales[selectedIndex])
+ displayUnit.toString(), x0 + length, y0 - yOff, 0.0,
TextStyle.NORMAL, color, HorizontalAlignment.CENTER,
VerticalAlignment.BOTTOM, null);
target.drawString(font,
df.format(scales[selectedIndex]) + displayUnit.toString(), x0
+ length, y0 - yOff, 0.0, TextStyle.NORMAL, color,
HorizontalAlignment.CENTER, VerticalAlignment.BOTTOM, null);
target.drawLine(x0, y0, 0.0, x0 + length, y0, 0.0, color, 1);

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
View file

@ -42,7 +42,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState.DisplayType;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState.Mode;
import com.raytheon.viz.ui.cmenu.IContextMenuContributor;
@ -95,7 +95,7 @@ public abstract class AbstractStormTrackResource extends
private int lastFrameCount = -1;
public AbstractStormTrackResource(
AwipsToolsResourceData<? extends AbstractStormTrackResource> resourceData,
GenericToolsResourceData<? extends AbstractStormTrackResource> resourceData,
LoadProperties loadProperties, MapDescriptor descriptor) {
super(resourceData, loadProperties);
setDescriptor(descriptor);

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/AzimuthToolAction.java
View file

@ -19,8 +19,8 @@
**/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.AzimuthToolLayer;
/**
@ -44,7 +44,7 @@ import com.raytheon.viz.awipstools.ui.layer.AzimuthToolLayer;
* @author ebabin
* @version 1
*/
public class AzimuthToolAction extends AbstractMapToolAction<AzimuthToolLayer> {
public class AzimuthToolAction extends AbstractGenericToolAction<AzimuthToolLayer> {
/*
* (non-Javadoc)
@ -53,8 +53,8 @@ public class AzimuthToolAction extends AbstractMapToolAction<AzimuthToolLayer> {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<AzimuthToolLayer> getResourceData() {
return new AwipsToolsResourceData<AzimuthToolLayer>(
protected GenericToolsResourceData<AzimuthToolLayer> getResourceData() {
return new GenericToolsResourceData<AzimuthToolLayer>(
AzimuthToolLayer.AZIMUTH_LOCATION, AzimuthToolLayer.class);
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/BaselinesToolAction.java
View file

@ -19,8 +19,8 @@
**/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.InteractiveBaselinesLayer;
/**
@ -44,7 +44,7 @@ import com.raytheon.viz.awipstools.ui.layer.InteractiveBaselinesLayer;
* @version 1
*/
public class BaselinesToolAction extends
AbstractMapToolAction<InteractiveBaselinesLayer> {
AbstractGenericToolAction<InteractiveBaselinesLayer> {
/*
* (non-Javadoc)
@ -53,8 +53,8 @@ public class BaselinesToolAction extends
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<InteractiveBaselinesLayer> getResourceData() {
return new AwipsToolsResourceData<InteractiveBaselinesLayer>(
protected GenericToolsResourceData<InteractiveBaselinesLayer> getResourceData() {
return new GenericToolsResourceData<InteractiveBaselinesLayer>(
"Interactive Baselines", InteractiveBaselinesLayer.class);
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/DistanceBearingToolAction.java
View file

@ -19,8 +19,8 @@
**/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.DistanceBearingToolLayer;
/**
@ -42,7 +42,7 @@ import com.raytheon.viz.awipstools.ui.layer.DistanceBearingToolLayer;
* @version 1
*/
public class DistanceBearingToolAction extends
AbstractMapToolAction<DistanceBearingToolLayer> {
AbstractGenericToolAction<DistanceBearingToolLayer> {
/*
* (non-Javadoc)
@ -51,8 +51,8 @@ public class DistanceBearingToolAction extends
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<DistanceBearingToolLayer> getResourceData() {
return new AwipsToolsResourceData<DistanceBearingToolLayer>(
protected GenericToolsResourceData<DistanceBearingToolLayer> getResourceData() {
return new GenericToolsResourceData<DistanceBearingToolLayer>(
DistanceBearingToolLayer.DEFAULT_NAME,
DistanceBearingToolLayer.class);
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/DistanceSpeedAction.java
View file

@ -24,8 +24,8 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.DistanceSpeedLayer;
/**
@ -46,7 +46,7 @@ import com.raytheon.viz.awipstools.ui.layer.DistanceSpeedLayer;
*/
public class DistanceSpeedAction extends
AbstractMapToolAction<DistanceSpeedLayer> {
AbstractGenericToolAction<DistanceSpeedLayer> {
/*
* (non-Javadoc)
@ -55,8 +55,8 @@ public class DistanceSpeedAction extends
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<DistanceSpeedLayer> getResourceData() {
return new AwipsToolsResourceData<DistanceSpeedLayer>(
protected GenericToolsResourceData<DistanceSpeedLayer> getResourceData() {
return new GenericToolsResourceData<DistanceSpeedLayer>(
DistanceSpeedLayer.NAME, DistanceSpeedLayer.class);
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/DistanceToolAction.java
View file

@ -20,8 +20,8 @@
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.common.DistanceTool;
/**
@ -40,7 +40,7 @@ import com.raytheon.viz.awipstools.common.DistanceTool;
* @author bphillip
*
*/
public class DistanceToolAction extends AbstractMapToolAction<DistanceTool> {
public class DistanceToolAction extends AbstractGenericToolAction<DistanceTool> {
/*
* (non-Javadoc)
@ -49,8 +49,8 @@ public class DistanceToolAction extends AbstractMapToolAction<DistanceTool> {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<DistanceTool> getResourceData() {
return new AwipsToolsResourceData<DistanceTool>("Distance Scale",
protected GenericToolsResourceData<DistanceTool> getResourceData() {
return new GenericToolsResourceData<DistanceTool>("Distance Scale",
DistanceTool.class);
}
}

6
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/EstimatedActualVelocityAction.java
View file

@ -19,7 +19,7 @@
**/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ui.layer.EstimatedActualVelocityLayer;
import com.raytheon.viz.awipstools.ui.layer.ShearLayer;
@ -48,8 +48,8 @@ public class EstimatedActualVelocityAction extends ShearAction {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<ShearLayer> getResourceData() {
return new AwipsToolsResourceData<ShearLayer>(
protected GenericToolsResourceData<ShearLayer> getResourceData() {
return new GenericToolsResourceData<ShearLayer>(
EstimatedActualVelocityLayer.EST_ACT_VEL_LOCATION,
EstimatedActualVelocityLayer.class);
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/FeatureFollowingZoomAction.java
View file

@ -19,8 +19,8 @@
******************************************************************************************/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.FeatureFollowingZoomLayer;
/**
@ -40,7 +40,7 @@ import com.raytheon.viz.awipstools.ui.layer.FeatureFollowingZoomLayer;
*/
public class FeatureFollowingZoomAction extends
AbstractMapToolAction<FeatureFollowingZoomLayer> {
AbstractGenericToolAction<FeatureFollowingZoomLayer> {
/*
* (non-Javadoc)
@ -49,8 +49,8 @@ public class FeatureFollowingZoomAction extends
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<FeatureFollowingZoomLayer> getResourceData() {
return new AwipsToolsResourceData<FeatureFollowingZoomLayer>(
protected GenericToolsResourceData<FeatureFollowingZoomLayer> getResourceData() {
return new GenericToolsResourceData<FeatureFollowingZoomLayer>(
"Feature Following Zoom", FeatureFollowingZoomLayer.class);
}
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/HomeToolAction.java
View file

@ -34,8 +34,8 @@ import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.HomeToolLayer;
import com.raytheon.viz.ui.input.EditableManager;
@ -57,7 +57,7 @@ import com.raytheon.viz.ui.input.EditableManager;
* @author ebabin
* @version 1
*/
public class HomeToolAction extends AbstractMapToolAction<HomeToolLayer> {
public class HomeToolAction extends AbstractGenericToolAction<HomeToolLayer> {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(HomeToolAction.class);
@ -125,8 +125,8 @@ public class HomeToolAction extends AbstractMapToolAction<HomeToolLayer> {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<HomeToolLayer> getResourceData() {
return new AwipsToolsResourceData<HomeToolLayer>(
protected GenericToolsResourceData<HomeToolLayer> getResourceData() {
return new GenericToolsResourceData<HomeToolLayer>(
HomeToolLayer.DEFAULT_NAME, HomeToolLayer.class);
}

10
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/RangeRingsAction.java
View file

@ -19,8 +19,8 @@
**/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.RangeRingsLayer;
/**
@ -38,7 +38,7 @@ import com.raytheon.viz.awipstools.ui.layer.RangeRingsLayer;
* @version 1.0
*/
public class RangeRingsAction extends AbstractMapToolAction<RangeRingsLayer> {
public class RangeRingsAction extends AbstractGenericToolAction<RangeRingsLayer> {
/*
* (non-Javadoc)
@ -47,8 +47,8 @@ public class RangeRingsAction extends AbstractMapToolAction<RangeRingsLayer> {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<RangeRingsLayer> getResourceData() {
return new AwipsToolsResourceData<RangeRingsLayer>(
protected GenericToolsResourceData<RangeRingsLayer> getResourceData() {
return new GenericToolsResourceData<RangeRingsLayer>(
RangeRingsLayer.DEFAULT_NAME, RangeRingsLayer.class);
}

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/ShearAction.java
View file

@ -26,7 +26,7 @@ import org.eclipse.ui.PlatformUI;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.ShearLayer;
import com.raytheon.viz.ui.input.InputAdapter;
import com.vividsolutions.jts.geom.Coordinate;
@ -47,7 +47,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* @version 1.0
*/
public abstract class ShearAction extends AbstractMapToolAction<ShearLayer> {
public abstract class ShearAction extends AbstractGenericToolAction<ShearLayer> {
protected ShearLayer getResource(LoadProperties loadProperties,
IDescriptor descriptor) throws VizException {

12
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/TimeOfArrivalAction.java
View file

@ -23,8 +23,8 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource.ResourceStatus;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
import com.raytheon.viz.awipstools.ui.layer.TimeOfArrivalLayer;
/**
@ -43,11 +43,11 @@ import com.raytheon.viz.awipstools.ui.layer.TimeOfArrivalLayer;
*/
public class TimeOfArrivalAction extends
AbstractMapToolAction<TimeOfArrivalLayer> {
AbstractGenericToolAction<TimeOfArrivalLayer> {
private TimeOfArrivalLayer layer = null;
private AwipsToolsResourceData<TimeOfArrivalLayer> data = null;
private GenericToolsResourceData<TimeOfArrivalLayer> data = null;
/*
* (non-Javadoc)
@ -56,9 +56,9 @@ public class TimeOfArrivalAction extends
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<TimeOfArrivalLayer> getResourceData() {
protected GenericToolsResourceData<TimeOfArrivalLayer> getResourceData() {
if (data == null) {
data = new AwipsToolsResourceData<TimeOfArrivalLayer>(
data = new GenericToolsResourceData<TimeOfArrivalLayer>(
TimeOfArrivalLayer.NAME, TimeOfArrivalLayer.class);
}
return data;

6
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/VRShearAction.java
View file

@ -19,7 +19,7 @@
**/
package com.raytheon.viz.awipstools.ui.action;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ui.layer.ShearLayer;
import com.raytheon.viz.awipstools.ui.layer.VRShearLayer;
@ -48,8 +48,8 @@ public class VRShearAction extends ShearAction {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<ShearLayer> getResourceData() {
return new AwipsToolsResourceData<ShearLayer>(
protected GenericToolsResourceData<ShearLayer> getResourceData() {
return new GenericToolsResourceData<ShearLayer>(
VRShearLayer.VRSHEAR_LOCATION, VRShearLayer.class);
}

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/LAPSToolsDlg.java
View file

@ -49,7 +49,7 @@ import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.status.StatusConstants;
import com.raytheon.viz.awipstools.Activator;
import com.raytheon.viz.awipstools.ui.action.LapsToolsData;
@ -970,7 +970,7 @@ public class LAPSToolsDlg extends CaveSWTDialog {
defaultBtn.setEnabled(false);
localizeLapsBtn.setEnabled(false);
readSpinners();
AwipsToolsResourceData<LapsToolLayer> rd = new AwipsToolsResourceData<LapsToolLayer>(
GenericToolsResourceData<LapsToolLayer> rd = new GenericToolsResourceData<LapsToolLayer>(
LapsToolLayer.DEFAULT_NAME, LapsToolLayer.class);
IDisplayPaneContainer container = EditorUtil.getActiveVizContainer();

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/AzimuthToolLayer.java
View file

@ -57,7 +57,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.rsc.tools.AbstractMovableToolLayer;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackDisplay;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackUIManager;
@ -188,7 +188,7 @@ public class AzimuthToolLayer extends
};
public AzimuthToolLayer(AwipsToolsResourceData<AzimuthToolLayer> data,
public AzimuthToolLayer(GenericToolsResourceData<AzimuthToolLayer> data,
LoadProperties props, MapDescriptor descriptor) {
super(data, props);
setDescriptor(descriptor);

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/BaselinesToolLayer.java
View file

@ -20,7 +20,7 @@
package com.raytheon.viz.awipstools.ui.layer;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
/**
* Strictly here so bundles don't break
@ -56,7 +56,7 @@ public class BaselinesToolLayer extends InteractiveBaselinesLayer {
* @param loadProperties
*/
public BaselinesToolLayer(
AwipsToolsResourceData<InteractiveBaselinesLayer> resourceData,
GenericToolsResourceData<InteractiveBaselinesLayer> resourceData,
LoadProperties loadProperties) {
super(resourceData, loadProperties);
}

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/DistanceBearingToolLayer.java
View file

@ -43,7 +43,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.rsc.tools.AbstractMovableToolLayer;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ToolsDataManager;
import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
import com.raytheon.viz.ui.cmenu.IContextMenuContributor;
@ -102,7 +102,7 @@ public class DistanceBearingToolLayer extends
private Coordinate selectedVertex = null;
public DistanceBearingToolLayer(
AwipsToolsResourceData<DistanceBearingToolLayer> resourceData,
GenericToolsResourceData<DistanceBearingToolLayer> resourceData,
LoadProperties loadProperties) {
super(resourceData, loadProperties, true);
getCapabilities().addCapability(new OutlineCapability());

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/DistanceSpeedLayer.java
View file

@ -29,7 +29,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.common.stormtrack.AbstractStormTrackResource;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState.LabelMode;
@ -71,7 +71,7 @@ public class DistanceSpeedLayer extends AbstractStormTrackResource {
private DistanceSpeedDialog dialog;
public DistanceSpeedLayer(
AwipsToolsResourceData<DistanceSpeedLayer> resourceData,
GenericToolsResourceData<DistanceSpeedLayer> resourceData,
LoadProperties loadProperties, MapDescriptor descriptor) {
super(resourceData, loadProperties, descriptor);
// add magnification capability

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/EstimatedActualVelocityLayer.java
View file

@ -42,7 +42,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.capabilities.EAVCapability;
import com.raytheon.viz.awipstools.common.EstimatedActualVelocity;
import com.raytheon.viz.core.rsc.BestResResource;
@ -81,7 +81,7 @@ public class EstimatedActualVelocityLayer extends VRShearLayer {
* @param descriptor
*/
public EstimatedActualVelocityLayer(
AwipsToolsResourceData<VRShearLayer> data, LoadProperties props,
GenericToolsResourceData<VRShearLayer> data, LoadProperties props,
MapDescriptor descriptor) {
super(data, props, descriptor);
// add magnification capability

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/FeatureFollowingZoomLayer.java
View file

@ -33,7 +33,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ToolsDataManager;
import com.raytheon.viz.awipstools.common.StormTrackData;
import com.vividsolutions.jts.geom.Coordinate;
@ -64,7 +64,7 @@ public class FeatureFollowingZoomLayer extends
private int lastFrame = -1;
public FeatureFollowingZoomLayer(
AwipsToolsResourceData<DistanceSpeedLayer> resourceData,
GenericToolsResourceData<DistanceSpeedLayer> resourceData,
LoadProperties loadProperties, MapDescriptor descriptor) {
super(resourceData, loadProperties);
// add magnification capability

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/HomeToolLayer.java
View file

@ -47,7 +47,7 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AbstractMovableToolLayer;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.points.IPointChangedListener;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
@ -92,7 +92,7 @@ public class HomeToolLayer extends AbstractMovableToolLayer<Coordinate>
private GeodeticCalculator gc;
public HomeToolLayer(AwipsToolsResourceData<HomeToolLayer> resourceData,
public HomeToolLayer(GenericToolsResourceData<HomeToolLayer> resourceData,
LoadProperties loadProperties) {
super(resourceData, loadProperties, false);
// add magnification capability

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/InteractiveBaselinesLayer.java
View file

@ -45,7 +45,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.IToolChangedListener;
import com.raytheon.viz.awipstools.ToolsDataManager;
import com.raytheon.viz.ui.cmenu.IContextMenuContributor;
@ -109,7 +109,7 @@ public class InteractiveBaselinesLayer extends
* @param loadProperties
*/
public InteractiveBaselinesLayer(
AwipsToolsResourceData<InteractiveBaselinesLayer> resourceData,
GenericToolsResourceData<InteractiveBaselinesLayer> resourceData,
LoadProperties loadProperties) {
super(resourceData, loadProperties);
getCapability(EditableCapability.class).setEditable(true);

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/LapsToolLayer.java
View file

@ -37,7 +37,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.tools.AbstractMovableToolLayer;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ui.action.LapsToolsData;
import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
import com.raytheon.viz.ui.cmenu.IContextMenuContributor;
@ -75,7 +75,7 @@ public class LapsToolLayer extends AbstractMovableToolLayer<Coordinate>
private IWireframeShape gridShape;
public LapsToolLayer(AwipsToolsResourceData<LapsToolLayer> resourceData,
public LapsToolLayer(GenericToolsResourceData<LapsToolLayer> resourceData,
LoadProperties loadProperties) {
super(resourceData, loadProperties, false);
selectLocationAction = new AbstractRightClickAction() {

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/RangeRingsLayer.java
View file

@ -54,7 +54,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.rsc.tools.AbstractMovableToolLayer;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ToolsDataManager;
import com.raytheon.viz.awipstools.common.RangeRing;
import com.raytheon.viz.awipstools.common.RangeRing.RangeRingType;
@ -111,7 +111,7 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
private static RangeRingDialog ringDialog = null;
public RangeRingsLayer(
AwipsToolsResourceData<RangeRingsLayer> resourceData,
GenericToolsResourceData<RangeRingsLayer> resourceData,
LoadProperties loadProperties) throws VizException {
super(resourceData, loadProperties);
getCapabilities().addCapability(new OutlineCapability());

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/ShearLayer.java
View file

@ -47,7 +47,7 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.viz.ui.input.EditableManager;
import com.vividsolutions.jts.geom.Coordinate;
@ -89,7 +89,7 @@ public class ShearLayer extends
private float endCircleRadius;
public ShearLayer(AwipsToolsResourceData<VRShearLayer> data,
public ShearLayer(GenericToolsResourceData<VRShearLayer> data,
LoadProperties props, MapDescriptor descriptor) {
super(data, props);
setDescriptor(descriptor);

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/TimeOfArrivalLayer.java
View file

@ -59,7 +59,7 @@ import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ProgressiveDisclosureProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.common.stormtrack.AbstractStormTrackResource;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackDisplay;
import com.raytheon.viz.awipstools.common.stormtrack.StormTrackState;
@ -247,7 +247,7 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
};
public TimeOfArrivalLayer(
AwipsToolsResourceData<TimeOfArrivalLayer> resourceData,
GenericToolsResourceData<TimeOfArrivalLayer> resourceData,
LoadProperties loadProperties, MapDescriptor descriptor) {
super(resourceData, loadProperties, descriptor);
// add magnification capability

4
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
View file

@ -38,7 +38,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.LineString;
@ -76,7 +76,7 @@ public class VRShearLayer extends ShearLayer {
* @param props
* @param descriptor
*/
public VRShearLayer(AwipsToolsResourceData<VRShearLayer> data,
public VRShearLayer(GenericToolsResourceData<VRShearLayer> data,
LoadProperties props, MapDescriptor descriptor) {
super(data, props, descriptor);
// add magnification capability

2
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
View file

@ -11,11 +11,11 @@ Require-Bundle: org.eclipse.ui,
javax.media.opengl,
org.geotools,
javax.vecmath,
com.raytheon.edex.common,
com.raytheon.uf.common.colormap;bundle-version="1.0.0",
com.raytheon.uf.viz.core,
com.raytheon.uf.common.util;bundle-version="1.0.0",
com.raytheon.uf.viz.application;bundle-version="1.0.0",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
javax.measure;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.core.gl,

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ShuffleZoneGroupsDialog.java
View file

@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
import com.raytheon.viz.ui.widgets.ToggleSelectList;

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
View file

@ -30,9 +30,9 @@ import java.util.TimeZone;
import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.viz.core.RGBColors;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.drawables.IDescriptor.FramesInfo;

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFELegendResource.java
View file

@ -35,12 +35,12 @@ import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.viz.core.IDisplayPaneContainer;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.RGBColors;

74
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/VizWorkbenchAdvisor.java
View file

@ -23,6 +23,9 @@ package com.raytheon.viz.ui.personalities.awips;
//import gov.noaa.nws.ost.awips.viz.CaveCommandExecutionListener;
//import gov.noaa.nws.ost.awips.viz.CaveJobChangeListener;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.commands.IExecutionListener;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
@ -47,6 +50,7 @@ import com.raytheon.uf.viz.core.Activator;
import com.raytheon.uf.viz.core.preferences.PreferenceConstants;
import com.raytheon.uf.viz.ui.menus.DiscoverMenuContributions;
import com.raytheon.viz.ui.VizWorkbenchManager;
import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
/**
* Workbench Advisor
@ -178,64 +182,16 @@ public class VizWorkbenchAdvisor extends WorkbenchAdvisor {
private void removeExtraPerspectives() {
IPerspectiveRegistry reg = PlatformUI.getWorkbench()
.getPerspectiveRegistry();
IPerspectiveDescriptor ipydev = reg
.findPerspectiveWithId("org.python.pydev.ui.PythonPerspective");
if (ipydev != null) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor pydev = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) ipydev;
IExtension ext = pydev.getConfigElement().getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { ipydev });
}
IPerspectiveDescriptor isync = reg
.findPerspectiveWithId("org.eclipse.team.ui.TeamSynchronizingPerspective");
if (isync != null) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor sync = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) isync;
IExtension ext = sync.getConfigElement().getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { isync });
}
IPerspectiveDescriptor idebug = reg
.findPerspectiveWithId("org.eclipse.debug.ui.DebugPerspective");
if (idebug != null) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor debug = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) idebug;
IExtension ext = debug.getConfigElement().getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { idebug });
}
IPerspectiveDescriptor ijava = reg
.findPerspectiveWithId("org.eclipse.jdt.ui.JavaPerspective");
if (ijava != null) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor java = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) ijava;
IExtension ext = java.getConfigElement().getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { ijava });
}
IPerspectiveDescriptor ijavaBrowse = reg
.findPerspectiveWithId("org.eclipse.jdt.ui.JavaBrowsingPerspective");
if (ijavaBrowse != null) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor java = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) ijavaBrowse;
IExtension ext = java.getConfigElement().getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { ijavaBrowse });
}
IPerspectiveDescriptor ijavaHier = reg
.findPerspectiveWithId("org.eclipse.jdt.ui.JavaHierarchyPerspective");
if (ijavaHier != null) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor java = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) ijavaHier;
IExtension ext = java.getConfigElement().getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { ijavaHier });
Set<String> managed = new HashSet<String>(
VizPerspectiveListener.getManagedPerspectives());
for (IPerspectiveDescriptor perspective : reg.getPerspectives()) {
if (managed.contains(perspective.getId()) == false) {
org.eclipse.ui.internal.registry.PerspectiveDescriptor sync = (org.eclipse.ui.internal.registry.PerspectiveDescriptor) perspective;
IExtension ext = sync.getConfigElement()
.getDeclaringExtension();
((org.eclipse.ui.internal.registry.PerspectiveRegistry) reg)
.removeExtension(ext, new Object[] { perspective });
}
}
}
@ -337,8 +293,6 @@ public class VizWorkbenchAdvisor extends WorkbenchAdvisor {
public void postStartup() {
super.postStartup();
// createDynamicMenus();
Boolean log = Activator.getDefault().getPreferenceStore()
.getBoolean(PreferenceConstants.P_LOG_PERF);

3
cave/com.raytheon.viz.ui.tools.map/build.properties
View file

@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
.

2
cave/com.raytheon.viz.ui.tools.map/src/com/raytheon/viz/ui/tools/map/AbstractMapTool.java
View file

@ -64,7 +64,7 @@ public abstract class AbstractMapTool extends AbstractTool {
*/
protected AbstractVizResource<?, ?> getResource(
Class<? extends AbstractVizResource<?, ?>> resourceClass,
Class<? extends AbstractMapTool> resourceAction)
Class<? extends AbstractTool> resourceAction)
throws ExecutionException {
AbstractVizResource<?, ?> resourceLayer = containsResource(resourceClass);

18
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
View file

@ -62,7 +62,8 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 6, 2010 mschenke Initial creation
* Apr 6, 2010 mschenke Initial creation
* Mar 21, 2013 1638 mschenke Added method to load procedure to window
*
* </pre>
*
@ -150,10 +151,16 @@ public class LoadSerializedXml extends AbstractHandler {
throw new VizException("Opening perspective failed", e);
}
} else {
page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getActivePage();
page = windowToLoadTo.getActivePage();
}
loadProcedureToScreen(procedure, page.getWorkbenchWindow());
}
public static void loadProcedureToScreen(Procedure procedure,
IWorkbenchWindow window) throws VizException {
IWorkbenchPage page = window.getActivePage();
// close existing containers
for (IEditorReference ref : page.getEditorReferences()) {
IEditorPart part = ref.getEditor(false);
@ -168,8 +175,6 @@ public class LoadSerializedXml extends AbstractHandler {
editorArea.restoreState(procedure.getLayout());
}
windowToLoadTo = page.getWorkbenchWindow();
Bundle[] bundles = procedure.getBundles();
for (Bundle b : bundles) {
// If an editor is specified, or no view part is specified,
@ -195,8 +200,7 @@ public class LoadSerializedXml extends AbstractHandler {
BundleLoader.loadTo(openedEditor, b);
} else {
// There is a view part specified
IViewPart part = UiUtil.findView(windowToLoadTo, b.getView(),
false);
IViewPart part = UiUtil.findView(window, b.getView(), false);
if (part != null && part instanceof IDisplayPaneContainer) {
BundleLoader.loadTo((IDisplayPaneContainer) part, b);

40
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
View file

@ -20,9 +20,10 @@
package com.raytheon.viz.ui.perspectives;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -52,7 +53,8 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 21, 2010 mschenke Initial creation
* Apr 21, 2010 mschenke Initial creation
* Mar 21, 2013 1638 mschenke Added method to get managed perspectives
*
* </pre>
*
@ -64,8 +66,16 @@ public class VizPerspectiveListener implements IPerspectiveListener4 {
private static final String PERSPECTIVE_MANAGER_EXTENSION = "com.raytheon.viz.ui.perspectiveManager";
private static final String PERSPECTIVE_ID = "perspectiveId";
private static final String NAME_ID = "name";
private static final String CLASS_ID = "class";
private static final List<IConfigurationElement> configurationElements = new ArrayList<IConfigurationElement>();
private static final Set<String> managedPerspectives = new LinkedHashSet<String>();
static {
IExtensionRegistry registry = Platform.getExtensionRegistry();
IExtensionPoint point = registry
@ -74,8 +84,12 @@ public class VizPerspectiveListener implements IPerspectiveListener4 {
IExtension[] extensions = point.getExtensions();
for (IExtension ext : extensions) {
configurationElements.addAll(Arrays.asList(ext
.getConfigurationElements()));
for (IConfigurationElement element : ext
.getConfigurationElements()) {
configurationElements.add(element);
managedPerspectives.add(element
.getAttribute(PERSPECTIVE_ID));
}
}
}
}
@ -98,16 +112,16 @@ public class VizPerspectiveListener implements IPerspectiveListener4 {
Map<String, AbstractVizPerspectiveManager> referenceMap = new HashMap<String, AbstractVizPerspectiveManager>();
for (IConfigurationElement cfg : configurationElements) {
try {
String name = cfg.getAttribute("name");
String clazz = cfg.getAttribute("class");
String perspective = cfg.getAttribute("perspectiveId");
String name = cfg.getAttribute(NAME_ID);
String clazz = cfg.getAttribute(CLASS_ID);
String perspective = cfg.getAttribute(PERSPECTIVE_ID);
String refKey = clazz + ":" + name;
if (referenceMap.containsKey(refKey)) {
managerMap.put(perspective, referenceMap.get(refKey));
} else {
AbstractVizPerspectiveManager mgr = (AbstractVizPerspectiveManager) cfg
.createExecutableExtension("class");
.createExecutableExtension(CLASS_ID);
mgr.setPerspectiveWindow(window);
mgr.setStatusLineManager(statusLine);
mgr.setPerspectiveId(perspective);
@ -138,6 +152,16 @@ public class VizPerspectiveListener implements IPerspectiveListener4 {
return null;
}
/**
* Returns all perspectives that are managed by an
* {@link AbstractVizPerspectiveManager}
*
* @return
*/
public static Collection<String> getManagedPerspectives() {
return new ArrayList<String>(managedPerspectives);
}
/**
* Get the perspective listener for the active window
*

10
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
View file

@ -24,8 +24,8 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.action.AbstractGenericToolAction;
/**
* Simple action for loading the warngen layer
@ -45,7 +45,7 @@ import com.raytheon.uf.viz.core.rsc.tools.action.AbstractMapToolAction;
* @version 1.0
*/
public class WarngenAction extends AbstractMapToolAction<WarngenLayer> {
public class WarngenAction extends AbstractGenericToolAction<WarngenLayer> {
/*
* (non-Javadoc)
*
@ -53,8 +53,8 @@ public class WarngenAction extends AbstractMapToolAction<WarngenLayer> {
* com.raytheon.viz.awipstools.ui.action.MapToolAction#getResourceData()
*/
@Override
protected AwipsToolsResourceData<WarngenLayer> getResourceData() {
return new AwipsToolsResourceData<WarngenLayer>(
protected GenericToolsResourceData<WarngenLayer> getResourceData() {
return new GenericToolsResourceData<WarngenLayer>(
"Interactive Warngen", WarngenLayer.class);
}

4
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
View file

@ -97,7 +97,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.EditableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.rsc.tools.AwipsToolsResourceData;
import com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData;
import com.raytheon.viz.awipstools.ToolsDataManager;
import com.raytheon.viz.awipstools.common.StormTrackData;
import com.raytheon.viz.awipstools.common.stormtrack.AbstractStormTrackResource;
@ -404,7 +404,7 @@ public class WarngenLayer extends AbstractStormTrackResource {
}
public WarngenLayer(
AwipsToolsResourceData<? extends AbstractStormTrackResource> resourceData,
GenericToolsResourceData<? extends AbstractStormTrackResource> resourceData,
LoadProperties loadProperties, MapDescriptor descriptor) {
super(resourceData, loadProperties, descriptor);
displayState.displayType = DisplayType.POINT;

2
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
View file

@ -69,7 +69,6 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
import com.raytheon.uf.common.dataplugin.gfe.server.notify.GridUpdateNotification;
import com.raytheon.uf.common.dataplugin.gfe.server.notify.LockNotification;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.dataplugin.gfe.util.GfeUtil;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
import com.raytheon.uf.common.dataplugin.grid.GridInfoConstants;
@ -86,6 +85,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.common.util.mapping.MultipleMappingException;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.purge.PurgeLogger;

2
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
View file

@ -35,7 +35,6 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.dataplugin.gfe.util.GfeUtil;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
@ -47,6 +46,7 @@ import com.raytheon.uf.common.message.WsId;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.Pair;
/**
* Base class for GFE grid databases. This class maintains the location of the

2
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
View file

@ -67,7 +67,6 @@ import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.VectorGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.WeatherGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.dataplugin.gfe.util.GfeUtil;
import com.raytheon.uf.common.dataplugin.gfe.weather.WeatherKey;
import com.raytheon.uf.common.datastorage.DataStoreFactory;
@ -90,6 +89,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.time.util.ITimer;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.edex.core.dataplugin.PluginRegistry;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.raytheon.uf.edex.database.plugin.PluginFactory;

62
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
View file

@ -40,6 +40,7 @@ import com.raytheon.uf.common.localization.exception.LocalizationException;
import com.raytheon.uf.common.localization.stream.AbstractLocalizationStreamRequest;
import com.raytheon.uf.common.localization.stream.LocalizationStreamGetRequest;
import com.raytheon.uf.common.localization.stream.LocalizationStreamPutRequest;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.edex.auth.resp.AuthorizationResponse;
import com.raytheon.uf.edex.core.EDEXUtil;
@ -64,59 +65,17 @@ public class LocalizationStreamHandler
extends
AbstractPrivilegedLocalizationRequestHandler<AbstractLocalizationStreamRequest> {
private class Pair {
LocalizationContext context;
String fileName;
private Pair(LocalizationContext context, String fileName) {
this.context = context;
this.fileName = fileName;
private static class StreamPair extends Pair<LocalizationContext, String> {
/**
* @param context
* @param fileName
*/
public StreamPair(LocalizationContext context, String fileName) {
super(context, fileName);
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + getOuterType().hashCode();
result = prime * result
+ ((context == null) ? 0 : context.hashCode());
result = prime * result
+ ((fileName == null) ? 0 : fileName.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;
Pair other = (Pair) obj;
if (!getOuterType().equals(other.getOuterType()))
return false;
if (context == null) {
if (other.context != null)
return false;
} else if (!context.equals(other.context))
return false;
if (fileName == null) {
if (other.fileName != null)
return false;
} else if (!fileName.equals(other.fileName))
return false;
return true;
}
private LocalizationStreamHandler getOuterType() {
return LocalizationStreamHandler.this;
}
}
private Map<Pair, File> fileMap = new HashMap<Pair, File>();
private Map<StreamPair, File> fileMap = new HashMap<StreamPair, File>();
/*
* (non-Javadoc)
@ -128,7 +87,8 @@ public class LocalizationStreamHandler
@Override
public Object handleRequest(AbstractLocalizationStreamRequest request)
throws Exception {
Pair pair = new Pair(request.getContext(), request.getFileName());
StreamPair pair = new StreamPair(request.getContext(),
request.getFileName());
File file = fileMap.get(pair);
if (file == null) {

1
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/META-INF/MANIFEST.MF
View file

@ -40,7 +40,6 @@ Export-Package: com.raytheon.uf.common.dataplugin.gfe,
com.raytheon.uf.common.dataplugin.gfe.slice,
com.raytheon.uf.common.dataplugin.gfe.textproduct,
com.raytheon.uf.common.dataplugin.gfe.time,
com.raytheon.uf.common.dataplugin.gfe.type,
com.raytheon.uf.common.dataplugin.gfe.util,
com.raytheon.uf.common.dataplugin.gfe.weather,
com.raytheon.uf.common.dataplugin.gfe.weatherelement

2
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/util/GfeUtil.java
View file

@ -41,8 +41,8 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.grid.Grid2DBit;
import com.raytheon.uf.common.dataplugin.gfe.type.Pair;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.Pair;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;

85
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/type/Pair.java → edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/Pair.java
View file

@ -17,10 +17,10 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.common.dataplugin.gfe.type;
package com.raytheon.uf.common.util;
/**
* TODO Add Description
* Generic Pair object
*
* <pre>
*
@ -28,76 +28,41 @@ package com.raytheon.uf.common.dataplugin.gfe.type;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 18, 2011 randerso Initial creation
* Mar 21, 2013 1638 mschenke Initial creation
*
* </pre>
*
* @author randerso
* @author mschenke
* @version 1.0
*/
public class Pair<A, B> {
public class Pair<F, S> {
private A first;
private F first;
private B second;
private S second;
public Pair(A first, B second) {
public Pair(F first, S second) {
this.first = first;
this.second = second;
}
/**
* @return the first
*/
public A getFirst() {
public F getFirst() {
return first;
}
/**
* @param first
* the first to set
*/
public void setFirst(A first) {
public void setFirst(F first) {
this.first = first;
}
/**
* @return the second
*/
public B getSecond() {
public S getSecond() {
return second;
}
/**
* @param second
* the second to set
*/
public void setSecond(B second) {
public void setSecond(S second) {
this.second = second;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("(");
sb.append(first);
sb.append(", ");
sb.append(second);
sb.append(")");
return sb.toString();
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
@ -107,37 +72,25 @@ public class Pair<A, B> {
return result;
}
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
if (this == obj)
return true;
}
if (obj == null) {
if (obj == null)
return false;
}
if (getClass() != obj.getClass()) {
if (getClass() != obj.getClass())
return false;
}
Pair other = (Pair) obj;
if (first == null) {
if (other.first != null) {
if (other.first != null)
return false;
}
} else if (!first.equals(other.first)) {
} else if (!first.equals(other.first))
return false;
}
if (second == null) {
if (other.second != null) {
if (other.second != null)
return false;
}
} else if (!second.equals(other.second)) {
} else if (!second.equals(other.second))
return false;
}
return true;
}