3 files changed, 46 insertions, 16 deletions

@@ -40,22 +40,54 @@ public class WellFormedItem {
         return good;
     }
 
+    private boolean checkForEqualFilters() {
+        boolean good = true;
+
+        Filter[] filters = Wrapper.getAllFilter();
+        int i = 0;
+        for (i = 0; i < filters.length; i++) {
+            if (filters[i].getSubscription().equals(aThis.headerMap.get("Subscription"))) {
+                if (filters[i].getEqual()) {
+                    good = (good ? aThis.headerMap.get(filters[i].getField()).contains(filters[i].getTest()) : false);
+                }
+            }
+        }
+
+        return good;
+    }
+
     private boolean checkForFilterInvalidation() {
         boolean good = true;
-        
+        good = (good ? checkForEqualFilters() : false);
+        good = (good ? checkForInequalFilters() : false);
+
+        if (!good) {
+            XmlRpc xmlrpc = new XmlRpc("deleteItem");
+            xmlrpc.addParam(Integer.decode(aThis.headerMap.get("ID")));
+            xmlrpc.execute();
+        }
+
+        return good;
+    }
+
+    private boolean checkForInequalFilters() {
+        boolean good = true;
+        boolean start = false;
+
         Filter[] filters = Wrapper.getAllFilter();
         int i = 0;
         for (i = 0; i < filters.length; i++) {
             if (filters[i].getSubscription().equals(aThis.headerMap.get("Subscription"))) {
-                if (filters[i].getEqual())
-                {
-                    good = (good ? (!aThis.headerMap.get(filters[i].getField()).equals(filters[i].getTest())) : false);
-                } else {
-                    good = (good ? (aThis.headerMap.get(filters[i].getField()).equals(filters[i].getTest())) : false);
+                if (!filters[i].getEqual()) {
+                    if (!start) {
+                        good = false;
+                        start = true;
+                    }
+                    good = (good ? true : !aThis.headerMap.get(filters[i].getField()).contains(filters[i].getTest()));
                 }
             }
         }
-        
+
         return good;
     }
 
@@ -107,9 +139,8 @@ public class WellFormedItem {
     private boolean checkForRequiredHeader(String string) {
         return checkForRequiredHeader(aThis.headerMap, string);
     }
-    
-    public static boolean checkForRequiredHeader(HashMap<String, String> headerMap, String string)
-    {
+
+    public static boolean checkForRequiredHeader(HashMap<String, String> headerMap, String string) {
         return headerMap.containsKey(string);
     }
 
@@ -117,7 +148,7 @@ public class WellFormedItem {
         try {
             URL url = new URL(aThis.headerMap.get("URL"));
             URI subUrl = new URI(aThis.headerMap.get("Subscription"));
-            
+
             return url.getHost().equals(subUrl.getHost());
         } catch (URISyntaxException ex) {
             Logger.getLogger(WellFormedItem.class.getName()).log(Level.SEVERE, null, ex);
@@ -130,8 +161,7 @@ public class WellFormedItem {
 
     private boolean checkForSubscription() {
         boolean good = Wrapper.existsSubscription(aThis.headerMap.get("Subscription"));
-        if (!good)
-        {
+        if (!good) {
             SubscriptionFile.deleteSubscription(Wrapper.getSubscription(aThis.headerMap.get("Subscription")), false);
         }
         return good;
@@ -88,9 +88,6 @@
       <Properties>
         <Property name="text" type="java.lang.String" resourceKey="jLabel2.text"/>
         <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[625, 17]"/>
-        </Property>
       </Properties>
     </Component>
     <Container class="javax.swing.JScrollPane" name="jScrollPane1">
@@ -162,6 +162,7 @@ public class ManageFiltersForm extends javax.swing.JDialog {
     }// </editor-fold>//GEN-END:initComponents
     private void jList1ValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_jList1ValueChanged
         refreshFilterPane();
+        jList2.setSelectedIndex(0);
     }//GEN-LAST:event_jList1ValueChanged
 
     private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
@@ -173,9 +174,11 @@ public class ManageFiltersForm extends javax.swing.JDialog {
         try {
             if (filter.getID() == -65536) {
                 jButton1.setText("Add");
+                jButton1.setEnabled(true);
                 jButton2.setEnabled(false);
             } else {
                 jButton1.setText("Edit");
+                jButton1.setEnabled(true);
                 jButton2.setEnabled(true);
             }
         } catch (Exception ex) {