Changeset 550

Timestamp:

08/16/12 15:16:22 (12 years ago)

Author:

pharms

Message:

• removed leading m in member variables

Location:

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore

Files:

• gui/InteractionEventList.java (modified) (3 diffs)
• gui/KeyInteraction.java (modified) (3 diffs)
• gui/MouseButtonInteraction.java (modified) (3 diffs)
• gui/ValueSelection.java (modified) (4 diffs)
• guimodel/AbstractDefaultGUIElement.java (modified) (4 diffs)
• guimodel/AbstractDefaultGUIElementFactory.java (modified) (4 diffs)

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/InteractionEventList.java

@@ -21 +21 @@
 @SuppressWarnings("serial")
 public class InteractionEventList extends ArrayList<Event> implements List<Event> {
+    
     /** stores the events to be handled later in the order, they should be processed */
-    private List<KeyEventPair> mEventPairs = new ArrayList<KeyEventPair>();
+    private List<KeyEventPair> eventPairs = new ArrayList<KeyEventPair>();
 
     /**
@@ -35 +36 @@
     public boolean add(Event event) {
         if (event.getType() instanceof KeyInteraction) {
-            for (int i = 0; i < mEventPairs.size(); i++) {
-                KeyEventPair eventPair = mEventPairs.get(i);
+            for (int i = 0; i < eventPairs.size(); i++) {
+                KeyEventPair eventPair = eventPairs.get(i);
 
                 if (eventPair.process(event)) {
                     // handle all leading and completed event pairs, if any
-                    while ((mEventPairs.size() > 0) && (mEventPairs.get(0).isComplete())) {
-                        addEventPair(mEventPairs.get(0));
-                        mEventPairs.remove(0);
+                    while ((eventPairs.size() > 0) && (eventPairs.get(0).isComplete())) {
+                        addEventPair(eventPairs.get(0));
+                        eventPairs.remove(0);
                     }
                     return true;
@@ -48 +49 @@
             }
 
-            mEventPairs.add(new KeyEventPair(event));
+            eventPairs.add(new KeyEventPair(event));
             return true;
         }

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteraction.java

@@ -21 +21 @@
 
     /** the key, that was actually pressed */
-    private VirtualKey mKey;
+    private VirtualKey key;
 
     /**
@@ -28 +28 @@
     public KeyInteraction(VirtualKey key) {
         super();
-        mKey = key;
+        this.key = key;
     }
 
@@ -35 +35 @@
      */
     public VirtualKey getKey() {
-        return mKey;
+        return key;
     }
 

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/MouseButtonInteraction.java

@@ -24 +24 @@
 
     /** the button used for mouse interaction */
-    private Button mButton;
+    private Button button;
 
     /**
@@ -30 +30 @@
      */
     public MouseButtonInteraction(Button button) {
-        mButton = button;
+        this.button = button;
     }
 
@@ -37 +37 @@
      */
     public Button getButton() {
-        return mButton;
+        return button;
     }
 

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/ValueSelection.java

@@ -19 +19 @@
 
     /** */
-    private T mSelectedValue;
+    private T selectedValue;
 
     /**
@@ -27 +27 @@
      */
     public ValueSelection(T selectedValue) {
-        mSelectedValue = selectedValue;
+        this.selectedValue = selectedValue;
     }
 
@@ -71 +71 @@
      */
     public T getSelectedValue() {
-        return mSelectedValue;
+        return selectedValue;
     }
 
@@ -89 +89 @@
         return
             ((otherValueSelection != null) &&
-             ((mSelectedValue == otherValueSelection.mSelectedValue) ||
-              ((mSelectedValue != null) &&
-               (mSelectedValue.equals(otherValueSelection.mSelectedValue)))));
+             ((selectedValue == otherValueSelection.selectedValue) ||
+              ((selectedValue != null) &&
+               (selectedValue.equals(otherValueSelection.selectedValue)))));
     }
 

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/AbstractDefaultGUIElement.java

@@ -19 +19 @@
 
     /** the parent interaction element */
-    private IGUIElement mParent;
+    private IGUIElement parent;
 
     /** the information about the original type before the mapping */
-    private String mOriginalTypeInfo;
+    private String originalTypeInfo;
 
     /*
@@ -30 +30 @@
      */
     public IGUIElement getParent() {
-        return mParent;
+        return parent;
     }
 
@@ -40 +40 @@
     @Override
     public String getOriginalTypeInfo() {
-        return mOriginalTypeInfo;
+        return originalTypeInfo;
     }
 
@@ -49 +49 @@
      */
     void setOriginalTypeInfo(String originalTypeInfo) {
-        mOriginalTypeInfo = originalTypeInfo;
+        this.originalTypeInfo = originalTypeInfo;
     }
 

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/AbstractDefaultGUIElementFactory.java

@@ -23 +23 @@
     
     /** */
-    private Properties mMappingsFromConfiguration;
+    private Properties mappingsFromConfiguration;
 
     /**
@@ -178 +178 @@
      */
     private synchronized Properties getMappingsFromConfiguration() {
-        if (mMappingsFromConfiguration != null) {
-            return mMappingsFromConfiguration;
+        if (mappingsFromConfiguration != null) {
+            return mappingsFromConfiguration;
         }
         else {
-            mMappingsFromConfiguration = new Properties();
+            mappingsFromConfiguration = new Properties();
 
             InputStream inStream =
@@ -189 +189 @@
             if (inStream != null) {
                 try {
-                    mMappingsFromConfiguration.load(inStream);
+                    mappingsFromConfiguration.load(inStream);
                 }
                 catch (IOException e) {
@@ -198 +198 @@
             }
 
-            return mMappingsFromConfiguration;
+            return mappingsFromConfiguration;
         }
     }