Changeset 990


Ignore:
Timestamp:
02/22/2011 02:59:41 PM (10 years ago)
Author:
joao.dias
Message:
 
Location:
AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/EmotionalStatePanel.java

    r981 r990  
    105105    } 
    106106     
    107     protected EmotionalState getEmotionalState(AgentModel am){ 
     107    protected synchronized EmotionalState getEmotionalState(AgentModel am){ 
    108108        return am.getEmotionalState(); 
    109109    } 
     
    113113        Float aux; 
    114114        ActiveEmotion em; 
    115         EmotionalState es = am.getEmotionalState(); 
     115        EmotionalState es = this.getEmotionalState(am); 
    116116        boolean updated = false; 
    117117         
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/EmotionalState.java

    r981 r990  
    5959import java.io.Serializable; 
    6060import java.util.Collection; 
     61import java.util.Collections; 
    6162import java.util.Hashtable; 
    6263import java.util.Iterator; 
     
    503504        } 
    504505 
    505         public Collection<ActiveEmotion> getEmotionPool() { 
    506                 return _emotionPool.values(); 
     506        public Collection<ActiveEmotion> getEmotionPoolValues() { 
     507                return Collections.unmodifiableCollection(_emotionPool.values()); 
    507508        } 
    508509         
Note: See TracChangeset for help on using the changeset viewer.