ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 18:56:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added needed module compiler flags and changed MtvView Vector<Object> to Vector<Vector> for Java 9 DefaultTableModel constructor compatibility

Browse Source
This commit is contained in:
Scott Fennell 2018-02-02 08:42:45 -06:00 committed by dbankieris
parent 4bf35a9c82
commit a2cf18f6d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trick_source/java/makefile
View File

@ -4,7 +4,7 @@ TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
JAVAC ?= javac 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_DIR = src
SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java) SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java)

8
trick_source/java/src/trick/mtv/MtvView.java
View File

@ -1202,7 +1202,7 @@ public class MtvView extends FrameView {
comboBox.addItem("Manual OFF"); comboBox.addItem("Manual OFF");
mode_selected = false; mode_selected = false;
event_table_rows = new Vector<Object>(); event_table_rows = new Vector<Vector>();
event_table_cols = new Vector<String>(); event_table_cols = new Vector<String>();
String[] col_names = {"Active", "Name", "Fired Time", "Fired Count", "Ran Time", "Ran Count", "Hold", "Mode", "Added"}; 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++) { for (int ii=0; ii<col_names.length; ii++) {
@ -1787,7 +1787,7 @@ public class MtvView extends FrameView {
jScrollPane2.setName("jScrollPane2"); // NOI18N jScrollPane2.setName("jScrollPane2"); // NOI18N
edit_table_rows = new Vector<Object>(); edit_table_rows = new Vector<Vector>();
edit_table_cols = new Vector<String>(); edit_table_cols = new Vector<String>();
user_text = new JTextArea(); user_text = new JTextArea();
String[] col_names2 = {"Event Syntax", "", "User Data", ""}; 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.JTable edit_table;
private javax.swing.table.DefaultTableModel model; private javax.swing.table.DefaultTableModel model;
private JTextArea user_text; private JTextArea user_text;
public Vector<Object> edit_table_rows; public Vector<Vector> edit_table_rows;
private Vector<String> edit_table_cols; private Vector<String> edit_table_cols;
private javax.swing.JTextField eventTextField; private javax.swing.JTextField eventTextField;
public ButtonGroup cycle_group; public ButtonGroup cycle_group;
public javax.swing.JComboBox comboBox; // Mode public javax.swing.JComboBox comboBox; // Mode
public javax.swing.JTable event_table; 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 Vector<String> event_table_cols;
public boolean mode_selected; // user clicked a row's Mode combobox public boolean mode_selected; // user clicked a row's Mode combobox
public javax.swing.JTextField host_field; public javax.swing.JTextField host_field;