From cb7e8d110ce16f991109239496b879fe2fbaf24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Thu, 27 Jan 2022 09:22:53 +0100 Subject: [PATCH] fix insee lock --- data/config/AdecWatt.xml | 90 ++++++++++-------- soft/Misc.jar | Bin 507851 -> 507849 bytes src/java/adecWatt/control/LaunchAdecWatt.java | 57 +++++------ .../control/LaunchUpdatedAdecWatt.java | 1 + src/java/adecWatt/model/AdecWatt.java | 6 +- src/java/adecWatt/model/PermanentDB.java | 1 + 6 files changed, 88 insertions(+), 67 deletions(-) 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 64632dc11bcca6a4e943e497879ce9c498c857cd..96ff5f899e028a75fc0aa46900f1cbda3a3f6064 100644 GIT binary patch delta 10916 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 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);