diff --git a/cave/com.raytheon.uf.viz.archive.feature/feature.xml b/cave/com.raytheon.uf.viz.archive.feature/feature.xml index 906e7a4d8e..6b25bdef69 100644 --- a/cave/com.raytheon.uf.viz.archive.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.archive.feature/feature.xml @@ -36,12 +36,6 @@ version="0.0.0" unpack="false"/> - - - - diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java index bff0be578d..04dc217a20 100644 --- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java +++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java @@ -25,13 +25,14 @@ import org.apache.commons.collections.map.DefaultedMap; import org.eclipse.jface.preference.IPreferenceStore; import com.raytheon.uf.common.comm.HttpClient; +import com.raytheon.uf.common.localization.msgs.GetServersRequest; import com.raytheon.uf.common.localization.msgs.GetServersResponse; import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.VizServers; -import com.raytheon.uf.viz.core.comm.ConnectivityManager; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.localization.LocalizationInitializer; import com.raytheon.uf.viz.core.localization.LocalizationManager; +import com.raytheon.uf.viz.core.requests.ThriftClient; import com.raytheon.uf.viz.thinclient.Activator; import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants; import com.raytheon.uf.viz.thinclient.ui.ThinClientConnectivityDialog; diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java index 620e83ec8f..a1b5789adb 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java @@ -321,8 +321,7 @@ public class GFESiteActivation implements ISiteActivationListener { && System.getProperty("edex.run.mode").equals("request")) { statusHandler.info("Enabling ISC..."); try { - IRTManager.getInstance().enableISC(siteID, - config.getMhsid()); + IRTManager.getInstance().enableISC(siteID, config); isIscActivated = true; } catch (Exception e) { statusHandler diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java index 7a5b22ec24..10d221f5dd 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java @@ -32,6 +32,7 @@ import jep.JepException; import com.raytheon.edex.plugin.gfe.config.GridDbConfig; import com.raytheon.edex.plugin.gfe.config.IFPServerConfig; +import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager; import com.raytheon.edex.plugin.gfe.server.IFPServer; import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException; import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID; @@ -81,8 +82,6 @@ public class GfeIRT extends Thread { /** The site ID associated with this IRT thread */ private final String siteID; - private final IFPServerConfig config; - /** The MHS ID associated with this IRT thread */ private final String mhsID; @@ -119,20 +118,15 @@ public class GfeIRT extends Thread { * If the GFE configuration for the specified site could not be * loaded. */ - public GfeIRT(String mhsid, String siteid) throws GfeConfigurationException { + public GfeIRT(String siteid, IFPServerConfig config) + throws GfeConfigurationException { this.setDaemon(true); this.siteID = siteid; - this.config = config; this.mhsID = config.getMhsid(); - IFPServerConfig config = IFPServerConfigManager.getServerConfig(siteID); - shutdownHooks.put(mhsID + siteID, hook); - this.serverHost = config.getServerHost(); this.serverPort = config.getRpcPort(); this.serverProtocol = config.getProtocolVersion(); - script = new PythonScript(scriptFile, includePath, this.getClass() - .getClassLoader()); GridLocation domain = config.dbDomain(); @@ -147,13 +141,11 @@ public class GfeIRT extends Thread { this.gridBoundBox.add(domain.getOrigin().y); this.gridBoundBox.add(domain.getExtent().x); this.gridBoundBox.add(domain.getExtent().y); - List dbs = IFPServer.getActiveServer(siteID) - .getGridParmMgr().getDbInventory().getPayload(); this.parmsWanted = config.requestedISCparms(); if (this.parmsWanted.isEmpty()) { - List dbs = GridParmManager.getDbInventory(this.siteID) - .getPayload(); + List dbs = IFPServer.getActiveServer(this.siteID) + .getGridParmMgr().getDbInventory().getPayload(); for (DatabaseID dbId : dbs) { if ((dbId.getModelName().equals("ISC")) && (dbId.getDbType().equals("")) @@ -208,7 +200,7 @@ public class GfeIRT extends Thread { } }; java.lang.Runtime.getRuntime().addShutdownHook(hook); - shutdownHooks.put(mhsid + siteid, hook); + shutdownHooks.put(mhsID + siteID, hook); } @Override diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java index 510c70bd42..9157348555 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java @@ -12,7 +12,6 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; - import org.hibernate.annotations.Index; import com.raytheon.uf.common.dataplugin.PluginDataObject; @@ -1033,7 +1032,6 @@ public class FSSObsRecord extends PersistablePluginDataObject implements return totCloudAmount; } - @Override @Override public ISpatialObject getSpatialObject() { return location; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java index 9a99f9b464..e6eeb3d455 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java @@ -409,7 +409,6 @@ public class LocalStormReport extends PersistablePluginDataObject implements identifier = dataURI; } - @Override @Override public SurfaceObsLocation getSpatialObject() { return location; @@ -477,7 +476,6 @@ public class LocalStormReport extends PersistablePluginDataObject implements return location.getLocationDefined(); } - @Override @Override public PointDataView getPointDataView() { return pointDataView; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java index d0654a8b4c..bd05dd804d 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java @@ -153,7 +153,6 @@ public class SvrWxRecord extends PersistablePluginDataObject implements identifier = dataURI; } - @Override @Override public SurfaceObsLocation getSpatialObject() { return location; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java index 6bc0baa23e..8d5816ff6e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java @@ -184,7 +184,6 @@ public class TropicalCycloneSummary extends PersistablePluginDataObject identifier = dataURI; } - @Override @Override public SurfaceObsLocation getSpatialObject() { return location; diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java index 7244773f43..2907aa5721 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java @@ -1361,7 +1361,7 @@ public class ContourSupport { // for ( int kk = 0; kk < 365; kk++ ){ // System.out.println( kk + " " + adjustedUw[kk]+ " " + uW[kk]); // } - + uW = null; vW = null; @@ -1431,6 +1431,7 @@ public class ContourSupport { rastPosToWorldGrid.transform( new double[] { f, point.getY() + minY }, 0, + out, 0, 1); pts.add(new Coordinate(f, point.getY() + minY));