delay loading of stored models to avoid exception (for nested models)

remove console msgs

Author: pfalstad

src/com/lushprojects/circuitjs1/client/CirSim.java

@@ -202,6 +202,8 @@ public void init() {
 	ui.setColors(positiveColor, negativeColor, neutralColor, selectColor, currentColor);
 	ui.setWheelSensitivity();
 
+	CustomCompositeModel.loadModelsFromStorage();
+
 	loader = new CircuitLoader(this, sim, scopeManager, menus);
 
 	if (startCircuitText != null) {

src/com/lushprojects/circuitjs1/client/CustomCompositeModel.java

@@ -66,6 +66,10 @@ static void initModelMap() {
 	globalModelMap.put(d.name, d);
 	sequenceNumber = 1;
 
+        loadInternalModels();
+    }
+
+    public static void loadModelsFromStorage() {
 	// get models from local storage
         Storage stor = Storage.getLocalStorageIfSupported();
         if (stor != null) {
@@ -97,21 +101,18 @@ static void initModelMap() {
         	}
             }
         }
-
-        loadInternalModels();
     }
 
     static CustomCompositeModel getModelWithName(String name) {
 	if (globalModelMap == null)
 	    initModelMap();
 	CustomCompositeModel lm = localModelMap.get(name);
 	if (lm != null) {
-	    CirSim.console("getModelWithName: " + name + " found in local");
+	    //CirSim.console("getModelWithName: " + name + " found in local");
 	    return lm;
 	}
 	lm = globalModelMap.get(name);
-	if (lm != null)
-	    CirSim.console("getModelWithName: " + name + " found in global");
+	//if (lm != null) CirSim.console("getModelWithName: " + name + " found in global");
 	return lm;
     }
 
@@ -179,20 +180,20 @@ static CustomCompositeModel undumpModel(StringTokenizer st) {
 	String name = CustomLogicModel.unescape(st.nextToken());
 	CustomCompositeModel model = getModelWithName(name);
 	if (model == null) {
-	    CirSim.console("undumpModel: creating new local model " + name);
+	    //CirSim.console("undumpModel: creating new local model " + name);
 	    model = new CustomCompositeModel();
 	    model.name = name;
 	    localModelMap.put(name, model);
 	    sequenceNumber++;
 	} else if (globalModelMap.containsKey(name) && !localModelMap.containsKey(name)) {
 	    // model exists in global map; create a local shadow instead of modifying global
-	    CirSim.console("undumpModel: creating local shadow for global model " + name);
+	    //CirSim.console("undumpModel: creating local shadow for global model " + name);
 	    model = new CustomCompositeModel();
 	    model.name = name;
 	    localModelMap.put(name, model);
 	    sequenceNumber++;
 	} else {
-	    CirSim.console("undumpModel: updating existing local model " + name);
+	    //CirSim.console("undumpModel: updating existing local model " + name);
 	}
 	model.undump(st);
 	return model;
@@ -359,20 +360,20 @@ static CustomCompositeModel undumpModelXml(XMLDeserializer xml) {
 	String name = xml.parseStringAttr("nm", null);
 	CustomCompositeModel model = getModelWithName(name);
 	if (model == null) {
-	    CirSim.console("undumpModelXml: creating new local model " + name);
+	    //CirSim.console("undumpModelXml: creating new local model " + name);
 	    model = new CustomCompositeModel();
 	    model.name = name;
 	    localModelMap.put(name, model);
 	    sequenceNumber++;
 	} else if (globalModelMap.containsKey(name) && !localModelMap.containsKey(name)) {
 	    // model exists in global map; create a local shadow instead of modifying global
-	    CirSim.console("undumpModelXml: creating local shadow for global model " + name);
+	    //CirSim.console("undumpModelXml: creating local shadow for global model " + name);
 	    model = new CustomCompositeModel();
 	    model.name = name;
 	    localModelMap.put(name, model);
 	    sequenceNumber++;
 	} else {
-	    CirSim.console("undumpModelXml: updating existing local model " + name);
+	    //CirSim.console("undumpModelXml: updating existing local model " + name);
 	}
 	model.undumpXml(xml);
 	return model;
@@ -468,7 +469,7 @@ static void replaceModel(CustomCompositeModel model) {
     }
 
     static void clearLocalModels() {
-	CirSim.console("clearLocalModels: clearing " + localModelMap.size() + " local models");
+	//CirSim.console("clearLocalModels: clearing " + localModelMap.size() + " local models");
 	localModelMap.clear();
 	sequenceNumber++;
     }