[Do Not Merge] - [WIP] OpenJDK 11 Upgrades

.gitignore

@@ -91,3 +91,8 @@ gradle-app.setting
 */Data/
 # End of https://www.gitignore.io/api/gradle,intellij
 Logs/
+
+.settings/
+bin/
+.classpath
+.project

BFB/src/main/java/BFB/GUI/ForcePanel.java

@@ -39,6 +39,7 @@ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
 import javax.swing.event.TableModelListener;
 
 public class ForcePanel extends javax.swing.JPanel {
+    private static final long serialVersionUID = 9012868947346629504L;
 
     private Force force;
     private abTable currentModel = new tbTotalWarfare();
@@ -79,7 +80,6 @@ private void OverrideSkills() {
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
@@ -93,7 +93,7 @@ private void initComponents() {
         jPanel2 = new javax.swing.JPanel();
         jLabel1 = new javax.swing.JLabel();
         txtForceName = new javax.swing.JTextField();
-        cmbForceType = new javax.swing.JComboBox();
+        cmbForceType = new javax.swing.JComboBox<String>();
         jLabel2 = new javax.swing.JLabel();
         txtOverrideGunnery = new javax.swing.JTextField();
         txtOverridePiloting = new javax.swing.JTextField();
@@ -175,7 +175,7 @@ public void keyReleased(java.awt.event.KeyEvent evt) {
 
         jLabel1.setText("Unit Name:");
 
-        cmbForceType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Inner Sphere", "Clan", "Comstar/WoB" }));
+        cmbForceType.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Inner Sphere", "Clan", "Comstar/WoB" }));
 
         jLabel2.setText("Type:");
 
@@ -401,7 +401,7 @@ public void tableChanged(TableModelEvent e) {
     private javax.swing.JButton btnRandom;
     private javax.swing.JButton btnSaveForce;
     private javax.swing.JButton btnTransfer;
-    private javax.swing.JComboBox cmbForceType;
+    private javax.swing.JComboBox<String> cmbForceType;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel6;

BFB/src/main/java/BFB/GUI/dlgAbout.java

@@ -32,6 +32,7 @@ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
  * @author gblouin
  */
 public class dlgAbout extends javax.swing.JDialog {
+    private static final long serialVersionUID = 2091416214909819417L;
 
     /** Creates new form dlgAbout */
     public dlgAbout() {
@@ -43,7 +44,6 @@ public dlgAbout() {
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
@@ -114,5 +114,4 @@ private void btnCloseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JTextPane txtAbout;
     // End of variables declaration//GEN-END:variables
-
 }

BFB/src/main/java/BFB/GUI/dlgAdvancedSearch.java

@@ -16,6 +16,7 @@
  * @author gblouin
  */
 public class dlgAdvancedSearch extends javax.swing.JDialog {
+    private static final long serialVersionUID = -1887334518951060000L;
 
     /** Creates new form dlgAdvancedSearch */
     public dlgAdvancedSearch(java.awt.Frame parent, boolean modal) {
@@ -28,7 +29,6 @@ public dlgAdvancedSearch(java.awt.Frame parent, boolean modal) {
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
@@ -44,14 +44,14 @@ private void initComponents() {
         jLabel2 = new javax.swing.JLabel();
         jLabel3 = new javax.swing.JLabel();
         jPanel2 = new javax.swing.JPanel();
-        cmbClass = new javax.swing.JComboBox();
+        cmbClass = new javax.swing.JComboBox<String>();
         jLabel16 = new javax.swing.JLabel();
-        cmbMechType = new javax.swing.JComboBox();
+        cmbMechType = new javax.swing.JComboBox<String>();
         jLabel15 = new javax.swing.JLabel();
-        cmbMotive = new javax.swing.JComboBox();
+        cmbMotive = new javax.swing.JComboBox<String>();
         jLabel14 = new javax.swing.JLabel();
         jLabel20 = new javax.swing.JLabel();
-        cmbRulesLevel = new javax.swing.JComboBox();
+        cmbRulesLevel = new javax.swing.JComboBox<String>();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
 
@@ -144,7 +144,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Options"));
 
-        cmbClass.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "All", "Light", "Medium", "Heavy", "Assault" }));
+        cmbClass.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "All", "Light", "Medium", "Heavy", "Assault" }));
         cmbClass.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cmbClassActionPerformed(evt);
@@ -153,7 +153,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         jLabel16.setText("Mech Type:");
 
-        cmbMechType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "BattleMech", "IndustrialMech", "Primitive BattleMech", "Primitive IndustrialMech" }));
+        cmbMechType.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "BattleMech", "IndustrialMech", "Primitive BattleMech", "Primitive IndustrialMech" }));
         cmbMechType.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cmbMechTypeActionPerformed(evt);
@@ -162,7 +162,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         jLabel15.setText("Motive Type:");
 
-        cmbMotive.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Biped", "Quad" }));
+        cmbMotive.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Biped", "Quad" }));
         cmbMotive.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cmbMotiveActionPerformed(evt);
@@ -173,7 +173,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         jLabel20.setText("Rules Level:");
 
-        cmbRulesLevel.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Introductory", "Tournament Legal", "Advanced Rules", "Experimental Tech", "Era Specific" }));
+        cmbRulesLevel.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Introductory", "Tournament Legal", "Advanced Rules", "Experimental Tech", "Era Specific" }));
         cmbRulesLevel.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 cmbRulesLevelActionPerformed(evt);
@@ -364,10 +364,10 @@ public void windowClosing(java.awt.event.WindowEvent e) {
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JComboBox cmbClass;
-    private javax.swing.JComboBox cmbMechType;
-    private javax.swing.JComboBox cmbMotive;
-    private javax.swing.JComboBox cmbRulesLevel;
+    private javax.swing.JComboBox<String> cmbClass;
+    private javax.swing.JComboBox<String> cmbMechType;
+    private javax.swing.JComboBox<String> cmbMotive;
+    private javax.swing.JComboBox<String> cmbRulesLevel;
     private javax.swing.JButton jButton1;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel14;

BFB/src/main/java/BFB/GUI/dlgBalance.java

@@ -31,11 +31,13 @@ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
 import Force.Skills;
 
 public class dlgBalance extends javax.swing.JDialog {
+    private static final long serialVersionUID = -3950107051873075862L;
+
     public int Result = -1;
     public Skills skills = new Skills();
     public boolean overwrite = false;
 
-    private Force force;
+    // private Force force;
 
     public static final int SK_CANCEL = -1,
                             SK_BESTSKILLS = 0,
@@ -46,15 +48,14 @@ public dlgBalance(java.awt.Frame parent, boolean modal, Force force) {
         super(parent, modal);
         initComponents();
 
-        this.force = force;
+       // this.force = force;
     }
 
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
@@ -71,11 +72,11 @@ private void initComponents() {
         rdoNeither = new javax.swing.JRadioButton();
         jPanel7 = new javax.swing.JPanel();
         jLabel12 = new javax.swing.JLabel();
-        cmbSkillLevel = new javax.swing.JComboBox();
+        cmbSkillLevel = new javax.swing.JComboBox<String>();
         btnRandomGen = new javax.swing.JButton();
         jPanel9 = new javax.swing.JPanel();
         jLabel14 = new javax.swing.JLabel();
-        cmbNameFilter = new javax.swing.JComboBox();
+        cmbNameFilter = new javax.swing.JComboBox<String>();
         btnRandomName = new javax.swing.JButton();
         chkOverwriteName = new javax.swing.JCheckBox();
 
@@ -159,7 +160,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         jLabel12.setText("Skill Level:");
 
-        cmbSkillLevel.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Random", "Green", "Regular", "Veteran", "Elite" }));
+        cmbSkillLevel.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Random", "Green", "Regular", "Veteran", "Elite" }));
 
         btnRandomGen.setText("Generate");
         btnRandomGen.addActionListener(new java.awt.event.ActionListener() {
@@ -198,7 +199,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         jLabel14.setText("Filter By:");
 
-        cmbNameFilter.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Random" }));
+        cmbNameFilter.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Random" }));
 
         btnRandomName.setText("Generate");
         btnRandomName.addActionListener(new java.awt.event.ActionListener() {
@@ -291,21 +292,21 @@ private void btnRandomNameActionPerformed(java.awt.event.ActionEvent evt) {//GEN
     private javax.swing.JButton btnFilter;
     private javax.swing.ButtonGroup btnGrpMinimize;
     private javax.swing.JButton btnRandomGen;
-    private javax.swing.JButton btnRandomGen1;
+    // private javax.swing.JButton btnRandomGen1;
     private javax.swing.JButton btnRandomName;
     private javax.swing.JCheckBox chkOverwriteName;
-    private javax.swing.JComboBox cmbNameFilter;
-    private javax.swing.JComboBox cmbSkillLevel;
-    private javax.swing.JComboBox cmbSkillLevel1;
+    private javax.swing.JComboBox<String> cmbNameFilter;
+    private javax.swing.JComboBox<String> cmbSkillLevel;
+    // private javax.swing.JComboBox<String> cmbSkillLevel1;
     private javax.swing.JLabel jLabel11;
     private javax.swing.JLabel jLabel12;
-    private javax.swing.JLabel jLabel13;
+    // private javax.swing.JLabel jLabel13;
     private javax.swing.JLabel jLabel14;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel7;
     private javax.swing.JPanel jPanel6;
     private javax.swing.JPanel jPanel7;
-    private javax.swing.JPanel jPanel8;
+    // private javax.swing.JPanel jPanel8;
     private javax.swing.JPanel jPanel9;
     private javax.swing.JRadioButton rdoGunnery;
     private javax.swing.JRadioButton rdoNeither;

BFB/src/main/java/BFB/GUI/dlgGenericUnit.java

@@ -5,6 +5,7 @@
 import Force.Unit;
 
 public class dlgGenericUnit extends javax.swing.JDialog {
+    private static final long serialVersionUID = -4119661501553704680L;
 
     Force force;
 
@@ -20,14 +21,13 @@ public dlgGenericUnit(java.awt.Frame parent, boolean modal, Force force) {
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
         jLabel1 = new javax.swing.JLabel();
         txtName = new javax.swing.JTextField();
         jLabel2 = new javax.swing.JLabel();
-        cmbType = new javax.swing.JComboBox();
+        cmbType = new javax.swing.JComboBox<String>();
         jLabel3 = new javax.swing.JLabel();
         txtBaseBV = new javax.swing.JTextField();
         txtModel = new javax.swing.JTextField();
@@ -47,7 +47,7 @@ private void initComponents() {
 
         jLabel2.setText("Unit Type:");
 
-        cmbType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "BattleMech", "IndustrialMech", "ProtoMech", "Vehicle", "Infantry", "Battle Armor", "Conventional Fighter", "Aerospace Fighter", "Small Craft", "Dropship", "Support Vehicle", "Mobile Structure" }));
+        cmbType.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "BattleMech", "IndustrialMech", "ProtoMech", "Vehicle", "Infantry", "Battle Armor", "Conventional Fighter", "Aerospace Fighter", "Small Craft", "Dropship", "Support Vehicle", "Mobile Structure" }));
 
         jLabel3.setText("Base BV:");
 
@@ -181,7 +181,7 @@ private void btnClearActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
     private javax.swing.JButton btnClear;
     private javax.swing.JButton btnClose;
     private javax.swing.JButton btnSave;
-    private javax.swing.JComboBox cmbType;
+    private javax.swing.JComboBox<String> cmbType;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;

BFB/src/main/java/BFB/GUI/dlgGroup.java

@@ -10,6 +10,8 @@
 import javax.swing.DefaultListModel;
 
 public class dlgGroup extends javax.swing.JDialog {
+    private static final long serialVersionUID = -6264074581148435903L;
+
     private Scenario scenario;
     private Media media = new Media();
     private Group curGroup;
@@ -31,20 +33,19 @@ public dlgGroup(java.awt.Frame parent, boolean modal, Scenario scenario) {
      * WARNING: Do NOT modify this code. The content of this method is
      * always regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
         btnGrpType = new javax.swing.ButtonGroup();
         jPanel2 = new javax.swing.JPanel();
         btnCancel = new javax.swing.JButton();
         jScrollPane1 = new javax.swing.JScrollPane();
-        lstGroups = new javax.swing.JList();
+        lstGroups = new javax.swing.JList<Group>();
         jLabel1 = new javax.swing.JLabel();
         jPanel1 = new javax.swing.JPanel();
         lblGroupLogo = new javax.swing.JLabel();
         jScrollPane2 = new javax.swing.JScrollPane();
-        lstUnits = new javax.swing.JList();
+        lstUnits = new javax.swing.JList<Unit>();
         jLabel3 = new javax.swing.JLabel();
         jLabel4 = new javax.swing.JLabel();
         jLabel5 = new javax.swing.JLabel();
@@ -80,10 +81,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             .addComponent(btnCancel)
         );
 
-        lstGroups.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
+        lstGroups.setModel(new javax.swing.AbstractListModel<Group>() {
+            private static final long serialVersionUID = 1L;
+
+            Group[] groups = { };
+            public int getSize() { return groups.length; }
+            public Group getElementAt(int i) { return groups[i]; }
         });
         lstGroups.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
             public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
@@ -102,10 +105,12 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         });
 
         lstUnits.setBackground(new java.awt.Color(240, 240, 240));
-        lstUnits.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
+        lstUnits.setModel(new javax.swing.AbstractListModel<Unit>() {
+            private static final long serialVersionUID = 2L;
+
+            Unit[] units = { };
+            public int getSize() { return units.length; }
+            public Unit getElementAt(int i) { return units[i]; }
         });
         jScrollPane2.setViewportView(lstUnits);
 
@@ -261,7 +266,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
     }// </editor-fold>//GEN-END:initComponents
 
     private void loadGroupList() {
-        DefaultListModel gModel = new DefaultListModel();
+        DefaultListModel<Group> gModel = new DefaultListModel<Group>();
         for ( Force f : scenario.getForces() ) {
             for ( Group g : f.Groups ) {
                 gModel.addElement(g);
@@ -292,7 +297,7 @@ else if ( curGroup.getType().equals(BattleForce.Clan) )
             lblPV.setText(curGroup.getTotalPV()+"");
             media.setLogo(lblGroupLogo, new File(curGroup.getLogo()));
 
-            DefaultListModel uModel = new DefaultListModel();
+            DefaultListModel<Unit> uModel = new DefaultListModel<Unit>();
             for ( Unit u : curGroup.getUnits() ) {
                 uModel.addElement(u);
             }
@@ -352,8 +357,8 @@ private void rdoComstarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
     private javax.swing.JLabel lblBV;
     private javax.swing.JLabel lblGroupLogo;
     private javax.swing.JLabel lblPV;
-    private javax.swing.JList lstGroups;
-    private javax.swing.JList lstUnits;
+    private javax.swing.JList<Group> lstGroups;
+    private javax.swing.JList<Unit> lstUnits;
     private javax.swing.JRadioButton rdoClan;
     private javax.swing.JRadioButton rdoComstar;
     private javax.swing.JRadioButton rdoInnerSphere;