update README

README.md

@@ -21,3 +21,16 @@ git config user.name "Your Name"
 
 [ADEC 56](http://adec56.org/spip/index.php)
 
+## Remote commands
+
+  * getRoles 
+  * zipList path
+  * zipGets path
+  * zipPuts zip
+  * zipRemove path
+
+## Test
+
+https://adecwatt.parlenet.org/lib/plugins/adecwatt/adecWattBD.php?version=v3&action=getRoles
+https://adecwatt.parlenet.org/lib/plugins/adecwatt/adecWattBD.php?version=v3&action=zipList&name=data
+

ant/build.xml

@@ -104,6 +104,14 @@
       </fileset>
     </replaceregexp>
 
+    <replaceregexp byline="true">
+      <regexp pattern="(.*entry key=&#34;.*Location&#34;&#62;)[^&#93;]*(.*)"/>
+      <substitution expression="\1&#91;x=50,y=50\2"/>
+      <fileset dir="data/config">
+	<include name="*.xml"/>
+      </fileset>
+    </replaceregexp>
+
     <replaceregexp byline="true">
       <regexp pattern="(.*entry key=&#34;Download.*Checked&#34;&#62;)false(.*)"/>
       <substitution expression="\1true\2"/>
@@ -287,6 +295,12 @@
 	<include name="misc/**/*.class"/>
       </fileset>
     </jar>
+    <copy todir="${webRef}/soft" preservelastmodified="true">
+      <fileset dir="${build.jar}">
+	<include name="UpdatedAdecWatt.jar"/>
+	<include name="Misc.jar"/>
+      </fileset>
+    </copy>
   </target>
 
   <!-- ======================================== -->

data/config/AdecWatt.xml

@@ -1,77 +1,76 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
-<comment>This file is automaticaly generated by AdecWatt application at 5:25 PM on May 26, 2019.</comment>
+<comment>This file is automaticaly generated by AdecWatt application at 3:16 PM on Jan 26, 2022.</comment>
-
-<entry key="DownloaddataChecked">true</entry>
-
-<entry key="HelpOrder">4</entry>
-
-
-<entry key="dumpDir">data/log/</entry>
-
-<entry key="EditChecked">true</entry>
-
-<entry key="BoundGlue">true</entry>
-<entry key="InSegmentGlue">false</entry>
-<entry key="LastExport">/home/felix/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz</entry>
-<entry key="HelpPlace">North</entry>
-
 
 <entry key="GridGlue">true</entry>
-<entry key="FileOrder">0</entry>
+<entry key="HelpOrder">4</entry>
+<entry key="AdecWattIcon">data/images/adecWatt.png</entry>
+<entry key="EditChecked">true</entry>
 
 
 
+<entry key="SliderPlace">North</entry>
+
+<entry key="EditPlace">North</entry>
+<entry key="SearchPlace">North</entry>
+<entry key="AboutChecked">false</entry>
+
+<entry key="FilePlace">North</entry>
+<entry key="LicenceLocation">[x=50,y=50]</entry>
+<entry key="LastCheck">20220126</entry>
+<entry key="SliderChecked">true</entry>
+<entry key="FrameLocation">[x=50,y=50]</entry>
+<entry key="SearchChecked">true</entry>
+
+<entry key="AboutLocation">[x=50,y=50]</entry>
+<entry key="SliderUndocked">false</entry>
+<entry key="Login"/>
+
+<entry key="FileUndocked">false</entry>
+<entry key="dumpDir">data/log/</entry>
+
+<entry key="HelpUndocked">false</entry>
+<entry key="PlacementChecked">true</entry>
+<entry key="PlacementOrder">3</entry>
+<entry key="EditUndocked">false</entry>
+<entry key="HelpPlace">North</entry>
+
+<entry key="DownloadsoftChecked">true</entry>
+<entry key="DownloaddataChecked">true</entry>
+<entry key="ManualLocation">[x=50,y=50]</entry>
+<entry key="HandleGlue">true</entry>
+
+
+<entry key="HelpChecked">true</entry>
+<entry key="SearchUndocked">false</entry>
+<entry key="ProxyPort">3128</entry>
+<entry key="PlacementUndocked">false</entry>
+
+<entry key="InSegmentGlue">false</entry>
+<entry key="FileChecked">true</entry>
+<entry key="SliderOrder">2</entry>
+<entry key="ManualChecked">false</entry>
+
+
 
 <entry key="EditOrder">1</entry>
-<entry key="HelpChecked">true</entry>
-<entry key="ProxyPort">3128</entry>
-
-
-<entry key="SearchOrder">5</entry>
-<entry key="FilePlace">North</entry>
-
-<entry key="AboutLocation">[x=0,y=31]</entry>
-
-<entry key="SearchUndocked">false</entry>
-
-<entry key="FileChecked">true</entry>
-<entry key="FrameLocation">[x=1 490,y=312]</entry>
-<entry key="EditPlace">North</entry>
-<entry key="CheckPeriod">Day</entry>
-<entry key="AboutChecked">false</entry>
-<entry key="LicenceLocation">[x=0,y=31]</entry>
-
-<entry key="PlacementChecked">true</entry>
-<entry key="SliderUndocked">false</entry>
-<entry key="SliderOrder">2</entry>
-<entry key="SearchPlace">North</entry>
-<entry key="SearchChecked">true</entry>
 
 <entry key="Variant"/>
-<entry key="DownloadsoftChecked">true</entry>
-<entry key="SliderChecked">true</entry>
-<entry key="AdecWattIcon">data/images/adecWatt.png</entry>
-
-<entry key="FileUndocked">false</entry>
-<entry key="SliderPlace">North</entry>
-<entry key="Login"/>
-<entry key="HelpUndocked">false</entry>
-
-<entry key="ManualChecked">false</entry>
-<entry key="LastCheck">20190526</entry>
 
+<entry key="SearchOrder">5</entry>
 <entry key="LicenceChecked">false</entry>
-<entry key="HandleGlue">true</entry>
-<entry key="PlacementOrder">3</entry>
-<entry key="EditUndocked">false</entry>
-<entry key="ManualLocation">[x=0,y=31]</entry>
-<entry key="PlacementUndocked">false</entry>
-
-
 
 <entry key="PlacementPlace">North</entry>
+<entry key="LastExport">/home/felix/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz</entry>
+<entry key="FileOrder">0</entry>
+
+
+
+<entry key="BoundGlue">true</entry>
+<entry key="CheckPeriod">Day</entry>
+
+
 
 <entry key=""/>
 </properties>

src/java/adecWatt/control/LaunchAdecWatt.java

@@ -18,8 +18,10 @@ public class LaunchAdecWatt {
     // ========================================
     static public void main (String[] args) {
 	try {
+	    System.err.println ("Config...");
 	    Config.setPWD (LaunchAdecWatt.class);
 	    Config.load ("AdecWatt");
+	    System.err.println ("Bundle...");
 	    Bundle.load ("Help");
 	    Bundle.load ("ToolBar");
 	    Bundle.load ("Proxy");
@@ -29,8 +31,6 @@ public class LaunchAdecWatt {
 	    Bundle.load ("AdecWatt");
 	    Bundle.load (JProp.AdecWattUser);
 
-	    updateShell ();
-
 	    final AdecWatt adecWatt = new AdecWatt ();
 	    SwingUtilities.invokeLater (new Runnable () {
 		    public void run () {
@@ -42,36 +42,37 @@ public class LaunchAdecWatt {
 	} catch (Exception e) {
 	    File softDir = new File (Config.getPWD ().getParentFile (), "soft");
 	    File jar = new File (softDir, "UpdatedAdecWatt.jar");
+	    System.err.println ("RemoteUpdate...");
 	    RemoteUpdate.launch (jar);
 	}
     }
 
-    public static void updateShell () {
+    // public static void updateShell () {
-	try {
+    // 	try {
-	    File dir = Config.getPWD ().getParentFile ();
+    // 	    File dir = Config.getPWD ().getParentFile ();
-	    File oldLaunch = new File (dir, "launch-lightPlot.sh");
+    // 	    File oldLaunch = new File (dir, "launch-lightPlot.sh");
-	    File softDir = new File (dir, "soft");
+    // 	    File softDir = new File (dir, "soft");
-	    File newJar = new File (softDir, "AdecWatt.jar");
+    // 	    File newJar = new File (softDir, "AdecWatt.jar");
-	    File oldJar = new File (softDir, "LightPlot.jar");
+    // 	    File oldJar = new File (softDir, "LightPlot.jar");
-	    if (newJar.length () < 1024)
+    // 	    if (newJar.length () < 1024)
-		return;
+    // 		return;
-	    if (oldLaunch.length () > 70) {
+    // 	    if (oldLaunch.length () > 70) {
-		PrintWriter pw = new PrintWriter (oldLaunch);
+    // 		PrintWriter pw = new PrintWriter (oldLaunch);
-		pw.println ("#!/bin/bash");
+    // 		pw.println ("#!/bin/bash");
-		pw.println ("cd `dirname \"$0\"`");
+    // 		pw.println ("cd `dirname \"$0\"`");
-		pw.println ("java -jar soft/AdecWatt.jar");
+    // 		pw.println ("java -jar soft/AdecWatt.jar");
-		pw.flush ();
+    // 		pw.flush ();
-		pw.close ();
+    // 		pw.close ();
-		JOptionPane.showMessageDialog (null,
+    // 		JOptionPane.showMessageDialog (null,
-					       "Votre logiciel a \u00E9t\u00E9 mis \u00E0 jour.\n"+
+    // 					       "Votre logiciel a \u00E9t\u00E9 mis \u00E0 jour.\n"+
-					       "Vous devez relancer l'application\n", "Information", JOptionPane.ERROR_MESSAGE);
+    // 					       "Vous devez relancer l'application\n", "Information", JOptionPane.ERROR_MESSAGE);
-		System.exit (0);
+    // 		System.exit (0);
-	    }
+    // 	    }
-	    if (oldJar.exists ())
+    // 	    if (oldJar.exists ())
-		oldJar.delete ();
+    // 		oldJar.delete ();
-	} catch (FileNotFoundException e) {
+    // 	} catch (FileNotFoundException e) {
-	}
+    // 	}
-    }
+    // }
 
     // ========================================
 }

src/java/adecWatt/control/LaunchUpdatedAdecWatt.java

@@ -9,6 +9,7 @@ public class LaunchUpdatedAdecWatt {
 
     // ========================================
     static public void main (String[] args) {
+	System.err.println ("LaunchUpdatedAdecWatt...");
 	Config.setPWD (LaunchUpdatedAdecWatt.class);
 	File dir = Config.getPWD ().getParentFile ();
 	RemoteUpdate.renameNewFile (dir);

src/java/adecWatt/model/AdecWatt.java

@@ -77,7 +77,11 @@ public class AdecWatt extends StateNotifier {
 	iconDB.reload ();
 	imageDB.reload ();
 	permanentDB.reload ();
+	(new Thread () {
+		public void run () {
 		    inseeDB = InseeDB.readDocument (Config.getDataUrl ("data", "server", "Insee.xml"));
+		}
+	    }).start ();
 	broadcastUpdate (BroadcastUnitRoots);
     }
 

src/java/adecWatt/model/Embedded.java

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

src/java/adecWatt/model/PermanentDB.java

@@ -114,6 +114,7 @@ public class PermanentDB {
 		try {
 		    if (file.length () == 0)
 			continue;
+		    Log.writeLog ("PermanentDB", "load "+srcDir+"/"+file.getName ());
 		    FileInputStream fileInputStream = new FileInputStream (file);
 		    Unit<?> unit = Unit.getInstanceFromStream (adecWatt, fileInputStream, file,
 							       serverToken.equals (srcDir) ? UnitLocation.Server : UnitLocation.Local);

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);
 	    }
     }