Commit 0b9897d1 authored by amccaskey's avatar amccaskey
Browse files

Reverting MOOSEModel changes and adding MOOSEFormEditor fix to next.


Signed-off-by: default avataramccaskey <mccaskeyaj@ornl.gov>
parent 4b854d52
......@@ -85,11 +85,8 @@ public class MOOSEFormEditor extends ICEFormEditor {
private static final String PLANT_PAGE_ID = "Plant View";
/**
* The {@link Entry} corresponding to the available apps in the MOOSE Model
* Builder.
*
*/
private Entry appsEntry;
private DataComponent postProcessors;
// ---- Plant Page variables ---- //
......@@ -131,8 +128,6 @@ public class MOOSEFormEditor extends ICEFormEditor {
Form form = ((ICEFormInput) input).getForm();
// Get the Entry that contains the available apps.
DataComponent dataComp = (DataComponent) form.getComponent(MOOSEModel.fileDataComponentId);
appsEntry = dataComp.retrieveEntry("MOOSE-Based Application");
postProcessors = (DataComponent) form.getComponent(MOOSE.ppDataId);
}
......@@ -740,8 +735,7 @@ public class MOOSEFormEditor extends ICEFormEditor {
// If the selection is for RELAP-7, create a Plant View page
// if one doesn't already exist. If the selection is NOT for
// RELAP-7, delete any existing Plant View page.
String appStr = appsEntry.getValue().toLowerCase();
if ("relap".equals(appStr)) {
if ("Components".equals(findComponentBlock().getName())) {
addPlantPage();
} else {
removePlantPage();
......@@ -749,4 +743,4 @@ public class MOOSEFormEditor extends ICEFormEditor {
return;
}
}
}
\ No newline at end of file
......@@ -115,7 +115,7 @@ public class RemoteYamlSyntaxGenerator extends Action {
try {
// Local Strings
String remoteSeparator = connection.getProperty(IRemoteConnection.FILE_SEPARATOR_PROPERTY);
String script = remoteSeparator + "tmp" + remoteSeparator + "executeYamlSyntax";
String script = remoteSeparator + "tmp" + remoteSeparator + "executeYamlSyntax_"+System.getProperty("user.name");
String fileLoc = remoteSeparator + "tmp" + remoteSeparator + appFile.getName();
// Get the remote file system
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment