3 files changed, 16 insertions, 11 deletions

@@ -34,6 +34,9 @@ public class Category {
         } else if (category.equals("email"))
         {
             return new ImageIcon(Email.email);
+        } else if (category.equals("vcs-rev"))
+        {
+            return new ImageIcon(Vcsrev.vcsrev);
         }
         return null;
     }
@@ -62,4 +65,10 @@ public class Category {
         }
     }
     
+    public static boolean checkForLegalCategory(HashMap<String, String> headerMap)
+    {
+        String category = Wrapper.getSubscription(headerMap.get("Subscription")).getCategory();
+        Icon i = iconFromCategory(category);
+        return (i != null);
+    }
 }
@@ -0,0 +1,6 @@
+package com.fourisland.instadisc.Item.Categories;
+
+public class Vcsrev
+{
+        public static byte[] vcsrev = new byte[] {-119,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,16,6,0,0,0,79,99,35,34,0,0,0,6,98,75,71,68,-1,-1,-1,-1,-1,-1,9,88,-9,-36,0,0,0,9,112,72,89,115,0,0,10,-16,0,0,10,-16,1,66,-84,52,-104,0,0,0,9,118,112,65,103,0,0,0,16,0,0,0,16,0,92,-58,-83,-61,0,0,6,-60,73,68,65,84,72,-57,-115,85,127,76,-109,-7,29,126,-34,-66,-27,109,75,91,88,-75,-48,94,-19,58,108,-101,80,65,-18,86,69,-86,52,-127,81,-52,-16,68,38,67,33,-64,-99,59,-58,-74,-69,-119,38,100,14,117,-57,6,-52,-102,-13,-57,-68,-60,-71,-125,-109,57,5,118,-24,121,7,7,70,49,23,-107,-88,1,65,14,21,8,69,70,-88,-76,50,-37,90,70,11,45,63,10,-3,1,-17,-69,63,68,-78,-36,-3,-79,-5,-4,-13,-55,-13,-51,39,79,-98,60,-33,-17,-25,-7,18,-8,-98,85,81,81,81,81,81,-79,10,-85,17,68,16,65,98,25,66,8,33,4,-101,-36,74,110,37,-73,66,-64,18,-78,-124,44,33,-13,11,-36,-58,109,-36,6,-71,50,79,87,86,86,86,86,86,126,-105,-105,-11,125,5,-84,86,37,42,81,-71,-19,103,-116,-128,17,48,-126,-117,109,-63,-8,96,124,48,-2,82,50,93,66,-105,-48,37,-97,9,-119,98,-94,-104,40,-2,117,-14,-54,-12,-16,-1,-93,35,-66,125,80,-42,92,-42,92,-42,-4,26,9,5,-81,122,-6,-57,-12,67,-6,33,-3,-16,-15,6,106,-114,-102,-93,-26,82,-65,-28,29,-30,29,-30,29,-70,-68,109,125,-7,-6,-14,-11,-27,-60,-69,-45,109,-45,109,-45,109,-128,39,-54,19,-27,-119,106,24,24,-107,-114,74,71,-91,-91,-1,8,-87,66,-86,-112,42,-115,-113,-53,-72,-116,-53,-61,-71,-81,-8,-58,116,45,-68,22,94,11,15,-85,22,-83,90,-20,-117,-10,69,-5,-94,57,63,-115,22,68,11,-94,5,-70,111,68,103,68,103,68,103,106,-13,-7,77,-4,38,126,-45,124,-61,-110,125,-55,-66,100,-89,106,-91,38,-87,73,106,-38,41,-55,-28,103,-14,51,-7,-124,36,-24,10,-70,-126,46,-64,101,117,89,93,86,115,34,-107,65,101,80,25,78,-111,32,67,-112,33,-56,-8,-76,-108,-85,-26,-86,-71,-22,-64,90,-77,-41,-20,53,123,7,5,90,-79,86,-84,21,7,-126,-20,111,59,-64,-15,114,-68,28,-17,-114,34,-82,-111,107,-28,26,-1,74,102,78,103,78,103,78,-81,51,15,28,28,56,56,112,-16,15,14,-41,115,-41,115,-41,115,38,66,-5,68,-5,68,-5,-124,112,-14,6,121,-125,-68,65,64,-59,82,-79,84,44,96,-58,57,-29,-100,113,-66,-3,14,85,72,21,82,-123,-37,-72,-70,50,93,-103,-82,-20,-115,-73,-18,-121,-33,15,-65,31,126,-44,35,56,41,56,41,56,41,72,-63,94,-20,-59,-34,63,90,87,5,48,-57,-104,99,-52,49,-128,46,-90,-117,-23,-30,-2,-118,-91,-86,-91,-86,-91,-86,-65,-3,105,96,116,96,116,96,-12,67,105,-108,49,-54,24,101,-116,-18,78,40,75,40,75,40,3,36,1,73,64,18,64,52,95,-52,23,-13,-59,-64,58,-55,58,-55,58,9,64,101,83,-39,84,-74,-16,47,22,-73,-59,109,113,11,113,75,115,75,115,75,-125,-49,108,30,-101,-57,-26,-7,50,-128,22,-76,-96,-27,43,-23,114,-3,114,-3,114,61,-109,68,26,-115,70,-93,-47,-120,79,-56,-51,-28,102,114,115,-14,127,72,29,-87,35,117,111,-122,-45,-5,-24,125,-12,62,-22,11,38,-107,73,101,82,83,10,18,38,19,38,19,38,5,63,-120,-69,26,119,53,-18,42,64,63,-96,31,-48,15,-128,-114,-115,29,27,59,54,2,-100,12,78,6,39,3,80,-6,-108,62,-91,15,96,63,98,63,98,63,2,122,-87,94,-86,-105,-62,73,-17,-88,119,-44,59,-38,83,27,91,29,91,29,91,-19,-19,79,-86,78,-86,78,-86,78,52,-84,108,1,65,51,87,-104,43,-52,-107,95,-83,-31,89,120,22,-98,-27,-13,-57,-78,9,-39,-124,108,-30,19,102,-117,108,-117,108,-117,76,50,35,-15,74,-68,18,47,48,-81,-98,87,-49,-85,-127,-31,-60,-31,-60,-31,-60,-91,-16,-38,75,-75,-105,106,47,-67,120,-89,87,-39,-85,-20,85,-50,-111,-45,117,-45,117,-45,117,0,39,-126,19,-63,-119,0,10,-75,-123,-38,66,45,-100,-6,115,-6,115,-6,115,7,-7,84,-120,10,81,-95,-81,114,23,-5,22,-5,22,-5,-2,-23,127,125,5,-84,80,78,40,39,-108,67,-116,-88,-57,-43,-29,-22,113,-64,-32,49,120,12,30,34,-127,-57,-26,-79,121,108,-128,-65,-117,-65,-117,-65,11,-72,-37,120,-73,-15,110,35,80,107,-83,-75,-42,90,95,-2,-36,91,-28,45,-14,22,-3,50,-33,-74,-57,-74,-57,-74,-25,-125,-44,-18,-95,-18,-95,-18,-95,60,-24,78,-23,78,-23,78,1,-111,-102,72,77,-92,6,44,-125,-54,-96,50,-88,96,49,9,77,66,-109,-112,64,87,74,87,74,87,10,-80,-6,6,-40,10,-74,-126,-83,0,-36,-116,-101,113,51,64,-65,-90,95,-45,-81,1,-44,14,-75,67,-19,0,100,65,89,80,22,4,-44,-119,-22,68,117,34,-112,91,-105,91,-105,91,39,-6,-62,-106,99,-53,-79,-27,124,-16,-109,-40,-75,-79,107,99,-41,-66,-27,87,-36,84,-36,84,-36,4,2,83,-127,-87,-64,20,-32,63,-21,63,-21,63,11,-116,12,-116,12,-116,12,0,35,5,35,5,35,5,-128,63,-34,31,-17,-113,7,-56,-76,-76,-76,-76,-76,52,124,77,-100,39,-50,19,-25,-93,-100,-66,25,-33,-116,111,102,70,-29,-86,113,-43,-72,106,70,-29,-4,6,-65,-63,111,80,-4,91,68,-120,8,17,-63,121,91,-71,95,-71,95,-71,31,-112,55,-55,-101,-28,77,-100,-86,-64,66,96,33,-80,16,-65,57,-58,17,-29,-120,113,-120,117,114,-79,92,44,23,3,-66,59,-66,59,-66,59,-64,51,-53,51,-53,51,11,-114,14,113,-121,-72,67,-36,-114,-4,-79,-120,-79,-120,-79,-120,-10,-104,48,119,-104,59,-52,-3,-81,-33,-66,78,66,-46,-37,-22,109,-11,-74,94,-4,-40,55,-26,27,-13,-115,-67,-33,-57,-36,96,110,48,55,-2,-66,-51,-95,117,104,29,90,-81,-18,69,-49,-117,-98,23,61,-128,-77,-56,89,-28,44,2,-126,71,-126,71,-126,71,-128,36,101,-110,50,73,9,-120,78,-120,78,-120,78,0,-18,11,-18,11,-18,11,-128,115,-73,115,-73,115,55,96,-73,-37,-19,118,59,-13,94,-88,43,-44,21,-22,-6,122,95,31,-39,71,-10,-111,-121,-75,-53,-41,-105,-81,47,95,127,-81,-128,-75,-110,-47,52,-33,-51,119,-13,-35,0,41,36,-123,-92,48,-29,35,78,9,-89,-124,83,114,-15,-49,-6,69,-3,-94,126,-15,-115,-68,-89,-11,79,-21,-97,-42,3,-51,84,51,-43,76,65,50,-71,125,114,-5,-28,118,-48,11,59,23,118,46,-20,4,22,118,44,-20,88,-40,1,-12,90,122,45,-67,22,28,109,85,-76,42,90,21,12,-77,-63,-66,-63,-66,-63,78,-12,80,-23,84,58,-107,94,110,-107,73,101,82,-103,-12,-120,-54,21,-29,-118,113,-59,-96,123,53,9,83,13,-87,-122,84,3,64,92,35,-82,17,-41,2,53,-16,-63,7,95,-48,58,-111,60,-111,60,-111,-4,-29,33,123,-79,-67,-40,94,-36,-40,-58,111,-32,55,-16,27,-66,-7,97,-28,-53,-56,-105,-111,47,-109,74,35,-83,-111,-42,72,43,74,77,-57,77,-57,77,-57,1,83,-89,-87,-45,-44,-39,81,99,-21,-76,117,-38,58,63,-83,-102,83,-49,-87,-25,-44,111,38,78,-51,78,-51,78,-51,-34,126,-20,58,-20,58,-20,58,-36,40,11,-21,14,-21,14,-21,-74,75,-66,-13,23,-28,-55,-14,100,121,-78,-41,40,122,69,-32,-17,102,-25,-37,-25,-37,-25,-37,91,69,-39,-9,-78,-17,101,-33,83,-3,-120,56,64,28,32,14,124,94,-71,102,-45,-102,77,107,54,17,-17,14,-26,13,-26,13,-26,1,-29,13,-29,13,-29,13,-11,-14,-119,-106,-119,-106,-119,-106,15,-73,-45,81,116,20,29,85,-6,123,34,-123,72,33,82,110,-23,95,-15,117,-50,-75,-101,-37,-51,-19,-26,-1,-39,-126,-43,40,78,-25,-92,115,-46,95,-93,-55,45,-81,122,-7,-5,113,-39,113,-39,113,-39,76,-48,-111,-17,-56,119,-28,107,62,10,85,-121,-86,67,-43,8,-12,-21,-5,-11,-3,122,96,-23,-12,-46,-23,-91,-45,0,39,-117,-109,-59,-55,98,-81,-105,-21,-27,122,-71,126,50,-87,110,-74,110,-74,110,-74,-4,55,89,89,89,89,89,89,56,-73,66,92,12,51,-52,48,3,-1,5,-47,24,-5,-89,-127,71,43,-27,0,0,0,42,122,84,88,116,83,111,102,116,119,97,114,101,0,0,120,-38,-13,77,76,46,-54,-49,77,77,-55,76,84,112,-53,44,74,45,-49,47,-54,46,86,48,-47,51,0,0,112,-29,8,-127,-87,-62,21,-98,0,0,0,0,73,69,78,68,-82,66,96,-126,-1};
+}
@@ -33,7 +33,7 @@ public class WellFormedItem {
         boolean good = true;
         good = (good ? checkForRequiredHeaders() : false);
         good = (good ? checkForSubscription() : false);
-        good = (good ? checkForLegalCategory() : false);
+        good = (good ? Category.checkForLegalCategory(aThis.headerMap) : false);
         good = (good ? Category.checkForRequiredSemantics(aThis.headerMap) : false);
         good = (good ? checkForProperVerification() : false);
         good = (good ? checkForFilterInvalidation() : false);
@@ -92,16 +92,6 @@ public class WellFormedItem {
         return good;
     }
 
-    private boolean checkForLegalCategory() {
-        boolean good = false;
-        good = checkForLegalCategory("blog-post", good);
-        good = checkForLegalCategory("blog-comment", good);
-        good = checkForLegalCategory("forum-post", good);
-        good = checkForLegalCategory("instadisc", good);
-        good = checkForLegalCategory("email", good);
-        return good;
-    }
-
     private boolean checkForLegalCategory(String string, boolean good) {
         return (good ? true : Wrapper.getSubscription(aThis.headerMap.get("Subscription")).getCategory().equals(string));
     }