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

Merge "Omaha #4509 added python time and dataaccess folders to include path" into omaha_15.1.1

Browse source 
Former-commit-id: 73f19eafac1c6c8de267847789aec6d389295a82
This commit is contained in:
Ron Anderson 2015-05-20 18:45:36 -05:00 • committed by Gerrit Code Review
commit 8f2c551485
4 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GFE Plug-in
Bundle-SymbolicName: com.raytheon.viz.gfe;singleton:=true
Bundle-Version: 1.14.0.qualifier
Bundle-Version: 1.15.0.qualifier
Bundle-Activator: com.raytheon.viz.gfe.Activator
Bundle-Vendor: Raytheon
Require-Bundle: org.eclipse.ui,
@ -36,7 +36,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.kml.export;bundle-version="1.14.1",
com.raytheon.uf.common.numeric;bundle-version="1.14.0",
com.raytheon.uf.common.topo;bundle-version="1.14.0",
com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.14.0"
com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.14.0",
com.raytheon.uf.common.dataaccess;bundle-version="1.15.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.gfe,
com.raytheon.viz.gfe.constants,

18
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
View file

@ -34,6 +34,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import com.raytheon.uf.common.python.PyUtil;
import com.raytheon.uf.common.python.PythonIncludePathUtil;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -65,6 +66,7 @@ import com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent;
* Aug 22, 2014 3500 bclement override postStartupActions()
* Aug 29, 2014 3500 bclement removed override of postStartupActions()
* since ProcedureXMLManager startup was moved to the CAVE subclass
* May 20, 2015 4509 njensen Added time and dataaccess to include path
*
* </pre>
*
@ -119,16 +121,16 @@ public class GfeClient extends AbstractAWIPSComponent {
boolean includeUser = (!VizApp.getWsId().getUserName().equals("SITE"));
String includePath = PyUtil.buildJepIncludePath(true, utilityDir,
GfeCavePyIncludeUtil.getCommonPythonIncludePath(),
GfeCavePyIncludeUtil.getCommonGfeIncludePath(),
GfeCavePyIncludeUtil.getConfigIncludePath(includeUser),
pyVizDir,
PythonIncludePathUtil.getCommonPythonIncludePath("time",
"dataaccess"), GfeCavePyIncludeUtil
.getCommonGfeIncludePath(), GfeCavePyIncludeUtil
.getConfigIncludePath(includeUser), pyVizDir,
GfeCavePyIncludeUtil.getUtilitiesIncludePath(includeUser),
GfeCavePyIncludeUtil.getIToolIncludePath(),
GfeCavePyIncludeUtil.getVtecIncludePath(),
GfeCavePyIncludeUtil.getHeadlineIncludePath(),
GfeCavePyIncludeUtil.getAutotestIncludePath(),
GfeCavePyIncludeUtil.getTextUtilitiesIncludePath(includeUser),
GfeCavePyIncludeUtil.getVtecIncludePath(), GfeCavePyIncludeUtil
.getHeadlineIncludePath(), GfeCavePyIncludeUtil
.getAutotestIncludePath(), GfeCavePyIncludeUtil
.getTextUtilitiesIncludePath(includeUser),
GfeCavePyIncludeUtil.getTextProductsIncludePath(includeUser),
GfeCavePyIncludeUtil.getCombinationsIncludePath(includeUser),
GfeCavePyIncludeUtil.getTestsIncludePath(),

14
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureFactory.java
View file

@ -27,6 +27,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.python.PyUtil;
import com.raytheon.uf.common.python.PythonIncludePathUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.viz.gfe.core.DataManager;
@ -39,6 +40,7 @@ import com.raytheon.viz.gfe.core.DataManager;
* ------------ ---------- ----------- --------------------------
* Nov 5, 2008 njensen Initial creation
* Feb 25, 2010 4108 ryu Add user/site directories to include path
* May 20, 2015 4509 njensen Added time and dataaccess to include path
*
* </pre>
*
@ -58,12 +60,12 @@ public class ProcedureFactory {
.getPath();
String scriptPath = FileUtil.join(baseUtil, "ProcedureInterface.py");
String includePath = PyUtil.buildJepIncludePath(
GfePyIncludeUtil.getCommonPythonIncludePath(),
GfePyIncludeUtil.getVtecIncludePath(),
GfePyIncludeUtil.getCommonGfeIncludePath(),
GfePyIncludeUtil.getProceduresIncludePath(),
GfePyIncludeUtil.getUtilitiesIncludePath());
String includePath = PyUtil.buildJepIncludePath(PythonIncludePathUtil
.getCommonPythonIncludePath("time", "dataaccess"),
GfePyIncludeUtil.getVtecIncludePath(), GfePyIncludeUtil
.getCommonGfeIncludePath(), GfePyIncludeUtil
.getProceduresIncludePath(), GfePyIncludeUtil
.getUtilitiesIncludePath());
ProcedureController procCont = null;
if (ui) {

22
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolFactory.java
View file

@ -27,6 +27,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.python.PyUtil;
import com.raytheon.uf.common.python.PythonIncludePathUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.viz.gfe.core.DataManager;
@ -35,10 +36,11 @@ import com.raytheon.viz.gfe.core.DataManager;
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 21, 2008 njensen Initial creation
* Jul 9, 2009 2454 ryu Put user and site's python scripts on path for import
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 21, 2008 njensen Initial creation
* Jul 9, 2009 2454 ryu Put user and site's python scripts on path for import
* May 20, 2015 4509 njensen Added time and dataaccess to include path
*
* </pre>
*
@ -59,12 +61,12 @@ public class SmartToolFactory {
private static SmartToolController buildInstance(DataManager dataMgr,
boolean ui) throws JepException {
String includePath = PyUtil.buildJepIncludePath(
GfePyIncludeUtil.getCommonPythonIncludePath(),
GfePyIncludeUtil.getVtecIncludePath(),
GfePyIncludeUtil.getCommonGfeIncludePath(),
GfePyIncludeUtil.getSmartToolsIncludePath(),
GfePyIncludeUtil.getUtilitiesIncludePath());
String includePath = PyUtil.buildJepIncludePath(PythonIncludePathUtil
.getCommonPythonIncludePath("time", "dataaccess"),
GfePyIncludeUtil.getVtecIncludePath(), GfePyIncludeUtil
.getCommonGfeIncludePath(), GfePyIncludeUtil
.getSmartToolsIncludePath(), GfePyIncludeUtil
.getUtilitiesIncludePath());
SmartToolController smartCont = null;
if (ui) {