Ignore:
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:
6 edited

Legend:

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

    r544 r550  
    2121@SuppressWarnings("serial") 
    2222public class InteractionEventList extends ArrayList<Event> implements List<Event> { 
     23     
    2324    /** stores the events to be handled later in the order, they should be processed */ 
    24     private List<KeyEventPair> mEventPairs = new ArrayList<KeyEventPair>(); 
     25    private List<KeyEventPair> eventPairs = new ArrayList<KeyEventPair>(); 
    2526 
    2627    /** 
     
    3536    public boolean add(Event event) { 
    3637        if (event.getType() instanceof KeyInteraction) { 
    37             for (int i = 0; i < mEventPairs.size(); i++) { 
    38                 KeyEventPair eventPair = mEventPairs.get(i); 
     38            for (int i = 0; i < eventPairs.size(); i++) { 
     39                KeyEventPair eventPair = eventPairs.get(i); 
    3940 
    4041                if (eventPair.process(event)) { 
    4142                    // handle all leading and completed event pairs, if any 
    42                     while ((mEventPairs.size() > 0) && (mEventPairs.get(0).isComplete())) { 
    43                         addEventPair(mEventPairs.get(0)); 
    44                         mEventPairs.remove(0); 
     43                    while ((eventPairs.size() > 0) && (eventPairs.get(0).isComplete())) { 
     44                        addEventPair(eventPairs.get(0)); 
     45                        eventPairs.remove(0); 
    4546                    } 
    4647                    return true; 
     
    4849            } 
    4950 
    50             mEventPairs.add(new KeyEventPair(event)); 
     51            eventPairs.add(new KeyEventPair(event)); 
    5152            return true; 
    5253        } 
  • trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/KeyInteraction.java

    r544 r550  
    2121 
    2222    /** the key, that was actually pressed */ 
    23     private VirtualKey mKey; 
     23    private VirtualKey key; 
    2424 
    2525    /** 
     
    2828    public KeyInteraction(VirtualKey key) { 
    2929        super(); 
    30         mKey = key; 
     30        this.key = key; 
    3131    } 
    3232 
     
    3535     */ 
    3636    public VirtualKey getKey() { 
    37         return mKey; 
     37        return key; 
    3838    } 
    3939 
  • trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/MouseButtonInteraction.java

    r544 r550  
    2424 
    2525    /** the button used for mouse interaction */ 
    26     private Button mButton; 
     26    private Button button; 
    2727 
    2828    /** 
     
    3030     */ 
    3131    public MouseButtonInteraction(Button button) { 
    32         mButton = button; 
     32        this.button = button; 
    3333    } 
    3434 
     
    3737     */ 
    3838    public Button getButton() { 
    39         return mButton; 
     39        return button; 
    4040    } 
    4141 
  • trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/gui/ValueSelection.java

    r544 r550  
    1919 
    2020    /** */ 
    21     private T mSelectedValue; 
     21    private T selectedValue; 
    2222 
    2323    /** 
     
    2727     */ 
    2828    public ValueSelection(T selectedValue) { 
    29         mSelectedValue = selectedValue; 
     29        this.selectedValue = selectedValue; 
    3030    } 
    3131 
     
    7171     */ 
    7272    public T getSelectedValue() { 
    73         return mSelectedValue; 
     73        return selectedValue; 
    7474    } 
    7575 
     
    8989        return 
    9090            ((otherValueSelection != null) && 
    91              ((mSelectedValue == otherValueSelection.mSelectedValue) || 
    92               ((mSelectedValue != null) && 
    93                (mSelectedValue.equals(otherValueSelection.mSelectedValue))))); 
     91             ((selectedValue == otherValueSelection.selectedValue) || 
     92              ((selectedValue != null) && 
     93               (selectedValue.equals(otherValueSelection.selectedValue))))); 
    9494    } 
    9595 
  • trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/AbstractDefaultGUIElement.java

    r545 r550  
    1919 
    2020    /** the parent interaction element */ 
    21     private IGUIElement mParent; 
     21    private IGUIElement parent; 
    2222 
    2323    /** the information about the original type before the mapping */ 
    24     private String mOriginalTypeInfo; 
     24    private String originalTypeInfo; 
    2525 
    2626    /* 
     
    3030     */ 
    3131    public IGUIElement getParent() { 
    32         return mParent; 
     32        return parent; 
    3333    } 
    3434 
     
    4040    @Override 
    4141    public String getOriginalTypeInfo() { 
    42         return mOriginalTypeInfo; 
     42        return originalTypeInfo; 
    4343    } 
    4444 
     
    4949     */ 
    5050    void setOriginalTypeInfo(String originalTypeInfo) { 
    51         mOriginalTypeInfo = originalTypeInfo; 
     51        this.originalTypeInfo = originalTypeInfo; 
    5252    } 
    5353 
  • trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/guimodel/AbstractDefaultGUIElementFactory.java

    r545 r550  
    2323     
    2424    /** */ 
    25     private Properties mMappingsFromConfiguration; 
     25    private Properties mappingsFromConfiguration; 
    2626 
    2727    /** 
     
    178178     */ 
    179179    private synchronized Properties getMappingsFromConfiguration() { 
    180         if (mMappingsFromConfiguration != null) { 
    181             return mMappingsFromConfiguration; 
     180        if (mappingsFromConfiguration != null) { 
     181            return mappingsFromConfiguration; 
    182182        } 
    183183        else { 
    184             mMappingsFromConfiguration = new Properties(); 
     184            mappingsFromConfiguration = new Properties(); 
    185185 
    186186            InputStream inStream = 
     
    189189            if (inStream != null) { 
    190190                try { 
    191                     mMappingsFromConfiguration.load(inStream); 
     191                    mappingsFromConfiguration.load(inStream); 
    192192                } 
    193193                catch (IOException e) { 
     
    198198            } 
    199199 
    200             return mMappingsFromConfiguration; 
     200            return mappingsFromConfiguration; 
    201201        } 
    202202    } 
Note: See TracChangeset for help on using the changeset viewer.