Update TregexGUI to use Java 11+ Desktop class (not historical Apple stuff)

manning · manning · commit 5ef39a57a912 · 2025-11-11T13:05:02.000-08:00
Remove old (no longer usable) Apple Java extensions class.
Support Options/Preferences/About via modern Desktop class methods.
Clean up and correct for 2020s some of the properties for Apple options.
Do running things on the Swing thread correctly.
diff --git a/lib/AppleJavaExtensions.jar b/lib/AppleJavaExtensions.jar
diff --git a/lib/README b/lib/README
@@ -175,32 +175,6 @@ LAST UPDATE: 2020/10/17
 LAST UPDATE BY: Christopher Manning
 
 ----------------------------------------------------------------------
-AppleJavaExtensions.jar
-
-ORIGINAL JAR NAME: AppleJavaExtensions.jar
-
-VERSION: 1.3
-
-RELEASE DATE: 2006-10-17
-
-SOURCE AVAILABLE: no
-
-DESCRIPTION: Stub methods to allow programs that can use Mac graphical
-stuff load on non-macs.  Should only be on compile classpath, not actually
-used at run time (Macs actually have the classes in this jar, and should load
-by reflection; see TregexGUI for an example).
-
-URL: http://developer.apple.com/samplecode/AppleJavaExtensions/index.html
-
-USED BY: TregexGUI.java
-Not needed by CoreNLP distributions
-(Only used for fake compilation -- at runtime, either Mac supplies this or it doesn't.)
-
-LAST UPDATE: 2007/09/18
-
-LAST UPDATE BY: Anna Rafferty.
-
------------------------------------------------------------------------
 xom-1.3.9.jar
 
 ORIGINAL JAR NAME: xom-1.3.9.jar
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/DisplayMatchesPanel.java b/src/edu/stanford/nlp/trees/tregex/gui/DisplayMatchesPanel.java
@@ -70,7 +70,7 @@
 @SuppressWarnings("serial")
 public class DisplayMatchesPanel extends JPanel implements ListSelectionListener {
 
-  private JScrollPane scroller;
+  private final JScrollPane scroller;
   private MouseEvent firstMouseEvent = null;
 
   private String fontName = "";
@@ -102,7 +102,7 @@ private DisplayMatchesPanel() {
     scroller = new JScrollPane(spaceholder);
 
     // Fix slow scrolling on OS X
-    if (TregexGUI.isMacOSX()) {
+    if (TregexGUI.isMacOS()) {
       scroller.getVerticalScrollBar().setUnitIncrement(3);
       scroller.getHorizontalScrollBar().setUnitIncrement(3);
     }
@@ -186,10 +186,10 @@ public void mousePressed(MouseEvent e) {
         firstMouseEvent = e;
       }
       e.consume();
-      if(((e.getModifiersEx()) & InputEvent.SHIFT_DOWN_MASK) == InputEvent.SHIFT_DOWN_MASK) {
+      if (((e.getModifiersEx()) & InputEvent.SHIFT_DOWN_MASK) == InputEvent.SHIFT_DOWN_MASK) {
         //shift is being held
         addHighlight(textField, firstMouseEvent, e);
-      } else if(!HighlightUtils.isInHighlight(e, textField, textField.getHighlighter())) {
+      } else if (!HighlightUtils.isInHighlight(e, textField, textField.getHighlighter())) {
         textField.getHighlighter().removeAllHighlights();
         firstMouseEvent = e;
         dragNDrop = false;
@@ -360,8 +360,9 @@ private ScrollableTreeJPanel getTreeJPanel(Tree t, List<Tree> matchedParts) {
     copy.setActionCommand((String) TransferHandler.getCopyAction()
                           .getValue(Action.NAME));
     copy.addActionListener(new TregexGUI.TransferActionListener());
-    int mask = TregexGUI.isMacOSX() ? InputEvent.META_MASK : InputEvent.CTRL_MASK;
+    int mask = TregexGUI.isMacOS() ? InputEvent.META_DOWN_MASK : InputEvent.CTRL_DOWN_MASK;
     copy.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, mask));
+
     treePopup.add(copy);
 
     JMenuItem exportTree = new JMenuItem("Export tree as image");
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/FilePanel.java b/src/edu/stanford/nlp/trees/tregex/gui/FilePanel.java
@@ -55,7 +55,7 @@ public class FilePanel extends JPanel {
 
   private static final long serialVersionUID = -2229250395240163264L;
   private static FilePanel filePanel = null;
-  private JTree tree;
+  private final JTree tree;
   private FileTreeModel treeModel;
 
   public static synchronized FilePanel getInstance() {
@@ -91,7 +91,7 @@ public void mouseClicked(MouseEvent e) {
 
     //layout/panel stuff
     this.setLayout(new BorderLayout());
-    this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),"Tree files: "));
+    this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),"Tree files"));
     JScrollPane scroller = new JScrollPane(tree);
     this.add(scroller, BorderLayout.CENTER);
   }
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/InputPanel.java b/src/edu/stanford/nlp/trees/tregex/gui/InputPanel.java
@@ -119,7 +119,7 @@ private InputPanel() {
 
     //layout/image stuff
     this.setLayout(new GridBagLayout());
-    this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),"Search pattern: "));
+    this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),"Search pattern"));
 
     //pattern/history area
     JPanel tregexInput = makeTregexPatternArea();
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/MatchesPanel.java b/src/edu/stanford/nlp/trees/tregex/gui/MatchesPanel.java
@@ -51,10 +51,10 @@
 @SuppressWarnings("serial")
 public class MatchesPanel extends JPanel implements ListSelectionListener {
   private static MatchesPanel instance = null;
-  private JList<TreeFromFile> list;
+  private final JList<TreeFromFile> list;
   // todo: Change the below to just be a List<List<Tree>> paralleling list above
   private Map<TreeFromFile,List<Tree>> matchedParts;
-  private List<MatchesPanelListener> listeners;
+  private final List<MatchesPanelListener> listeners;
   private Color highlightColor = Color.CYAN;
   private boolean showOnlyMatchedPortion = false;
   private JTextField lastSelected = null;
@@ -171,7 +171,7 @@ private int getCharOffset(FontMetrics fm, String characters, int xPos) {
     listeners = new ArrayList<>();
     //layout
     this.setLayout(new BorderLayout());
-    this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),"Matches: "));
+    this.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(),"Matches"));
     JScrollPane scroller = new JScrollPane(list);
     this.add(scroller, BorderLayout.CENTER);
   }
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/OSXAdapter.java b/src/edu/stanford/nlp/trees/tregex/gui/OSXAdapter.java
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/PreferencesPanel.java b/src/edu/stanford/nlp/trees/tregex/gui/PreferencesPanel.java
@@ -74,13 +74,13 @@ public class PreferencesPanel extends JDialog {
   private static final String HISTORY_ERROR = "history";//error code if history size is not an int >0
   private static final String MAX_MATCH_ERROR = "maxMatch";//error code if history size is not an int >0
 
-  private TregexGUI gui;
+  private final TregexGUI gui;
 
   final JButton highlightButton;
-  private JTextField setEncoding;//declared here because may change in different places
+  private final JTextField setEncoding;//declared here because may change in different places
 
   public PreferencesPanel(TregexGUI gui) {
-    super(gui, "Preferences");
+    super(gui, TregexGUI.isMacOS() ? "Settings": "Preferences");
 
     this.gui = gui;
 
@@ -121,7 +121,7 @@ public PreferencesPanel(TregexGUI gui) {
     JPanel treeDisplayOptions = new JPanel();
     treeDisplayOptions.setLayout(new GridLayout(4,2));
     JLabel fontName = new JLabel("Font: ");
-    final JComboBox fontPicker = new JComboBox(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
+    final JComboBox<String> fontPicker = new JComboBox<>(GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
     fontPicker.setSelectedItem(Preferences.getFont());
 
     JLabel sizeLabel = new JLabel("Font size: ");
@@ -154,12 +154,12 @@ public PreferencesPanel(TregexGUI gui) {
     advOptions.setBorder(BorderFactory.createTitledBorder("Advanced "));
     advOptions.setLayout(new GridLayout(3,2,0,4));
     JLabel headfinderName = new JLabel("Head finder:");
-    final JComboBox headfinderPicker = new JComboBox(new String[] {"ArabicHeadFinder", "BikelChineseHeadFinder", "ChineseHeadFinder", "ChineseSemanticHeadFinder", "CollinsHeadFinder", "DybroFrenchHeadFinder", "LeftHeadFinder", "ModCollinsHeadFinder", "NegraHeadFinder", "SemanticHeadFinder", "SunJurafskyChineseHeadFinder", "TueBaDZHeadFinder", "UniversalSemanticHeadFinder"}); //
+    final JComboBox<String> headfinderPicker = new JComboBox<>(new String[] {"ArabicHeadFinder", "BikelChineseHeadFinder", "ChineseHeadFinder", "ChineseSemanticHeadFinder", "CollinsHeadFinder", "DybroFrenchHeadFinder", "LeftHeadFinder", "ModCollinsHeadFinder", "NegraHeadFinder", "SemanticHeadFinder", "SunJurafskyChineseHeadFinder", "TueBaDZHeadFinder", "UniversalSemanticHeadFinder"}); //
     headfinderPicker.setEditable(true);
     headfinderPicker.setSelectedItem(Preferences.getHeadFinder()
                                      .getClass().getSimpleName());
     JLabel treeReaderFactoryName = new JLabel("Tree reader factory:");
-    final JComboBox trfPicker = new JComboBox(new String[] {"ArabicTreeReaderFactory", "ArabicTreeReaderFactory.ArabicRawTreeReaderFactory", "CTBTreeReaderFactory", "Basic categories only (LabeledScoredTreeReaderFactory)", "FrenchTreeReaderFactory","NoEmptiesCTBTreeReaderFactory", "PennTreeReaderFactory", "TregexTreeReaderFactory" });
+    final JComboBox<String> trfPicker = new JComboBox<>(new String[] {"ArabicTreeReaderFactory", "ArabicTreeReaderFactory.ArabicRawTreeReaderFactory", "CTBTreeReaderFactory", "Basic categories only (LabeledScoredTreeReaderFactory)", "FrenchTreeReaderFactory","NoEmptiesCTBTreeReaderFactory", "PennTreeReaderFactory", "TregexTreeReaderFactory" });
     trfPicker.setEditable(true);
     trfPicker.setSelectedItem(Preferences.getTreeReaderFactory()
                               .getClass().getSimpleName());
@@ -248,7 +248,7 @@ public void actionPerformed(ActionEvent arg0) {
             JOptionPane.showMessageDialog(prefPanel, "Please enter an integer greater than 0 for the font size.", "Font size error", JOptionPane.ERROR_MESSAGE);
           else if (e.getMessage() == PreferencesPanel.HISTORY_ERROR)
             JOptionPane.showMessageDialog(prefPanel, "Please enter an integer greater than or equal to 0 for the number of recent matches to remember.", "History size error", JOptionPane.ERROR_MESSAGE);
-          else if (e.getMessage() == PreferencesPanel.HISTORY_ERROR)
+          else if (e.getMessage() == PreferencesPanel.MAX_MATCH_ERROR)
             JOptionPane.showMessageDialog(prefPanel, "Please enter an integer greater than or equal to 0 for the maximum number of matches to display.", "Max Matches size error", JOptionPane.ERROR_MESSAGE);
           else
             JOptionPane.showMessageDialog(prefPanel, "Please check that the font size, max matches to display, and number of recent matches to remember are all integers greater than 0.", "Size error", JOptionPane.ERROR_MESSAGE);
@@ -267,7 +267,7 @@ else if (e.getMessage() == PreferencesPanel.HISTORY_ERROR)
   private static Integer checkNumberFormat(JTextField component, String errorType) throws NumberFormatException {
     Integer number = null;
     String txt = component.getText();
-    if(txt!= null && !"".equals(txt)) {
+    if (txt!= null && ! txt.isEmpty()) {
       try {
         number = Integer.parseInt(txt);
         if(number <= 0)
@@ -360,8 +360,6 @@ private void doEncodingPrompt(final String encoding, final String oldEncoding) {
     final JDialog dialog = fileFilterDialog.createDialog(null, "Default encoding changed...");
     useNewEncoding.addActionListener(arg0 -> {
       FileTreeModel.setCurEncoding(encoding);
-      if(setEncoding == null)
-        System.out.println("encoding null!!");
       setEncoding.setText(encoding);
       dialog.setVisible(false);
     });
diff --git a/src/edu/stanford/nlp/trees/tregex/gui/TregexGUI.java b/src/edu/stanford/nlp/trees/tregex/gui/TregexGUI.java
