rhbz961564 remove 'alias' from Keys

zanata · May 13, 2013 · fb61fea · fb61fea
1 parent 60cb6b7
commit fb61fea
Showing 1 changed file with 8 additions and 28 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java b/zanata-war/src/main/java/org/zanata/webtrans/client/keys/Keys.java
@@ -36,7 +36,6 @@ public class Keys implements Comparable<Keys>
 {
 
    public static final int NO_MODIFIER = 0x0;
-   public static final int NO_ALIAS = 0x0;
    public static final int ALT_KEY = 0x1;
    public static final int SHIFT_KEY = 0x2;
    public static final int CTRL_KEY = 0x4;
@@ -54,22 +53,13 @@ public class Keys implements Comparable<Keys>
    public static final int KEY_NUM_3 = 99;
    public static final int KEY_NUM_4 = 100;
 
-   public static final int ALIAS_KEY = ALT_KEY | 'X';
-
-   private int alias;
    private final int modifiers;
    private final int keyCode;
 
    public Keys(int modifiers, int keyCode)
-   {
-      this(NO_ALIAS, modifiers, keyCode);
-   }
-
-   public Keys(int alias, int modifiers, int keyCode)
    {
       this.modifiers = modifiers;
       this.keyCode = keyCode;
-      this.alias = alias;
    }
 
    public int getModifiers()
@@ -82,21 +72,11 @@ public int getKeyCode()
       return keyCode;
    }
 
-   public int getAlias()
-   {
-      return alias;
-   }
-
-   public void setAlias(int alias)
-   {
-      this.alias = alias;
-   }
-
    @Override
    public int hashCode()
    {
       // could pre-calculate hash as these are both final.
-      return keyCode * 8 + modifiers + alias;
+      return keyCode * 8 + modifiers;
    }
 
    /**
@@ -111,7 +91,7 @@ public boolean equals(Object obj)
       if (!(obj instanceof Keys))
          return false;
       Keys other = (Keys) obj;
-      boolean equal = keyCode == other.keyCode && modifiers == other.modifiers && alias == other.alias;
+      boolean equal = keyCode == other.keyCode && modifiers == other.modifiers;
       return equal;
    }
 
@@ -121,15 +101,15 @@ public int compareTo(Keys o)
       Integer compareFrom;
       Integer compareTo;
 
-      if (this.alias == o.alias && this.modifiers == o.modifiers)
+      if (this.modifiers == o.modifiers)
       {
-         compareFrom = this.alias + this.modifiers + this.keyCode;
-         compareTo = o.alias + o.modifiers + o.keyCode;
+         compareFrom = this.modifiers + this.keyCode;
+         compareTo = o.modifiers + o.keyCode;
       }
       else
       {
-         compareFrom = this.alias + this.modifiers;
-         compareTo = o.alias + o.modifiers;
+         compareFrom = this.modifiers;
+         compareTo = o.modifiers;
       }
 
       return compareFrom.compareTo(compareTo);
@@ -138,7 +118,7 @@ public int compareTo(Keys o)
    @Override
    public String toString()
    {
-      return "alias: " + alias + " mod: " + modifiers + " key: " + keyCode + " hash: " + hashCode();
+      return "mod: " + modifiers + " key: " + keyCode + " hash: " + hashCode();
    }
 
    public static Set<Keys> setOf(Keys... keys)