Added key components and boolean comparison

git-svn-id: http://svn.dmdirc.com/trunk@1567 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/actions/CoreActionComparison.java

@@ -98,6 +98,18 @@ public enum CoreActionComparison implements ActionComparison {
         public String getName() { return "contains"; }
     },
     
+    /** Checks if two boolean values are equal. */
+    BOOL_IS {
+        /** {@inheritDoc} */
+        public boolean test(final Object arg1, final Object arg2) {
+            return ((Boolean) arg1).equals(Boolean.valueOf((String) arg2));
+        }
+        /** {@inheritDoc} */
+        public Class appliesTo() { return Boolean.class; }
+        /** {@inheritDoc} */
+        public String getName() { return "is"; }
+    },
+    
     /** Checks if the colour is the same as another colour. */
     COLOUR_EQUALS {
         /** {@inheritDoc} */

src/com/dmdirc/actions/CoreActionComponent.java

@@ -27,6 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.parser.ChannelClientInfo;
 
 import java.awt.Color;
+import java.awt.event.KeyEvent;
 import java.util.GregorianCalendar;
 
 /**
@@ -70,7 +71,7 @@ public enum CoreActionComponent implements ActionComponent {
         public Class getType() { return String.class; }
         /** {@inheritDoc} */
         public String getName() { return "away reason"; }
-    },  
+    },
     
     /** Returns the nickname for the server. */
     SERVER_MYNICKNAME {
@@ -82,7 +83,7 @@ public enum CoreActionComponent implements ActionComponent {
         public Class getType() { return String.class; }
         /** {@inheritDoc} */
         public String getName() { return "nickname"; }
-    },    
+    },
     
     /** Returns the name of the channel. */
     CHANNEL_NAME {
@@ -190,6 +191,60 @@ public enum CoreActionComponent implements ActionComponent {
         public Class getType() { return String.class; }
         /** {@inheritDoc} */
         public String getName() { return "full date"; }
+    },
+    
+    /** Returns the name of the key that was pressed. */
+    KEYEVENT_KEYNAME {
+        /** {@inheritDoc} */
+        public Object get(final Object argument) { return KeyEvent.getKeyText(((KeyEvent) argument).getKeyCode()); }
+        /** {@inheritDoc} */
+        public Class appliesTo() { return KeyEvent.class; }
+        /** {@inheritDoc} */
+        public Class getType() { return String.class; }
+        /** {@inheritDoc} */
+        public String getName() { return "key name"; }
+    },
+    
+    /** Returns the state of the control key for a key press event. */
+    KEYEVENT_CTRLSTATE {
+        /** {@inheritDoc} */
+        public Object get(final Object argument) {
+            return Boolean.valueOf((((KeyEvent) argument).getModifiers() & KeyEvent.CTRL_DOWN_MASK) != 0);
+        }
+        /** {@inheritDoc} */
+        public Class appliesTo() { return KeyEvent.class; }
+        /** {@inheritDoc} */
+        public Class getType() { return String.class; }
+        /** {@inheritDoc} */
+        public String getName() { return "control key state"; }
+    },
+    
+    /** Returns the state of the shift key for a key press event. */
+    KEYEVENT_SHIFTSTATE {
+        /** {@inheritDoc} */
+        public Object get(final Object argument) {
+            return Boolean.valueOf((((KeyEvent) argument).getModifiers() & KeyEvent.SHIFT_DOWN_MASK) != 0);
+        }
+        /** {@inheritDoc} */
+        public Class appliesTo() { return KeyEvent.class; }
+        /** {@inheritDoc} */
+        public Class getType() { return String.class; }
+        /** {@inheritDoc} */
+        public String getName() { return "shift key state"; }
+    },
+    
+    /** Returns the state of the shift key for a key press event. */
+    KEYEVENT_ALTSTATE {
+        /** {@inheritDoc} */
+        public Object get(final Object argument) {
+            return Boolean.valueOf((((KeyEvent) argument).getModifiers() & KeyEvent.ALT_DOWN_MASK) != 0);
+        }
+        /** {@inheritDoc} */
+        public Class appliesTo() { return KeyEvent.class; }
+        /** {@inheritDoc} */
+        public Class getType() { return String.class; }
+        /** {@inheritDoc} */
+        public String getName() { return "alt key state"; }
     };
     
     /** {@inheritDoc} */