wip

Author: derreisende77

src/main/java/mediathek/gui/tabs/tab_film/EditHistoryDialog.java

@@ -20,21 +20,21 @@
  * @author christianfranzke
  */
 public class EditHistoryDialog extends JDialog {
-    public EditHistoryDialog(Window owner, JMenuItem item, EventList<String> eventList) {
+    public EditHistoryDialog(Window owner, JMenuItem menuItem, EventList<String> eventList) {
         super(owner);
         initComponents();
 
-        item.setEnabled(false);
+        menuItem.setEnabled(false);
         addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosed(WindowEvent e) {
-                item.setEnabled(true);
+                menuItem.setEnabled(true);
             }
         });
 
         DefaultEventListModel<String> model = GlazedListsSwing.eventListModelWithThreadProxyList(eventList);
-        list1.setModel(model);
-        list1.getSelectionModel().addListSelectionListener(l -> {
+        list.setModel(model);
+        list.getSelectionModel().addListSelectionListener(l -> {
             if (l.getValueIsAdjusting())
                 return;
             adjustDeleteButton();
@@ -43,16 +43,17 @@ public void windowClosed(WindowEvent e) {
         adjustDeleteButton();
 
         btnDeleteEntries.addActionListener(l -> {
-            var list = new ArrayList<String>();
-            for (var idx : list1.getSelectedIndices()) {
-                list.add(list1.getModel().getElementAt(idx));
+            var changeList = new ArrayList<String>();
+            for (var idx : list.getSelectedIndices()) {
+                changeList.add(list.getModel().getElementAt(idx));
             }
-            list.forEach(eventList::remove);
+            changeList.forEach(eventList::remove);
+            changeList.clear();
         });
     }
 
     private void adjustDeleteButton() {
-        btnDeleteEntries.setEnabled(list1.getSelectionModel().getSelectedItemsCount() > 0);
+        btnDeleteEntries.setEnabled(list.getSelectionModel().getSelectedItemsCount() > 0);
     }
 
     private void initComponents() {
@@ -61,7 +62,7 @@ private void initComponents() {
         var dialogPane = new JPanel();
         var contentPanel = new JPanel();
         var scrollPane1 = new JScrollPane();
-        list1 = new JList<>();
+        list = new JList<>();
         var toolBar1 = new JToolBar();
         btnDeleteEntries = new JButton();
         btnDeleteEntries.setIcon(SVGIconUtilities.createSVGIcon("icons/fontawesome/trash-can.svg")); //NON-NLS
@@ -84,7 +85,7 @@ private void initComponents() {
 
                 //======== scrollPane1 ========
                 {
-                    scrollPane1.setViewportView(list1);
+                    scrollPane1.setViewportView(list);
                 }
                 contentPanel.add(scrollPane1, BorderLayout.CENTER);
 
@@ -108,7 +109,7 @@ private void initComponents() {
 
     // JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables  @formatter:off
     // Generated using JFormDesigner non-commercial license
-    private JList<String> list1;
+    private JList<String> list;
     private JButton btnDeleteEntries;
     // JFormDesigner - End of variables declaration  //GEN-END:variables  @formatter:on
 }

src/main/java/mediathek/gui/tabs/tab_film/EditHistoryDialog.jfd

@@ -25,7 +25,7 @@ new FormModel {
 							"JavaCodeGenerator.variableLocal": true
 						}
 						add( new FormComponent( "javax.swing.JList" ) {
-							name: "list1"
+							name: "list"
 							auxiliary() {
 								"JavaCodeGenerator.typeParameters": "String"
 							}