Changeset 172 for architecture
- Timestamp:
- 10/20/2009 12:19:11 PM (11 years ago)
- Location:
- architecture/architectureMain
- Files:
-
- 1 added
- 7 deleted
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
architecture/architectureMain/src/lirec/architecture/LirecComponent.java
r143 r172 34 34 35 35 /** reference to the architecture, through which references to other components can be obtained */ 36 protected Architecture architecture;36 protected IArchitecture architecture; 37 37 38 38 /** create a new Lirec Component */ 39 protected LirecComponent( Architecture architecture)39 protected LirecComponent(IArchitecture architecture) 40 40 { 41 41 this.architecture = architecture; … … 43 43 44 44 /** returns a reference to the Lire architecture object */ 45 public Architecture getArchitecture() {45 public IArchitecture getArchitecture() { 46 46 return architecture; 47 47 } -
architecture/architectureMain/src/lirec/level2/Competency.java
r143 r172 35 35 import java.util.HashMap; 36 36 37 import lirec.architecture. Architecture;37 import lirec.architecture.IArchitecture; 38 38 import lirec.architecture.LirecComponent; 39 39 … … 59 59 60 60 /** create a competency object */ 61 public Competency( Architecture architecture)61 public Competency(IArchitecture architecture) 62 62 { 63 63 super(architecture); -
architecture/architectureMain/src/lirec/level2/CompetencyExecution.java
r143 r172 39 39 import java.util.HashMap; 40 40 41 import lirec.architecture. Architecture;41 import lirec.architecture.IArchitecture; 42 42 import lirec.architecture.LirecComponent; 43 43 … … 50 50 51 51 /** create a new Competency Execution Component */ 52 public CompetencyExecution( Architecture architecture)52 public CompetencyExecution(IArchitecture architecture) 53 53 { 54 54 super(architecture); -
architecture/architectureMain/src/lirec/level2/CompetencyLibrary.java
r143 r172 44 44 import org.w3c.dom.NodeList; 45 45 46 import lirec.architecture. Architecture;46 import lirec.architecture.IArchitecture; 47 47 import lirec.architecture.LirecComponent; 48 48 … … 59 59 60 60 /** Create a new competency library */ 61 public CompetencyLibrary( Architecture architecture, String competencyLibraryFile) throws Exception61 public CompetencyLibrary(IArchitecture architecture, String competencyLibraryFile) throws Exception 62 62 { 63 63 super(architecture); … … 139 139 constructorParametersStr= atrConstrPars.getNodeValue(); 140 140 141 // the first parameter to the constructor is always a reference to the architecture for all lirec components141 // create array to store values of contrucotr parameters 142 142 ArrayList<Object> constructorParameters = new ArrayList<Object>(); 143 // create array that specifies the classes of the parameters of the constructor 144 ArrayList<Class<?>> constructorClasses = new ArrayList<Class<?>>(); 145 146 // the first parameter to the constructor is always a reference to the architecture for all lirec components 143 147 constructorParameters.add(architecture); 148 // it's class is IArchitecture 149 constructorClasses.add(IArchitecture.class); 144 150 145 151 // di-sect constructor parameters (in the string all parameters are seperated by a comma) … … 148 154 { 149 155 String token = st.nextToken().trim(); 150 if (!token.equals("")) constructorParameters.add(token); 156 if (!token.equals("")) 157 { 158 constructorParameters.add(token); 159 constructorClasses.add(String.class); 160 } 151 161 } 152 162 … … 155 165 // obtain class 156 166 Class<?> cls = Class.forName(className); 157 158 // create array that specifies the classes of the parameters of the constructor159 ArrayList<Class<?>> constructorClasses = new ArrayList<Class<?>>();160 for (Object o: constructorParameters)161 constructorClasses.add(o.getClass());162 167 163 168 // obtain the constructor -
architecture/architectureMain/src/lirec/level2/RemoteCompetency.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 34 34 /** an abstract class describing a competency, whose main execution is performed remotely, … … 47 47 48 48 /** call this constructor from subclasses */ 49 protected RemoteCompetency( Architecture architecture)49 protected RemoteCompetency(IArchitecture architecture) 50 50 { 51 51 super(architecture); -
architecture/architectureMain/src/lirec/level2/RemoteTCPCompetency.java
r143 r172 36 36 import java.net.Socket; 37 37 38 import lirec.architecture. Architecture;38 import lirec.architecture.IArchitecture; 39 39 40 40 /** A class encapsulating tcp communication we another process on the network. */ … … 70 70 * to, if serverMode is true this parameter is not used (can be null) 71 71 */ 72 protected RemoteTCPCompetency( Architecture architecture, int port, boolean serverMode, String serverAddress) {72 protected RemoteTCPCompetency(IArchitecture architecture, int port, boolean serverMode, String serverAddress) { 73 73 super(architecture); 74 74 this.port = port; … … 92 92 { 93 93 writer.write(message + "\n"); 94 writer.flush(); 94 95 } 95 96 catch (IOException e) -
architecture/architectureMain/src/lirec/level2/competencies/ExampleCompetency.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.Competency; 34 34 … … 39 39 /** constructor, every competency, should if possible have a constructor 40 40 * that receives the Architecture as an argument */ 41 public ExampleCompetency( Architecture architecture)41 public ExampleCompetency(IArchitecture architecture) 42 42 { 43 43 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/ExampleTCPCompetency.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.RemoteTCPCompetency; 34 34 … … 39 39 /** constructor, every competency, should if possible have a constructor 40 40 * that receives the Architecture as an argument */ 41 public ExampleTCPCompetency( Architecture architecture)41 public ExampleTCPCompetency(IArchitecture architecture) 42 42 { 43 43 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/test/TestCompetency1.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.Competency; 34 34 … … 38 38 39 39 /** constructor of the test competency */ 40 public TestCompetency1( Architecture architecture)40 public TestCompetency1(IArchitecture architecture) 41 41 { 42 42 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/test/TestCompetency2.java
r143 r172 31 31 import java.util.Random; 32 32 33 import lirec.architecture. Architecture;33 import lirec.architecture.IArchitecture; 34 34 import lirec.level2.Competency; 35 35 … … 39 39 40 40 /** constructor of the test competency */ 41 public TestCompetency2( Architecture architecture)41 public TestCompetency2(IArchitecture architecture) 42 42 { 43 43 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/test/TestCompetency3.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.Competency; 34 34 … … 38 38 39 39 /** constructor of the test competency */ 40 public TestCompetency3( Architecture architecture)40 public TestCompetency3(IArchitecture architecture) 41 41 { 42 42 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/test/TestCompetency4.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.Competency; 34 34 … … 37 37 38 38 /** constructor of the test competency */ 39 public TestCompetency4( Architecture architecture)39 public TestCompetency4(IArchitecture architecture) 40 40 { 41 41 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/test/TestCompetency5.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.Competency; 34 34 … … 44 44 /** constructor of the test competency, this one has an additional parameter, purely 45 45 * for the purpose whether the constructor is found and the parameter passed correctly */ 46 public TestCompetency5( Architecture architecture, String someParameter1, String someParameter2)46 public TestCompetency5(IArchitecture architecture, String someParameter1, String someParameter2) 47 47 { 48 48 // call parent class constructor, always do this first -
architecture/architectureMain/src/lirec/level2/competencies/test/TestCompetency6.java
r143 r172 30 30 import java.util.HashMap; 31 31 32 import lirec.architecture. Architecture;32 import lirec.architecture.IArchitecture; 33 33 import lirec.level2.Competency; 34 34 … … 40 40 41 41 /** constructor of the test competency */ 42 public TestCompetency6( Architecture architecture) {42 public TestCompetency6(IArchitecture architecture) { 43 43 super(architecture); 44 44 -
architecture/architectureMain/src/lirec/level3/AgentMindConnector.java
r143 r172 31 31 import ion.Meta.IEvent; 32 32 import ion.Meta.Simulation; 33 import lirec.architecture. Architecture;33 import lirec.architecture.IArchitecture; 34 34 import lirec.architecture.LirecComponent; 35 35 import lirec.storage.EventPropertyChanged; … … 50 50 51 51 /** create a new Agent Mind Connector */ 52 public AgentMindConnector( Architecture architecture)52 public AgentMindConnector(IArchitecture architecture) 53 53 { 54 54 super(architecture); -
architecture/architectureMain/src/lirec/level3/CompetencyManager.java
r143 r172 42 42 import javax.xml.parsers.DocumentBuilderFactory; 43 43 44 import lirec.architecture. Architecture;44 import lirec.architecture.IArchitecture; 45 45 import lirec.architecture.LirecComponent; 46 46 import lirec.level2.CompetencyExecutionPlan; … … 69 69 70 70 71 public CompetencyManager( Architecture architecture, String competencyManagerRulesFileName) throws Exception71 public CompetencyManager(IArchitecture architecture, String competencyManagerRulesFileName) throws Exception 72 72 { 73 73 super(architecture); -
architecture/architectureMain/src/lirec/level3/fatima/FAtiMAConnector.java
r143 r172 33 33 import java.util.HashMap; 34 34 35 import lirec.architecture. Architecture;35 import lirec.architecture.IArchitecture; 36 36 import lirec.level3.AgentMindConnector; 37 37 import lirec.level3.MindAction; … … 50 50 51 51 /** create a new FAtiMA connector */ 52 public FAtiMAConnector( Architecture architecture)52 public FAtiMAConnector(IArchitecture architecture) 53 53 { 54 54 super(architecture); -
architecture/architectureMain/src/lirec/level3/supersimplemind/SuperSimpleMindConnector.java
r143 r172 28 28 package lirec.level3.supersimplemind; 29 29 30 import lirec.architecture. Architecture;30 import lirec.architecture.IArchitecture; 31 31 import lirec.level3.AgentMindConnector; 32 32 import lirec.level3.MindAction; … … 40 40 41 41 /** creates a new connector for a SuperSimpleMind */ 42 public SuperSimpleMindConnector( Architecture architecture)42 public SuperSimpleMindConnector(IArchitecture architecture) 43 43 { 44 44 super(architecture); -
architecture/architectureMain/src/lirec/storage/LirecStorageContainer.java
r143 r172 38 38 import java.util.HashMap; 39 39 40 import lirec.architecture. Architecture;40 import lirec.architecture.IArchitecture; 41 41 import lirec.architecture.LirecComponent; 42 42 … … 88 88 * @param architecture reference to the lirec architecture object 89 89 */ 90 protected LirecStorageContainer( String name, String type, LirecStorageContainer parentContainer, Architecture architecture)90 protected LirecStorageContainer(IArchitecture architecture, String name, String type, LirecStorageContainer parentContainer) 91 91 { 92 92 super(architecture); … … 104 104 * @param architecture reference to the lirec architecture object 105 105 */ 106 public LirecStorageContainer( String name, String type, Architecture architecture)107 { 108 this( name,type,null,architecture);106 public LirecStorageContainer(IArchitecture architecture, String name, String type) 107 { 108 this(architecture,name,type,null); 109 109 } 110 110 … … 289 289 { 290 290 // ok we don't have such a sub container yet, create it then 291 LirecStorageContainer container = new LirecStorageContainer( name,type,this,architecture);291 LirecStorageContainer container = new LirecStorageContainer(architecture,name,type,this); 292 292 293 293 // add it to our list of sub containers -
architecture/architectureMain/src/lirec/storage/WorldModel.java
r143 r172 31 31 import java.util.HashMap; 32 32 33 import lirec.architecture. Architecture;33 import lirec.architecture.IArchitecture; 34 34 35 35 /** a specific subclass of lirec storage container with convenience methods added … … 41 41 42 42 43 public WorldModel( String name, Architecture architecture) {43 public WorldModel(IArchitecture architecture, String name) { 44 44 // this container is of the type "WorldModel" 45 super( name, "WorldModel", null, architecture);45 super(architecture,name, "WorldModel", null); 46 46 } 47 47
Note: See TracChangeset
for help on using the changeset viewer.