From a2cf18f6d367c2aa45fd7a671c5ba666bdb26f3b Mon Sep 17 00:00:00 2001
From: Scott Fennell <spfennell@gmail.com>
Date: Fri, 2 Feb 2018 08:42:45 -0600
Subject: [PATCH] Added needed module compiler flags and changed MtvView
 Vector<Object> to Vector<Vector> for Java 9 DefaultTableModel constructor
 compatibility

---
 trick_source/java/makefile                   | 2 +-
 trick_source/java/src/trick/mtv/MtvView.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/trick_source/java/makefile b/trick_source/java/makefile
index a78a47a7..8cdcc007 100644
--- a/trick_source/java/makefile
+++ b/trick_source/java/makefile
@@ -4,7 +4,7 @@ TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 JAVAC ?= javac
-JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation
+JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation --add-modules java.se.ee,java.desktop
 
 SRC_DIR   = src
 SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java)
diff --git a/trick_source/java/src/trick/mtv/MtvView.java b/trick_source/java/src/trick/mtv/MtvView.java
index 3b152bc7..6221f2f1 100644
--- a/trick_source/java/src/trick/mtv/MtvView.java
+++ b/trick_source/java/src/trick/mtv/MtvView.java
@@ -1202,7 +1202,7 @@ public class MtvView extends FrameView {
         comboBox.addItem("Manual OFF");
         mode_selected = false;
 
-        event_table_rows = new Vector<Object>();
+        event_table_rows = new Vector<Vector>();
         event_table_cols = new Vector<String>();
         String[] col_names = {"Active", "Name", "Fired Time", "Fired Count", "Ran Time", "Ran Count", "Hold", "Mode", "Added"};
         for (int ii=0; ii<col_names.length; ii++) {
@@ -1787,7 +1787,7 @@ public class MtvView extends FrameView {
 
             jScrollPane2.setName("jScrollPane2"); // NOI18N
 
-            edit_table_rows = new Vector<Object>();
+            edit_table_rows = new Vector<Vector>();
             edit_table_cols = new Vector<String>();
             user_text = new JTextArea();
             String[] col_names2 = {"Event Syntax", "", "User Data", ""};
@@ -1944,13 +1944,13 @@ public class MtvView extends FrameView {
     private javax.swing.JTable edit_table;
     private javax.swing.table.DefaultTableModel model;
     private JTextArea user_text;
-    public Vector<Object> edit_table_rows;
+    public Vector<Vector> edit_table_rows;
     private Vector<String> edit_table_cols;
     private javax.swing.JTextField eventTextField;
     public ButtonGroup cycle_group;
     public javax.swing.JComboBox comboBox; // Mode
     public javax.swing.JTable event_table;
-    public Vector<Object> event_table_rows;
+    public Vector<Vector> event_table_rows;
     public Vector<String> event_table_cols;
     public boolean mode_selected; // user clicked a row's Mode combobox
     public javax.swing.JTextField host_field;