diff --git a/ant/build.xml b/ant/build.xml index 74fc2f8..db1f2e2 100644 --- a/ant/build.xml +++ b/ant/build.xml @@ -24,7 +24,7 @@ - + @@ -121,6 +121,7 @@ + diff --git a/data/config/BundleManager.xml b/data/config/BundleManager.xml index c223597..1cc221d 100644 --- a/data/config/BundleManager.xml +++ b/data/config/BundleManager.xml @@ -1,38 +1,38 @@ - + -This file is automaticaly generated by BundleManager application at 6:58 PM on Aug 17, 2018. -0 -2 -North -/mnt/f/home/felix/Travail/IUT/M3101/data/config -false -false - -[x=50,y=50] -data/images/bundle/bundle.png -false -false -1 -true -[x=50,y=50] -false -/mnt/sata/stock/nomade/IRISA-UBS/ImageByTrees/src/java/imageByTrees/app +This file is automaticaly generated by BundleManager application at 7:38 PM on Jan 26, 2022. +true +true +false +[x=50,y=50] true -[x=50,y=50] +/mnt/sata/stock/nomade/IRISA-UBS/ImageByTrees/src/java/imageByTrees/app North -[x=50,y=50] -North -[x=50,y=50] +true +false +South data/log +2 +[x=50,y=50] true -[x=50,y=50] +false +[x=50,y=50] +[x=50,y=50] + +0 +1 [x=50,y=50] -false -South -true -true -false +North +false +false +false +false +[x=50,y=50] +data/images/bundle/bundle.png +/mnt/f/home/felix/Travail/IUT/M3101/data/config +[x=50,y=50] +North diff --git a/data/config/Chat.xml b/data/config/Chat.xml index 095ad39..ec0d226 100644 --- a/data/config/Chat.xml +++ b/data/config/Chat.xml @@ -1,60 +1,60 @@ - + -This file is automaticaly generated by Chat application at 8:59 AM on Aug 17, 2018. -1 -projets.iut-info-vannes.net -127.0.0.10 -3 -10 -data/images/chat/chat.png -false -/ -squidva.univ-ubs.fr +This file is automaticaly generated by Chat application at 7:40 PM on Jan 26, 2022. true -felix +data/log +10 +80 +3 +isa +8080 +10 +false +2 10 +1 +/ +[x=50,y=50] +127.0.0.10 +projets.iut-info-vannes.net +2 [x=50,y=50] -80 -false -[x=50,y=50] +[x=50,y=50] 1 - - data/log +felix +false +64 +10 +squidva.univ-ubs.fr +18 +3 /home/felix -[x=50,y=50] -2 -10 +10 +127.0.0.1 +1 -10 -1 -64 -false +2 + +false 8080 -8080 -2 localhost -2 -10 - - -data/log - -10 -127.0.0.1 -3 -false +2 + false -[x=50,y=50] -isa -2 -inconnu_2212 -SetDodwan -18 +false 9090 -10 -10 +inconnu_5342 3128 -10 +SetDodwan + +[x=50,y=50] +10 +data/images/chat/chat.png + +10 + +10 +10 diff --git a/data/config/Login.xml b/data/config/Login.xml index 72cc4df..a9bf116 100644 --- a/data/config/Login.xml +++ b/data/config/Login.xml @@ -1,69 +1,70 @@ - + -This file is automaticaly generated by Login application at 8:54 AM on Aug 17, 2018. -1 -0 +This file is automaticaly generated by Login application at 7:40 PM on Jan 26, 2022. +data/log +10 +1 +1 3 +8080 +10 +false +1 +North +10 +1 +/ +[x=50,y=50] 127.0.0.10 -data/images/login/login.png -2 +1 [x=50,y=50] -10 -false -true -felix -10 -true [x=50,y=50] -false -[x=50,y=50] -false +[x=50,y=50] 1 - - +false data/log -[x=50,y=50] -1 -10 - -10 -1 -true -false -1 -true -80 -8080 -1 +false +felix +false +North North / -localhost -1 -10 -false -North - - -data/log - -10 -projets.iut-info-vannes.net -false -1 +10 +false +data/images/login/login.png 2 -false -false -North -[x=50,y=50] +2 +true +10 +projets.iut-info-vannes.net +true +1 + 2 -[x=50,y=50] -North -SetClient + +false +80 +true +localhost +1 + +false +false [x=50,y=50] -10 -10 -10 -[x=50,y=50] +0 +SetClient +[x=50,y=50] + +[x=50,y=50] false +10 +true + +North +10 + +10 +[x=50,y=50] +10 diff --git a/data/config/Misc.xml b/data/config/Misc.xml index e0657a8..f583f7f 100644 --- a/data/config/Misc.xml +++ b/data/config/Misc.xml @@ -1,7 +1,7 @@ -This file is automaticaly generated by Misc application at 10:48 AM on Jan 28, 2021. +This file is automaticaly generated by Misc application at 7:40 PM on Jan 26, 2022. [x=50,y=50] [x=50,y=50] @@ -12,6 +12,6 @@ [x=50,y=50] -data/images/misc.png false +data/images/misc.png diff --git a/import/jar/junit-4.6.jar b/import/jar/junit-4.6.jar new file mode 100755 index 0000000..00770a4 Binary files /dev/null and b/import/jar/junit-4.6.jar differ diff --git a/src/java/network/ProtocolManager.java b/src/java/network/ProtocolManager.java index 765aab9..9bfabaf 100644 --- a/src/java/network/ProtocolManager.java +++ b/src/java/network/ProtocolManager.java @@ -238,7 +238,7 @@ import static misc.Util.GBCNL; Protocol protocol = null; if (unsetProtocolToken.equals (protocolType)) ; - } else if (setClientToken.equals (protocolType)) { + else if (setClientToken.equals (protocolType)) { if (proxyCheckBox.isSelected ()) protocol = new Client (hostCB.getItemAt (hostCB.getSelectedIndex ()), portCB.getItemAt (portCB.getSelectedIndex ()), @@ -309,9 +309,6 @@ import static misc.Util.GBCNL; // ======================================== public void addActiveButtons (Hashtable buttons) { // XXX ??? fournir la sous-liste - for (String action : Arrays.asList (GameManager.actionPlayersClass, GameManager.actionCut, - GameManager.actionEmpty, GameManager.actionOpen)) - addNoNetworkCommand (buttons.get (action)); } // ========================================