IDE rules update (Netbeans 8.2 to 12)

Bojo38 · Jun 25, 2021 · ff21440 · ff21440
1 parent 9f61bd0
commit ff21440
Show file tree

Hide file tree

Showing 55 changed files with 2,692 additions and 1,853 deletions.
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
diff --git 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=[email protected]
-# 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=[email protected]
+# 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
@@ -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
@@ -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
diff --git 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.
     <name>DwarfKey</name>
     <reroll>40000</reroll>
     <max_big_guy>1</max_big_guy>
+     <apothecary>true</apothecary>
     <playertypes>               
         <playerType>
             <limit>2</limit>

diff --git a/src/bb/teamma/views/Bundle.properties b/src/bb/teamma/views/Bundle.properties
diff --git 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
@@ -55,7 +55,7 @@
         <Component class="javax.swing.JButton" name="jbtOK">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="teamma/languages/language.properties" key="OK" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/teamma/languages/language.properties" key="OK" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="ok" noResource="true"/>
           </Properties>
@@ -66,7 +66,7 @@
         <Component class="javax.swing.JButton" name="jbtCancel">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="teamma/languages/language.properties" key="Cancel" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/teamma/languages/language.properties" key="Cancel" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="cancel" noResource="true"/>
           </Properties>
@@ -88,13 +88,20 @@
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="teamma/languages/language.properties" key="SelectColor" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/teamma/languages/language.properties" key="SelectColor" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
         </Component>
         <Component class="javax.swing.JButton" name="jbtColor">
           <Properties>
-            <Property name="text" type="java.lang.String" value=" "/>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="0" green="0" red="0" type="rgb"/>
+            </Property>
+            <Property name="text" type="java.lang.String" value="Skill"/>
+            <Property name="borderPainted" type="boolean" value="false"/>
+            <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
+              <Color id="Curseur par d&#xe9;faut"/>
+            </Property>
           </Properties>
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jbtColorActionPerformed"/>

diff --git 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
@@ -39,10 +39,10 @@
         <Component class="javax.swing.JButton" name="jbtOK">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/tourma/images/Select.png"/>
+              <Image iconType="3" name="/bb/tourma/images/Select.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="teamma/languages/language.properties" key="OK" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/teamma/languages/language.properties" key="OK" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -52,10 +52,10 @@
         <Component class="javax.swing.JButton" name="jbtPrint">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/tourma/images/Document.png"/>
+              <Image iconType="3" name="/bb/tourma/images/Document.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="teamma/languages/language.properties" key="Print" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/teamma/languages/language.properties" key="Print" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -65,10 +65,10 @@
         <Component class="javax.swing.JButton" name="jbtExport">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/tourma/images/Html.png"/>
+              <Image iconType="3" name="/bb/tourma/images/Html.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="teamma/languages/language.properties" key="HTMLExport" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/teamma/languages/language.properties" key="HTMLExport" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jbtExport" noResource="true"/>
           </Properties>
@@ -79,10 +79,10 @@
         <Component class="javax.swing.JButton" name="jbtExportPDF">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/tourma/images/pdf.jpg"/>
+              <Image iconType="3" name="/bb/tourma/images/pdf.jpg"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="tourma/languages/language.properties" key="PDFExport" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/tourma/languages/language.properties" key="PDFExport" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>

diff --git a/src/bb/tourma/JdgChangePairing.form b/src/bb/tourma/JdgChangePairing.form
@@ -32,10 +32,10 @@
         <Component class="javax.swing.JButton" name="jbtOK">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/tourma/images/Select.png"/>
+              <Image iconType="3" name="/bb/tourma/images/Select.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="tourma/languages/language.properties" key="OK" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/tourma/languages/language.properties" key="OK" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="ok" noResource="true"/>
           </Properties>
@@ -46,10 +46,10 @@
         <Component class="javax.swing.JButton" name="jbtCancel">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/tourma/images/Halt.png"/>
+              <Image iconType="3" name="/bb/tourma/images/Halt.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="tourma/languages/language.properties" key="ANNULER" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="bb/tourma/languages/language.properties" key="ANNULER" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <Events>
@@ -75,7 +75,7 @@
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
                 <TitledBorder title="Matchs">
-                  <ResourceString PropertyName="titleX" bundle="tourma/languages/language.properties" key="Matchs" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+                  <ResourceString PropertyName="titleX" bundle="bb/tourma/languages/language.properties" key="Matchs" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
                 </TitledBorder>
               </Border>
             </Property>