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

First fix

Browse Source
This commit is contained in:
François 2022-01-26 19:42:09 +01:00
parent 766904b714
commit fb5abb2807
7 changed files with 150 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ant/build.xml
View File

@ -24,7 +24,7 @@
<path id="test.classpath"> <path id="test.classpath">
<pathelement location="${result.class}"/> <pathelement location="${result.class}"/>
<pathelement path="/usr/share/java/junit4.jar:/usr/share/java/junit.jar:${java.class.path}:${result.miscJar}"/> <pathelement path="/usr/share/java/junit4.jar:/usr/share/java/junit.jar:${java.class.path}:${result.miscJar}:${junit.jar}"/>
<fileset dir="${result.jar}"> <fileset dir="${result.jar}">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
@ -121,6 +121,7 @@
<src path="${java.test}"/> <src path="${java.test}"/>
<classpath> <classpath>
<pathelement location="${result.class}"/> <pathelement location="${result.class}"/>
<pathelement location="${junit.jar}"/>
</classpath> </classpath>
</javac> </javac>
</target> </target>

64
data/config/BundleManager.xml
View File

@ -1,38 +1,38 @@
<?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 BundleManager application at 6:58 PM on Aug 17, 2018.</comment> <comment>This file is automaticaly generated by BundleManager application at 7:38 PM on Jan 26, 2022.</comment>
<entry key="FileOrder">0</entry>
<entry key="HelpOrder">2</entry>
<entry key="HelpPlace">North</entry>
<entry key="BundleDir">/mnt/f/home/felix/Travail/IUT/M3101/data/config</entry>
<entry key="BundleManagerToolBarUndocked">false</entry>
<entry key="HelpUndocked">false</entry>
<entry key="BundleLocation">[x=50,y=50]</entry>
<entry key="BundleIcon">data/images/bundle/bundle.png</entry>
<entry key="FileUndocked">false</entry>
<entry key="LicenceChecked">false</entry>
<entry key="BundleOrder">1</entry>
<entry key="HelpChecked">true</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="JConsoleChecked">false</entry>
<entry key="SourceIteratorDir">/mnt/sata/stock/nomade/IRISA-UBS/ImageByTrees/src/java/imageByTrees/app</entry>
<entry key="PackBugChecked">true</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry>
<entry key="FilePlace">North</entry>
<entry key="AboutLocation">[x=50,y=50]</entry>
<entry key="BundleManagerToolBarPlace">North</entry>
<entry key="HelpLocation">[x=50,y=50]</entry>
<entry key="dumpDir">data/log</entry>
<entry key="BundleManagerToolBarChecked">true</entry>
<entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="FileLocation">[x=50,y=50]</entry>
<entry key="BundleUndocked">false</entry>
<entry key="BundlePlace">South</entry>
<entry key="FileChecked">true</entry> <entry key="FileChecked">true</entry>
<entry key="BundleChecked">true</entry> <entry key="BundleChecked">true</entry>
<entry key="BundleUndocked">false</entry>
<entry key="HelpLocation">[x=50,y=50]</entry>
<entry key="PackBugChecked">true</entry>
<entry key="SourceIteratorDir">/mnt/sata/stock/nomade/IRISA-UBS/ImageByTrees/src/java/imageByTrees/app</entry>
<entry key="FilePlace">North</entry>
<entry key="HelpChecked">true</entry>
<entry key="AboutChecked">false</entry> <entry key="AboutChecked">false</entry>
<entry key="BundlePlace">South</entry>
<entry key="dumpDir">data/log</entry>
<entry key="HelpOrder">2</entry>
<entry key="BundleLocation">[x=50,y=50]</entry>
<entry key="BundleManagerToolBarChecked">true</entry>
<entry key="FileUndocked">false</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="AboutLocation">[x=50,y=50]</entry>
<entry key="Variant"/>
<entry key="FileOrder">0</entry>
<entry key="BundleOrder">1</entry>
<entry key="FileLocation">[x=50,y=50]</entry>
<entry key="BundleManagerToolBarPlace">North</entry>
<entry key="JConsoleChecked">false</entry>
<entry key="BundleManagerToolBarUndocked">false</entry>
<entry key="LicenceChecked">false</entry>
<entry key="HelpUndocked">false</entry>
<entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="BundleIcon">data/images/bundle/bundle.png</entry>
<entry key="BundleDir">/mnt/f/home/felix/Travail/IUT/M3101/data/config</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry>
<entry key="HelpPlace">North</entry>
</properties> </properties>

106
data/config/Chat.xml
View File

@ -1,60 +1,60 @@
<?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 Chat application at 8:59 AM on Aug 17, 2018.</comment> <comment>This file is automaticaly generated by Chat application at 7:40 PM on Jan 26, 2022.</comment>
<entry key="groupMember-size">1</entry>
<entry key="hostProtocol-0001">projets.iut-info-vannes.net</entry>
<entry key="hostProtocol-0002">127.0.0.10</entry>
<entry key="hostProtocol-size">3</entry>
<entry key="pseudo-max">10</entry>
<entry key="ChatIcon">data/images/chat/chat.png</entry>
<entry key="SetProxyChecked">false</entry>
<entry key="uriProtocol">/</entry>
<entry key="hostProxy-0001">squidva.univ-ubs.fr</entry>
<entry key="ManageExtentionChecked">true</entry> <entry key="ManageExtentionChecked">true</entry>
<entry key="pseudo">felix</entry>
<entry key="uriProtocol-max">10</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="portProtocol-0001">80</entry>
<entry key="PackBugChecked">false</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry>
<entry key="groupAdmin-size">1</entry>
<entry key="groupName"></entry>
<entry key="dumpDir">data/log</entry>
<entry key="ChatDir">/home/felix</entry>
<entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="hostProxy-size">2</entry>
<entry key="portProtocol-max">10</entry>
<entry key="groupName-max">10</entry>
<entry key="groupName-size">1</entry>
<entry key="ChatColumns">64</entry>
<entry key="AboutChecked">false</entry>
<entry key="portProtocol">8080</entry>
<entry key="portProxy">8080</entry>
<entry key="portProtocol-size">2</entry>
<entry key="hostProxy">localhost</entry>
<entry key="pseudo-size">2</entry>
<entry key="hostProtocol-max">10</entry>
<entry key="groupAdmin"></entry>
<entry key="logPath">data/log</entry> <entry key="logPath">data/log</entry>
<entry key="groupMember"></entry>
<entry key="groupAdmin-max">10</entry>
<entry key="hostProtocol">127.0.0.1</entry>
<entry key="portProxy-size">3</entry>
<entry key="LicenceChecked">false</entry>
<entry key="JConsoleChecked">false</entry>
<entry key="AboutLocation">[x=50,y=50]</entry>
<entry key="pseudo-0001">isa</entry>
<entry key="uriProtocol-size">2</entry>
<entry key="chatLogin">inconnu_2212</entry>
<entry key="ProtocolType">SetDodwan</entry>
<entry key="ChatRows">18</entry>
<entry key="portProxy-0002">9090</entry>
<entry key="groupMember-max">10</entry>
<entry key="hostProxy-max">10</entry> <entry key="hostProxy-max">10</entry>
<entry key="portProxy-0001">3128</entry> <entry key="portProtocol-0001">80</entry>
<entry key="portProxy-size">3</entry>
<entry key="pseudo-0001">isa</entry>
<entry key="portProxy">8080</entry>
<entry key="portProxy-max">10</entry> <entry key="portProxy-max">10</entry>
<entry key="AboutChecked">false</entry>
<entry key="portProtocol-size">2</entry>
<entry key="uriProtocol-max">10</entry>
<entry key="groupName-size">1</entry>
<entry key="uriProtocol">/</entry>
<entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="hostProtocol-0002">127.0.0.10</entry>
<entry key="hostProtocol-0001">projets.iut-info-vannes.net</entry>
<entry key="pseudo-size">2</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="AboutLocation">[x=50,y=50]</entry>
<entry key="groupAdmin-size">1</entry>
<entry key="dumpDir">data/log</entry>
<entry key="pseudo">felix</entry>
<entry key="PackBugChecked">false</entry>
<entry key="ChatColumns">64</entry>
<entry key="groupMember-max">10</entry>
<entry key="hostProxy-0001">squidva.univ-ubs.fr</entry>
<entry key="ChatRows">18</entry>
<entry key="hostProtocol-size">3</entry>
<entry key="ChatDir">/home/felix</entry>
<entry key="pseudo-max">10</entry>
<entry key="hostProtocol">127.0.0.1</entry>
<entry key="groupMember-size">1</entry>
<entry key="uriProtocol-size">2</entry>
<entry key="groupMember"/>
<entry key="SetProxyChecked">false</entry>
<entry key="portProtocol">8080</entry>
<entry key="hostProxy">localhost</entry>
<entry key="hostProxy-size">2</entry>
<entry key="Variant"/>
<entry key="JConsoleChecked">false</entry>
<entry key="LicenceChecked">false</entry>
<entry key="portProxy-0002">9090</entry>
<entry key="chatLogin">inconnu_5342</entry>
<entry key="portProxy-0001">3128</entry>
<entry key="ProtocolType">SetDodwan</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry>
<entry key="portProtocol-max">10</entry>
<entry key="ChatIcon">data/images/chat/chat.png</entry>
<entry key="groupAdmin"/>
<entry key="hostProtocol-max">10</entry>
<entry key="groupName"/>
<entry key="groupName-max">10</entry>
<entry key="groupAdmin-max">10</entry>
</properties> </properties>

119
data/config/Login.xml
View File

@ -1,69 +1,70 @@
<?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 Login application at 8:54 AM on Aug 17, 2018.</comment> <comment>This file is automaticaly generated by Login application at 7:40 PM on Jan 26, 2022.</comment>
<entry key="groupMember-size">1</entry> <entry key="logPath">data/log</entry>
<entry key="FileOrder">0</entry> <entry key="hostProxy-max">10</entry>
<entry key="HelpOrder">3</entry> <entry key="portProxy-size">1</entry>
<entry key="hostProtocol-0001">127.0.0.10</entry>
<entry key="LoginIcon">data/images/login/login.png</entry>
<entry key="hostProtocol-size">2</entry>
<entry key="NetworkLocation">[x=50,y=50]</entry>
<entry key="pseudo-max">10</entry>
<entry key="SetProxyChecked">false</entry>
<entry key="ConnectionChecked">true</entry>
<entry key="pseudo">felix</entry>
<entry key="uriProtocol-max">10</entry>
<entry key="HelpChecked">true</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="PackBugChecked">false</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry>
<entry key="ConnectionUndocked">false</entry>
<entry key="groupAdmin-size">1</entry>
<entry key="groupName"></entry>
<entry key="dumpDir">data/log</entry>
<entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="hostProxy-size">1</entry>
<entry key="portProtocol-max">10</entry>
<entry key="groupName-max">10</entry>
<entry key="groupName-size">1</entry>
<entry key="FileChecked">true</entry>
<entry key="AboutChecked">false</entry>
<entry key="ConnectionOrder">1</entry> <entry key="ConnectionOrder">1</entry>
<entry key="NetworkChecked">true</entry> <entry key="HelpOrder">3</entry>
<entry key="portProtocol">80</entry>
<entry key="portProxy">8080</entry> <entry key="portProxy">8080</entry>
<entry key="portProxy-max">10</entry>
<entry key="AboutChecked">false</entry>
<entry key="portProtocol-size">1</entry> <entry key="portProtocol-size">1</entry>
<entry key="FilePlace">North</entry>
<entry key="uriProtocol-max">10</entry>
<entry key="groupName-size">1</entry>
<entry key="uriProtocol">/</entry>
<entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="hostProtocol-0001">127.0.0.10</entry>
<entry key="pseudo-size">1</entry>
<entry key="NetworkLocation">[x=50,y=50]</entry>
<entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="AboutLocation">[x=50,y=50]</entry>
<entry key="groupAdmin-size">1</entry>
<entry key="FileUndocked">false</entry>
<entry key="dumpDir">data/log</entry>
<entry key="HelpUndocked">false</entry>
<entry key="pseudo">felix</entry>
<entry key="PackBugChecked">false</entry>
<entry key="ConnectionPlace">North</entry>
<entry key="HelpPlace">North</entry> <entry key="HelpPlace">North</entry>
<entry key="uriProtocol-0001">/</entry> <entry key="uriProtocol-0001">/</entry>
<entry key="hostProxy">localhost</entry>
<entry key="pseudo-size">1</entry>
<entry key="hostProtocol-max">10</entry>
<entry key="HelpUndocked">false</entry>
<entry key="NetworkPlace">North</entry>
<entry key="groupAdmin"></entry>
<entry key="logPath">data/log</entry>
<entry key="groupMember"></entry>
<entry key="groupAdmin-max">10</entry>
<entry key="hostProtocol">projets.iut-info-vannes.net</entry>
<entry key="FileUndocked">false</entry>
<entry key="portProxy-size">1</entry>
<entry key="NetworkOrder">2</entry>
<entry key="LicenceChecked">false</entry>
<entry key="JConsoleChecked">false</entry>
<entry key="FilePlace">North</entry>
<entry key="AboutLocation">[x=50,y=50]</entry>
<entry key="uriProtocol-size">2</entry>
<entry key="HelpLocation">[x=50,y=50]</entry>
<entry key="ConnectionPlace">North</entry>
<entry key="ProtocolType">SetClient</entry>
<entry key="FileLocation">[x=50,y=50]</entry>
<entry key="groupMember-max">10</entry> <entry key="groupMember-max">10</entry>
<entry key="hostProxy-max">10</entry> <entry key="ConnectionUndocked">false</entry>
<entry key="portProxy-max">10</entry> <entry key="LoginIcon">data/images/login/login.png</entry>
<entry key="ConnectionLocation">[x=50,y=50]</entry> <entry key="NetworkOrder">2</entry>
<entry key="hostProtocol-size">2</entry>
<entry key="NetworkChecked">true</entry>
<entry key="pseudo-max">10</entry>
<entry key="hostProtocol">projets.iut-info-vannes.net</entry>
<entry key="HelpChecked">true</entry>
<entry key="groupMember-size">1</entry>
<entry key="uriProtocol-size">2</entry>
<entry key="groupMember"/>
<entry key="SetProxyChecked">false</entry>
<entry key="portProtocol">80</entry>
<entry key="FileChecked">true</entry>
<entry key="hostProxy">localhost</entry>
<entry key="hostProxy-size">1</entry>
<entry key="Variant"/>
<entry key="JConsoleChecked">false</entry>
<entry key="LicenceChecked">false</entry>
<entry key="FileLocation">[x=50,y=50]</entry>
<entry key="FileOrder">0</entry>
<entry key="ProtocolType">SetClient</entry>
<entry key="HelpLocation">[x=50,y=50]</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry>
<entry key="NetworkUndocked">false</entry> <entry key="NetworkUndocked">false</entry>
<entry key="portProtocol-max">10</entry>
<entry key="ConnectionChecked">true</entry>
<entry key="groupAdmin"/>
<entry key="NetworkPlace">North</entry>
<entry key="hostProtocol-max">10</entry>
<entry key="groupName"/>
<entry key="groupName-max">10</entry>
<entry key="ConnectionLocation">[x=50,y=50]</entry>
<entry key="groupAdmin-max">10</entry>
</properties> </properties>

4
data/config/Misc.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?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 Misc application at 10:48 AM on Jan 28, 2021.</comment> <comment>This file is automaticaly generated by Misc application at 7:40 PM on Jan 26, 2022.</comment>
<entry key="LicenceLocation">[x=50,y=50]</entry> <entry key="LicenceLocation">[x=50,y=50]</entry>
<entry key="JConsoleLocation">[x=50,y=50]</entry> <entry key="JConsoleLocation">[x=50,y=50]</entry>
@ -12,6 +12,6 @@
<entry key="FrameLocation">[x=50,y=50]</entry> <entry key="FrameLocation">[x=50,y=50]</entry>
<entry key="Variant"/> <entry key="Variant"/>
<entry key="MiscIcon">data/images/misc.png</entry>
<entry key="PackBugChecked">false</entry> <entry key="PackBugChecked">false</entry>
<entry key="MiscIcon">data/images/misc.png</entry>
</properties> </properties>

BIN
import/jar/junit-4.6.jar Executable file
View File

Binary file not shown.

5
src/java/network/ProtocolManager.java
View File

@ -238,7 +238,7 @@ import static misc.Util.GBCNL;
Protocol protocol = null; Protocol protocol = null;
if (unsetProtocolToken.equals (protocolType)) if (unsetProtocolToken.equals (protocolType))
; ;
} else if (setClientToken.equals (protocolType)) { else if (setClientToken.equals (protocolType)) {
if (proxyCheckBox.isSelected ()) if (proxyCheckBox.isSelected ())
protocol = new Client (hostCB.getItemAt (hostCB.getSelectedIndex ()), protocol = new Client (hostCB.getItemAt (hostCB.getSelectedIndex ()),
portCB.getItemAt (portCB.getSelectedIndex ()), portCB.getItemAt (portCB.getSelectedIndex ()),
@ -309,9 +309,6 @@ import static misc.Util.GBCNL;
// ======================================== // ========================================
public void addActiveButtons (Hashtable<String, AbstractButton> buttons) { public void addActiveButtons (Hashtable<String, AbstractButton> buttons) {
// XXX ??? fournir la sous-liste // XXX ??? fournir la sous-liste
for (String action : Arrays.asList (GameManager.actionPlayersClass, GameManager.actionCut,
GameManager.actionEmpty, GameManager.actionOpen))
addNoNetworkCommand (buttons.get (action));
} }
// ======================================== // ========================================