diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17abbbcd..be846c9f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -33,10 +33,10 @@
-
-
+
+
@@ -341,7 +341,7 @@
-
+
1590645202357
@@ -738,79 +738,79 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -858,9 +858,10 @@
-
-
+
+
+
diff --git a/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.form b/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.form
index 54000964..69206673 100644
--- a/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.form
+++ b/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.form
@@ -2,218 +2,258 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.java b/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.java
index b01e5a78..a7fe3e9f 100644
--- a/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.java
+++ b/src/main/java/edu/ucdenver/ccp/knowtator/view/iaa/IAAOptionsDialog.java
@@ -61,6 +61,7 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
import javax.swing.JTable;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
@@ -401,145 +402,140 @@ public void dispose() {
createUIComponents();
contentPane = new JPanel();
contentPane.setLayout(new GridBagLayout());
- final JPanel panel1 = new JPanel();
- panel1.setLayout(new BorderLayout(0, 0));
+ final JSplitPane splitPane1 = new JSplitPane();
GridBagConstraints gbc;
gbc = new GridBagConstraints();
- gbc.gridx = 1;
- gbc.gridy = 0;
- gbc.weightx = 1.0;
- gbc.weighty = 1.0;
- gbc.fill = GridBagConstraints.BOTH;
- contentPane.add(panel1, gbc);
- panel1.setBorder(BorderFactory.createTitledBorder(null, this.$$$getMessageFromBundle$$$("ui", "profiles"), TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
- profilesPanel = new JPanel();
- profilesPanel.setLayout(new BorderLayout(0, 0));
- panel1.add(profilesPanel, BorderLayout.NORTH);
- profilesSelectAllButton = new JButton();
- this.$$$loadButtonText$$$(profilesSelectAllButton, this.$$$getMessageFromBundle$$$("log4j", "select.all"));
- profilesPanel.add(profilesSelectAllButton, BorderLayout.NORTH);
- final JScrollPane scrollPane1 = new JScrollPane();
- profilesPanel.add(scrollPane1, BorderLayout.CENTER);
- profilesTable = new JTable();
- profilesTable.setAutoCreateRowSorter(true);
- scrollPane1.setViewportView(profilesTable);
- final JPanel panel2 = new JPanel();
- panel2.setLayout(new BorderLayout(0, 0));
- gbc = new GridBagConstraints();
- gbc.gridx = 2;
- gbc.gridy = 0;
- gbc.weightx = 1.0;
- gbc.weighty = 1.0;
- gbc.fill = GridBagConstraints.BOTH;
- contentPane.add(panel2, gbc);
- panel2.setBorder(BorderFactory.createTitledBorder(null, this.$$$getMessageFromBundle$$$("log4j", "documents"), TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
- documentsPanel = new JPanel();
- documentsPanel.setLayout(new BorderLayout(0, 0));
- panel2.add(documentsPanel, BorderLayout.NORTH);
- documentsSelectAllButton = new JButton();
- this.$$$loadButtonText$$$(documentsSelectAllButton, this.$$$getMessageFromBundle$$$("log4j", "select.all"));
- documentsPanel.add(documentsSelectAllButton, BorderLayout.NORTH);
- final JScrollPane scrollPane2 = new JScrollPane();
- documentsPanel.add(scrollPane2, BorderLayout.CENTER);
- documentsTable = new JTable();
- scrollPane2.setViewportView(documentsTable);
- final JPanel panel3 = new JPanel();
- panel3.setLayout(new BorderLayout(0, 0));
- gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 0;
gbc.fill = GridBagConstraints.BOTH;
- contentPane.add(panel3, gbc);
- final JPanel panel4 = new JPanel();
- panel4.setLayout(new GridBagLayout());
- panel3.add(panel4, BorderLayout.NORTH);
- panel4.setBorder(BorderFactory.createTitledBorder(null, "Mode", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
+ contentPane.add(splitPane1, gbc);
+ final JSplitPane splitPane2 = new JSplitPane();
+ splitPane1.setLeftComponent(splitPane2);
+ final JPanel panel1 = new JPanel();
+ panel1.setLayout(new GridBagLayout());
+ splitPane2.setLeftComponent(panel1);
+ panel1.setBorder(BorderFactory.createTitledBorder(null, "Mode", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
iaaClassCheckBox = new JCheckBox();
this.$$$loadButtonText$$$(iaaClassCheckBox, this.$$$getMessageFromBundle$$$("log4j", "class.iaa"));
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 0;
gbc.anchor = GridBagConstraints.WEST;
- panel4.add(iaaClassCheckBox, gbc);
+ panel1.add(iaaClassCheckBox, gbc);
iaaSpanCheckBox = new JCheckBox();
this.$$$loadButtonText$$$(iaaSpanCheckBox, this.$$$getMessageFromBundle$$$("log4j", "span.iaa"));
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 1;
gbc.anchor = GridBagConstraints.WEST;
- panel4.add(iaaSpanCheckBox, gbc);
+ panel1.add(iaaSpanCheckBox, gbc);
iaaClassAndSpanCheckBox = new JCheckBox();
this.$$$loadButtonText$$$(iaaClassAndSpanCheckBox, this.$$$getMessageFromBundle$$$("log4j", "class.and.span.iaa"));
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 2;
gbc.anchor = GridBagConstraints.WEST;
- panel4.add(iaaClassAndSpanCheckBox, gbc);
+ panel1.add(iaaClassAndSpanCheckBox, gbc);
+ final JPanel panel2 = new JPanel();
+ panel2.setLayout(new BorderLayout(0, 0));
+ splitPane2.setRightComponent(panel2);
+ panel2.setBorder(BorderFactory.createTitledBorder(null, this.$$$getMessageFromBundle$$$("ui", "profiles"), TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
+ profilesPanel = new JPanel();
+ profilesPanel.setLayout(new BorderLayout(0, 0));
+ panel2.add(profilesPanel, BorderLayout.NORTH);
+ final JScrollPane scrollPane1 = new JScrollPane();
+ profilesPanel.add(scrollPane1, BorderLayout.CENTER);
+ profilesTable = new JTable();
+ profilesTable.setAutoCreateRowSorter(true);
+ scrollPane1.setViewportView(profilesTable);
+ final JPanel panel3 = new JPanel();
+ panel3.setLayout(new BorderLayout(0, 0));
+ profilesPanel.add(panel3, BorderLayout.NORTH);
+ profilesSelectAllButton = new JButton();
+ this.$$$loadButtonText$$$(profilesSelectAllButton, this.$$$getMessageFromBundle$$$("log4j", "select.all"));
+ panel3.add(profilesSelectAllButton, BorderLayout.EAST);
+ final JSplitPane splitPane3 = new JSplitPane();
+ splitPane1.setRightComponent(splitPane3);
+ final JPanel panel4 = new JPanel();
+ panel4.setLayout(new BorderLayout(0, 0));
+ splitPane3.setLeftComponent(panel4);
+ panel4.setBorder(BorderFactory.createTitledBorder(null, this.$$$getMessageFromBundle$$$("log4j", "documents"), TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
+ documentsPanel = new JPanel();
+ documentsPanel.setLayout(new BorderLayout(0, 0));
+ panel4.add(documentsPanel, BorderLayout.NORTH);
+ final JScrollPane scrollPane2 = new JScrollPane();
+ documentsPanel.add(scrollPane2, BorderLayout.CENTER);
+ documentsTable = new JTable();
+ scrollPane2.setViewportView(documentsTable);
final JPanel panel5 = new JPanel();
panel5.setLayout(new BorderLayout(0, 0));
- gbc = new GridBagConstraints();
- gbc.gridx = 3;
- gbc.gridy = 0;
- gbc.fill = GridBagConstraints.BOTH;
- contentPane.add(panel5, gbc);
- panel5.setBorder(BorderFactory.createTitledBorder(null, "OWL Classes", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
+ documentsPanel.add(panel5, BorderLayout.NORTH);
+ documentsSelectAllButton = new JButton();
+ this.$$$loadButtonText$$$(documentsSelectAllButton, this.$$$getMessageFromBundle$$$("log4j", "select.all"));
+ panel5.add(documentsSelectAllButton, BorderLayout.EAST);
final JPanel panel6 = new JPanel();
panel6.setLayout(new BorderLayout(0, 0));
- panel5.add(panel6, BorderLayout.CENTER);
- owlClassesSelectAllButton = new JButton();
- owlClassesSelectAllButton.setText("Select all");
- panel6.add(owlClassesSelectAllButton, BorderLayout.NORTH);
+ splitPane3.setRightComponent(panel6);
+ panel6.setBorder(BorderFactory.createTitledBorder(null, "OWL Classes", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
+ final JPanel panel7 = new JPanel();
+ panel7.setLayout(new BorderLayout(0, 0));
+ panel6.add(panel7, BorderLayout.CENTER);
final JScrollPane scrollPane3 = new JScrollPane();
- panel6.add(scrollPane3, BorderLayout.CENTER);
+ panel7.add(scrollPane3, BorderLayout.CENTER);
scrollPane3.setViewportView(owlClassesTable);
- final JPanel panel7 = new JPanel();
- panel7.setLayout(new GridBagLayout());
- panel5.add(panel7, BorderLayout.SOUTH);
+ final JPanel panel8 = new JPanel();
+ panel8.setLayout(new BorderLayout(0, 0));
+ panel7.add(panel8, BorderLayout.NORTH);
+ owlClassesSelectAllButton = new JButton();
+ owlClassesSelectAllButton.setText("Select all");
+ panel8.add(owlClassesSelectAllButton, BorderLayout.EAST);
+ final JPanel panel9 = new JPanel();
+ panel9.setLayout(new GridBagLayout());
+ panel6.add(panel9, BorderLayout.SOUTH);
includeSubclassesCheckBox.setText("Include subclasses");
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 0;
gbc.anchor = GridBagConstraints.WEST;
- panel7.add(includeSubclassesCheckBox, gbc);
- final JPanel panel8 = new JPanel();
- panel8.setLayout(new GridBagLayout());
+ panel9.add(includeSubclassesCheckBox, gbc);
+ final JPanel panel10 = new JPanel();
+ panel10.setLayout(new GridBagLayout());
gbc = new GridBagConstraints();
- gbc.gridx = 3;
+ gbc.gridx = 0;
gbc.gridy = 1;
- gbc.weightx = 1.0;
gbc.fill = GridBagConstraints.BOTH;
- contentPane.add(panel8, gbc);
- final JPanel spacer1 = new JPanel();
+ contentPane.add(panel10, gbc);
+ compareAcrossProjectsButton = new JButton();
+ compareAcrossProjectsButton.setText("Compare across projects");
gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 0;
gbc.fill = GridBagConstraints.HORIZONTAL;
- panel8.add(spacer1, gbc);
- buttonOK = new JButton();
- this.$$$loadButtonText$$$(buttonOK, this.$$$getMessageFromBundle$$$("log4j", "ok"));
+ panel10.add(compareAcrossProjectsButton, gbc);
+ buttonCancel = new JButton();
+ this.$$$loadButtonText$$$(buttonCancel, this.$$$getMessageFromBundle$$$("log4j", "cancel"));
gbc = new GridBagConstraints();
- gbc.gridx = 1;
+ gbc.gridx = 3;
gbc.gridy = 0;
gbc.weightx = 1.0;
gbc.weighty = 1.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
- panel8.add(buttonOK, gbc);
- buttonCancel = new JButton();
- this.$$$loadButtonText$$$(buttonCancel, this.$$$getMessageFromBundle$$$("log4j", "cancel"));
+ panel10.add(buttonCancel, gbc);
+ buttonOK = new JButton();
+ buttonOK.setText("Run");
gbc = new GridBagConstraints();
gbc.gridx = 2;
gbc.gridy = 0;
gbc.weightx = 1.0;
gbc.weighty = 1.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
- panel8.add(buttonCancel, gbc);
- compareAcrossProjectsButton = new JButton();
- compareAcrossProjectsButton.setText("Compare across projects");
+ panel10.add(buttonOK, gbc);
+ final JPanel spacer1 = new JPanel();
gbc = new GridBagConstraints();
- gbc.gridx = 0;
- gbc.gridy = 1;
+ gbc.gridx = 1;
+ gbc.gridy = 0;
gbc.fill = GridBagConstraints.HORIZONTAL;
- contentPane.add(compareAcrossProjectsButton, gbc);
+ panel10.add(spacer1, gbc);
}
private static Method $$$cachedGetBundleMethod$$$ = null;