Merge pull request #33 from r4fterman/feature/issue-32-remove-all-obsolete-code

Issue-#32: Remove Java applet support

Author: r4fterman

abbot/src/main/java/abbot/editor/EditorConstants.java

@@ -8,61 +8,6 @@
  */
 public interface EditorConstants {
 
-  String MENU_FILE = "menus.file";
-  String MENU_EDIT = "menus.edit";
-  String MENU_TEST = "menus.test";
-  String MENU_INSERT = "menus.insert";
-  String MENU_CAPTURE = "menus.capture";
-  String MENU_HELP = "menus.help";
-
   String ACTION_PREFIX = "actions.";
-  String ACTION_EDITOR_ABOUT = "editor-about";
-  String ACTION_EDITOR_EMAIL = "editor-email";
-  String ACTION_EDITOR_BUGREPORT = "editor-submit-bug";
-  String ACTION_EDITOR_WEBSITE = "editor-website";
-  String ACTION_EDITOR_USERGUIDE = "editor-userguide";
-  String ACTION_EDITOR_QUIT = "editor-quit";
-  String ACTION_SCRIPT_OPEN = "script-open";
-  String ACTION_SCRIPT_NEW = "script-new";
-  String ACTION_SCRIPT_DUPLICATE = "script-duplicate";
-  String ACTION_SCRIPT_SAVE = "script-save";
-  String ACTION_SCRIPT_SAVE_AS = "script-save-as";
-  String ACTION_SCRIPT_RENAME = "script-rename";
-  String ACTION_SCRIPT_CLOSE = "script-close";
-  String ACTION_SCRIPT_DELETE = "script-delete";
-  String ACTION_SCRIPT_CLEAR = "script-clear";
-  String ACTION_STEP_CUT = "step-cut";
-  String ACTION_STEP_MOVE_UP = "step-move-up";
-  String ACTION_STEP_MOVE_DOWN = "step-move-down";
-  String ACTION_STEP_GROUP = "step-group";
-  String ACTION_SELECT_TESTSUITE = "select-testsuite";
-  String ACTION_EXPORT_HIERARCHY = "export-hierarchy";
-  String ACTION_RUN = "run";
-  String ACTION_RUN_TO = "run-to";
-  String ACTION_RUN_SELECTED = "run-selected";
-  String ACTION_RUN_LAUNCH = "run-launch";
-  String ACTION_RUN_TERMINATE = "run-terminate";
-  String ACTION_GET_VMARGS = "run-get-vmargs";
   String ACTION_TOGGLE_FORKED = "toggle-forked";
-  String ACTION_TOGGLE_SLOW_PLAYBACK = "toggle-slow-playback";
-  String ACTION_TOGGLE_AWT_MODE = "toggle-awt-mode";
-  String ACTION_TOGGLE_STOP_ON_FAILURE = "toggle-stop-on-failure";
-  String ACTION_TOGGLE_STOP_ON_ERROR = "toggle-stop-on-error";
-  String ACTION_INSERT_LAUNCH = "insert-launch";
-  String ACTION_INSERT_APPLET = "insert-applet";
-  String ACTION_INSERT_TERMINATE = "insert-terminate";
-  String ACTION_INSERT_CALL = "insert-call";
-  String ACTION_INSERT_SAMPLE = "insert-sample";
-  String ACTION_INSERT_SEQUENCE = "insert-sequence";
-  String ACTION_INSERT_SCRIPT = "insert-script";
-  String ACTION_INSERT_FIXTURE = "insert-fixture";
-  String ACTION_INSERT_COMMENT = "insert-comment";
-  String ACTION_INSERT_EXPRESSION = "insert-expression";
-  String ACTION_INSERT_ANNOTATION = "insert-annotation";
-  String ACTION_DYNAMIC = "dynamic-actions";
-  String ACTION_CAPTURE_IMAGE = "capture-image";
-  String ACTION_CAPTURE_COMPONENT = "capture-component";
-  String ACTION_SELECT_COMPONENT = "select-component";
-  String ACTION_CAPTURE = "capture";
-  String ACTION_CAPTURE_ALL = "capture-all";
 }

abbot/src/main/java/abbot/editor/editors/AppletviewerEditor.java

@@ -42,24 +42,19 @@ public boolean contains(Component component) {
 
   @Override
   public void dispose(Window window) {
-    if (AWT.isAppletViewerFrame(window)) {
-      // Don't dispose, it must quit on its own
-      return;
-    }
-
     Log.debug("Dispose " + window);
 
     Arrays.stream(window.getOwnedWindows()).forEach(this::dispose);
 
     if (AWT.isSharedInvisibleFrame(window)) {
-      // Don't dispose, or any child windows which may be currently
-      // ignored (but not hidden) will be hidden and disposed.
+      // Don't dispose, or any child windows that may be currently
+      // ignored (but not hidden) will be hidden and disposed of.
       return;
     }
 
     // Ensure the disposal is done on the swing thread so we can catch any
     // exceptions. If Window.dispose is called from a non-Swing thread,
-    // it will invoke the dispose action on the Swing thread but in that
+    // it will invoke the dispose action on the Swing thread, but in that
     // case we have no control over exceptions.
     Runnable action =
         () -> {
@@ -114,15 +109,14 @@ public Collection<Component> getComponents(Component component) {
         new ArrayList<>(Arrays.asList(((Container) component).getComponents()));
     // Add other components which are not explicitly children, but
     // that are conceptually descendents
-    if (component instanceof JMenu menu) {
-      list.add(menu.getPopupMenu());
-    } else if (component instanceof Window window) {
-      list.addAll(Arrays.asList(window.getOwnedWindows()));
-    } else if (component instanceof JDesktopPane) {
-      // Add iconified frames, which are otherwise unreachable.
-      // For consistency, they are still considerered children of
-      // the desktop pane.
-      list.addAll(findInternalFramesFromIcons((Container) component));
+    switch (component) {
+      case JMenu menu -> list.add(menu.getPopupMenu());
+      case Window window -> list.addAll(Arrays.asList(window.getOwnedWindows()));
+      case JDesktopPane jDesktopPane ->
+          // Add iconified frames, which are otherwise unreachable.
+          // For consistency, they are still considered children of the desktop pane.
+          list.addAll(findInternalFramesFromIcons((Container) component));
+      default -> {}
     }
     return list;
   }

abbot/src/main/java/abbot/finder/AWTHierarchy.java

@@ -22,9 +22,6 @@ public class TestHierarchy extends AWTHierarchy {
   // Map of components to ignore
   private final Map<Component, Boolean> filtered = new WeakHashMap<>();
 
-  private static final boolean TRACK_APPLET_CONSOLE =
-      Boolean.getBoolean("abbot.applet.track_console");
-
   /**
    * Create a new TestHierarchy which does not contain any UI Components which might already exist.
    */
@@ -88,10 +85,6 @@ public boolean isFiltered(Component component) {
       return false;
     }
 
-    if ("sun.plugin.ConsoleWindow".equals(component.getClass().getName())) {
-      return !TRACK_APPLET_CONSOLE;
-    }
-
     return filtered.containsKey(component)
         || ((component instanceof Window) && isFiltered(component.getParent()))
         || (!(component instanceof Window) && isWindowFiltered(component));