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

Issue #2297 - fix 14.2.1 merge

Browse source 
Former-commit-id: e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b
This commit is contained in:
Bryan Kowal 2013-11-11 13:04:21 -06:00
parent 3a5028a42d
commit 411e0fa7c4
9 changed files with 11 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,12 +36,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.commons.io"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.apache.commons.compress"
download-size="0"
@ -49,10 +43,4 @@
version="0.0.0"
unpack="false"/>
<plugin
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

3
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
View file

@ -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;

3
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
View file

@ -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

20
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
View file

@ -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<DatabaseID> dbs = IFPServer.getActiveServer(siteID)
.getGridParmMgr().getDbInventory().getPayload();
this.parmsWanted = config.requestedISCparms();
if (this.parmsWanted.isEmpty()) {
List<DatabaseID> dbs = GridParmManager.getDbInventory(this.siteID)
.getPayload();
List<DatabaseID> 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

2
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
View file

@ -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;

2
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
View file

@ -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;

1
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
View file

@ -153,7 +153,6 @@ public class SvrWxRecord extends PersistablePluginDataObject implements
identifier = dataURI;
}
@Override
@Override
public SurfaceObsLocation getSpatialObject() {
return location;

1
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
View file

@ -184,7 +184,6 @@ public class TropicalCycloneSummary extends PersistablePluginDataObject
identifier = dataURI;
}
@Override
@Override
public SurfaceObsLocation getSpatialObject() {
return location;

3
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
View file

@ -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));