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

Issue #851 Cleaned up dead code and unused dependencies in GFE.

Browse source 
Amend: Issue #851 resubmitting after accepting ticket

Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e

Former-commit-id: 48d040f331 [formerly b4c02fd246] [formerly 936b2cabca] [formerly 058edcf6c6701eca16ffd286f2dfe8065a9ff120 [formerly 936b2cabca [formerly ff5c7b7498]]] [formerly 59a3ebe8ba [formerly 936b2cabca [formerly ff5c7b7498] [formerly 59a3ebe8ba [formerly af1332170e28aed53ff91997ce089b20423203d5]]]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: c64af7af3d6565334a89e17ff49dc594c3328aea [formerly deb40e1efbb342a3a1a406a5b1b9de83925bea87] [formerly 5186dcf321 [formerly 0c5199ba03]]
Former-commit-id: 5186dcf321
Former-commit-id: 68ddc7056d
This commit is contained in:
Ron Anderson 2012-07-05 15:30:54 -05:00
parent c4924ea745
commit ff4df1b04d
12 changed files with 0 additions and 544 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.gfe.feature/feature.xml
View file

@ -23,9 +23,6 @@
<import feature="com.raytheon.uf.viz.common.core.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.viz.core.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.viz.text.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.viz.grib.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.viz.dataplugin.obs.feature" version="1.0.0.qualifier"/>
<import feature="com.raytheon.uf.viz.core.maps.feature" version="1.0.0.qualifier"/>
</requires>
<plugin

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

@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui,
org.geotools,
org.jep,
org.apache.velocity,
com.raytheon.viz.shapefile,
com.raytheon.viz.core.contours,
javax.vecmath,
com.raytheon.uf.common.dataplugin.text,

19
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
View file

@ -61,8 +61,6 @@ import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob;
import com.raytheon.viz.core.mode.CAVEMode;
import com.raytheon.viz.gfe.GFEServerException;
import com.raytheon.viz.gfe.core.internal.DataMgrInitStatus;
import com.raytheon.viz.gfe.core.internal.GFEClimoManager;
import com.raytheon.viz.gfe.core.internal.GFEHlsTopoManager;
import com.raytheon.viz.gfe.core.internal.GFEParmCacheInitJob;
import com.raytheon.viz.gfe.core.internal.GFESpatialDisplayManager;
import com.raytheon.viz.gfe.core.internal.GFETopoManager;
@ -174,8 +172,6 @@ public class DataManager {
private final NotificationRouter router;
private final IClimoManager climoManager;
private final ITopoManager topoManager;
private IGridManager gridManager;
@ -216,8 +212,6 @@ public class DataManager {
private List<String> allSites;
private IHlsTopoManager hlsTopoManager;
/**
* Not to be instantiated directly.
*
@ -292,8 +286,6 @@ public class DataManager {
this.router.start();
this.parmOp = new ParmOp(this);
this.climoManager = new GFEClimoManager(this);
this.hlsTopoManager = new GFEHlsTopoManager(this);
this.topoManager = new GFETopoManager(this);
this.autoSaveJob = new AutoSaveJob(this);
@ -615,10 +607,6 @@ public class DataManager {
return this.sampleSetManager;
}
public IHlsTopoManager getHlsTopoManager() {
return this.hlsTopoManager;
}
public ITopoManager getTopoManager() {
return this.topoManager;
}
@ -928,13 +916,6 @@ public class DataManager {
new ISCSendStatusChangedMsg(state).send();
}
/**
* @return the climo manager
*/
public IClimoManager getClimoManager() {
return climoManager;
}
public EditActionProcessor getEditActionProcessor() {
return this.editActionProcessor;
}

55
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IClimoManager.java
View file

@ -1,55 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.gfe.core;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 22, 2010 wldougher Initial creation
*
* </pre>
*
* @author wldougher
* @version 1.0
*/
public interface IClimoManager {
/**
* @param objects
* @return
*/
IGridSlice[] getCompositeClimo(String source, String shortParmName);
/**
* @param source
* @param shortParmName
* @return
*/
ParmID getCompositeParmID(String source, String shortParmName);
}

62
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IHlsTopoManager.java
View file

@ -1,62 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.gfe.core;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
/**
* A TopoManager manages the topography data sets available from the server.
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 2, 2008 #1160 randerso Initial creation
* Mar 18, 2011 wldougher
*
* </pre>
*
* @author randerso
* @version 1.0
*/
public interface IHlsTopoManager {
/**
* Returns the composite topography grid. This is a grid which matches the
* composite grid location as defined by the Data Manager.
*
* @param parmName
* "AvgTopo", "MaxTopo", or "MinTopo"
* @param simpleModel
* "NED" or "CRSTopo"
* @return
*/
IGridSlice[] getCompositeTopo(String parmName, String simpleModel);
/**
* Returns the parm id for the composite topography grid.
*
* @return
*/
ParmID getCompositeParmID(String parmName, String simpleModel);
}

26
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IParmManager.java
View file

@ -452,32 +452,6 @@ public interface IParmManager extends IParmInventoryChangedListener,
*/
public void deallocateUnusedGrids(int seconds);
/**
* @param wanted
* true to enable the parm, false to diable it
* @param forceVisibility
* true to make the parm visible, false to leave it hidden
* @param source
* The name of the provider
* @param shortParmName
* "mxt", "mnt", or "tp"
*/
public void enableDisableClimoParm(boolean wanted, boolean forceVisibility,
String source, String shortParmName);
/**
* @param wanted
* true to enable the parm, false to diable it
* @param forceVisibility
* true to make the parm visible, false to leave it hidden
* @param source
* The name of the provider
* @param shortParmName
* "mxt", "mnt", or "tp"
*/
public void enableDisableHlsTopoParm(boolean wanted,
boolean forceVisibility, String shortParmName, String simpleModel);
/**
* Command to enable or disable the topography parm.
*

12
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
View file

@ -31,8 +31,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.core.runtime.ListenerList;
@ -202,9 +200,6 @@ public abstract class AbstractParmManager implements IParmManager {
private static final int MILLIS_PER_HOUR = SECONDS_PER_HOUR
* MILLIS_PER_SECOND;
private static final Pattern CLIMO_EXPR_PATTERN = Pattern
.compile("(\\w{2,3})_SFC_(\\w{3,4})_Climo_(\\w{4,5})");
protected final DataManager dataManager;
protected final RWLArrayList<Parm> parms;
@ -1122,13 +1117,6 @@ public abstract class AbstractParmManager implements IParmManager {
return getParmInExpr(exprName, false, variableParm);
}
Matcher climoMatcher = CLIMO_EXPR_PATTERN.matcher(exprName);
if (climoMatcher.matches()) {
String shortVar = climoMatcher.group(1);
String source = climoMatcher.group(3);
enableDisableClimoParm(true, false, source, shortVar);
}
// Check the mutable database first
// ParmID topoID = _dataMgr->topoMgr()->compositeParmID();
if (mutableDb != null /* isValid() */) {

126
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFEClimoManager.java
View file

@ -1,126 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.gfe.core.internal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
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.TimeRange;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.IClimoManager;
/**
* GFEClimoMgr manages the set of climate data sets available from the
* ifpServer.
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 22, 2010 wldougher Initial creation
*
* </pre>
*
* @author wldougher
* @version 1.0
*/
public class GFEClimoManager implements IClimoManager {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(GFEClimoManager.class);
private DataManager dataManager;
private Map<List<String>, List<IGridSlice>> compositeClimoMap;
public GFEClimoManager(DataManager dataManager) {
this.dataManager = dataManager;
compositeClimoMap = new HashMap<List<String>, List<IGridSlice>>();
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.gfe.core.IClimoManager#getCompositeClimo(java.lang.Object
* [])
*/
@Override
public synchronized IGridSlice[] getCompositeClimo(String source,
String shortParmName) {
List<String> parmKey = new ArrayList<String>(2);
parmKey.add(source);
parmKey.add(shortParmName);
List<IGridSlice> slicesL = compositeClimoMap.get(parmKey);
IGridSlice[] slices = null;
if (slicesL == null) {
ParmID aClimoParmID = null;
aClimoParmID = getCompositeParmID(source, shortParmName);
try {
IFPClient client = dataManager.getClient();
List<TimeRange> trs = client.getGridInventory(aClimoParmID);
slicesL = client.getGridData(aClimoParmID, trs);
GridParmInfo gpi = client.getGridParmInfo(aClimoParmID);
gpi.setParmID(aClimoParmID);
// Save the result in the map
if (slicesL != null) {
compositeClimoMap.put(parmKey, slicesL);
}
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM, "Unable to load "
+ source + " climatology data for " + shortParmName, e);
}
}
if (slicesL != null) {
// make copies?? - too slow...
slices = slicesL.toArray(new IGridSlice[0]);
}
return slices;
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.gfe.core.IClimoManager#getCompositeParmID(java.lang.
* String, java.lang.String)
*/
@Override
public ParmID getCompositeParmID(String source, String shortParmName) {
ParmID rtnVal = null;
String siteID = dataManager.getSiteID();
String modelID = siteID + "_GRID_Climo_" + source + "_00000000_0000";
rtnVal = new ParmID(shortParmName, modelID, "SFC");
return rtnVal;
}
}

128
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFEHlsTopoManager.java
View file

@ -1,128 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.gfe.core.internal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
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.TimeRange;
import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.constants.StatusConstants;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.IHlsTopoManager;
/**
* GFEClimoMgr manages the set of climate data sets available from the
* ifpServer.
*
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 18, 2011 wldougher Initial creation
*
* </pre>
*
* @author wldougher
* @version 1.0
*/
public class GFEHlsTopoManager implements IHlsTopoManager {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(GFEHlsTopoManager.class);
private DataManager dataManager;
private Map<List<String>, List<IGridSlice>> compositeHlsTopoMap;
public GFEHlsTopoManager(DataManager dataManager) {
this.dataManager = dataManager;
compositeHlsTopoMap = new HashMap<List<String>, List<IGridSlice>>();
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.gfe.core.IClimoManager#getCompositeClimo(java.lang.Object
* [])
*/
@Override
public synchronized IGridSlice[] getCompositeTopo(String shortParmName,
String simpleModel) {
List<String> parmKey = new ArrayList<String>(2);
parmKey.add(simpleModel);
parmKey.add(shortParmName);
List<IGridSlice> slicesL = compositeHlsTopoMap.get(parmKey);
IGridSlice[] slices = null;
if (slicesL == null) {
ParmID aParmID = null;
aParmID = getCompositeParmID(shortParmName, simpleModel);
try {
IFPClient client = dataManager.getClient();
List<TimeRange> trs = client.getGridInventory(aParmID);
slicesL = client.getGridData(aParmID, trs);
GridParmInfo gpi = client.getGridParmInfo(aParmID);
gpi.setParmID(aParmID);
// Save the result in the map
if (slicesL != null) {
compositeHlsTopoMap.put(parmKey, slicesL);
}
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM, "Unable to load "
+ simpleModel + " HLS topology data for "
+ shortParmName, e);
}
}
if (slicesL != null) {
// make copies?? - too slow...
slices = slicesL.toArray(new IGridSlice[0]);
}
return slices;
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.gfe.core.IClimoManager#getCompositeParmID(java.lang.
* String, java.lang.String)
*/
@Override
public ParmID getCompositeParmID(String shortParmName, String model) {
ParmID rtnVal = null;
String siteID = dataManager.getSiteID();
String modelID = siteID + "_GRID_hlsTopo_" + model + "_00000000_0000";
rtnVal = new ParmID(shortParmName, modelID, "SFC");
return rtnVal;
}
}

13
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/MockParmManager.java
View file

@ -782,12 +782,6 @@ public class MockParmManager extends AbstractParmManager {
}
@Override
public void enableDisableClimoParm(boolean wanted, boolean forceVisible,
String source, String shortParmName) {
}
/*
* (non-Javadoc)
*
@ -820,13 +814,6 @@ public class MockParmManager extends AbstractParmManager {
}
@Override
public void enableDisableHlsTopoParm(boolean wanted,
boolean forceVisibility, String source, String shortParmName) {
// TODO Auto-generated method stub
}
/*
* (non-Javadoc)
*

98
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
View file

@ -1054,43 +1054,6 @@ public class ParmManager extends AbstractParmManager {
.getSpatialDisplayManager().getActivatedParm());
}
@Override
public void enableDisableClimoParm(boolean wanted, boolean forceVisibility,
String source, String shortParmName) {
// Guard: only climo grids we know about
if ("PRISM".equals(source) || "NCDC".equals(source)) {
if ("mnt".equals(shortParmName) || "mxt".equals(shortParmName)
|| "tp".equals(shortParmName)) {
//
Parm aClimoParm = null;
aClimoParm = getParm(dataManager.getClimoManager()
.getCompositeParmID(source, shortParmName));
boolean exists = (aClimoParm != null);
if (wanted && !exists) {
// Get all 12 grids for the element
IGridSlice[] gridSlices = dataManager.getClimoManager()
.getCompositeClimo(source, shortParmName);
if (gridSlices != null) {
GridParmInfo gpi = gridSlices[0].getGridInfo();
aClimoParm = createVirtualParm(gpi.getParmID(), gpi,
gridSlices, false, true);
// If forceVisibility, force the display to IMAGE,
// and force the visibility on
if (forceVisibility) {
this.dataManager.getSpatialDisplayManager()
.setDisplayMode(aClimoParm, VisMode.IMAGE);
this.dataManager.getSpatialDisplayManager()
.makeVisible(aClimoParm, true, false);
}
}
} else if (!wanted && exists) {
deleteParm(new Parm[] { aClimoParm });
}
}
}
}
/*
* (non-Javadoc)
*
@ -1147,67 +1110,6 @@ public class ParmManager extends AbstractParmManager {
}
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.viz.gfe.core.IParmManager#enableDisableTopoParm(boolean,
* boolean)
*/
@Override
public void enableDisableHlsTopoParm(boolean wanted,
boolean forceVisibility, String shortParmName, String simpleModel) {
// find out if the hls topo parm already exists
boolean exists = false;
Parm topoParm = getParm(this.dataManager.getHlsTopoManager()
.getCompositeParmID(shortParmName, simpleModel));
if (topoParm != null) {
exists = true;
}
// nothing to do
if (wanted && exists || !wanted && !exists) {
return;
}
// if needed
if (wanted) {
// get the data from the topography manager
IGridSlice[] gridSlices = this.dataManager.getHlsTopoManager()
.getCompositeTopo(shortParmName, simpleModel);
IGridSlice gridSlice = null;
if (gridSlices != null && gridSlices.length > 0) {
gridSlice = gridSlices[0];
}
// ensure validity
if (gridSlice != null && gridSlice.isValid() == null) {
// create the parm
topoParm = createVirtualParm(gridSlice.getGridInfo()
.getParmID(), gridSlice.getGridInfo(),
new IGridSlice[] { gridSlice }, false, true);
// If forceVisibility, force the visibility to on,
// and force the display to IMAGE
if (forceVisibility) {
this.dataManager.getSpatialDisplayManager().setDisplayMode(
topoParm, VisMode.IMAGE);
this.dataManager.getSpatialDisplayManager().makeVisible(
topoParm, true, false);
}
} else {
statusHandler.handle(Priority.PROBLEM,
"HLS Topography Not Available");
}
}
// not wanted
else {
deleteParm(new Parm[] { topoParm });
}
}
@Override
public List<DatabaseID> getIscDatabases() {
return new ArrayList<DatabaseID>(iscDbs);

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

@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
com.raytheon.viz.ui,
com.raytheon.viz.core,
com.raytheon.viz.shapefile,
org.geotools,
com.raytheon.viz.gfe,
com.raytheon.viz.alerts,