From ff21440ab51041f17a9dde406182092dadc34725 Mon Sep 17 00:00:00 2001
From: BERGER Frederic <>
Date: Fri, 25 Jun 2021 11:17:28 +0200
Subject: [PATCH] IDE rules update (Netbeans 8.2 to 12)
---
nbproject/build-impl.xml | 3191 +++++++++--------
nbproject/genfiles.properties | 16 +-
nbproject/private/private.properties | 2 +-
nbproject/project.properties | 12 +
randomskillstest.xml | 343 ++
src/bb/teamma/rules/lrb4/dwarves.xml | 1 +
src/bb/teamma/views/Bundle.properties | 4 -
src/bb/teamma/views/JdgRoster.java | 14 +-
src/bb/teamma/views/JdgSelectSkill.form | 15 +-
src/bb/teamma/views/JdgSelectSkill.java | 7 +-
.../views/report/JdgPrintableRoster.form | 16 +-
src/bb/tourma/JdgChangePairing.form | 10 +-
src/bb/tourma/JdgCoach.form | 52 +-
src/bb/tourma/JdgCoach.java | 2 +-
src/bb/tourma/JdgCupOptions.form | 40 +-
src/bb/tourma/JdgManualCupDraw.form | 10 +-
src/bb/tourma/JdgMassAdd.form | 18 +-
src/bb/tourma/JdgPairing.form | 22 +-
src/bb/tourma/JdgParameters.form | 69 +-
src/bb/tourma/JdgParameters.java | 74 +-
src/bb/tourma/JdgRosters.form | 22 +-
src/bb/tourma/JdgSelectNumber.form | 8 +-
src/bb/tourma/JdgTeam.form | 32 +-
src/bb/tourma/JdgTeam.java | 2 +-
src/bb/tourma/JdgTeamPairing.form | 16 +-
src/bb/tourma/MainFrame.java | 2 +-
src/bb/tourma/data/Tournament.java | 12 +
src/bb/tourma/languages/language.properties | 1 +
.../tourma/languages/language_fr.properties | 4 +-
.../views/fullscreen/JFullScreenTeamRank.java | 4 +-
.../views/parameters/JPNParamCategories.form | 18 +-
.../tourma/views/parameters/JPNParamClan.form | 28 +-
.../views/parameters/JPNParamCriterias.form | 28 +-
.../views/parameters/JPNParamFormulas.form | 8 +-
.../views/parameters/JPNParamGroup.form | 36 +-
.../views/parameters/JPNParamIndiv.form | 38 +-
.../tourma/views/parameters/JPNParamTeam.form | 80 +-
.../views/parameters/JPNParameters.form | 26 +-
src/bb/tourma/views/parameters/JPNTeams.form | 12 +-
src/bb/tourma/views/report/JdgGlobal.form | 16 +-
src/bb/tourma/views/report/JdgPrintLabel.form | 8 +-
src/bb/tourma/views/report/JdgRanking.form | 16 +-
src/bb/tourma/views/report/JdgReport.form | 24 +-
src/bb/tourma/views/report/JdgRound.form | 16 +-
.../tourma/views/round/JPNAnnexRanking.form | 16 +-
src/bb/tourma/views/round/JPNCategory.form | 12 +-
src/bb/tourma/views/round/JPNClan.form | 14 +-
src/bb/tourma/views/round/JPNGroup.form | 8 +-
src/bb/tourma/views/round/JPNMatch.form | 12 +-
src/bb/tourma/views/round/JPNPool.form | 14 +-
src/bb/tourma/views/round/JPNRound.form | 46 +-
src/bb/tourma/views/round/JPNTeamRound.form | 18 +-
src/bb/tourma/views/system/JdgAbout.form | 16 +-
src/bb/tourma/views/system/JdgOnlineHelp.form | 8 +-
src/bb/tourma/views/system/JdgRevisions.form | 6 +-
55 files changed, 2692 insertions(+), 1853 deletions(-)
create mode 100644 randomskillstest.xml
delete mode 100644 src/bb/teamma/views/Bundle.properties
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 7b9e7de4..1848355c 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1,1420 +1,1771 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set src.dir
- Must set test.src.dir
- Must set build.dir
- Must set dist.dir
- Must set build.classes.dir
- Must set dist.javadoc.dir
- Must set build.test.classes.dir
- Must set build.test.results.dir
- Must set build.classes.excludes
- Must set dist.jar
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- No tests executed.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must set JVM to use for profiling in profiler.info.jvm
- Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- To run this application from the command line without Ant, try:
-
- java -jar "${dist.jar.resolved}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must select one file in the IDE or set debug.class
-
-
-
-
- Must set fix.includes
-
-
-
-
-
-
-
-
-
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set profile.class
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
-
-
-
-
- This target only works when run from inside the NetBeans IDE.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
-
- Must select one file in the IDE or set run.class
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set javac.includes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some tests failed; see details above.
-
-
-
-
-
-
-
-
- Must select some files in the IDE or set test.includes
-
-
-
- Some tests failed; see details above.
-
-
-
- Must select some files in the IDE or set test.class
- Must select some method in the IDE or set test.method
-
-
-
- Some tests failed; see details above.
-
-
-
-
- Must select one file in the IDE or set test.class
-
-
-
- Must select one file in the IDE or set test.class
- Must select some method in the IDE or set test.method
-
-
-
-
-
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
- Must select one file in the IDE or set applet.url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.dir
+ Must set test.src.dir
+ Must set build.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No tests executed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set JVM to use for profiling in profiler.info.jvm
+ Must set profiler agent JVM arguments in profiler.info.jvmargs.agent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ To run this application from the command line without Ant, try:
+
+ java -jar "${dist.jar.resolved}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set profile.class
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+
+
+
+
+ This target only works when run from inside the NetBeans IDE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+ Must select some files in the IDE or set test.class
+ Must select some method in the IDE or set test.method
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+ Must select one file in the IDE or set test.class
+ Must select some method in the IDE or set test.method
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set applet.url
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 06755251..3887adb1 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=b1fa2474
-build.xml.script.CRC32=98028888
-build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=b1fa2474
-nbproject/build-impl.xml.script.CRC32=4ed1f4fa
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
+build.xml.data.CRC32=b1fa2474
+build.xml.script.CRC32=98028888
+build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=b1fa2474
+nbproject/build-impl.xml.script.CRC32=4984fb77
+nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.99.0.48
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
index 5ae7ef3e..79124487 100644
--- a/nbproject/private/private.properties
+++ b/nbproject/private/private.properties
@@ -8,4 +8,4 @@ file.reference.xerces.jar=C:\\Perso\\tourma\\deps_old\\jdom\\lib\\xerces.jar
file.reference.xml-apis.jar=C:\\Perso\\tourma\\libs\\xml-apis.jar
javac.debug=true
javadoc.preview=true
-user.properties.file=C:\\Users\\WFMJ7631\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
+user.properties.file=C:\\Users\\wfmj7631\\AppData\\Roaming\\NetBeans\\12.4\\build.properties
diff --git a/nbproject/project.properties b/nbproject/project.properties
index caf09e5b..c085cf7c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -20,8 +20,12 @@ build.test.results.dir=${build.dir}/test/results
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
+debug.modulepath=\
+ ${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
+debug.test.modulepath=\
+ ${run.test.modulepath}
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/TourMa.jar
@@ -90,6 +94,8 @@ javac.classpath=\
javac.compilerargs=
javac.deprecation=false
javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=1.8
@@ -108,6 +114,8 @@ javac.test.classpath=\
${file.reference.fest-reflect-1.2.jar}:\
${file.reference.fest-util-1.1.2.jar}:\
${file.reference.jcip-annotations-1.0.jar}
+javac.test.modulepath=\
+ ${javac.modulepath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
@@ -144,9 +152,13 @@ run.classpath=\
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
# or test-sys-prop.name=value to set system properties for unit tests):
run.jvmargs=-Xms64M -Xmx512M -splash:src/tourma/images/splash.png
+run.modulepath=\
+ ${javac.modulepath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
+run.test.modulepath=\
+ ${javac.test.modulepath}
source.encoding=UTF-8
source.reference.fest-assert-1.2.jar=deps_tests/fest-swing-1.2/lib/fest-assert-1.2-sources.jar
source.reference.fest-reflect-1.2.jar=deps_tests/fest-swing-1.2/lib/fest-reflect-1.2-sources.jar
diff --git a/randomskillstest.xml b/randomskillstest.xml
new file mode 100644
index 00000000..4c415c7a
--- /dev/null
+++ b/randomskillstest.xml
@@ -0,0 +1,343 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/bb/teamma/rules/lrb4/dwarves.xml b/src/bb/teamma/rules/lrb4/dwarves.xml
index 1fa1ff9f..c478f92c 100644
--- a/src/bb/teamma/rules/lrb4/dwarves.xml
+++ b/src/bb/teamma/rules/lrb4/dwarves.xml
@@ -13,6 +13,7 @@ and open the template in the editor.
DwarfKey
40000
1
+ true
2
diff --git a/src/bb/teamma/views/Bundle.properties b/src/bb/teamma/views/Bundle.properties
deleted file mode 100644
index 9c41ba4a..00000000
--- a/src/bb/teamma/views/Bundle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# To change this license header, choose License Headers in Project Properties.
-# To change this template file, choose Tools | Templates
-# and open the template in the editor.
-
diff --git a/src/bb/teamma/views/JdgRoster.java b/src/bb/teamma/views/JdgRoster.java
index a7a86487..6473547b 100644
--- a/src/bb/teamma/views/JdgRoster.java
+++ b/src/bb/teamma/views/JdgRoster.java
@@ -93,8 +93,13 @@ public JdgRoster(java.awt.Frame parent, Coach coach, Roster roster, boolean moda
_coach = new Coach();
_data = new Roster();
}
+
initComponents();
+ if ((_coach == null)||(roster!=null)) {
+ jcbLRB.setEnabled(false);
+ }
+
this.setPreferredSize(new Dimension(1024, 768));
pack();
@@ -1069,7 +1074,7 @@ private void jtbStarsMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:ev
}//GEN-LAST:event_jtbStarsMouseClicked
private void jbtHTMLActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtHTMLActionPerformed
- JdgPrintableRoster jdg = new JdgPrintableRoster(null, true, this._data, this._coach, jcbWithSkills.isSelected(),lrbversion);
+ JdgPrintableRoster jdg = new JdgPrintableRoster(null, true, this._data, this._coach, jcbWithSkills.isSelected(), lrbversion);
jdg.setVisible(true);
}//GEN-LAST:event_jbtHTMLActionPerformed
@@ -1210,7 +1215,7 @@ private void update() {
_max_champions = 2 + count_paired_stars;
if (lrbversion == null) {
- lrbversion = LRB.E_Version.BB2016;
+ lrbversion = LRB.E_Version.BB2020;
}
switch (lrbversion) {
case LRB1:
@@ -1237,6 +1242,9 @@ private void update() {
case BB2016:
jcbLRB.setSelectedIndex(7);
break;
+ case BB2020:
+ jcbLRB.setSelectedIndex(8);
+ break;
}
if (_data.getRoster() != null) {
@@ -1290,8 +1298,6 @@ private void update() {
jtbPlayers.getColumnModel().getColumn(columnIndex++).setMinWidth(10);
jtbPlayers.getColumnModel().getColumn(columnIndex++).setMinWidth(10);
jtbPlayers.getColumnModel().getColumn(columnIndex++).setMinWidth(10);
-
-
/**
* Star players
diff --git a/src/bb/teamma/views/JdgSelectSkill.form b/src/bb/teamma/views/JdgSelectSkill.form
index 2e5383a4..fb34ac01 100644
--- a/src/bb/teamma/views/JdgSelectSkill.form
+++ b/src/bb/teamma/views/JdgSelectSkill.form
@@ -55,7 +55,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -88,13 +88,20 @@
-
+
-
+
+
+
+
+
+
+
+
diff --git a/src/bb/teamma/views/JdgSelectSkill.java b/src/bb/teamma/views/JdgSelectSkill.java
index 260358d8..0aa3f19c 100644
--- a/src/bb/teamma/views/JdgSelectSkill.java
+++ b/src/bb/teamma/views/JdgSelectSkill.java
@@ -177,7 +177,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jLabel1.setText(bundle.getString("SelectColor")); // NOI18N
jPanel1.add(jLabel1);
- jbtColor.setText(" ");
+ jbtColor.setBackground(new java.awt.Color(0, 0, 0));
+ jbtColor.setText("Skill");
+ jbtColor.setBorderPainted(false);
+ jbtColor.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
jbtColor.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jbtColorActionPerformed(evt);
@@ -227,6 +230,8 @@ private void jbtColorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
Color c=JColorChooser.showDialog(this,"Choose",Color.CYAN);
this._color=c;
jbtColor.setBackground(c);
+ jbtColor.setOpaque(true);
+
}//GEN-LAST:event_jbtColorActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
diff --git a/src/bb/teamma/views/report/JdgPrintableRoster.form b/src/bb/teamma/views/report/JdgPrintableRoster.form
index a2bd83fb..c5f7f253 100644
--- a/src/bb/teamma/views/report/JdgPrintableRoster.form
+++ b/src/bb/teamma/views/report/JdgPrintableRoster.form
@@ -39,10 +39,10 @@
-
+
-
+
@@ -52,10 +52,10 @@
-
+
-
+
@@ -65,10 +65,10 @@
-
+
-
+
@@ -79,10 +79,10 @@
-
+
-
+
diff --git a/src/bb/tourma/JdgChangePairing.form b/src/bb/tourma/JdgChangePairing.form
index 4d1cc239..39946a68 100644
--- a/src/bb/tourma/JdgChangePairing.form
+++ b/src/bb/tourma/JdgChangePairing.form
@@ -32,10 +32,10 @@
-
+
-
+
@@ -46,10 +46,10 @@
-
+
-
+
@@ -75,7 +75,7 @@
-
+
diff --git a/src/bb/tourma/JdgCoach.form b/src/bb/tourma/JdgCoach.form
index 8a7795ea..0890cd76 100644
--- a/src/bb/tourma/JdgCoach.form
+++ b/src/bb/tourma/JdgCoach.form
@@ -35,10 +35,10 @@
-
+
-
+
@@ -48,10 +48,10 @@
-
+
-
+
@@ -76,8 +76,8 @@
-
-
+
+
@@ -102,7 +102,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
@@ -122,7 +122,7 @@
-
+
@@ -164,8 +164,8 @@
-
-
+
+
@@ -190,7 +190,7 @@
-
+
@@ -200,7 +200,7 @@
-
+
@@ -265,7 +265,7 @@
-
+
@@ -279,7 +279,7 @@
-
+
@@ -289,7 +289,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -343,7 +343,7 @@
-
+
@@ -356,12 +356,12 @@
-
+
-
+
@@ -378,7 +378,7 @@
-
+
@@ -386,14 +386,14 @@
-
+
-
+
@@ -407,7 +407,7 @@
-
+
@@ -417,7 +417,7 @@
-
+
@@ -435,7 +435,7 @@
-
+
diff --git a/src/bb/tourma/JdgCoach.java b/src/bb/tourma/JdgCoach.java
index 3cd87120..a5211b18 100644
--- a/src/bb/tourma/JdgCoach.java
+++ b/src/bb/tourma/JdgCoach.java
@@ -809,7 +809,7 @@ private void jbtDelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:
private void jbtAvatarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtAvatarActionPerformed
try {
- List listOfFiles = getImagesResources("/tourma/images/avatar");
+ List listOfFiles = getImagesResources("/bb//tourma/images/avatar");
Object[] objects = new Object[listOfFiles.size() + 1];
for (int i = 0; i < listOfFiles.size(); i++) {
diff --git a/src/bb/tourma/JdgCupOptions.form b/src/bb/tourma/JdgCupOptions.form
index f25d88dd..2ad74c59 100644
--- a/src/bb/tourma/JdgCupOptions.form
+++ b/src/bb/tourma/JdgCupOptions.form
@@ -41,10 +41,10 @@
-
+
-
+
@@ -89,7 +89,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -144,7 +144,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -170,7 +170,7 @@
-
+
@@ -183,7 +183,7 @@
-
+
@@ -197,7 +197,7 @@
-
+
@@ -214,7 +214,7 @@
-
+
@@ -227,7 +227,7 @@
-
+
@@ -240,7 +240,7 @@
-
+
@@ -250,7 +250,7 @@
-
+
@@ -260,7 +260,7 @@
-
+
@@ -274,7 +274,7 @@
-
+
@@ -287,7 +287,7 @@
-
+
@@ -300,7 +300,7 @@
-
+
@@ -323,7 +323,7 @@
-
+
diff --git a/src/bb/tourma/JdgManualCupDraw.form b/src/bb/tourma/JdgManualCupDraw.form
index b2b42f83..53cd2d59 100644
--- a/src/bb/tourma/JdgManualCupDraw.form
+++ b/src/bb/tourma/JdgManualCupDraw.form
@@ -41,10 +41,10 @@
-
+
-
+
@@ -131,7 +131,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
@@ -198,7 +198,7 @@
-
+
diff --git a/src/bb/tourma/JdgMassAdd.form b/src/bb/tourma/JdgMassAdd.form
index 323af4f8..57a2acc6 100644
--- a/src/bb/tourma/JdgMassAdd.form
+++ b/src/bb/tourma/JdgMassAdd.form
@@ -32,10 +32,10 @@
-
+
-
+
@@ -46,10 +46,10 @@
-
+
-
+
@@ -75,7 +75,7 @@
-
+
@@ -128,7 +128,7 @@
-
+
@@ -138,7 +138,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -159,7 +159,7 @@
-
+
diff --git a/src/bb/tourma/JdgPairing.form b/src/bb/tourma/JdgPairing.form
index c6fa2002..d18854d9 100644
--- a/src/bb/tourma/JdgPairing.form
+++ b/src/bb/tourma/JdgPairing.form
@@ -61,10 +61,10 @@
-
+
-
+
@@ -103,7 +103,7 @@
-
+
@@ -141,10 +141,10 @@
-
+
-
+
@@ -154,10 +154,10 @@
-
+
-
+
@@ -167,10 +167,10 @@
-
+
-
+
@@ -180,10 +180,10 @@
-
+
-
+
diff --git a/src/bb/tourma/JdgParameters.form b/src/bb/tourma/JdgParameters.form
index ea3b9f6c..12e99a72 100644
--- a/src/bb/tourma/JdgParameters.form
+++ b/src/bb/tourma/JdgParameters.form
@@ -17,7 +17,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
@@ -125,7 +125,7 @@
-
+
@@ -145,7 +145,7 @@
-
+
@@ -162,7 +162,7 @@
-
+
@@ -180,7 +180,7 @@
-
+
@@ -193,19 +193,50 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -215,7 +246,7 @@
-
+
@@ -233,7 +264,7 @@
-
+
@@ -247,7 +278,7 @@
-
+
@@ -260,7 +291,7 @@
-
+
@@ -273,7 +304,7 @@
-
+
@@ -289,7 +320,7 @@
-
+
@@ -308,7 +339,7 @@
-
+
@@ -322,7 +353,7 @@
-
+
@@ -345,7 +376,7 @@
-
+
diff --git a/src/bb/tourma/JdgParameters.java b/src/bb/tourma/JdgParameters.java
index e21a4f81..b33d1a08 100644
--- a/src/bb/tourma/JdgParameters.java
+++ b/src/bb/tourma/JdgParameters.java
@@ -4,13 +4,16 @@
*/
package bb.tourma;
+import bb.teamma.data.LRB;
import java.awt.DisplayMode;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import bb.tourma.data.EIndivPairing;
import bb.tourma.data.ETeamPairing;
import bb.tourma.data.Parameters;
+import bb.tourma.data.RosterType;
import bb.tourma.data.Tournament;
+import javax.swing.DefaultComboBoxModel;
/**
*
@@ -77,6 +80,14 @@ public JdgParameters(java.awt.Frame parent, boolean modal) {
jspCoachNumber.setValue(mParams.getTeamMatesNumber());
jckSubstitutes.setEnabled(mParams.isSubstitutes());
+
+ String[] lrbs = {"LRB1", "LRB2", "LRB3", "LRB4", "LRB5", "LRB6", "CRP1", "BB2016", "BB2020"};
+
+ DefaultComboBoxModel jcbModel = new DefaultComboBoxModel(lrbs);
+ jcbRules.setModel(jcbModel);
+
+ jcbRules.setSelectedIndex(jcbModel.getSize()-1);
+
update();
}
@@ -108,6 +119,9 @@ private void initComponents() {
jLabel3 = new javax.swing.JLabel();
jpnMisc = new javax.swing.JPanel();
jcxMultipleRoster = new javax.swing.JCheckBox();
+ jPanel1 = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ jcbRules = new javax.swing.JComboBox<>();
jpnIndivTeamRanking = new javax.swing.JPanel();
jrbIndivPairingByRanking = new javax.swing.JRadioButton();
jrbIndivPairingRandom = new javax.swing.JRadioButton();
@@ -183,7 +197,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jPanel3.add(jpnNbCoachs, java.awt.BorderLayout.NORTH);
jpnMisc.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("Miscellaneous"))); // NOI18N
- jpnMisc.setLayout(new java.awt.GridLayout(1, 1));
+ jpnMisc.setLayout(new java.awt.GridLayout(2, 1));
jcxMultipleRoster.setText(bundle.getString("UseSeveralRosters")); // NOI18N
jcxMultipleRoster.addActionListener(new java.awt.event.ActionListener() {
@@ -193,6 +207,19 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
jpnMisc.add(jcxMultipleRoster);
+ jLabel1.setText(bundle.getString("RosterRules")); // NOI18N
+ jPanel1.add(jLabel1);
+
+ jcbRules.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+ jcbRules.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jcbRulesActionPerformed(evt);
+ }
+ });
+ jPanel1.add(jcbRules);
+
+ jpnMisc.add(jPanel1);
+
jPanel3.add(jpnMisc, java.awt.BorderLayout.SOUTH);
jpnByTeam.add(jPanel3);
@@ -403,17 +430,62 @@ private void jcxMultipleRosterActionPerformed(java.awt.event.ActionEvent evt) {/
mParams.setMultiRoster(jcxMultipleRoster.isSelected());
}//GEN-LAST:event_jcxMultipleRosterActionPerformed
+ private LRB.E_Version lrbversion = LRB.E_Version.BB2020;
+
+
+ private void jcbRulesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jcbRulesActionPerformed
+ int index = jcbRules.getSelectedIndex();
+ LRB.E_Version newversion = LRB.E_Version.BB2020;
+ switch (index) {
+ case 0:
+ newversion = LRB.E_Version.LRB1;
+ break;
+ case 1:
+ newversion = LRB.E_Version.LRB2;
+ break;
+ case 2:
+ newversion = LRB.E_Version.LRB3;
+ break;
+ case 3:
+ newversion = LRB.E_Version.LRB4;
+ break;
+ case 4:
+ newversion = LRB.E_Version.LRB5;
+ break;
+ case 5:
+ newversion = LRB.E_Version.LRB6;
+ break;
+ case 6:
+ newversion = LRB.E_Version.CRP1;
+ break;
+ case 7:
+ newversion = LRB.E_Version.BB2016;
+ break;
+ case 8:
+ newversion = LRB.E_Version.BB2020;
+ break;
+ }
+
+ Tournament.getTournament().setLRB(LRB.getLRB(newversion));
+ RosterType.initCollection( Tournament.getTournament().getLRB());
+
+ update();
+ }//GEN-LAST:event_jcbRulesActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.ButtonGroup btgGame;
private javax.swing.ButtonGroup btgIndivTeamPairing;
private javax.swing.ButtonGroup btgTeam;
private javax.swing.ButtonGroup btgTeamPairing;
+ private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel3;
+ private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
private javax.swing.JPanel jPanel5;
private javax.swing.JButton jbtOK;
private javax.swing.JCheckBox jcbMultiroster;
+ private javax.swing.JComboBox jcbRules;
private javax.swing.JCheckBox jckSubstitutes;
private javax.swing.JCheckBox jcxMultipleRoster;
private javax.swing.JLabel jlbNbCoachs;
diff --git a/src/bb/tourma/JdgRosters.form b/src/bb/tourma/JdgRosters.form
index 90b56299..c07b7747 100644
--- a/src/bb/tourma/JdgRosters.form
+++ b/src/bb/tourma/JdgRosters.form
@@ -35,10 +35,10 @@
-
+
-
+
@@ -48,10 +48,10 @@
-
+
-
+
@@ -81,10 +81,10 @@
-
+
-
+
@@ -94,10 +94,10 @@
-
+
-
+
@@ -107,10 +107,10 @@
-
+
-
+
@@ -122,7 +122,7 @@
-
+
diff --git a/src/bb/tourma/JdgSelectNumber.form b/src/bb/tourma/JdgSelectNumber.form
index 6685109f..8ebe8cfa 100644
--- a/src/bb/tourma/JdgSelectNumber.form
+++ b/src/bb/tourma/JdgSelectNumber.form
@@ -39,7 +39,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -75,10 +75,10 @@
-
+
-
+
diff --git a/src/bb/tourma/JdgTeam.form b/src/bb/tourma/JdgTeam.form
index d6d77fb8..92727073 100644
--- a/src/bb/tourma/JdgTeam.form
+++ b/src/bb/tourma/JdgTeam.form
@@ -35,10 +35,10 @@
-
+
-
+
@@ -48,10 +48,10 @@
-
+
-
+
@@ -65,7 +65,7 @@
-
+
@@ -93,10 +93,10 @@
-
+
-
+
@@ -106,10 +106,10 @@
-
+
-
+
@@ -119,10 +119,10 @@
-
+
-
+
@@ -203,7 +203,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -231,7 +231,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -271,7 +271,7 @@
-
+
diff --git a/src/bb/tourma/JdgTeam.java b/src/bb/tourma/JdgTeam.java
index 9032841b..fa2e7740 100644
--- a/src/bb/tourma/JdgTeam.java
+++ b/src/bb/tourma/JdgTeam.java
@@ -469,7 +469,7 @@ public List getImagesResources(final String path) throws IOException
private void jbtAvatarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jbtAvatarActionPerformed
try {
- List listOfFiles = getImagesResources("/tourma/images/flags");
+ List listOfFiles = getImagesResources("/bb/tourma/images/flags");
Object[] objects = new Object[listOfFiles.size() + 1];
for (int i = 0; i < listOfFiles.size(); i++) {
diff --git a/src/bb/tourma/JdgTeamPairing.form b/src/bb/tourma/JdgTeamPairing.form
index 57f1d6ec..5f419c3f 100644
--- a/src/bb/tourma/JdgTeamPairing.form
+++ b/src/bb/tourma/JdgTeamPairing.form
@@ -61,10 +61,10 @@
-
+
-
+
@@ -74,10 +74,10 @@
-
+
-
+
@@ -107,10 +107,10 @@
-
+
-
+
@@ -120,10 +120,10 @@
-
+
-
+
diff --git a/src/bb/tourma/MainFrame.java b/src/bb/tourma/MainFrame.java
index c2334f5e..bd365622 100644
--- a/src/bb/tourma/MainFrame.java
+++ b/src/bb/tourma/MainFrame.java
@@ -1170,7 +1170,7 @@ private void jmiNouveauActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
mTournament = Tournament.getTournament();
- RosterType.initCollection();
+ RosterType.initCollection(mTournament.getLRB());
mTournament.clearGroups();
final Group group = new Group(Translate.translate(CS_None));
diff --git a/src/bb/tourma/data/Tournament.java b/src/bb/tourma/data/Tournament.java
index 575f0dbf..8304462d 100644
--- a/src/bb/tourma/data/Tournament.java
+++ b/src/bb/tourma/data/Tournament.java
@@ -50,6 +50,18 @@ public boolean isClient() {
return isClient;
}
+ LRB lrb=LRB.getLRB(LRB.E_Version.BB2020);
+
+ public LRB getLRB()
+ {
+ return lrb;
+ }
+
+ public void setLRB(LRB rules)
+ {
+ lrb=rules;
+ }
+
public void setIsClient(boolean isClient) {
this.isClient = isClient;
}
diff --git a/src/bb/tourma/languages/language.properties b/src/bb/tourma/languages/language.properties
index a5e8d272..944b5e19 100644
--- a/src/bb/tourma/languages/language.properties
+++ b/src/bb/tourma/languages/language.properties
@@ -1148,3 +1148,4 @@ DisplayByPages=Display by Pages
#Les joueurs de la Spartak ont droit \u00e0 un affichage plus sexy.
SpartakPatch=Spartak Patch
DisplayRandomSkills=Display Random Skills
+RosterRules=Roster rules
diff --git a/src/bb/tourma/languages/language_fr.properties b/src/bb/tourma/languages/language_fr.properties
index 6b13b18d..50263ac2 100644
--- a/src/bb/tourma/languages/language_fr.properties
+++ b/src/bb/tourma/languages/language_fr.properties
@@ -2369,4 +2369,6 @@ Variables\ possibles=les variables utilisables dans les formules correspondent a
UsePages=Affichage par pages
SpartakPatch= Patch Spartak
-DisplayRandomSkills=Afficher les comp\u00e9tences al\u00e9atoires
\ No newline at end of file
+DisplayRandomSkills=Afficher les comp\u00e9tences al\u00e9atoires
+
+RosterRules=R\u00e8gles de rosters
\ No newline at end of file
diff --git a/src/bb/tourma/views/fullscreen/JFullScreenTeamRank.java b/src/bb/tourma/views/fullscreen/JFullScreenTeamRank.java
index fb6582a1..06d12153 100644
--- a/src/bb/tourma/views/fullscreen/JFullScreenTeamRank.java
+++ b/src/bb/tourma/views/fullscreen/JFullScreenTeamRank.java
@@ -70,7 +70,7 @@ protected void clientLoop(int screen) throws InterruptedException {
semStart.acquire();
try {
- Font font = Font.createFont(Font.TRUETYPE_FONT, this.getClass().getResourceAsStream("/tourma/languages/calibri.ttf"));
+ Font font = Font.createFont(Font.TRUETYPE_FONT, this.getClass().getResourceAsStream("/bb/tourma/languages/calibri.ttf"));
int width = mSelectedGD.getDisplayMode().getWidth();
int height = mSelectedGD.getDisplayMode().getHeight();
@@ -178,7 +178,7 @@ private void buildPanel(ArrayList rankeds, int screen) throws FontForma
try {
// Criteria td = Tournament.getTournament().getParams().getCriterion(0);
- font = Font.createFont(Font.TRUETYPE_FONT, this.getClass().getResourceAsStream("/tourma/languages/calibri.ttf"));
+ font = Font.createFont(Font.TRUETYPE_FONT, this.getClass().getResourceAsStream("/bb/tourma/languages/calibri.ttf"));
} catch (IOException ex) {
Logger.getLogger(JFullScreenTeamRank.class.getName()).log(Level.SEVERE, null, ex);
} finally {
diff --git a/src/bb/tourma/views/parameters/JPNParamCategories.form b/src/bb/tourma/views/parameters/JPNParamCategories.form
index 68210270..ca116969 100644
--- a/src/bb/tourma/views/parameters/JPNParamCategories.form
+++ b/src/bb/tourma/views/parameters/JPNParamCategories.form
@@ -28,10 +28,10 @@
-
+
-
+
@@ -41,10 +41,10 @@
-
+
-
+
@@ -54,10 +54,10 @@
-
+
-
+
@@ -83,7 +83,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -150,7 +150,7 @@
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParamClan.form b/src/bb/tourma/views/parameters/JPNParamClan.form
index c1a394e0..9dcaf432 100644
--- a/src/bb/tourma/views/parameters/JPNParamClan.form
+++ b/src/bb/tourma/views/parameters/JPNParamClan.form
@@ -32,7 +32,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -110,10 +110,10 @@
-
+
-
+
@@ -123,10 +123,10 @@
-
+
-
+
@@ -136,10 +136,10 @@
-
+
-
+
@@ -149,10 +149,10 @@
-
+
-
+
@@ -178,7 +178,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParamCriterias.form b/src/bb/tourma/views/parameters/JPNParamCriterias.form
index c19ca345..cb2c8de3 100644
--- a/src/bb/tourma/views/parameters/JPNParamCriterias.form
+++ b/src/bb/tourma/views/parameters/JPNParamCriterias.form
@@ -28,10 +28,10 @@
-
+
-
+
@@ -41,10 +41,10 @@
-
+
-
+
@@ -58,7 +58,7 @@
-
+
@@ -77,10 +77,10 @@
-
+
-
+
@@ -92,10 +92,10 @@
-
+
-
+
@@ -106,7 +106,7 @@
-
+
@@ -128,7 +128,7 @@
-
+
@@ -147,7 +147,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -207,7 +207,7 @@
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParamFormulas.form b/src/bb/tourma/views/parameters/JPNParamFormulas.form
index 12531cbb..f811c7d2 100644
--- a/src/bb/tourma/views/parameters/JPNParamFormulas.form
+++ b/src/bb/tourma/views/parameters/JPNParamFormulas.form
@@ -28,10 +28,10 @@
-
+
-
+
@@ -41,10 +41,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParamGroup.form b/src/bb/tourma/views/parameters/JPNParamGroup.form
index 0984fd30..a6aa9b4b 100644
--- a/src/bb/tourma/views/parameters/JPNParamGroup.form
+++ b/src/bb/tourma/views/parameters/JPNParamGroup.form
@@ -21,7 +21,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
@@ -215,7 +215,7 @@
-
+
@@ -225,7 +225,7 @@
-
+
@@ -248,7 +248,7 @@
-
+
@@ -271,7 +271,7 @@
-
+
@@ -279,7 +279,7 @@
-
+
@@ -287,7 +287,7 @@
-
+
@@ -332,7 +332,7 @@
-
+
@@ -396,10 +396,10 @@
-
+
-
+
@@ -409,10 +409,10 @@
-
+
-
+
@@ -422,10 +422,10 @@
-
+
-
+
@@ -436,7 +436,7 @@
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParamIndiv.form b/src/bb/tourma/views/parameters/JPNParamIndiv.form
index 893f2a08..ab4324e3 100644
--- a/src/bb/tourma/views/parameters/JPNParamIndiv.form
+++ b/src/bb/tourma/views/parameters/JPNParamIndiv.form
@@ -22,7 +22,7 @@
-
+
@@ -45,10 +45,10 @@
-
+
-
+
@@ -66,10 +66,10 @@
-
+
-
+
@@ -87,10 +87,10 @@
-
+
-
+
@@ -107,7 +107,7 @@
-
+
@@ -130,10 +130,10 @@
-
+
-
+
@@ -151,10 +151,10 @@
-
+
-
+
@@ -172,10 +172,10 @@
-
+
-
+
@@ -193,10 +193,10 @@
-
+
-
+
@@ -378,7 +378,7 @@
-
+
@@ -395,7 +395,7 @@
-
+
@@ -407,7 +407,7 @@
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParamTeam.form b/src/bb/tourma/views/parameters/JPNParamTeam.form
index 3f426187..3ee5a47b 100644
--- a/src/bb/tourma/views/parameters/JPNParamTeam.form
+++ b/src/bb/tourma/views/parameters/JPNParamTeam.form
@@ -21,7 +21,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -63,7 +63,7 @@
-
+
@@ -86,10 +86,10 @@
-
+
-
+
@@ -99,7 +99,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -132,10 +132,10 @@
-
+
-
+
@@ -145,7 +145,7 @@
-
+
@@ -156,10 +156,10 @@
-
+
-
+
@@ -177,10 +177,10 @@
-
+
-
+
@@ -197,7 +197,7 @@
-
+
@@ -220,10 +220,10 @@
-
+
-
+
@@ -233,7 +233,7 @@
-
+
@@ -244,10 +244,10 @@
-
+
-
+
@@ -264,7 +264,7 @@
-
+
@@ -287,10 +287,10 @@
-
+
-
+
@@ -300,7 +300,7 @@
-
+
@@ -314,7 +314,7 @@
-
+
@@ -346,7 +346,7 @@
-
+
@@ -378,7 +378,7 @@
-
+
@@ -410,7 +410,7 @@
-
+
@@ -442,7 +442,7 @@
-
+
@@ -471,10 +471,10 @@
-
+
-
+
@@ -492,10 +492,10 @@
-
+
-
+
@@ -512,7 +512,7 @@
-
+
@@ -529,7 +529,7 @@
-
+
@@ -541,7 +541,7 @@
-
+
@@ -555,7 +555,7 @@
-
+
@@ -574,7 +574,7 @@
-
+
@@ -586,7 +586,7 @@
-
+
diff --git a/src/bb/tourma/views/parameters/JPNParameters.form b/src/bb/tourma/views/parameters/JPNParameters.form
index 1ca4793a..214c4d69 100644
--- a/src/bb/tourma/views/parameters/JPNParameters.form
+++ b/src/bb/tourma/views/parameters/JPNParameters.form
@@ -28,7 +28,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -167,10 +167,10 @@
-
+
-
+
@@ -180,10 +180,10 @@
-
+
-
+
@@ -193,10 +193,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/parameters/JPNTeams.form b/src/bb/tourma/views/parameters/JPNTeams.form
index e2be5827..be48ee44 100644
--- a/src/bb/tourma/views/parameters/JPNTeams.form
+++ b/src/bb/tourma/views/parameters/JPNTeams.form
@@ -71,10 +71,10 @@
-
+
-
+
@@ -84,10 +84,10 @@
-
+
-
+
@@ -97,10 +97,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/report/JdgGlobal.form b/src/bb/tourma/views/report/JdgGlobal.form
index a8df6100..71cc192c 100644
--- a/src/bb/tourma/views/report/JdgGlobal.form
+++ b/src/bb/tourma/views/report/JdgGlobal.form
@@ -36,10 +36,10 @@
-
+
-
+
@@ -49,10 +49,10 @@
-
+
-
+
@@ -62,10 +62,10 @@
-
+
-
+
@@ -75,10 +75,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/report/JdgPrintLabel.form b/src/bb/tourma/views/report/JdgPrintLabel.form
index 13ce61bf..d341ed78 100644
--- a/src/bb/tourma/views/report/JdgPrintLabel.form
+++ b/src/bb/tourma/views/report/JdgPrintLabel.form
@@ -35,10 +35,10 @@
-
+
-
+
@@ -48,10 +48,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/report/JdgRanking.form b/src/bb/tourma/views/report/JdgRanking.form
index 7f99a697..e7e5d716 100644
--- a/src/bb/tourma/views/report/JdgRanking.form
+++ b/src/bb/tourma/views/report/JdgRanking.form
@@ -36,10 +36,10 @@
-
+
-
+
@@ -49,10 +49,10 @@
-
+
-
+
@@ -62,10 +62,10 @@
-
+
-
+
@@ -75,10 +75,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/report/JdgReport.form b/src/bb/tourma/views/report/JdgReport.form
index 569a98da..f41f5ce9 100644
--- a/src/bb/tourma/views/report/JdgReport.form
+++ b/src/bb/tourma/views/report/JdgReport.form
@@ -36,10 +36,10 @@
-
+
-
+
@@ -49,10 +49,10 @@
-
+
-
+
@@ -62,10 +62,10 @@
-
+
-
+
@@ -75,10 +75,10 @@
-
+
-
+
@@ -88,10 +88,10 @@
-
+
-
+
@@ -101,10 +101,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/report/JdgRound.form b/src/bb/tourma/views/report/JdgRound.form
index 986670c1..94018f7e 100644
--- a/src/bb/tourma/views/report/JdgRound.form
+++ b/src/bb/tourma/views/report/JdgRound.form
@@ -39,10 +39,10 @@
-
+
-
+
@@ -52,10 +52,10 @@
-
+
-
+
@@ -65,10 +65,10 @@
-
+
-
+
@@ -78,10 +78,10 @@
-
+
-
+
diff --git a/src/bb/tourma/views/round/JPNAnnexRanking.form b/src/bb/tourma/views/round/JPNAnnexRanking.form
index 3727e9c8..d4797ab7 100644
--- a/src/bb/tourma/views/round/JPNAnnexRanking.form
+++ b/src/bb/tourma/views/round/JPNAnnexRanking.form
@@ -70,10 +70,10 @@
-
+
-
+
@@ -83,7 +83,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
@@ -152,10 +152,10 @@
-
+
-
+
@@ -165,7 +165,7 @@
-
+
@@ -181,7 +181,7 @@
-
+
diff --git a/src/bb/tourma/views/round/JPNCategory.form b/src/bb/tourma/views/round/JPNCategory.form
index 6dae5f2a..55708533 100644
--- a/src/bb/tourma/views/round/JPNCategory.form
+++ b/src/bb/tourma/views/round/JPNCategory.form
@@ -28,7 +28,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -54,10 +54,10 @@
-
+
-
+
@@ -67,7 +67,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
diff --git a/src/bb/tourma/views/round/JPNClan.form b/src/bb/tourma/views/round/JPNClan.form
index 5af0b2f9..e136958b 100644
--- a/src/bb/tourma/views/round/JPNClan.form
+++ b/src/bb/tourma/views/round/JPNClan.form
@@ -42,7 +42,7 @@
-
+
@@ -90,10 +90,10 @@
-
+
-
+
@@ -103,10 +103,10 @@
-
+
-
+
@@ -116,7 +116,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/src/bb/tourma/views/round/JPNGroup.form b/src/bb/tourma/views/round/JPNGroup.form
index 105c28ba..79241f4a 100644
--- a/src/bb/tourma/views/round/JPNGroup.form
+++ b/src/bb/tourma/views/round/JPNGroup.form
@@ -54,10 +54,10 @@
-
+
-
+
@@ -67,7 +67,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
diff --git a/src/bb/tourma/views/round/JPNMatch.form b/src/bb/tourma/views/round/JPNMatch.form
index d543fa22..bea3f589 100644
--- a/src/bb/tourma/views/round/JPNMatch.form
+++ b/src/bb/tourma/views/round/JPNMatch.form
@@ -84,7 +84,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -181,7 +181,7 @@
-
+
@@ -206,7 +206,7 @@
-
+
@@ -251,7 +251,7 @@
-
+
@@ -265,7 +265,7 @@
-
+
diff --git a/src/bb/tourma/views/round/JPNPool.form b/src/bb/tourma/views/round/JPNPool.form
index 1839a54f..7b1aa30e 100644
--- a/src/bb/tourma/views/round/JPNPool.form
+++ b/src/bb/tourma/views/round/JPNPool.form
@@ -42,7 +42,7 @@
-
+
@@ -90,10 +90,10 @@
-
+
-
+
@@ -103,10 +103,10 @@
-
+
-
+
@@ -116,7 +116,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/src/bb/tourma/views/round/JPNRound.form b/src/bb/tourma/views/round/JPNRound.form
index 338a903c..99cdb0b2 100644
--- a/src/bb/tourma/views/round/JPNRound.form
+++ b/src/bb/tourma/views/round/JPNRound.form
@@ -11,7 +11,7 @@