Client: Tweaked the client to work (better)

7 files changed, 115 insertions, 197 deletions

@@ -1,85 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.fourisland.instadisc.Database;
-
-import com.sleepycat.persist.model.Entity;
-import com.sleepycat.persist.model.PrimaryKey;
-import java.util.HashMap;
-
-/**
- *
- * @author hatkirby
- */
-@Entity
-public class Item {
-
-    @PrimaryKey
-    private Integer id;
-    private String subscription;
-    private String title;
-    private String author;
-    private String url;
-    private HashMap<String, String> semantics;
-
-    public Item() {
-        semantics = new HashMap<String, String>();
-    }
-
-    public Integer getID() {
-        return id;
-    }
-
-    public String getSubscription() {
-        return subscription;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public String getURL() {
-        return url;
-    }
-
-    public HashMap<String, String> getSemantics() {
-        return semantics;
-    }
-
-    public void setID(Integer id) {
-        this.id = id;
-    }
-
-    public void setSubscription(String subscription) {
-        this.subscription = subscription;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public void setURL(String url) {
-        this.url = url;
-    }
-
-    public void setSemantics(HashMap<String, String> semantics) {
-        this.semantics = semantics;
-    }
-
-    public String getSemantics(String key) {
-        return semantics.get(key);
-    }
-
-    public void putSemantics(String key, String value) {
-        semantics.put(key, value);
-    }
-}
@@ -26,7 +26,6 @@ public class Wrapper {
     public static EntityStore es = null;
     public static PrimaryIndex<Integer, OldVerID> oldVerID;
     public static PrimaryIndex<String, IDConfig> idConfig;
-    public static PrimaryIndex<Integer, Item> item;
     public static PrimaryIndex<String, Subscription> subscription;
     public static PrimaryIndex<Integer, Filter> filter;
 
@@ -49,7 +48,6 @@ public class Wrapper {
         try {
             oldVerID = es.getPrimaryIndex(Integer.class, OldVerID.class);
             idConfig = es.getPrimaryIndex(String.class, IDConfig.class);
-            item = es.getPrimaryIndex(Integer.class, Item.class);
             subscription = es.getPrimaryIndex(String.class, Subscription.class);
             filter = es.getPrimaryIndex(Integer.class, Filter.class);
         } catch (DatabaseException ex) {
@@ -137,63 +135,6 @@ public class Wrapper {
         }
     }
 
-    public static void addItem(Item m_item) {
-        synchronized (item) {
-            try {
-                item.put(m_item);
-            } catch (DatabaseException ex) {
-                Logger.getLogger(Wrapper.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-    }
-
-    public static int countItem() {
-        synchronized (item) {
-            try {
-                return (int) item.count();
-            } catch (DatabaseException ex) {
-                Logger.getLogger(Wrapper.class.getName()).log(Level.SEVERE, null, ex);
-                return 0;
-            }
-        }
-    }
-
-    public static void dropFromTopItem() {
-        synchronized (item) {
-            try {
-                Integer[] keySet = (Integer[]) item.map().keySet().toArray();
-                item.delete(keySet[0]);
-            } catch (DatabaseException ex) {
-                Logger.getLogger(Wrapper.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-    }
-
-    public static Item[] getAllItem() {
-        synchronized (item) {
-            try {
-                Iterator<Item> i = item.entities().iterator();
-                Item[] temp = new Item[0];
-                int len = 0;
-
-                while (i.hasNext()) {
-                    Item[] temp2 = new Item[len + 1];
-                    int j = 0;
-                    for (j = 0; j < len; j++) {
-                        temp2[j] = temp[j];
-                    }
-                    temp2[len] = i.next();
-                    temp = temp2;
-                }
-
-                return temp;
-            } catch (DatabaseException ex) {
-                Logger.getLogger(Wrapper.class.getName()).log(Level.SEVERE, null, ex);
-                return new Item[0];
-            }
-        }
-    }
-
     public static Subscription getSubscription(String url) {
         synchronized (subscription) {
             try {
@@ -4,7 +4,7 @@
  */
 package com.fourisland.instadisc;
 
-import com.fourisland.instadisc.Database.Item;
+import com.fourisland.instadisc.Item.Item;
 import com.fourisland.instadisc.Database.Wrapper;
 import com.fourisland.instadisc.Item.Categories.Category;
 import java.awt.Component;
@@ -56,7 +56,7 @@ public class InstaDiscThread implements Runnable {
 class HandleItemThread implements Runnable {
 
     Socket s;
-
+    
     public HandleItemThread(Socket s) {
         this.s = s;
     }
@@ -40,6 +40,7 @@
               </Properties>
               <Events>
                 <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jList1MouseClicked"/>
+                <EventHandler event="componentShown" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="jList1ComponentShown"/>
               </Events>
             </Component>
           </SubComponents>
@@ -3,7 +3,7 @@
  */
 package com.fourisland.instadisc;
 
-import com.fourisland.instadisc.Database.Item;
+import com.fourisland.instadisc.Item.Item;
 import com.fourisland.instadisc.Database.Wrapper;
 import com.fourisland.instadisc.Item.Categories.InstaDiscIcon;
 import java.awt.AWTException;
@@ -94,11 +94,10 @@ public class InstaDiscView extends FrameView {
                 }
             }
         });
-        
+
         this.getFrame().setIconImage(new ImageIcon(InstaDiscIcon.instadiscicon).getImage());
-        
-        if (SystemTray.isSupported())
-        {
+
+        if (SystemTray.isSupported()) {
             try {
                 TrayIcon ti = new TrayIcon(new ImageIcon(InstaDiscIcon.instadisciconmiddle).getImage(), "InstaDisc");
                 SystemTray.getSystemTray().add(ti);
@@ -108,14 +107,15 @@ public class InstaDiscView extends FrameView {
             }
         }
 
-        jList1.setCellRenderer(new IDItemListCellRenderer());
+        lm.ensureCapacity(10);
+        lm.clear();
         jList1.setModel(lm);
-        refreshItemPane();
+        jList1.setCellRenderer(new IDItemListCellRenderer());
 
         InstaDiscThread idt = new InstaDiscThread();
         Thread idtt = new Thread(idt);
         idtt.start();
-        
+
         XmlRpc xmlrpc = new XmlRpc("requestRetained");
         xmlrpc.execute();
     }
@@ -170,6 +170,11 @@ public class InstaDiscView extends FrameView {
                 jList1MouseClicked(evt);
             }
         });
+        jList1.addComponentListener(new java.awt.event.ComponentAdapter() {
+            public void componentShown(java.awt.event.ComponentEvent evt) {
+                jList1ComponentShown(evt);
+            }
+        });
         jScrollPane1.setViewportView(jList1);
 
         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
@@ -338,6 +343,10 @@ public class InstaDiscView extends FrameView {
         xmlrpc.execute();
     }//GEN-LAST:event_jMenuItem4ActionPerformed
 
+    private void jList1ComponentShown(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_jList1ComponentShown
+        jList1.repaint();
+    }//GEN-LAST:event_jList1ComponentShown
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JList jList1;
     private javax.swing.JMenu jMenu1;
@@ -363,12 +372,15 @@ public class InstaDiscView extends FrameView {
     private JDialog aboutBox;
     private DefaultListModel lm = new DefaultListModel();
 
-    public void refreshItemPane() {
-        lm.clear();
-        Item[] items = Wrapper.getAllItem();
-        int i = 0;
-        for (i = 0; i < items.length; i++) {
-            lm.addElement(items[i]);
+    public void addItemPane(Item item) {
+        if (lm.size() >= Integer.decode(Wrapper.getConfig("itemBufferSize"))) {
+            while (lm.size() >= Integer.decode(Wrapper.getConfig("itemBufferSize"))) {
+                lm.remove(0);
+            }
         }
+
+        lm.addElement(item);
+        jList1.setModel(lm);
+        jList1.repaint();
     }
 }
@@ -10,12 +10,7 @@ import com.fourisland.instadisc.InstaDiscView;
 import com.fourisland.instadisc.XmlRpc;
 import java.awt.SystemTray;
 import java.awt.TrayIcon.MessageType;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -24,8 +19,75 @@ import java.util.logging.Logger;
 public class Item {
 
     HashMap<String, String> headerMap;
+    private Integer id;
+    private String subscription;
+    private String title;
+    private String author;
+    private String url;
+    private HashMap<String, String> semantics;
+
+    public Item() {
+        semantics = new HashMap<String, String>();
+    }
+
+    public Integer getID() {
+        return id;
+    }
+
+    public String getSubscription() {
+        return subscription;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public String getURL() {
+        return url;
+    }
+
+    public HashMap<String, String> getSemantics() {
+        return semantics;
+    }
+
+    public void setID(Integer id) {
+        this.id = id;
+    }
+
+    public void setSubscription(String subscription) {
+        this.subscription = subscription;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public void setURL(String url) {
+        this.url = url;
+    }
+
+    public void setSemantics(HashMap<String, String> semantics) {
+        this.semantics = semantics;
+    }
+
+    public String getSemantics(String key) {
+        return semantics.get(key);
+    }
+
+    public void putSemantics(String key, String value) {
+        semantics.put(key, value);
+    }
 
     public Item(HashMap<String, String> headerMap) {
+        this();
         this.headerMap = headerMap;
     }
 
@@ -35,41 +97,28 @@ public class Item {
             XmlRpc xmlrpc = new XmlRpc("deleteItem");
             xmlrpc.addParam(Integer.decode(headerMap.get("ID")));
             xmlrpc.execute();
-            
-            if (Wrapper.countItem() >= Integer.decode(Wrapper.getConfig("itemBufferSize")))
-            {
-                Wrapper.dropFromTopItem();
-            }
 
-            try {
-                com.fourisland.instadisc.Database.Item di = new com.fourisland.instadisc.Database.Item();
-                di.setID(Integer.decode(headerMap.get("ID")));
-                di.setSubscription(headerMap.get("Subscription"));
-                di.setTitle(headerMap.get("Title"));
-                di.setAuthor(headerMap.get("Author"));
-                di.setURL(new URL(headerMap.get("URL")).toString());
-                
-                HashMap<String, String> temp = new HashMap(headerMap);
-                temp.remove("ID");
-                temp.remove("Verification");
-                temp.remove("Verification-ID");
-                temp.remove("Subscription");
-                temp.remove("Title");
-                temp.remove("Author");
-                temp.remove("URL");
-                di.setSemantics(temp);
-                
-                Wrapper.addItem(di);
-            } catch (MalformedURLException ex) {
-                Logger.getLogger(Item.class.getName()).log(Level.SEVERE, null, ex);
-            }
-            
-            if (SystemTray.isSupported())
-            {
+            setID(Integer.decode(headerMap.get("ID")));
+            setSubscription(headerMap.get("Subscription"));
+            setTitle(headerMap.get("Title"));
+            setAuthor(headerMap.get("Author"));
+            setURL(headerMap.get("URL"));
+
+            HashMap<String, String> temp = new HashMap<String, String>(headerMap);
+            temp.remove("ID");
+            temp.remove("Verification");
+            temp.remove("Verification-ID");
+            temp.remove("Subscription");
+            temp.remove("Title");
+            temp.remove("Author");
+            temp.remove("URL");
+            setSemantics(temp);
+
+            ((InstaDiscView) InstaDiscApp.getApplication().getMainView()).addItemPane(this);
+
+            if (SystemTray.isSupported()) {
                 InstaDiscApp.ti.displayMessage("New item recieved!", Wrapper.getSubscription(headerMap.get("Subscription")).getTitle() + ", " + headerMap.get("Title") + " by " + headerMap.get("Author"), MessageType.INFO);
             }
-
-            ((InstaDiscView)InstaDiscApp.getApplication().getMainView()).refreshItemPane();
         }
     }
 }