litesoft
Subversion Repository Public Repository

litesoft

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions 947 vs 948 for /trunk/Java/GWT/Client/src/org/litesoft/GWT/client/KeyboardKeyModifier.java

Diff revisions: vs.
  @@ -4,226 +4,175 @@
4 4 import java.io.*;
5 5
6 6 public enum KeyboardKeyModifier implements KeyboardKeyModifierBits,
7 - Serializable
8 - {
7 + Serializable {
9 8 None,
10 - Shift
11 - {
12 - @Override
13 - public int getBits()
14 - {
15 - return iSHIFT;
16 - }
17 - },
18 - Ctrl
19 - {
20 - @Override
21 - public int getBits()
22 - {
23 - return iCTRL;
24 - }
25 - },
26 - Alt
27 - {
28 - @Override
29 - public int getBits()
30 - {
31 - return iALT;
32 - }
33 - },
34 - Meta
35 - {
36 - @Override
37 - public int getBits()
38 - {
39 - return iMETA;
40 - }
41 - },
42 - Ctrl_Alt
43 - {
44 - @Override
45 - public int getBits()
46 - {
47 - return iCTRL_ALT;
48 - }
49 - },
50 - Ctrl_Meta
51 - {
52 - @Override
53 - public int getBits()
54 - {
55 - return iCTRL_META;
56 - }
57 - },
58 - Ctrl_Shift
59 - {
60 - @Override
61 - public int getBits()
62 - {
63 - return iCTRL_SHIFT;
64 - }
65 - },
66 - Alt_Meta
67 - {
68 - @Override
69 - public int getBits()
70 - {
71 - return iALT_META;
72 - }
73 - },
74 - Alt_Shift
75 - {
76 - @Override
77 - public int getBits()
78 - {
79 - return iALT_SHIFT;
80 - }
81 - },
82 - Meta_Shift
83 - {
84 - @Override
85 - public int getBits()
86 - {
87 - return iMETA_SHIFT;
88 - }
89 - },
90 - Ctrl_Alt_Meta
91 - {
92 - @Override
93 - public int getBits()
94 - {
95 - return iCTRL_ALT_META;
96 - }
97 - },
98 - Ctrl_Alt_Shift
99 - {
100 - @Override
101 - public int getBits()
102 - {
103 - return iCTRL_ALT_SHIFT;
104 - }
105 - },
106 - Ctrl_Meta_Shift
107 - {
108 - @Override
109 - public int getBits()
110 - {
111 - return iCTRL_META_SHIFT;
112 - }
113 - },
114 - Alt_Meta_Shift
115 - {
116 - @Override
117 - public int getBits()
118 - {
119 - return iALT_META_SHIFT;
120 - }
121 - },
122 - Ctrl_Alt_Meta_Shift
123 - {
124 - @Override
125 - public int getBits()
126 - {
127 - return iCTRL_ALT_META_SHIFT;
128 - }
129 - };
9 + Shift {
10 + @Override
11 + public int getBits() {
12 + return iSHIFT;
13 + }
14 + },
15 + Ctrl {
16 + @Override
17 + public int getBits() {
18 + return iCTRL;
19 + }
20 + },
21 + Alt {
22 + @Override
23 + public int getBits() {
24 + return iALT;
25 + }
26 + },
27 + Meta {
28 + @Override
29 + public int getBits() {
30 + return iMETA;
31 + }
32 + },
33 + Ctrl_Alt {
34 + @Override
35 + public int getBits() {
36 + return iCTRL_ALT;
37 + }
38 + },
39 + Ctrl_Meta {
40 + @Override
41 + public int getBits() {
42 + return iCTRL_META;
43 + }
44 + },
45 + Ctrl_Shift {
46 + @Override
47 + public int getBits() {
48 + return iCTRL_SHIFT;
49 + }
50 + },
51 + Alt_Meta {
52 + @Override
53 + public int getBits() {
54 + return iALT_META;
55 + }
56 + },
57 + Alt_Shift {
58 + @Override
59 + public int getBits() {
60 + return iALT_SHIFT;
61 + }
62 + },
63 + Meta_Shift {
64 + @Override
65 + public int getBits() {
66 + return iMETA_SHIFT;
67 + }
68 + },
69 + Ctrl_Alt_Meta {
70 + @Override
71 + public int getBits() {
72 + return iCTRL_ALT_META;
73 + }
74 + },
75 + Ctrl_Alt_Shift {
76 + @Override
77 + public int getBits() {
78 + return iCTRL_ALT_SHIFT;
79 + }
80 + },
81 + Ctrl_Meta_Shift {
82 + @Override
83 + public int getBits() {
84 + return iCTRL_META_SHIFT;
85 + }
86 + },
87 + Alt_Meta_Shift {
88 + @Override
89 + public int getBits() {
90 + return iALT_META_SHIFT;
91 + }
92 + },
93 + Ctrl_Alt_Meta_Shift {
94 + @Override
95 + public int getBits() {
96 + return iCTRL_ALT_META_SHIFT;
97 + }
98 + };
130 99
131 100 public static final long serialVersionUID = 1L;
132 101
133 - public static KeyboardKeyModifier deNull( KeyboardKeyModifier pModifiers )
134 - {
102 + public static KeyboardKeyModifier deNull( KeyboardKeyModifier pModifiers ) {
135 103 return (pModifiers != null) ? pModifiers : None;
136 104 }
137 105
138 - public int getBits()
139 - {
106 + public int getBits() {
140 107 return 0;
141 108 }
142 109
143 - public boolean isCtrl()
144 - {
110 + public boolean isCtrl() {
145 111 return hasBit( iCTRL );
146 112 }
147 113
148 - public boolean isAlt()
149 - {
114 + public boolean isAlt() {
150 115 return hasBit( iALT );
151 116 }
152 117
153 - public boolean isMeta()
154 - {
118 + public boolean isMeta() {
155 119 return hasBit( iMETA );
156 120 }
157 121
158 - public boolean isShift()
159 - {
122 + public boolean isShift() {
160 123 return hasBit( iSHIFT );
161 124 }
162 125
163 - public KeyboardKeyModifier addCtrl()
164 - {
126 + public KeyboardKeyModifier addCtrl() {
165 127 return add( Ctrl );
166 128 }
167 129
168 - public KeyboardKeyModifier addAlt()
169 - {
130 + public KeyboardKeyModifier addAlt() {
170 131 return add( Alt );
171 132 }
172 133
173 - public KeyboardKeyModifier addMeta()
174 - {
134 + public KeyboardKeyModifier addMeta() {
175 135 return add( Ctrl );
176 136 }
177 137
178 - public KeyboardKeyModifier addShift()
179 - {
138 + public KeyboardKeyModifier addShift() {
180 139 return add( Shift );
181 140 }
182 141
183 - public KeyboardKeyModifier add( KeyboardKeyModifier them )
184 - {
185 - if ( them != null )
186 - {
142 + public KeyboardKeyModifier add( KeyboardKeyModifier them ) {
143 + if ( them != null ) {
187 144 int zCurBits = this.getBits();
188 145 int zModBits = them.getBits();
189 146 int zNewBits = zCurBits | zModBits;
190 - if ( zCurBits != zNewBits )
191 - {
147 + if ( zCurBits != zNewBits ) {
192 148 return (zModBits == zNewBits) ? them : fromBits( zNewBits );
193 149 }
194 150 }
195 151 return this;
196 152 }
197 153
198 - public KeyboardKeyModifier removeCtrl()
199 - {
154 + public KeyboardKeyModifier removeCtrl() {
200 155 return remove( Ctrl );
201 156 }
202 157
203 - public KeyboardKeyModifier removeAlt()
204 - {
158 + public KeyboardKeyModifier removeAlt() {
205 159 return remove( Alt );
206 160 }
207 161
208 - public KeyboardKeyModifier removeMeta()
209 - {
162 + public KeyboardKeyModifier removeMeta() {
210 163 return remove( Ctrl );
211 164 }
212 165
213 - public KeyboardKeyModifier removeShift()
214 - {
166 + public KeyboardKeyModifier removeShift() {
215 167 return remove( Shift );
216 168 }
217 169
218 - public KeyboardKeyModifier remove( KeyboardKeyModifier them )
219 - {
220 - if ( them != null )
221 - {
170 + public KeyboardKeyModifier remove( KeyboardKeyModifier them ) {
171 + if ( them != null ) {
222 172 int zCurBits = this.getBits();
223 173 int zModBits = them.getBits();
224 174 int zSharedBits = zCurBits & zModBits;
225 - if ( zSharedBits != 0 )
226 - {
175 + if ( zSharedBits != 0 ) {
227 176 int zNewBits = zCurBits - zSharedBits;
228 177 return (zNewBits == 0) ? None : fromBits( zNewBits );
229 178 }
  @@ -231,30 +180,24 @@
231 180 return this;
232 181 }
233 182
234 - private boolean hasBit( int pBit )
235 - {
183 + private boolean hasBit( int pBit ) {
236 184 return 0 != (getBits() & pBit);
237 185 }
238 186
239 187 public static KeyboardKeyModifier fromBits( int pBits )
240 - throws IllegalArgumentException
241 - {
188 + throws IllegalArgumentException {
242 189 KeyboardKeyModifier zModifier = LLfromBits( pBits );
243 190 int zXtraBits = pBits - zModifier.getBits();
244 - if ( zXtraBits == 0 )
245 - {
191 + if ( zXtraBits == 0 ) {
246 192 return zModifier;
247 193 }
248 194 throw new IllegalArgumentException( "KeyboardKeyModifier '" + zModifier + "' w/ extra bits: " + zXtraBits );
249 195 }
250 196
251 - private static KeyboardKeyModifier LLfromBits( int pBits )
252 - {
197 + private static KeyboardKeyModifier LLfromBits( int pBits ) {
253 198 int zValidBits = pBits & iCTRL_ALT_META_SHIFT;
254 - for ( KeyboardKeyModifier zModifier : values() )
255 - {
256 - if ( zValidBits == zModifier.getBits() )
257 - {
199 + for ( KeyboardKeyModifier zModifier : values() ) {
200 + if ( zValidBits == zModifier.getBits() ) {
258 201 return zModifier;
259 202 }
260 203 }

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/GWT/Client/src/org/litesoft/GWT/client/KeyboardKeyModifier.java

Need assistance?   Get in touch, or head to our documentation site.