diff --git a/data/config/AdecWatt.xml b/data/config/AdecWatt.xml index 85c548a..ddfe28a 100644 --- a/data/config/AdecWatt.xml +++ b/data/config/AdecWatt.xml @@ -1,62 +1,76 @@ - + -This file is automaticaly generated by AdecWatt application at 5:44 PM on Jan 25, 2022. - -North -Day - -5 -0 +This file is automaticaly generated by AdecWatt application at 3:16 PM on Jan 26, 2022. +true 4 -true -20220125 -1 -false -true -false +data/images/adecWatt.png +true + + + +North + North -true +North +false + +North +[x=50,y=50] +20220126 +true [x=50,y=50] -North +true -[x=50,y=50] +[x=50,y=50] +false + +false +data/log/ +false +true 3 +false +North + true -data/log/ -[x=50,y=50] +true +[x=50,y=50] +true -true -false -data/images/adecWatt.png -true + +true false -/home/felix/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz -North +3128 +false + false +true +2 +false -false -false -2 -false -true +1 + + + +5 false +North +/home/felix/perso/adecWatt56/data/export/CendresLampionsChapelleBleue.lpz +0 + + -true true -North -[x=50,y=50] -North -true +Day -true -false -3128 + + diff --git a/soft/Misc.jar b/soft/Misc.jar index 64632dc..96ff5f8 100644 Binary files a/soft/Misc.jar and b/soft/Misc.jar differ diff --git a/src/java/adecWatt/control/LaunchAdecWatt.java b/src/java/adecWatt/control/LaunchAdecWatt.java index fb50daa..9b1ac0e 100644 --- a/src/java/adecWatt/control/LaunchAdecWatt.java +++ b/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 () { - try { - File dir = Config.getPWD ().getParentFile (); - File oldLaunch = new File (dir, "launch-lightPlot.sh"); - File softDir = new File (dir, "soft"); - File newJar = new File (softDir, "AdecWatt.jar"); - File oldJar = new File (softDir, "LightPlot.jar"); - if (newJar.length () < 1024) - return; - if (oldLaunch.length () > 70) { - PrintWriter pw = new PrintWriter (oldLaunch); - pw.println ("#!/bin/bash"); - pw.println ("cd `dirname \"$0\"`"); - pw.println ("java -jar soft/AdecWatt.jar"); - pw.flush (); - pw.close (); - JOptionPane.showMessageDialog (null, - "Votre logiciel a \u00E9t\u00E9 mis \u00E0 jour.\n"+ - "Vous devez relancer l'application\n", "Information", JOptionPane.ERROR_MESSAGE); - System.exit (0); - } - if (oldJar.exists ()) - oldJar.delete (); - } catch (FileNotFoundException e) { - } - } + // public static void updateShell () { + // try { + // File dir = Config.getPWD ().getParentFile (); + // File oldLaunch = new File (dir, "launch-lightPlot.sh"); + // File softDir = new File (dir, "soft"); + // File newJar = new File (softDir, "AdecWatt.jar"); + // File oldJar = new File (softDir, "LightPlot.jar"); + // if (newJar.length () < 1024) + // return; + // if (oldLaunch.length () > 70) { + // PrintWriter pw = new PrintWriter (oldLaunch); + // pw.println ("#!/bin/bash"); + // pw.println ("cd `dirname \"$0\"`"); + // pw.println ("java -jar soft/AdecWatt.jar"); + // pw.flush (); + // pw.close (); + // JOptionPane.showMessageDialog (null, + // "Votre logiciel a \u00E9t\u00E9 mis \u00E0 jour.\n"+ + // "Vous devez relancer l'application\n", "Information", JOptionPane.ERROR_MESSAGE); + // System.exit (0); + // } + // if (oldJar.exists ()) + // oldJar.delete (); + // } catch (FileNotFoundException e) { + // } + // } // ======================================== } diff --git a/src/java/adecWatt/control/LaunchUpdatedAdecWatt.java b/src/java/adecWatt/control/LaunchUpdatedAdecWatt.java index 10c7a9c..783581b 100644 --- a/src/java/adecWatt/control/LaunchUpdatedAdecWatt.java +++ b/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); diff --git a/src/java/adecWatt/model/AdecWatt.java b/src/java/adecWatt/model/AdecWatt.java index 22ee5d0..13af3e6 100644 --- a/src/java/adecWatt/model/AdecWatt.java +++ b/src/java/adecWatt/model/AdecWatt.java @@ -77,7 +77,11 @@ public class AdecWatt extends StateNotifier { iconDB.reload (); imageDB.reload (); permanentDB.reload (); - inseeDB = InseeDB.readDocument (Config.getDataUrl ("data", "server", "Insee.xml")); + (new Thread () { + public void run () { + inseeDB = InseeDB.readDocument (Config.getDataUrl ("data", "server", "Insee.xml")); + } + }).start (); broadcastUpdate (BroadcastUnitRoots); } diff --git a/src/java/adecWatt/model/PermanentDB.java b/src/java/adecWatt/model/PermanentDB.java index aa96796..98ac502 100644 --- a/src/java/adecWatt/model/PermanentDB.java +++ b/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);