Changeset 248


Ignore:
Timestamp:
11/30/2009 10:40:41 AM (11 years ago)
Author:
michael.kriegel
Message:

Final update for renaming process, code complete and functional again

Location:
libs/cmion
Files:
5 added
48 edited
1 moved

Legend:

Unmodified
Added
Removed
  • libs/cmion/cmionAddOns/src/cmion/addOns/level2/RemoteAirCompetency.java

    r181 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2121        Revision History: 
    2222  --- 
    23   20/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
     23  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.addOns.level2; 
     30package cmion.addOns.level2; 
     31 
     32import cmion.architecture.IArchitecture; 
     33import cmion.level2.RemoteCompetency; 
    2934 
    3035import com.cmlabs.air.JavaAIRPlug; 
    3136import com.cmlabs.air.Message; 
    3237 
    33 import lirec.architecture.IArchitecture; 
    34 import lirec.level2.RemoteCompetency; 
    3538 
    3639/** This class implements the base class for remote competencies that connect to their  
     
    5457        private String whiteBoard; 
    5558 
    56     /** the type of the messages that we are sending */ 
    57         private String sendMsgType; 
     59    /** the types of the messages that we are sending */ 
     60        private String [] sendMsgTypes; 
    5861     
    59         /** the type of the messages that we are receiving */ 
    60         private String rcvMsgType; 
     62        /** the types of the messages that we are receiving */ 
     63        private String [] rcvMsgTypes; 
    6164         
    6265         
    6366        /** 
    6467         * Create a new air competency 
    65          * @param architecture a reference to the Lirec architecture  
     68         * @param architecture a reference to the architecture  
    6669         * @param name the name we use to identify ourselves in the PsyClone framework 
    6770         * @param hostName the name of the host we want to connect to (the machine that runs the psyclone framework) 
    6871         * @param port the port we use for connecting 
    6972         * @param whiteBoard the white board we are connecting to 
    70          * @param sendMsgType the type of the messages that we are sending 
    71          * @param rcvMsgType the type of the messages that we are receiving 
     73         * @param sendMsgTypes the types of the messages that we are sending 
     74         * @param rcvMsgTypes the types of the messages that we are receiving 
    7275         */ 
    7376        protected RemoteAirCompetency(IArchitecture architecture, String name, String hostName, int port, 
    74                                                                 String whiteBoard, String sendMsgType, String rcvMsgType)  
     77                                                                String whiteBoard, String [] sendMsgTypes, String [] rcvMsgTypes)  
    7578        { 
    7679                super(architecture); 
     
    7982                this.port = port; 
    8083                this.whiteBoard = whiteBoard; 
    81                 this.sendMsgType = sendMsgType; 
    82                 this.rcvMsgType = rcvMsgType; 
     84                this.sendMsgTypes = sendMsgTypes; 
     85                this.rcvMsgTypes = rcvMsgTypes; 
    8386        } 
    8487 
    8588        /** use this method to send a message to the remotely connected Psyclone framework. Call it typically from  
    86          *  the startExecution method or from an event handler */        
     89         *  the startExecution method or from an event handler 
     90         *  Note: you should use this if this competency is only registered for one type of send messages, if 
     91         *  it is registered for more, you should use sendMessage(String message, String msgType) to specify 
     92         *  the type of the message. If the no sendMsgTypes are registered, nothing will be sent*/       
    8793        @Override 
    88         protected void sendMessage(String message) { 
    89                 Message msg = new Message(name,whiteBoard,sendMsgType); 
     94        protected void sendMessage(String message)  
     95        { 
     96                if (sendMsgTypes!=null && sendMsgTypes.length>0) 
     97                { 
     98                        Message msg = new Message(name,whiteBoard,sendMsgTypes[0]); 
     99                        msg.content = message; 
     100                        plug.postMessage(whiteBoard, msg, ""); 
     101                } 
     102        } 
     103 
     104        /** use this method to send a message of a particular type to the remotely connected Psyclone framework*/ 
     105        protected void sendMessage(String message, String msgType)  
     106        { 
     107                Message msg = new Message(name,whiteBoard,msgType); 
    90108                msg.content = message; 
    91109                plug.postMessage(whiteBoard, msg, ""); 
    92110        } 
    93  
     111         
     112        /** this method will be invoked in parallel with processMessage(String message), whenever a  
     113         *  new message is received. Use this version if the competency has more than one receive msg 
     114         *  types and you need to distinguish the type of message. Both methods have to implemented, 
     115         *  but only one the body of one of them should be programmed out */ 
     116        protected abstract void processMessage(String message, String type); 
     117         
    94118        /** initializes the Air Plug */ 
    95119        @Override 
     
    134158                          
    135159                         
    136                          // register for send messages 
    137                      String xml = "<module name=\"" + name + "\" type=\"external\">" +  
    138                                           "<post to=\"" + whiteBoard + "\" type=\"" + sendMsgType + "\" /></module>"; 
     160                         // we can send messages without registering 
    139161                      
    140                      if (!plug.sendRegistration(xml)) 
     162                 // register for receiving messages 
     163                     if (rcvMsgTypes!=null) 
    141164                     { 
    142                          // we could not register, initialisation has failed 
    143                          System.out.println("Error registering for sending messages to Psyclone"); 
    144                          return; 
     165                         String xml = "<module name=\"" + name + "\" type=\"external\">"; 
     166 
     167                         for (String rcvMsgType : rcvMsgTypes) 
     168                                 xml+= "<trigger from=\"" + whiteBoard + "\" type=\"" + rcvMsgType + "\" />"; 
     169                         xml += "</module>"; 
     170                      
     171                         if (!plug.sendRegistration(xml)) 
     172                         { 
     173                                 // we could not register, initialisation has failed 
     174                                 System.out.println("Error registering for receiving messages to Psyclone"); 
     175                                 return; 
     176                         } 
    145177                     } 
    146178                      
    147                          // register for receiving messages 
    148                      xml = "<module name=\"" + name + "\" type=\"external\">" +  
    149                                           "<trigger from=\"" + whiteBoard + "\" type=\"" + rcvMsgType + "\" /></module>"; 
    150                       
    151                      if (!plug.sendRegistration(xml)) 
    152                      { 
    153                          // we could not register, initialisation has failed 
    154                          System.out.println("Error registering for receiving messages to Psyclone"); 
    155                          return; 
    156                      } 
    157                           
    158179                        // if we reach this point we have established a connection 
    159180                     
     
    165186                    while (true)  
    166187                    { 
    167                        if ( (message = plug.waitForNewMessage(100)) != null)  
     188                       if ( (message = plug.waitForNewMessage(100)) != null) 
     189                       { 
     190                           // invoke the standard process message 
    168191                           processMessage(message.getContent()); 
     192                            
     193                           // invoke the process message that also submits the type 
     194                           processMessage(message.getContent(),message.type); 
     195                            
     196                       } 
    169197                    } 
    170198                }        
  • libs/cmion/cmionLauncher/src/cmion/architecture/Architecture.java

    r173 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.architecture; 
     30package cmion.architecture; 
    2931 
    3032import java.io.File; 
     
    4143import org.w3c.dom.NodeList; 
    4244 
     45import cmion.architecture.EventCmionReady; 
     46import cmion.architecture.IArchitecture; 
     47import cmion.architecture.CmionComponent; 
     48import cmion.level2.CompetencyExecution; 
     49import cmion.level2.CompetencyLibrary; 
     50import cmion.level3.CompetencyManager; 
     51import cmion.storage.CmionStorageContainer; 
     52import cmion.storage.WorldModel; 
     53 
    4354import ion.Meta.Element; 
    4455import ion.Meta.Simulation; 
    45 import lirec.level2.CompetencyExecution; 
    46 import lirec.level2.CompetencyLibrary; 
    47 import lirec.level3.CompetencyManager; 
    48 import lirec.storage.LirecStorageContainer; 
    49 import lirec.storage.WorldModel; 
    50  
    51  
    52 /** this class is used at the moment as the executable / main entry point for the  
    53  * Lirec architecture. It is also used for accessing references to all main  
    54  * architecture components */ 
    55 public class Architecture implements IArchitecture { 
     56 
     57 
     58/** this class is used at the moment as the executable / main entry point for CMION 
     59 *  It is also used for accessing references to all main CMION components */ 
     60public class Architecture extends Element implements IArchitecture { 
    5661                 
    5762        /** the world model in which we store high level symbolic information */ 
     
    6065        /** the black board that stores lower level information for competencies to share 
    6166         *  between each other */ 
    62         private LirecStorageContainer blackBoard; 
     67        private CmionStorageContainer blackBoard; 
    6368         
    6469        /** the competency execution system */ 
     
    7984        /** This list stores all custom components that are loaded dynamically, depending on the  
    8085         *  architecture configuration, i.e. the scenario*/ 
    81         private ArrayList<LirecComponent> customComponents;  
     86        private ArrayList<CmionComponent> customComponents;  
    8287         
    8388        /** create a new architecture */ 
     
    8590        {        
    8691                // initialise lists 
    87                 customComponents = new ArrayList<LirecComponent>(); 
     92                customComponents = new ArrayList<CmionComponent>(); 
    8893                 
    8994                // load the configuration file (in here custom components will be built) 
    9095                loadConfigFile(architectureConfigurationFile); 
     96                 
     97                // add the architecture itself to the ION Simulation 
     98                Simulation.instance.getElements().add(this); 
     99                Simulation.instance.update(); 
    91100                 
    92101                // now build default components 
     
    97106                Simulation.instance.update(); 
    98107                 
    99                 blackBoard = new LirecStorageContainer(this,"BlackBoard","BlackBoard"); 
     108                blackBoard = new CmionStorageContainer(this,"BlackBoard","BlackBoard"); 
    100109                Simulation.instance.getElements().add(blackBoard); 
    101110                Simulation.instance.update(); 
     
    116125                Simulation.instance.update(); 
    117126                                 
    118                 // now register handlers for all Lirec Components 
     127                // now register handlers for all CMION Components 
    119128                for (Element element : Simulation.instance.getElements()) 
    120                         if (element instanceof LirecComponent) 
    121                                 ((LirecComponent)element).registerHandlers(); 
    122                  
    123                 System.out.println("Lirec Architecture initialised"); 
     129                        if (element instanceof CmionComponent) 
     130                                ((CmionComponent)element).registerHandlers(); 
     131                 
     132                System.out.println("CMION initialised"); 
    124133        } 
    125134         
     
    190199                                ArrayList<Class<?>> constructorClasses = new ArrayList<Class<?>>(); 
    191200                                 
    192                                 // the first parameter to the constructor is always a reference to the architecture for all lirec components 
     201                                // the first parameter to the constructor is always a reference to the architecture for all CMION components 
    193202                                constructorParameters.add(this); 
    194203                                // its class is IArchitecture 
     
    220229                                 
    221230                                // check if instance is of the right type 
    222                                 if (!(instance instanceof LirecComponent)) throw new Exception("Architecture component could not be built. "+ className+ " is not a subclass of LirecComponent"); 
     231                                if (!(instance instanceof CmionComponent)) throw new Exception("CMION component could not be built. "+ className+ " is not a subclass of CmionComponent"); 
    223232                                 
    224233                                // add custom component to the simulation 
    225                                 customComponents.add((LirecComponent) instance); 
    226                                 Simulation.instance.getElements().add((LirecComponent) instance);                
     234                                customComponents.add((CmionComponent) instance); 
     235                                Simulation.instance.getElements().add((CmionComponent) instance);                
    227236                                Simulation.instance.update(); 
    228237                                 
     
    235244        private void runSimulation() 
    236245        { 
    237                 System.out.println("Lirec Architecture running"); 
     246                System.out.println("CMION running"); 
    238247                 
    239248                // first start the competencies that are constantly running in the background 
    240249                competencyLibrary.startBackgroundCompetencies(); 
    241250                 
     251                int counter = 0; 
     252                                 
    242253                // run the ion simulation in an endless loop 
    243254                while (true) 
     
    249260                                Thread.sleep(50); 
    250261                        } catch (InterruptedException e) {} 
     262 
     263                        counter++; 
     264                         
     265                        // for now, raise the event that architecture is ready here after waiting for a while, later needs to be more  
     266                        // sophisticated (maybe receiving signals from competencies that they are ready) 
     267                        if (counter == 20)  
     268                                this.raise(new EventCmionReady()); 
    251269                }                
    252270        } 
     
    261279        /** returns the black board component */ 
    262280        @Override 
    263         public LirecStorageContainer getBlackBoard() 
     281        public CmionStorageContainer getBlackBoard() 
    264282        { 
    265283                return blackBoard; 
     
    309327                         
    310328        } 
     329 
     330        @Override 
     331        public void onDestroy() { 
     332                // TODO Auto-generated method stub 
     333                 
     334        } 
    311335         
    312336 
  • libs/cmion/cmionMain/src/cmion/architecture/CmionComponent.java

    r246 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.architecture; 
     30package cmion.architecture; 
    2931 
    3032import ion.Meta.Element; 
    3133 
    32 /** parent class for all Lirec architecture components */ 
    33 public abstract class LirecComponent extends Element { 
     34/** parent class for all cmion components */ 
     35public abstract class CmionComponent extends Element { 
    3436         
    3537/** reference to the architecture, through which references to other components can be obtained */ 
    3638protected IArchitecture architecture; 
    3739 
    38 /** create a new Lirec Component */ 
    39 protected LirecComponent(IArchitecture architecture) 
     40/** create a new cmion Component */ 
     41protected CmionComponent(IArchitecture architecture) 
    4042{ 
    4143        this.architecture = architecture; 
    4244} 
    4345 
    44 /** returns a reference to the Lire architecture object */ 
     46/** returns a reference to the architecture object, through which references to other components can be obtained */ 
    4547public IArchitecture getArchitecture() { 
    4648        return architecture; 
    4749} 
    4850 
    49 /** every lirec component has to implement this method and register its event and 
     51/** every cmion component has to implement this method and register its event and 
    5052 *      request handlers in here */ 
    5153public abstract void registerHandlers(); 
    5254 
    53 /** Lirec Compoenents that do require a socket connection to an external program, such 
     55/** Cmion compoenents that do require a socket connection to an external program, such 
    5456 *  as a fatima mind, various competencies, etc.  can override this method and in it 
    5557 *  return the connection status */ 
  • libs/cmion/cmionMain/src/cmion/architecture/IArchitecture.java

    r179 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2121        Revision History: 
    2222  --- 
    23   20/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
     23  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.architecture; 
     30package cmion.architecture; 
    2931 
    30 import lirec.level2.CompetencyExecution; 
    31 import lirec.level2.CompetencyLibrary; 
    32 import lirec.level3.CompetencyManager; 
    33 import lirec.storage.LirecStorageContainer; 
    34 import lirec.storage.WorldModel; 
     32import cmion.level2.CompetencyExecution; 
     33import cmion.level2.CompetencyLibrary; 
     34import cmion.level3.CompetencyManager; 
     35import cmion.storage.CmionStorageContainer; 
     36import cmion.storage.WorldModel; 
    3537 
    36 /** specifies an interface for an architecture class that constructs the architecture components and 
     38/** specifies an interface for an architecture class that constructs the cmion components and 
    3739 *  stores references to them */ 
    3840public interface IArchitecture { 
     
    4244 
    4345        /** in this method the architecture must return a reference to the Black Board component */ 
    44         public LirecStorageContainer getBlackBoard(); 
     46        public CmionStorageContainer getBlackBoard(); 
    4547         
    4648        /** in this method the architecture must return a reference to the competency execution component */     
  • libs/cmion/cmionMain/src/cmion/level2/Competency.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import ion.Meta.IReadOnlyQueueSet; 
     
    3537import java.util.HashMap; 
    3638 
    37 import lirec.architecture.IArchitecture; 
    38 import lirec.architecture.LirecComponent; 
     39import cmion.architecture.IArchitecture; 
     40import cmion.architecture.CmionComponent; 
     41 
    3942 
    4043/** competencies are represented by objects of subclasses of this class */ 
    41 public abstract class Competency extends LirecComponent implements Runnable 
     44public abstract class Competency extends CmionComponent implements Runnable 
    4245{ 
    4346         
  • libs/cmion/cmionMain/src/cmion/level2/CompetencyExecution.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import ion.Meta.EventHandler; 
     
    3941import java.util.HashMap; 
    4042 
    41 import lirec.architecture.IArchitecture; 
    42 import lirec.architecture.LirecComponent; 
    43  
    44 /** this component is responsible for executing plans of competencies it has received from the competency 
    45  *  manager */ 
    46 public class CompetencyExecution extends LirecComponent { 
     43import cmion.architecture.IArchitecture; 
     44import cmion.architecture.CmionComponent; 
     45 
     46 
     47/** this component is responsible for executing plans of competencies it has received  
     48 * (normally from the competency manager) */ 
     49public class CompetencyExecution extends CmionComponent { 
    4750         
    4851        /** store all plans that we are currently executing */ 
  • libs/cmion/cmionMain/src/cmion/level2/CompetencyExecutionPlan.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import java.util.ArrayList; 
  • libs/cmion/cmionMain/src/cmion/level2/CompetencyExecutionPlanStep.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import java.util.ArrayList; 
  • libs/cmion/cmionMain/src/cmion/level2/CompetencyLibrary.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import ion.Meta.Simulation; 
     
    4446import org.w3c.dom.NodeList; 
    4547 
    46 import lirec.architecture.IArchitecture; 
    47 import lirec.architecture.LirecComponent; 
     48import cmion.architecture.IArchitecture; 
     49import cmion.architecture.CmionComponent; 
     50 
    4851 
    4952/** the competency library is the component that registers all components */ 
    50 public class CompetencyLibrary extends LirecComponent { 
     53public class CompetencyLibrary extends CmionComponent { 
    5154 
    5255        /** the list of competencies that are available for execution by the competency 
     
    144147                                ArrayList<Class<?>> constructorClasses = new ArrayList<Class<?>>(); 
    145148                                 
    146                                 // the first parameter to the constructor is always a reference to the architecture for all lirec components                             
     149                                // the first parameter to the constructor is always a reference to the architecture for all cmion components                             
    147150                                constructorParameters.add(architecture); 
    148151                                // it's class is IArchitecture 
  • libs/cmion/cmionMain/src/cmion/level2/EventCompetencyExecutionPlanFailed.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    3234/** this type of event is raised by the competency execution system when a competency execution plan has been carried out successfully  
    3335*  the competency manager listens for those events */ 
    34 public class EventCompetencyExecutionPlanFailed extends Event  
     36public class EventCompetencyExecutionPlanFailed extends CmionEvent  
    3537{ 
    3638 
     
    4951                return executionPlan; 
    5052        } 
     53         
     54        /** displays information about this event */ 
     55        @Override 
     56        public String toString() 
     57        { 
     58                // not sure how to display more concise short information about this 
     59                String evtString =  "Competency Execution plan failed"; 
     60                return evtString; 
     61        } 
    5162} 
  • libs/cmion/cmionMain/src/cmion/level2/EventCompetencyExecutionPlanSucceeded.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    3234/** this type of event is raised by the competency execution system when a competency execution plan has been carried out successfully  
    3335*  the competency manager listens for those events */ 
    34 public class EventCompetencyExecutionPlanSucceeded extends Event  
     36public class EventCompetencyExecutionPlanSucceeded extends CmionEvent  
    3537{ 
    3638 
     
    4951                return executionPlan; 
    5052        } 
     53         
     54        /** displays information about this event */ 
     55        @Override 
     56        public String toString() 
     57        { 
     58                // not sure how to display more concise short information about this 
     59                String evtString =  "Competency Execution plan succeeded"; 
     60                return evtString; 
     61        } 
     62 
    5163} 
  • libs/cmion/cmionMain/src/cmion/level2/EventCompetencyFailed.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
    29  
    30 import ion.Meta.Event; 
     30package cmion.level2; 
    3131 
    3232import java.util.HashMap; 
    3333 
     34import cmion.architecture.CmionEvent; 
     35 
    3436/** this event signifies that the execution of a competency has failed */ 
    35 public class EventCompetencyFailed extends Event  
     37public class EventCompetencyFailed extends CmionEvent  
    3638{ 
    3739 
     
    6264        }        
    6365         
     66        /** displays information about this event */ 
     67        @Override 
     68        public String toString() 
     69        { 
     70                String evtString =  "Competency failed: " + competency.getCompetencyName(); 
     71                evtString += ", parameters:"; 
     72                if (parameters.size()==0) evtString += " none"; 
     73                else for (String parameterName : parameters.keySet()) 
     74                        evtString += " " + parameterName +"="+parameters.get(parameterName); 
     75                return evtString;                
     76        } 
     77 
    6478} 
  • libs/cmion/cmionMain/src/cmion/level2/EventCompetencySucceeded.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    30 import ion.Meta.Event; 
    3132 
    3233import java.util.HashMap; 
    3334 
     35import cmion.architecture.CmionEvent; 
     36 
    3437/** this event signifies that the execution of a competency has suceeded */ 
    35 public class EventCompetencySucceeded extends Event { 
     38public class EventCompetencySucceeded extends CmionEvent { 
    3639 
    3740        /** a reference to the competency that has succeeded */ 
     
    6164        } 
    6265 
     66        /** displays information about this event */ 
     67        @Override 
     68        public String toString() 
     69        { 
     70                String evtString =  "Competency succeeded: " + competency.getCompetencyName(); 
     71                evtString += ", parameters:"; 
     72                if (parameters.size()==0) evtString += " none"; 
     73                else for (String parameterName : parameters.keySet()) 
     74                        evtString += " " + parameterName +"="+parameters.get(parameterName); 
     75                return evtString;                
     76        } 
    6377         
    6478} 
  • libs/cmion/cmionMain/src/cmion/level2/RemoteCompetency.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
     34import cmion.architecture.IArchitecture; 
     35 
    3336 
    3437/** an abstract class describing a competency, whose main execution is performed remotely, 
  • libs/cmion/cmionMain/src/cmion/level2/RemoteTCPCompetency.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import java.io.BufferedReader; 
     
    3638import java.net.Socket; 
    3739 
    38 import lirec.architecture.IArchitecture; 
     40import cmion.architecture.IArchitecture; 
    3941 
    40 /** A class encapsulating tcp communication we another process on the network. */ 
     42 
     43/** A class encapsulating tcp communication with another process on the network. */ 
    4144public abstract class RemoteTCPCompetency extends RemoteCompetency { 
    4245 
  • libs/cmion/cmionMain/src/cmion/level2/RequestNewCompetencyExecutionPlan.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import ion.Meta.Request; 
  • libs/cmion/cmionMain/src/cmion/level2/RequestStartCompetency.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2; 
     30package cmion.level2; 
    2931 
    3032import ion.Meta.Request; 
  • libs/cmion/cmionMain/src/cmion/level2/competencies/ExampleCompetency.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies; 
     30package cmion.level2.competencies; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.Competency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.Competency; 
     36 
    3437 
    3538/** example of the implementation of a competency, with comments explaining how 
  • libs/cmion/cmionMain/src/cmion/level2/competencies/ExampleTCPCompetency.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies; 
     30package cmion.level2.competencies; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.RemoteTCPCompetency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.RemoteTCPCompetency; 
     36 
    3437 
    3538/** example of the implementation of a TCP remote competency, with comments  
  • libs/cmion/cmionMain/src/cmion/level2/competencies/test/TestCompetency1.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies.test; 
     30package cmion.level2.competencies.test; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.Competency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.Competency; 
     36 
    3437 
    3538/** one of several test competencies to test the execution system */  
  • libs/cmion/cmionMain/src/cmion/level2/competencies/test/TestCompetency2.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies.test; 
     30package cmion.level2.competencies.test; 
    2931 
    3032import java.util.HashMap; 
    3133import java.util.Random; 
    3234 
    33 import lirec.architecture.IArchitecture; 
    34 import lirec.level2.Competency; 
     35import cmion.architecture.IArchitecture; 
     36import cmion.level2.Competency; 
     37 
    3538 
    3639/** one of several test competencies to test the execution system */  
  • libs/cmion/cmionMain/src/cmion/level2/competencies/test/TestCompetency3.java

    r181 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies.test; 
     30package cmion.level2.competencies.test; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.Competency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.Competency; 
     36 
    3437 
    3538/** one of several test competencies to test the execution system */  
  • libs/cmion/cmionMain/src/cmion/level2/competencies/test/TestCompetency4.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies.test; 
     30package cmion.level2.competencies.test; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.Competency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.Competency; 
     36 
    3437 
    3538/** one of several test competencies to test the execution system */  
  • libs/cmion/cmionMain/src/cmion/level2/competencies/test/TestCompetency5.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies.test; 
     30package cmion.level2.competencies.test; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.Competency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.Competency; 
     36 
    3437 
    3538public class TestCompetency5 extends Competency  
  • libs/cmion/cmionMain/src/cmion/level2/competencies/test/TestCompetency6.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level2.competencies.test; 
     30package cmion.level2.competencies.test; 
    2931 
    3032import java.util.HashMap; 
    3133 
    32 import lirec.architecture.IArchitecture; 
    33 import lirec.level2.Competency; 
     34import cmion.architecture.IArchitecture; 
     35import cmion.level2.Competency; 
     36 
    3437 
    3538/** this is an example of a competency that is not started as part of an order 
  • libs/cmion/cmionMain/src/cmion/level3/AgentMindConnector.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
    29  
     30package cmion.level3; 
     31 
     32import cmion.architecture.EventCmionReady; 
     33import cmion.architecture.IArchitecture; 
     34import cmion.architecture.CmionComponent; 
     35import cmion.storage.EventPropertyChanged; 
     36import cmion.storage.EventPropertyRemoved; 
     37import cmion.storage.EventSubContainerAdded; 
     38import cmion.storage.EventSubContainerRemoved; 
     39import cmion.storage.WorldModel; 
    3040import ion.Meta.EventHandler; 
    3141import ion.Meta.IEvent; 
    3242import ion.Meta.Simulation; 
    33 import lirec.architecture.IArchitecture; 
    34 import lirec.architecture.LirecComponent; 
    35 import lirec.storage.EventPropertyChanged; 
    36 import lirec.storage.EventPropertyRemoved; 
    37 import lirec.storage.EventSubContainerAdded; 
    38 import lirec.storage.EventSubContainerRemoved; 
    39 import lirec.storage.WorldModel; 
    4043 
    4144/** This abstract class describes the functionality an agent mind interface should provide.  
     
    4649 *  
    4750 * */ 
    48 public abstract class AgentMindConnector extends LirecComponent  
     51public abstract class AgentMindConnector extends CmionComponent  
    4952{ 
    5053         
     
    8790protected abstract void processPropertyRemoved(String entityName,String propertyName); 
    8891 
    89  
     92/** informs the mind that the architecture is ready for the mind executing actions */ 
     93protected abstract void architectureReady(); 
    9094 
    9195/** in this method the mind connector registers its request and event handlers with ION*/ 
     
    112116        architecture.getWorldModel().registerEventHandlerWithSubContainers(new HandlePropertyChanged()); 
    113117        architecture.getWorldModel().registerEventHandlerWithSubContainers(new HandlePropertyRemoved());         
     118 
     119        // register handler for event architecture ready 
     120        Simulation.instance.getEventHandlers().add(new HandleArchitectureReady()); 
    114121} 
    115122 
     
    265272} 
    266273 
    267  
    268 } 
     274/** internal event handler class for listening to architecture ready events */ 
     275private class HandleArchitectureReady extends EventHandler { 
     276 
     277    public HandleArchitectureReady() { 
     278        super(EventCmionReady.class); 
     279    } 
     280 
     281    @Override 
     282    public void invoke(IEvent evt)  
     283    { 
     284        architectureReady(); 
     285    } 
     286} 
     287 
     288} 
  • libs/cmion/cmionMain/src/cmion/level3/CompetencyManager.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
     30package cmion.level3; 
    2931 
    3032import ion.Meta.EventHandler; 
     
    4244import javax.xml.parsers.DocumentBuilderFactory; 
    4345 
    44 import lirec.architecture.IArchitecture; 
    45 import lirec.architecture.LirecComponent; 
    46 import lirec.level2.CompetencyExecutionPlan; 
    47 import lirec.level2.EventCompetencyExecutionPlanFailed; 
    48 import lirec.level2.EventCompetencyExecutionPlanSucceeded; 
    49 import lirec.level2.RequestNewCompetencyExecutionPlan; 
    5046 
    5147import org.w3c.dom.Document; 
    5248import org.w3c.dom.NodeList; 
    5349 
    54 /** the competency manager keeps a dynamic overview about which competencies are connected,  
    55  * receives actions from the mind for execution and decomposes them into competencies, 
    56  * for execution */ 
    57 public class CompetencyManager extends LirecComponent  
     50import cmion.architecture.IArchitecture; 
     51import cmion.architecture.CmionComponent; 
     52import cmion.level2.CompetencyExecutionPlan; 
     53import cmion.level2.EventCompetencyExecutionPlanFailed; 
     54import cmion.level2.EventCompetencyExecutionPlanSucceeded; 
     55import cmion.level2.RequestNewCompetencyExecutionPlan; 
     56 
     57/** the competency manager receives actions from the mind for execution and decomposes  
     58 *  them into a plan of competencies for execution */ 
     59public class CompetencyManager extends CmionComponent  
    5860{ 
    5961 
  • libs/cmion/cmionMain/src/cmion/level3/CompetencyManagerRule.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
     30package cmion.level3; 
    2931 
    30 import lirec.level2.CompetencyExecutionPlan; 
    3132 
    3233import org.w3c.dom.Node; 
    3334import org.w3c.dom.NodeList; 
     35 
     36import cmion.level2.CompetencyExecutionPlan; 
    3437 
    3538/** a competency manager rule maps a mind action and the state of available competencies  
  • libs/cmion/cmionMain/src/cmion/level3/EventMindActionFailed.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
     30package cmion.level3; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    3234/** this type of event is raised by the competency manager when a mind action has failed  
    3335 *  the agent mind connector listens for those events and sends them to the agent mind*/ 
    34 public class EventMindActionFailed extends Event  
     36public class EventMindActionFailed extends CmionEvent  
    3537{ 
    3638 
     
    4951        return mindAction; 
    5052} 
     53 
     54/** displays information about this event */ 
     55@Override 
     56public String toString() 
     57{ 
     58        String evtString =  "Mind Action failed: " + mindAction.getName(); 
     59        for (String parameter : mindAction.getParameters()) 
     60                evtString += " " + parameter; 
     61        return evtString;                
    5162} 
    5263 
     64 
     65} 
     66 
  • libs/cmion/cmionMain/src/cmion/level3/EventMindActionSucceeded.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
     30package cmion.level3; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    3234        /** this type of event is raised by the competency manager when a mind action has succeeded  
    3335         *  the agent mind connector listens for those events and sends them to the agent mind*/ 
    34 public class EventMindActionSucceeded extends Event  
     36public class EventMindActionSucceeded extends CmionEvent  
    3537{ 
    3638 
     
    4951                return mindAction; 
    5052        } 
     53         
     54        /** displays information about this event */ 
     55        @Override 
     56        public String toString() 
     57        { 
     58                String evtString =  "Mind Action succeeded: " + mindAction.getName(); 
     59                for (String parameter : mindAction.getParameters()) 
     60                        evtString += " " + parameter; 
     61                return evtString;                
     62        } 
    5163} 
  • libs/cmion/cmionMain/src/cmion/level3/EventRemoteAction.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
    29 import ion.Meta.Event; 
     30package cmion.level3; 
     31import cmion.architecture.CmionEvent; 
    3032 
    3133/** this type of event can be raised by any sensing competency. It represents someone 
     
    3335 *  as an agent mind action. The agent mind connector listens for those events and sends  
    3436 *  them to the agent mind*/ 
    35 public class EventRemoteAction extends Event  
     37public class EventRemoteAction extends CmionEvent  
    3638{ 
    3739        /** create a new event remote action*/ 
     
    5052                return remoteAction; 
    5153        } 
     54         
     55        /** displays information about this event */ 
     56        @Override 
     57        public String toString() 
     58        { 
     59                String evtString =  "Remote Action by " + remoteAction.getSubject() + 
     60                                    ": "  + remoteAction.getName(); 
     61                for (String parameter : remoteAction.getParameters()) 
     62                        evtString += " " + parameter; 
     63                return evtString;                
     64        } 
    5265} 
  • libs/cmion/cmionMain/src/cmion/level3/MindAction.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
     30package cmion.level3; 
    2931 
    3032import java.util.ArrayList; 
  • libs/cmion/cmionMain/src/cmion/level3/RequestNewMindAction.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3; 
     30package cmion.level3; 
    2931 
    3032import ion.Meta.Request; 
     
    3537{ 
    3638 
    37         /** creates a new event */ 
     39        /** creates a new request */ 
    3840        RequestNewMindAction(MindAction mindAction) 
    3941        { 
  • libs/cmion/cmionMain/src/cmion/level3/fatima/FAtiMAConnector.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3.fatima; 
     30package cmion.level3.fatima; 
    2931 
    3032import java.io.IOException; 
     
    3335import java.util.HashMap; 
    3436 
    35 import lirec.architecture.IArchitecture; 
    36 import lirec.level3.AgentMindConnector; 
    37 import lirec.level3.MindAction; 
     37import cmion.architecture.IArchitecture; 
     38import cmion.level3.AgentMindConnector; 
     39import cmion.level3.MindAction; 
     40 
    3841 
    3942public class FAtiMAConnector extends AgentMindConnector { 
     
    163166        } 
    164167 
     168        @Override 
     169        protected void architectureReady() { 
     170                // TODO Auto-generated method stub 
     171                 
     172        } 
     173 
    165174 
    166175 
  • libs/cmion/cmionMain/src/cmion/level3/fatima/FAtiMAListenerThread.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3.fatima; 
     30package cmion.level3.fatima; 
    2931 
    3032import java.net.Socket; 
     
    3234import java.util.StringTokenizer; 
    3335 
    34 import lirec.storage.WorldModel; 
    35 import lirec.util.SocketListener; 
     36import cmion.storage.WorldModel; 
     37import cmion.util.SocketListener; 
     38 
    3639 
    3740/** In this thread we communicate with the FAtiMA mind through a remote connection */ 
  • libs/cmion/cmionMain/src/cmion/level3/fatima/FAtiMAutils.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3.fatima; 
     30package cmion.level3.fatima; 
    2931 
    3032import java.util.ArrayList; 
    3133import java.util.StringTokenizer; 
    3234 
    33 import lirec.level3.MindAction; 
    34 import lirec.storage.LirecStorageContainer; 
     35import cmion.level3.MindAction; 
     36import cmion.storage.CmionStorageContainer; 
     37 
    3538 
    3639/** a collection of utility methods for handling the communication via the FAtiMA 
     
    4043        /** returns a String listing all properties of a storage container in the format 
    4144         * specified by the FAtiMA protocol, which is for example "prop1:value1 prop2:value2 prop3:value3" */ 
    42         public static String getPropertiesString(LirecStorageContainer entityContainer) { 
     45        public static String getPropertiesString(CmionStorageContainer entityContainer) { 
    4346                String propString=""; 
    4447                for (String propName : entityContainer.getPropertyNames()) 
  • libs/cmion/cmionMain/src/cmion/level3/supersimplemind/SuperSimpleMind.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3.supersimplemind; 
     30package cmion.level3.supersimplemind; 
    2931 
    30 import lirec.level3.MindAction; 
     32import cmion.level3.MindAction; 
    3133 
    3234/** an example mind that does almost nothing except executing random actions, 
  • libs/cmion/cmionMain/src/cmion/level3/supersimplemind/SuperSimpleMindConnector.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.level3.supersimplemind; 
     30package cmion.level3.supersimplemind; 
    2931 
    30 import lirec.architecture.IArchitecture; 
    31 import lirec.level3.AgentMindConnector; 
    32 import lirec.level3.MindAction; 
     32import cmion.architecture.IArchitecture; 
     33import cmion.level3.AgentMindConnector; 
     34import cmion.level3.MindAction; 
    3335 
    3436/** The connector to a SuperSimpleMind (example implementation of a simple mind interface) */ 
     
    104106        } 
    105107 
     108 
     109        @Override 
     110        protected void architectureReady()  
     111        {        
     112                mind.sendAwake(); 
     113        } 
     114 
    106115} 
  • libs/cmion/cmionMain/src/cmion/storage/CmionStorageContainer.java

    r247 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    3032import ion.Meta.EventHandler; 
     
    3840import java.util.HashMap; 
    3941 
    40 import lirec.architecture.IArchitecture; 
    41 import lirec.architecture.LirecComponent; 
     42import cmion.architecture.IArchitecture; 
     43import cmion.architecture.CmionComponent; 
     44 
    4245 
    4346/** a storage container is used for storing data that is shared between the components. 
     
    5659 *  so that the storage hierarchy itself can also contain information about the type of information stored. 
    5760 *  For example if there are containers for Agents and Objects as in WorldModel, the type 
    58  *  can help ditinguishing them. For properties the type is not stored explicitly but implicit 
     61 *  can help distinguishing them. For properties the type is not stored explicitly but implicit 
    5962 *  through the class of the property object. */ 
    6063 
    61 public class LirecStorageContainer extends LirecComponent {      
     64public class CmionStorageContainer extends CmionComponent {      
    6265         
    6366        /** the name (identifier) of this container */ 
     
    6871         
    6972        /** all sub containers stored in this container */ 
    70         private HashMap <String,LirecStorageContainer> subContainers;  
     73        private HashMap <String,CmionStorageContainer> subContainers;  
    7174         
    7275        /** all properties stored in this container */ 
     
    7477         
    7578        /** the parent container that owns this container (null for top container in a hierarchy */ 
    76         private LirecStorageContainer parentContainer; 
     79        private CmionStorageContainer parentContainer; 
    7780         
    7881        /** the event handlers that would like to be registered with sub components  */ 
     
    8083 
    8184                 
    82         /** create a new Lirec Storage Container (this constructor is protected because it 
     85        /** create a new CMION Storage Container (this constructor is protected because it 
    8386         * should not be accessed from outside) to create a new top level container, use the  
    8487         * public constructor) 
     
    8689         * @param type the type/class of this container  
    8790         * @param parentContainer the container that owns this container or null for a top container in a hierarchy 
    88          * @param architecture reference to the lirec architecture object 
     91         * @param architecture reference to the architecture object 
    8992         */ 
    90         protected LirecStorageContainer(IArchitecture architecture, String name, String type, LirecStorageContainer parentContainer)  
     93        protected CmionStorageContainer(IArchitecture architecture, String name, String type, CmionStorageContainer parentContainer)  
    9194        { 
    9295                super(architecture); 
     
    9497                this.containerType = type; 
    9598                this.parentContainer = parentContainer; 
    96                 subContainers = new HashMap<String,LirecStorageContainer>(); 
     99                subContainers = new HashMap<String,CmionStorageContainer>(); 
    97100                properties = new HashMap<String, Object>(); 
    98101                subContainerEventHandlers = new ArrayList<EventHandler>(); 
    99102        }        
    100103 
    101         /** create a new Lirec Storage Container  
     104        /** create a new CMION Storage Container  
    102105         * @param name the name of this container, should be unique along siblings in storage hierarchy  
    103106         * @param type the type/class of this container  
    104          * @param architecture reference to the lirec architecture object 
     107         * @param architecture reference to the architecture object 
    105108         */ 
    106         public LirecStorageContainer(IArchitecture architecture, String name, String type)  
     109        public CmionStorageContainer(IArchitecture architecture, String name, String type)  
    107110        { 
    108111                this(architecture,name,type,null); 
     
    114117        { 
    115118                // register handler with all sub containers we have currently 
    116                 for (LirecStorageContainer container : subContainers.values()) 
     119                for (CmionStorageContainer container : subContainers.values()) 
    117120                        container.getEventHandlers().add(handler); 
    118121                 
     
    124127        /** returns the sub container with the provided name or null, if there is no 
    125128         *  such container in this storage container */ 
    126         public LirecStorageContainer getSubContainer(String subContainerName) 
     129        public CmionStorageContainer getSubContainer(String subContainerName) 
    127130        { 
    128131                return subContainers.get(subContainerName); 
     
    131134        /** returns the parent container or null if this is the top container of a storage 
    132135         * hierarchy */ 
    133          public LirecStorageContainer getParentContainer() 
     136         public CmionStorageContainer getParentContainer() 
    134137         { 
    135138                 return parentContainer; 
     
    245248                if  (subContainers.containsKey(name)) 
    246249                { 
    247                         LirecStorageContainer c = subContainers.get(name); 
     250                        CmionStorageContainer c = subContainers.get(name); 
    248251                        if (c==null) return false; 
    249252                        if (c.getContainerType().equals(type)) return true; 
     
    289292                { 
    290293                        // ok we don't have such a sub container yet, create it then 
    291                         LirecStorageContainer container = new LirecStorageContainer(architecture,name,type,this); 
     294                        CmionStorageContainer container = new CmionStorageContainer(architecture,name,type,this); 
    292295                         
    293296                        // add it to our list of sub containers 
     
    324327        { 
    325328                // first of all call this recursively for all our children 
    326                 for (LirecStorageContainer container : subContainers.values()) 
     329                for (CmionStorageContainer container : subContainers.values()) 
    327330                        container.removeAndDestroy(); 
    328331                 
     
    351354                { 
    352355                        // obtain a reference to the container 
    353                         LirecStorageContainer container = subContainers.get(name); 
     356                        CmionStorageContainer container = subContainers.get(name); 
    354357                         
    355358                        // obtain the type of the container 
  • libs/cmion/cmionMain/src/cmion/storage/EventPropertyChanged.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    3234/** This event is raised whenever a property value has been set through a 
    3335 *  RequestSetProperty. Also raised when the property did not exist before and was  
    3436 *  created.*/ 
    35 public class EventPropertyChanged extends Event { 
     37public class EventPropertyChanged extends CmionEvent { 
    3638 
    3739        /** the name of the property whose value has changed*/ 
     
    4244         
    4345        /** the container to which the changed property belongs */ 
    44         private LirecStorageContainer parentContainer; 
     46        private CmionStorageContainer parentContainer; 
    4547 
    4648        /** create a new event that a property of given name to given value*/ 
    47         public EventPropertyChanged(String propertyName, Object propertyValue, LirecStorageContainer parentContainer) 
     49        public EventPropertyChanged(String propertyName, Object propertyValue, CmionStorageContainer parentContainer) 
    4850        { 
    4951                this.propertyName = propertyName; 
     
    6567         
    6668        /** return the container which the changed property belongs to */ 
    67         public LirecStorageContainer getParentContainer() 
     69        public CmionStorageContainer getParentContainer() 
    6870        { 
    6971                return parentContainer; 
    7072        } 
    7173         
     74        /** displays information about this event */ 
     75        @Override 
     76        public String toString() 
     77        { 
     78                String evtString =  "Property changed of " + parentContainer.getContainerName() + 
     79                                    ": "  + propertyName +" = " + propertyValue ; 
     80                return evtString;                
     81        } 
     82         
    7283} 
  • libs/cmion/cmionMain/src/cmion/storage/EventPropertyRemoved.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    3234/** This event is raised by a container whenever a property is removed from this 
     
    3436 * itself or its parent grandparent etc is removed.  
    3537 */ 
    36 public class EventPropertyRemoved extends Event { 
     38public class EventPropertyRemoved extends CmionEvent { 
    3739 
    3840        /** the name of the property whose value has changed*/ 
     
    4042 
    4143        /** the container from which the property was removed */ 
    42         private LirecStorageContainer parentContainer; 
     44        private CmionStorageContainer parentContainer; 
    4345         
    4446        /** create a new event that a property of given name was removed*/ 
    45         public EventPropertyRemoved(String propertyName, LirecStorageContainer parentContainer) 
     47        public EventPropertyRemoved(String propertyName, CmionStorageContainer parentContainer) 
    4648        { 
    4749                this.propertyName = propertyName; 
     
    5658         
    5759        /** returns a reference to the container from which the property was removed  */ 
    58         public LirecStorageContainer getParentContainer() 
     60        public CmionStorageContainer getParentContainer() 
    5961        { 
    6062                return parentContainer; 
    6163        } 
    6264         
     65        /** displays information about this event */ 
     66        @Override 
     67        public String toString() 
     68        { 
     69                String evtString =  "Property removed of " + parentContainer.getContainerName() + 
     70                                    ": "  + propertyName; 
     71                return evtString;                
     72        } 
     73         
     74         
    6375} 
  • libs/cmion/cmionMain/src/cmion/storage/EventSubContainerAdded.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    32 /** an event informing that a new subcontainer has been added to a LirecStorageContainer 
     34/** an event informing that a new subcontainer has been added to a CMION StorageContainer 
    3335 *  This will be raised by the owner container*/ 
    34 public class EventSubContainerAdded extends Event{ 
     36public class EventSubContainerAdded extends CmionEvent{ 
    3537 
    3638/** the sub container that has been added */ 
    37 private LirecStorageContainer subContainer; 
     39private CmionStorageContainer subContainer; 
    3840 
    3941/** the parent container that has added the sub container*/ 
    40 private LirecStorageContainer parentContainer; 
     42private CmionStorageContainer parentContainer; 
    4143 
    4244 
    4345/** create a new event sub container added */ 
    44 public EventSubContainerAdded(LirecStorageContainer parentContainer, LirecStorageContainer subContainer) 
     46public EventSubContainerAdded(CmionStorageContainer parentContainer, CmionStorageContainer subContainer) 
    4547{ 
    4648        this.parentContainer = parentContainer; 
     
    4951 
    5052/** returns the sub container that has been added */ 
    51 public LirecStorageContainer getSubContainer() 
     53public CmionStorageContainer getSubContainer() 
    5254{ 
    5355        return subContainer; 
     
    5557 
    5658/** returns the container that has added the sub container */ 
    57 public LirecStorageContainer getParentContainer() 
     59public CmionStorageContainer getParentContainer() 
    5860{ 
    5961        return parentContainer; 
    6062} 
    6163 
     64/** displays information about this event */ 
     65@Override 
     66public String toString() 
     67{ 
     68        String evtString =  "Sub Container added to " + parentContainer.getContainerName() + 
     69                            ": " + subContainer.getContainerName(); 
     70        return evtString;                
     71} 
     72 
    6273 
    6374} 
  • libs/cmion/cmionMain/src/cmion/storage/EventSubContainerRemoved.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    30 import ion.Meta.Event; 
     32import cmion.architecture.CmionEvent; 
    3133 
    32 /** an event informing that a new sub container has been removed from a LirecStorageContainer 
     34 
     35/** an event informing that a new sub container has been removed from a CMION StorageContainer 
    3336 *  This will be raised by the owner container 
    3437 *  Note that this will only be raised if removal has been requested for the container itself, 
    3538 *  if this container was removed because its parent, grandparent, etc, was removed, the event 
    3639 *  will not be raised  */ 
    37 public class EventSubContainerRemoved extends Event  
     40public class EventSubContainerRemoved extends CmionEvent  
    3841{ 
    3942        /** the name of the container that was removed */ 
     
    4447         
    4548        /** the container from which the sub container was removed */ 
    46         private LirecStorageContainer parentContainer; 
     49        private CmionStorageContainer parentContainer; 
    4750         
    4851        /** create an event informing of the removal of a sub container*/ 
    49         public EventSubContainerRemoved(String removedContainerName, String removedContainerType, LirecStorageContainer parentContainer) 
     52        public EventSubContainerRemoved(String removedContainerName, String removedContainerType, CmionStorageContainer parentContainer) 
    5053        { 
    5154                this.removedContainerName = removedContainerName; 
     
    6770         
    6871        /** returns a reference to the container from which the sub container was removed  */ 
    69         public LirecStorageContainer getParentContainer() 
     72        public CmionStorageContainer getParentContainer() 
    7073        { 
    7174                return parentContainer; 
    7275        } 
    7376         
     77        /** displays information about this event */ 
     78        @Override 
     79        public String toString() 
     80        { 
     81                String evtString =  "Sub Container removed from " + parentContainer.getContainerName() + 
     82                                    ": " + removedContainerName; 
     83                return evtString;                
     84        } 
     85         
    7486} 
  • libs/cmion/cmionMain/src/cmion/storage/RequestAddSubContainer.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    3032import ion.Meta.Request; 
     
    3234import java.util.HashMap; 
    3335 
    34 /** a request that can be made to any Lirec Storage Container for adding a new 
     36/** a request that can be made to any CMION Storage Container for adding a new 
    3537 *  sub container*/ 
    3638public class RequestAddSubContainer extends Request  
  • libs/cmion/cmionMain/src/cmion/storage/RequestRemoveProperty.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    3032import ion.Meta.Request; 
  • libs/cmion/cmionMain/src/cmion/storage/RequestRemoveSubContainer.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    3032import ion.Meta.Request; 
    3133 
    32 /** a request that can be made to any Lirec Storage Container for removing an 
     34/** a request that can be made to any CMION Storage Container for removing an 
    3335 *  existing sub container (does not remove sub sub containers)*/ 
    3436public class RequestRemoveSubContainer extends Request { 
  • libs/cmion/cmionMain/src/cmion/storage/RequestSetProperty.java

    r143 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    3032import ion.Meta.Request; 
  • libs/cmion/cmionMain/src/cmion/storage/WorldModel.java

    r172 r248  
    11/*       
    2         Lirec Architecture 
     2    CMION 
    33        Copyright(C) 2009 Heriot Watt University 
    44 
     
    2323  09/10/2009      Michael Kriegel <mk95@hw.ac.uk> 
    2424  First version. 
     25  27/11/2009      Michael Kriegel <mk95@hw.ac.uk> 
     26  Renamed to CMION 
    2527  ---   
    2628*/ 
    2729 
    28 package lirec.storage; 
     30package cmion.storage; 
    2931 
    3032import java.util.ArrayList; 
    3133import java.util.HashMap; 
    3234 
    33 import lirec.architecture.IArchitecture; 
     35import cmion.architecture.IArchitecture; 
    3436 
    35 /** a specific subclass of lirec storage container with convenience methods added  
     37 
     38/** a specific subclass of cmion storage container with convenience methods added  
    3639 * for handling "agent" and "object" sub containers. */ 
    37 public class WorldModel extends LirecStorageContainer { 
     40public class WorldModel extends CmionStorageContainer { 
    3841 
    3942        public static String AGENT_TYPE_NAME = "agent"; 
     
    111114        /** returns the agent storage container with the specified name or null if  
    112115         * it does not exist in this world model */ 
    113         public synchronized LirecStorageContainer getAgent(String name) 
     116        public synchronized CmionStorageContainer getAgent(String name) 
    114117        { 
    115118                if (this.hasAgent(name)) return this.getSubContainer(name); 
     
    119122        /** returns the object storage container with the specified name or null if  
    120123         * it does not exist in this world model */ 
    121         public synchronized LirecStorageContainer getObject(String name) 
     124        public synchronized CmionStorageContainer getObject(String name) 
    122125        { 
    123126                if (this.hasObject(name)) return this.getSubContainer(name); 
  • libs/cmion/cmionMain/src/cmion/util/SocketListener.java

    r143 r248  
    3030 */ 
    3131 
    32 package lirec.util; 
     32package cmion.util; 
    3333 
    3434import java.io.BufferedReader; 
Note: See TracChangeset for help on using the changeset viewer.