Merge pull request #969 from virtualcell/dan-ss-enable-prop

Adding enableSpringSaLaD propperty

Author: danv61

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/BioModelEditorApplicationsPanel.java

@@ -45,6 +45,7 @@
 import cbit.vcell.mapping.SimulationContext.Application;
 import cbit.vcell.mapping.SimulationContext.MathMappingCallback;
 import cbit.vcell.mapping.SimulationContext.NetworkGenerationRequirements;
+import cbit.vcell.resource.PropertyLoader;
 import cbit.vcell.solver.Simulation;
 import cbit.vcell.xml.XmlHelper;
 import cbit.vcell.xml.XmlParseException;
@@ -355,7 +356,10 @@ private javax.swing.JPopupMenu getNewAppPopupMenu() {
 				appsPopupMenu.add(appNewDeterministicApp);
 				appsPopupMenu.add(appNewStochApp);
 				appsPopupMenu.add(appNewRulebasedApp);
-				appsPopupMenu.add(appNewSpringSaLaDApp);
+				String enableSpringSaLaD = PropertyLoader.getProperty(PropertyLoader.enableSpringSaLaD, "false");
+				if("true".equals(enableSpringSaLaD)) {
+					appsPopupMenu.add(appNewSpringSaLaDApp);
+				}
 				// user code begin {1}
 				// user code end
 			} catch (java.lang.Throwable ivjExc) {

vcell-client/src/main/java/cbit/vcell/client/desktop/biomodel/DocumentEditor.java

@@ -72,6 +72,7 @@
 import cbit.vcell.desktop.MathModelMetaDataPanel;
 import cbit.vcell.mapping.SimulationContext;
 import cbit.vcell.mathmodel.MathModel;
+import cbit.vcell.resource.PropertyLoader;
 import cbit.vcell.xml.gui.MiriamTreeModel.LinkNode;
 /**
  * Insert the type's description here.
@@ -720,7 +721,10 @@ private void construcutPopupMenu() {
 			addNewAppMenu.add(addNewAppDeterministicMenuItem);
 			addNewAppMenu.add(addNewAppStochasticMenuItem);
 			addNewAppMenu.add(addNewAppRulebasedMenuItem);
-			addNewAppMenu.add(addNewAppSpringSaLaDMenuItem);
+			String enableSpringSaLaD = PropertyLoader.getProperty(PropertyLoader.enableSpringSaLaD, "false");
+			if("true".equals(enableSpringSaLaD)) {
+				addNewAppMenu.add(addNewAppSpringSaLaDMenuItem);
+			}
 		}
 		popupMenu.add(addNewAppMenu);
 	}

vcell-core/src/main/java/cbit/vcell/resource/PropertyLoader.java

@@ -248,6 +248,8 @@ public class PropertyLoader {
 
 	public static final String cliWorkingDir = record("cli.workingDir", ValueType.DIR);
 
+	public static final String enableSpringSaLaD = record("vcell.enableSpringSaLaD", ValueType.BOOL);
+	
 	/**
 	 * native library directory, server side
 	 */