From a8e201308dfe1405d1854ad5faa2b2e543d47d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toldi=20Bal=C3=A1zs=20=C3=81d=C3=A1m?= <balazs@toldi.eu>
Date: Wed, 25 Nov 2020 18:47:21 +0100
Subject: [PATCH] Fixed table updating and icon loading

---
 .idea/ReadeRSS.iml                        |  2 ++
 pom.xml                                   |  2 +-
 src/main/java/eu/toldi/rss/FeedFrame.java | 35 +++++------------------
 3 files changed, 10 insertions(+), 29 deletions(-)
 create mode 100644 .idea/ReadeRSS.iml

diff --git a/.idea/ReadeRSS.iml b/.idea/ReadeRSS.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/.idea/ReadeRSS.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f7acf03..8d1c1f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <build>
         <resources>
             <resource>
-                <directory>eu.toldi.rss.icons</directory>
+                <directory>resources/icons</directory>
             </resource>
         </resources>
         <plugins>
diff --git a/src/main/java/eu/toldi/rss/FeedFrame.java b/src/main/java/eu/toldi/rss/FeedFrame.java
index ed6f143..fa7a583 100644
--- a/src/main/java/eu/toldi/rss/FeedFrame.java
+++ b/src/main/java/eu/toldi/rss/FeedFrame.java
@@ -8,6 +8,9 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.*;
+import java.lang.Class;
+import java.lang.ClassLoader;
+
 
 public class FeedFrame extends JFrame {
 
@@ -31,7 +34,7 @@ public class FeedFrame extends JFrame {
     }
 
     private void initTable(){
-        JTable table = new JTable();
+        table = new JTable();
         scrollPane = new JScrollPane(table);
         table.setModel(data);
         table.addMouseListener(new MouseAdapter() {
@@ -66,13 +69,13 @@ public class FeedFrame extends JFrame {
     private void initTree(){
         DefaultMutableTreeNode root = data.getRootNode();
         feeds = new JTree(root);
-        feeds.addTreeSelectionListener(new SwitchFeed2());
+        feeds.addMouseListener(new SwitchFeed());
         add(feeds,BorderLayout.WEST);
     }
 
     private void initComponents() {
         this.setLayout(new BorderLayout());
-        ImageIcon icon = new ImageIcon("/icons/icon.png");
+        ImageIcon icon = new ImageIcon(this.getClass().getResource("/icons/icon.png"));
         this.setIconImage(icon.getImage());
         initTable();
         initMenuBar();
@@ -112,32 +115,8 @@ public class FeedFrame extends JFrame {
             loader.saveFeedData();
         }
     }
-    private  class SwitchFeed2 implements TreeSelectionListener{
-
-        @Override
-        public void valueChanged(TreeSelectionEvent e) {
-            DefaultMutableTreeNode node = (DefaultMutableTreeNode)
-                    feeds.getLastSelectedPathComponent();
-
-            /* if nothing is selected */
-            if (node == null) return;
-
-            /* retrieve the node that was selected */
-            Feed nodeInfo = (Feed) node.getUserObject();
-           /* if(node == root){
-                data.limitTo(null);
-            }else{*/
-                data.limitTo(nodeInfo);
-            //}
-            table.updateUI();
-        }
-    }
     private class SwitchFeed extends MouseAdapter {
-        JTable jTable;
 
-        public SwitchFeed(JTable jTable) {
-            this.jTable = jTable;
-        }
 
         @Override
         public void mousePressed(MouseEvent e) {
@@ -150,7 +129,7 @@ public class FeedFrame extends JFrame {
                         data.limitTo((Feed) ((DefaultMutableTreeNode) selPath.getLastPathComponent()).getUserObject());
 
                     }
-
+                    table.updateUI();
                 }
             }
         }