looking through all MainWindowActions

Author: wadoon

key.core/src/main/java/de/uka/ilkd/key/pp/SequentPrintFilter.java

@@ -82,6 +82,10 @@ public ImmutableList<SequentPrintFilterEntry> getFilteredSucc() {
      * entries.
      */
     protected void filterIdentity() {
+        if(originalSequent==null) {
+            return;
+        }
+
         antec = ImmutableSLList.nil();
         Iterator<SequentFormula> it = originalSequent.antecedent().iterator();
         while (it.hasNext()) {

key.ui/src/main/java/de/uka/ilkd/key/core/KeYMediator.java

@@ -720,7 +720,7 @@ public void enableWhenProofLoaded(final Action a) {
         addKeYSelectionListener(new KeYSelectionListener() {
             @Override
             public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
-                a.setEnabled(e.getSource().getSelectedProof() != null);
+                a.setEnabled(e.source().getSelectedProof() != null);
             }
         });
     }
@@ -736,7 +736,7 @@ public void enableWhenProofLoaded(final javax.swing.AbstractButton a) {
 
             @Override
             public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
-                a.setEnabled(e.getSource().getSelectedProof() != null);
+                a.setEnabled(e.source().getSelectedProof() != null);
             }
         });
     }

key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionEvent.java

@@ -6,52 +6,20 @@
 
 /**
  * An event that indicates that the users focused node or proof has changed
+ *
+ * @param source            the source of this event
+ * @param previousSelection the previously selected item
+ * @param currentSelection  the previously selected item
  */
-
-public class KeYSelectionEvent<Sel> {
-
-    /** the source of this event */
-    private final KeYSelectionModel source;
-
-    /** the previously selected item */
-    private final Sel previousSelection;
-
-    /**
-     * creates a new SelectedNodeEvent
-     *
-     * @param source the SelectedNodeModel where the event had its origin
-     * @param previousSelection the previous selected item
-     */
-    public KeYSelectionEvent(KeYSelectionModel source, Sel previousSelection) {
-        this.source = source;
-        this.previousSelection = previousSelection;
-    }
-
-    /**
-     * creates a new SelectedNodeEvent
-     *
-     * @param source the SelectedNodeModel where the event had its origin
-     */
-    public KeYSelectionEvent(KeYSelectionModel source) {
-        this(source, null);
-    }
-
-
+public record KeYSelectionEvent<Sel>(
+        KeYSelectionModel source, Sel previousSelection, Sel currentSelection) {
     /**
      * returns the KeYSelectionModel that caused this event
      *
      * @return the KeYSelectionModel that caused this event
      */
-    public KeYSelectionModel getSource() {
+    @Override
+    public KeYSelectionModel source() {
         return source;
     }
-
-    /**
-     * returns the previous selected item
-     *
-     * @return the previous selected item
-     */
-    public Sel getPreviousSelection() {
-        return previousSelection;
-    }
 }

key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionModel.java

@@ -360,7 +360,7 @@ public void removeKeYSelectionListener(KeYSelectionListener listener) {
     public synchronized void fireSelectedNodeChanged(Node previousNode) {
         synchronized (listenerList) {
             final KeYSelectionEvent<Node> selectionEvent =
-                new KeYSelectionEvent<>(this, previousNode);
+                new KeYSelectionEvent<>(this, previousNode, selectedNode);
             for (final KeYSelectionListener listener : listenerList) {
                 listener.selectedNodeChanged(selectionEvent);
             }
@@ -371,7 +371,7 @@ public synchronized void fireSelectedProofChanged(Proof previousProof) {
         synchronized (listenerList) {
             LOGGER.debug("Selected Proof changed, firing...");
             final KeYSelectionEvent<Proof> selectionEvent =
-                new KeYSelectionEvent<>(this, previousProof);
+                new KeYSelectionEvent<>(this, previousProof, proof);
             for (final KeYSelectionListener listener : listenerList) {
                 listener.selectedProofChanged(selectionEvent);
             }

key.ui/src/main/java/de/uka/ilkd/key/gui/GoalList.java

@@ -568,7 +568,7 @@ public void selectedNodeChanged(KeYSelectionEvent<Node> e) {
          */
         public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
             LOGGER.debug("GoalList: initialize with new proof");
-            selectingListModel.setProof(e.getSource().getSelectedProof());
+            selectingListModel.setProof(e.source().getSelectedProof());
             validate();
         }
     }

key.ui/src/main/java/de/uka/ilkd/key/gui/InfoView.java

@@ -214,7 +214,7 @@ public void selectedNodeChanged(KeYSelectionEvent<Node> e) {
          */
         @Override
         public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
-            final KeYSelectionModel selectionModel = e.getSource();
+            final KeYSelectionModel selectionModel = e.source();
             Runnable action = () -> {
                 if (isVisible()) {
                     if (selectionModel.getSelectedProof() == null) {

key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindow.java

@@ -8,6 +8,7 @@
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Path;
@@ -1650,7 +1651,7 @@ public synchronized void selectedProofChanged(KeYSelectionEvent<Proof> e) {
             if (proof != null && !proof.isDisposed()) {
                 proof.getSettings().getStrategySettings().removePropertyChangeListener(this);
             }
-            proof = e.getSource().getSelectedProof();
+            proof = e.source().getSelectedProof();
             if (proof != null) {
                 proof.getSettings().getStrategySettings().removePropertyChangeListener(this);
             }
@@ -1697,7 +1698,7 @@ private void enable(boolean b) {
 
         @Override
         public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
-            handleProof(e.getSource().getSelectedProof());
+            handleProof(e.source().getSelectedProof());
         }
 
         private void handleProof(Proof p) {
@@ -1710,7 +1711,7 @@ private void handleProof(Proof p) {
 
         @Override
         public void selectedNodeChanged(KeYSelectionEvent<Node> e) {
-            handleProof(e.getSource().getSelectedProof());
+            handleProof(e.source().getSelectedProof());
         }
 
     }

key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroMenu.java

@@ -7,12 +7,15 @@
 import javax.swing.*;
 
 import de.uka.ilkd.key.core.KeYMediator;
+import de.uka.ilkd.key.core.KeYSelectionEvent;
+import de.uka.ilkd.key.core.KeYSelectionListener;
+import de.uka.ilkd.key.core.KeYSelectionModel;
 import de.uka.ilkd.key.gui.actions.ProofScriptFromFileAction;
 import de.uka.ilkd.key.gui.actions.ProofScriptInputAction;
 import de.uka.ilkd.key.gui.actions.useractions.ProofMacroUserAction;
-import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager;
 import de.uka.ilkd.key.macros.ProofMacro;
 import de.uka.ilkd.key.proof.Node;
+import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.settings.FeatureSettings;
 
 import org.key_project.prover.sequent.PosInOccurrence;
@@ -24,8 +27,8 @@
  * This class provides the user interface to the macro extensions.
  *
  * <p>
- * It provides a menu with all macros which are applicable in a given context. The check of of
- * applicability is done using {@link ProofMacro#canApplyTo}.
+ * It provides a menu with all macros which are applicable in a given context.
+ * The check of applicability is done using {@link ProofMacro#canApplyTo}.
  *
  * <p>
  * The menu items bear the name returned by {@link ProofMacro#getName()} and the tooltip is set to
@@ -39,19 +42,14 @@
  * register a macro, add its class name to the file
  * <tt>resources/META-INF/services/de.uka.ilkd.key.macros.ProofMacro</tt>.
  *
+ * @author mattias ulbrich
  * @see ProofMacro
  * @see ServiceLoader
- *
- * @author mattias ulbrich
  */
 public class ProofMacroMenu extends JMenu {
-
-
-    private static final long serialVersionUID = -5946657022043894399L;
-
     /**
      * The loader used to access the providers for macros.
-     *
+     * <p>
      * This is used as iteration source in other parts of KeY's ui.
      */
     public static final Iterable<ProofMacro> REGISTERED_MACROS =
@@ -73,13 +71,11 @@ public class ProofMacroMenu extends JMenu {
      * @param mediator the mediator of the current proof.
      * @param posInOcc the pos in occurrence, can be <code>null</code> if not available.
      */
-    public ProofMacroMenu(KeYMediator mediator,
-            PosInOccurrence posInOcc) {
+    public ProofMacroMenu(KeYMediator mediator, PosInOccurrence posInOcc) {
         super("Strategy Macros");
 
         // Macros are grouped according to their category.
         Map<String, List<JMenuItem>> submenus = new LinkedHashMap<>();
-
         int count = 0;
         Node node = mediator.getSelectedNode();
         for (ProofMacro macro : REGISTERED_MACROS) {
@@ -127,25 +123,23 @@ public ProofMacroMenu(KeYMediator mediator,
                 }
             });
         }
-
-        mediator.enableWhenProofLoaded(this);
         this.numberOfMacros = count;
+
+        setEnabled(mediator.getSelectedProof() != null);
+        mediator.addKeYSelectionListener(new KeYSelectionListener() {
+            @Override
+            public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
+                setEnabled(e.currentSelection() != null);
+            }
+        });
     }
 
-    private static JMenuItem createMenuItem(final ProofMacro macro, final KeYMediator mediator,
+    private static JMenuItem createMenuItem(final ProofMacro macro,
+            final KeYMediator mediator,
             final PosInOccurrence posInOcc) {
-
-        JMenuItem menuItem = new JMenuItem(macro.getName());
-        menuItem.setToolTipText(macro.getDescription());
-        final KeyStroke macroKey = KeyStrokeManager.get(macro);
-
-        if (macroKey != null && posInOcc == null) { // currently only for global macro applications
-            menuItem.setAccelerator(macroKey);
-        }
-
-        menuItem.addActionListener(
-            new ProofMacroUserAction(mediator, macro, posInOcc, mediator.getSelectedProof()));
-        return menuItem;
+        var action =
+            new ProofMacroUserAction(mediator, macro, posInOcc, mediator.getSelectedProof());
+        return new JMenuItem(action);
     }
 
     /**

key.ui/src/main/java/de/uka/ilkd/key/gui/SelectionHistory.java

@@ -151,12 +151,12 @@ public void navigateForward() {
     @Override
     public void selectedNodeChanged(KeYSelectionEvent<Node> e) {
         if (selectedNodes.isEmpty()) {
-            selectedNodes.add(new WeakReference<>(e.getSource().getSelectedNode()));
+            selectedNodes.add(new WeakReference<>(e.source().getSelectedNode()));
             fireChangeEvent();
             return;
         }
         Node last = selectedNodes.peekLast().get();
-        Node now = e.getSource().getSelectedNode();
+        Node now = e.source().getSelectedNode();
         if (last != now) {
             selectedNodes.add(new WeakReference<>(now));
             fireChangeEvent();
@@ -165,7 +165,7 @@ public void selectedNodeChanged(KeYSelectionEvent<Node> e) {
 
     @Override
     public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
-        Proof p = e.getSource().getSelectedProof();
+        Proof p = e.source().getSelectedProof();
         if (p == null || monitoredProofs.contains(p)) {
             return;
         }

key.ui/src/main/java/de/uka/ilkd/key/gui/StrategySelectionView.java

@@ -98,7 +98,7 @@ public final class StrategySelectionView extends JPanel implements TabPanel {
     private final KeYSelectionListener mediatorListener = new KeYSelectionListener() {
 
         public void selectedProofChanged(KeYSelectionEvent<Proof> e) {
-            refresh(e.getSource().getSelectedProof());
+            refresh(e.source().getSelectedProof());
         }
     };
     private JButton btnGo;