- implement context menu for thema combo box

- code refactor

Author: derreisende77

src/main/java/mediathek/gui/tabs/tab_film/filter/SwingFilterDialog.java

@@ -226,10 +226,15 @@ private void updateThemaComboBox() {
         jcbThema.setSelectedItem(aktuellesThema);
     }
 
+    private JPopupMenu createPopupMenu() {
+        var popupMenu = new JPopupMenu();
+        popupMenu.add(new ResetThemaButtonAction());
+        return popupMenu;
+    }
+
     private void setupThemaComboBox() {
-        jcbThema.setNoActionOnKeyNavigation(true);
-        jcbThema.setStrict(true);
-        jcbThema.setStrictCompletion(true);
+        jcbThema.setComponentPopupMenu(createPopupMenu());
+
         var model = GlazedListsSwing.eventComboBoxModel(new EventListWithEmptyFirstEntry(sourceThemaList));
         jcbThema.setModel(model);
         //otherwise stored filter will not be accepted as entry may not be in list
@@ -480,21 +485,22 @@ public void restoreFilterConfig() {
 
     private class AddNewFilterAction extends AbstractAction {
         private static final String STR_ACTION_NAME = "Neuen Filter anlegen";
+
         public AddNewFilterAction() {
             putValue(Action.SMALL_ICON, SVGIconUtilities.createSVGIcon("icons/fontawesome/plus.svg"));
             putValue(Action.SHORT_DESCRIPTION, STR_ACTION_NAME);
         }
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            String newFilterName = (String)JOptionPane.showInputDialog(MediathekGui.ui(), "Filtername:",
+            String newFilterName = (String) JOptionPane.showInputDialog(MediathekGui.ui(), "Filtername:",
                     STR_ACTION_NAME, JOptionPane.PLAIN_MESSAGE, null, null,
                     String.format("Filter %d", filterConfig.getAvailableFilters().size() + 1));
             if (newFilterName != null) {
                 filterConfig.findFilterForName(newFilterName).ifPresentOrElse(f ->
                         JOptionPane.showMessageDialog(MediathekGui.ui(),
-                        "Ein Filter mit dem gewählten Namen existiert bereits!",
-                        STR_ACTION_NAME, JOptionPane.ERROR_MESSAGE), () -> {
+                                "Ein Filter mit dem gewählten Namen existiert bereits!",
+                                STR_ACTION_NAME, JOptionPane.ERROR_MESSAGE), () -> {
                     FilterDTO newFilter = new FilterDTO(UUID.randomUUID(), newFilterName);
                     filterConfig.addNewFilter(newFilter);
                     checkDeleteCurrentFilterButtonState();
@@ -525,9 +531,11 @@ public void actionPerformed(ActionEvent e) {
     }
 
     private class ResetThemaAction extends AbstractAction {
+        protected static final String STR_RESET_THEMA = "Thema zurücksetzen";
+
         public ResetThemaAction() {
             putValue(Action.SMALL_ICON, SVGIconUtilities.createSVGIcon("icons/fontawesome/trash-can.svg"));
-            putValue(Action.SHORT_DESCRIPTION, "Thema zurücksetzen");
+            putValue(Action.SHORT_DESCRIPTION, STR_RESET_THEMA);
         }
 
         @Override
@@ -537,6 +545,12 @@ public void actionPerformed(ActionEvent e) {
         }
     }
 
+    private class ResetThemaButtonAction extends ResetThemaAction {
+        public ResetThemaButtonAction() {
+            putValue(Action.NAME, STR_RESET_THEMA);
+        }
+    }
+
     private class RenameFilterAction extends AbstractAction {
         public RenameFilterAction() {
             putValue(Action.SMALL_ICON, SVGIconUtilities.createSVGIcon("icons/fontawesome/pen-to-square.svg"));

src/main/java/mediathek/tool/swing/AutoCompletionComboBox2.java

@@ -26,14 +26,12 @@
 /**
  * An auto completion combobox.
  * <p/>
- * Since auto-complete has to listen to the key user types, it has to be editable. If you want to limit user to the list
- * available in the combobox model, you can call {@link #setStrict(boolean)} and set it to true.
  * This class is a rewrite of {@link com.jidesoft.swing.AutoCompletionComboBox} and does not send action events when keys
  * are pressed if {@link #setNoActionOnKeyNavigation(boolean)} is set to true.
  */
 public class AutoCompletionComboBox2 extends JComboBox<String> {
     protected AutoCompletion _autoCompletion;
-    boolean _noActionOnKeyNavigation;
+    protected boolean _noActionOnKeyNavigation;
     private boolean _preventActionEvent;
 
     public AutoCompletionComboBox2() {
@@ -42,7 +40,11 @@ public AutoCompletionComboBox2() {
 
     protected void initComponents() {
         setEditable(true);
+        setNoActionOnKeyNavigation(true);
+
         _autoCompletion = createAutoCompletion();
+        _autoCompletion.setStrict(true);
+        _autoCompletion.setStrictCompletion(true);
     }
 
     public void setNoActionOnKeyNavigation(boolean _noActionOnKeyNavigation) {
@@ -58,38 +60,6 @@ protected AutoCompletion createAutoCompletion() {
         return new AutoCompletion(this, new NoFireOnKeyComboBoxSearchable());
     }
 
-    /**
-     * Sets the strict property. If true, it will not allow user to type in anything that is not in the known item list.
-     * If false, user can type in whatever he/she wants. If the text can match with a item in the known item list, it
-     * will still auto-complete.
-     *
-     * @param strict true or false.
-     */
-    public void setStrict(boolean strict) {
-        getAutoCompletion().setStrict(strict);
-    }
-
-    /**
-     * Sets the strict completion property. If true, in case insensitive searching, it will always use the exact item in
-     * the Searchable to replace whatever user types. For example, when Searchable has an item "Arial" and user types in
-     * "AR", if this flag is true, it will auto-completed as "Arial". If false, it will be auto-completed as "ARial". Of
-     * course, this flag will only make a difference if Searchable is case insensitive.
-     *
-     * @param strictCompletion true or false.
-     */
-    public void setStrictCompletion(boolean strictCompletion) {
-        getAutoCompletion().setStrictCompletion(strictCompletion);
-    }
-
-    /**
-     * Gets the underlying AutoCompletion class.
-     *
-     * @return the underlying AutoCompletion.
-     */
-    public AutoCompletion getAutoCompletion() {
-        return _autoCompletion;
-    }
-
     protected void resetCaretPosition() {
         final var tf = (JTextField)getEditor().getEditorComponent();
         final var textLength = tf.getText().length();