fix model

src/java/adecWatt/model/Embedded.java

@@ -119,7 +119,8 @@ public abstract class Embedded<P extends XmlPermanent<T, A>, T extends Enum<?>,
 	if (visited.contains (this))
 	    return;
 	super.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks);
-	model.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks);
+	if (model != null)
+	    model.getLocalLink (visited, unitLinks, iconsLinks, imagesLinks);
     }
 
     public boolean renameUnits (TreeMap<String, String> translateMap) {

src/java/adecWatt/model/unit/Workspace.java

@@ -706,7 +706,17 @@ public abstract class Workspace extends Unit<Item<?, ?, ?>> {
 		Circuits.CircuitState circuitState = circuits.getState (plugedComp, acc);
 		if (circuitState == null)
 		    continue;
-		Acc.printCircuit (printGraphics, lineWidth, plugedComp.getAccCenter (acc.getId ()), circuitState);
+		Point2D c = plugedComp.getAccCenter (acc.getId ());
+		// try {
+		//     Comp endComp = (Comp) namedItems.get (acc.getConnectedTo ());
+		//     Point2D a = plugedComp.getAccCenter (acc.getId ());
+		//     Point2D b = endComp.getAccCenter (acc.getConnectedOn ());
+		//     c = new Point2D.Double ((1*a.getX ()+b.getX ())/2, (1*a.getY ()+b.getY ())/2);
+		// } catch (Exception e) {
+		// }
+		// XXX
+		//Acc.printCircuit (printGraphics, lineWidth, c, circuitState);
+		Acc.printCircuit (printGraphics, c, circuitState, .4);
 	    }
     }