francois/adecWatt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix insee lock

Browse Source
This commit is contained in:
François 2022-01-27 09:22:53 +01:00
parent bca1181b8b
commit cb7e8d110c
6 changed files with 93 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
data/config/AdecWatt.xml
View File

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

BIN
soft/Misc.jar
View File

Binary file not shown.

57
src/java/adecWatt/control/LaunchAdecWatt.java
View File

@ -18,8 +18,10 @@ public class LaunchAdecWatt {
// ======================================== // ========================================
static public void main (String[] args) { static public void main (String[] args) {
try { try {
System.err.println ("Config...");
Config.setPWD (LaunchAdecWatt.class); Config.setPWD (LaunchAdecWatt.class);
Config.load ("AdecWatt"); Config.load ("AdecWatt");
System.err.println ("Bundle...");
Bundle.load ("Help"); Bundle.load ("Help");
Bundle.load ("ToolBar"); Bundle.load ("ToolBar");
Bundle.load ("Proxy"); Bundle.load ("Proxy");
@ -29,8 +31,6 @@ public class LaunchAdecWatt {
Bundle.load ("AdecWatt"); Bundle.load ("AdecWatt");
Bundle.load (JProp.AdecWattUser); Bundle.load (JProp.AdecWattUser);
updateShell ();
final AdecWatt adecWatt = new AdecWatt (); final AdecWatt adecWatt = new AdecWatt ();
SwingUtilities.invokeLater (new Runnable () { SwingUtilities.invokeLater (new Runnable () {
public void run () { public void run () {
@ -42,36 +42,37 @@ public class LaunchAdecWatt {
} catch (Exception e) { } catch (Exception e) {
File softDir = new File (Config.getPWD ().getParentFile (), "soft"); File softDir = new File (Config.getPWD ().getParentFile (), "soft");
File jar = new File (softDir, "UpdatedAdecWatt.jar"); File jar = new File (softDir, "UpdatedAdecWatt.jar");
System.err.println ("RemoteUpdate...");
RemoteUpdate.launch (jar); 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) {
} // }
} // }
// ======================================== // ========================================
} }

1
src/java/adecWatt/control/LaunchUpdatedAdecWatt.java
View File

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

4
src/java/adecWatt/model/AdecWatt.java
View File

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

1
src/java/adecWatt/model/PermanentDB.java
View File

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