Permalink
Browse files

Enforces the usages of generics & iterables for IPopulation.

Signed-off-by: AlexisDrogoul <alexis.drogoul@gmail.com>
  • Loading branch information...
1 parent 6828001 commit a291734db91c3d2940638207292e100a11c1044c @AlexisDrogoul AlexisDrogoul committed Oct 7, 2016
Showing with 719 additions and 813 deletions.
  1. +2 −2 irit.gaml.extensions.database/src/msi/gama/database/CreateFromDatabaseDelegate.java
  2. +2 −1 msi.gama.core/META-INF/MANIFEST.MF
  3. +1 −1 msi.gama.core/src/msi/gama/common/interfaces/ICreateDelegate.java
  4. +15 −4 msi.gama.core/src/msi/gama/common/interfaces/IExperimentAgentCreator.java
  5. +11 −8 msi.gama.core/src/msi/gama/kernel/batch/BatchOutput.java
  6. +1 −1 msi.gama.core/src/msi/gama/kernel/batch/ParamSpaceExploAlgorithm.java
  7. +16 −17 msi.gama.core/src/msi/gama/kernel/experiment/ExperimentAgent.java
  8. +16 −23 msi.gama.core/src/msi/gama/kernel/experiment/ExperimentExport.java
  9. +1 −1 msi.gama.core/src/msi/gama/kernel/experiment/ExperimentParameter.java
  10. +30 −30 msi.gama.core/src/msi/gama/kernel/experiment/ExperimentPlan.java
  11. +6 −7 msi.gama.core/src/msi/gama/kernel/experiment/ExperimentPopulation.java
  12. +1 −1 msi.gama.core/src/msi/gama/kernel/experiment/IExperimentController.java
  13. +2 −3 msi.gama.core/src/msi/gama/kernel/experiment/IExperimentPlan.java
  14. +1 −1 msi.gama.core/src/msi/gama/kernel/model/GamlModelSpecies.java
  15. +8 −13 msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java
  16. +8 −7 msi.gama.core/src/msi/gama/kernel/simulation/SimulationPopulation.java
  17. +8 −9 msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java
  18. +1 −1 msi.gama.core/src/msi/gama/metamodel/agent/AgentIdentifier.java
  19. +32 −32 msi.gama.core/src/msi/gama/metamodel/agent/GamlAgent.java
  20. +3 −3 msi.gama.core/src/msi/gama/metamodel/agent/IAgent.java
  21. +7 −8 msi.gama.core/src/msi/gama/metamodel/agent/IMacroAgent.java
  22. +4 −4 msi.gama.core/src/msi/gama/metamodel/agent/MinimalAgent.java
  23. +7 −8 msi.gama.core/src/msi/gama/metamodel/agent/SavedAgent.java
  24. +54 −60 msi.gama.core/src/msi/gama/metamodel/population/GamaPopulation.java
  25. +15 −15 msi.gama.core/src/msi/gama/metamodel/population/IPopulation.java
  26. +5 −3 msi.gama.core/src/msi/gama/metamodel/population/IPopulationSet.java
  27. +1 −1 msi.gama.core/src/msi/gama/metamodel/population/MetaPopulation.java
  28. +1 −1 msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java
  29. +1 −1 msi.gama.core/src/msi/gama/metamodel/topology/ITopology.java
  30. +1 −1 msi.gama.core/src/msi/gama/metamodel/topology/continuous/AmorphousTopology.java
  31. +25 −37 msi.gama.core/src/msi/gama/metamodel/topology/grid/GamaSpatialMatrix.java
  32. +6 −5 msi.gama.core/src/msi/gama/metamodel/topology/grid/GridDiffuser.java
  33. +1 −1 msi.gama.core/src/msi/gama/metamodel/topology/grid/GridTopology.java
  34. +3 −3 msi.gama.core/src/msi/gama/metamodel/topology/grid/IGrid.java
  35. +5 −16 msi.gama.core/src/msi/gama/outputs/AbstractDisplayOutput.java
  36. +7 −4 msi.gama.core/src/msi/gama/outputs/AbstractOutput.java
  37. +33 −52 msi.gama.core/src/msi/gama/outputs/AbstractOutputManager.java
  38. +2 −2 msi.gama.core/src/msi/gama/outputs/ExperimentOutputManager.java
  39. +7 −0 msi.gama.core/src/msi/gama/outputs/IOutput.java
  40. +11 −9 msi.gama.core/src/msi/gama/outputs/IOutputManager.java
  41. +4 −4 msi.gama.core/src/msi/gama/outputs/InspectDisplayOutput.java
  42. +1 −1 msi.gama.core/src/msi/gama/outputs/LayeredDisplayOutput.java
  43. +1 −1 msi.gama.core/src/msi/gama/outputs/SimulationOutputManager.java
  44. +1 −1 msi.gama.core/src/msi/gama/outputs/layers/AbstractLayerStatement.java
  45. +1 −1 msi.gama.core/src/msi/gama/outputs/layers/AgentLayerStatement.java
  46. +31 −45 msi.gama.core/src/msi/gama/outputs/layers/GraphicLayerStatement.java
  47. +1 −1 msi.gama.core/src/msi/gama/outputs/layers/GridLayerStatement.java
  48. +5 −5 msi.gama.core/src/msi/gama/outputs/layers/SpeciesLayer.java
  49. +1 −1 msi.gama.core/src/msi/gama/outputs/layers/SpeciesLayerStatement.java
  50. +1 −2 msi.gama.core/src/msi/gama/outputs/layers/charts/ChartLayerStatement.java
  51. +4 −1 msi.gama.core/src/msi/gama/util/Guava.java
  52. +10 −5 msi.gama.core/src/msi/gama/util/graph/AbstractGraphEdgeAgent.java
  53. +2 −1 msi.gama.core/src/msi/gama/util/graph/AbstractGraphNodeAgent.java
  54. +2 −1 msi.gama.core/src/msi/gama/util/graph/BaseGraphEdgeAgent.java
  55. +1 −1 msi.gama.core/src/msi/gama/util/graph/GamaGraph.java
  56. +2 −2 msi.gama.core/src/msi/gama/util/graph/loader/GamaGraphParserListener.java
  57. +6 −5 msi.gama.core/src/msi/gaml/architecture/finite_state_machine/FsmStateStatement.java
  58. +1 −1 msi.gama.core/src/msi/gaml/architecture/reflex/ReflexArchitecture.java
  59. +4 −3 msi.gama.core/src/msi/gaml/architecture/user/UserPanelStatement.java
  60. +17 −13 msi.gama.core/src/msi/gaml/architecture/weighted_tasks/ProbabilisticTasksArchitecture.java
  61. +1 −2 msi.gama.core/src/msi/gaml/architecture/weighted_tasks/SortedTasksArchitecture.java
  62. +3 −3 msi.gama.core/src/msi/gaml/compilation/IAgentConstructor.java
  63. +1 −3 msi.gama.core/src/msi/gaml/compilation/ISymbol.java
  64. +0 −5 msi.gama.core/src/msi/gaml/compilation/Symbol.java
  65. +1 −1 msi.gama.core/src/msi/gaml/descriptions/IDescription.java
  66. +5 −10 msi.gama.core/src/msi/gaml/descriptions/ModelDescription.java
  67. +4 −4 msi.gama.core/src/msi/gaml/descriptions/SymbolDescription.java
  68. +3 −1 msi.gama.core/src/msi/gaml/factories/ModelFactory.java
  69. +31 −35 msi.gama.core/src/msi/gaml/skills/GridSkill.java
  70. +3 −3 msi.gama.core/src/msi/gaml/species/AbstractSpecies.java
  71. +3 −2 msi.gama.core/src/msi/gaml/species/ISpecies.java
  72. +1 −3 msi.gama.core/src/msi/gaml/statements/AbstractStatement.java
  73. +3 −3 msi.gama.core/src/msi/gaml/statements/AbstractStatementSequence.java
  74. +1 −2 msi.gama.core/src/msi/gaml/statements/AskStatement.java
  75. +2 −2 msi.gama.core/src/msi/gaml/statements/CaptureStatement.java
  76. +2 −2 msi.gama.core/src/msi/gaml/statements/CreateFromCSVDelegate.java
  77. +2 −2 msi.gama.core/src/msi/gaml/statements/CreateFromGenstarDelegate.java
  78. +2 −2 msi.gama.core/src/msi/gaml/statements/CreateFromGeometriesDelegate.java
  79. +2 −2 msi.gama.core/src/msi/gaml/statements/CreateFromGridFileDelegate.java
  80. +5 −5 msi.gama.core/src/msi/gaml/statements/CreateFromNullDelegate.java
  81. +4 −4 msi.gama.core/src/msi/gaml/statements/CreateStatement.java
  82. +3 −4 msi.gama.core/src/msi/gaml/statements/IfStatement.java
  83. +1 −3 msi.gama.core/src/msi/gaml/statements/MigrateStatement.java
  84. +1 −1 msi.gama.core/src/msi/gaml/statements/ReleaseStatement.java
  85. +4 −4 msi.gama.core/src/msi/gaml/statements/SwitchStatement.java
  86. +4 −3 msi.gama.core/src/msi/gaml/statements/UserCommandStatement.java
  87. +1 −1 msi.gama.core/src/msi/gaml/variables/Variable.java
  88. +0 −6 msi.gama.lang.gaml/src/msi/gama/lang/gaml/EGaml.java
  89. +1 −4 msi.gama.lang.gaml/src/msi/gama/lang/gaml/GamlStandaloneSetup.java
  90. +18 −15 msi.gama.lang.gaml/src/msi/gama/lang/gaml/expression/ExpressionDescriptionBuilder.java
  91. +76 −86 msi.gama.lang.gaml/src/msi/gama/lang/gaml/expression/GamlExpressionCompiler.java
  92. +1 −1 msi.gama.lang.gaml/src/msi/gama/lang/gaml/parsing/GamlSyntacticConverter.java
  93. +2 −2 msi.gama.lang.gaml/src/msi/gama/lang/gaml/resource/GamlFile.java
  94. +0 −13 msi.gama.lang.gaml/src/msi/gama/lang/gaml/resource/GamlResource.java
  95. +22 −21 msi.gama.lang.gaml/src/msi/gama/lang/gaml/statements/SimulateStatement.java
  96. +1 −2 msi.gaml.architecture.simplebdi/src/msi/gaml/architecture/simplebdi/PerceiveStatement.java
  97. +1 −1 msi.gaml.architecture.simplebdi/src/msi/gaml/architecture/simplebdi/SimpleBdiArchitecture.java
  98. +1 −1 simtools.gaml.extensions.physics/src/simtools/gaml/extensions/physics/Physical3DWorldAgent.java
  99. +1 −1 ummisco.gama.opengl/src/ummisco/gama/webgl/ParameterReceiver.java
  100. +2 −1 ummisco.gama.serialize/src/ummisco/gama/serializer/experiment/ExperimentBackwardAgent.java
  101. +1 −1 ...sco.gama.serialize/src/ummisco/gama/serializer/gamaType/converters/GamaAgentConverterNetwork.java
  102. +2 −1 ummisco.gama.serialize/src/ummisco/gama/serializer/gamaType/converters/GamaSpeciesConverter.java
  103. +2 −2 ummisco.gama.ui.experiment/src/ummisco/gama/ui/controls/StatusControlContribution.java
  104. +3 −2 ummisco.gama.ui.experiment/src/ummisco/gama/ui/experiment/parameters/AgentAttributesEditorsList.java
  105. +2 −1 ummisco.gama.ui.experiment/src/ummisco/gama/ui/factories/AgentMenuFactory.java
  106. +5 −5 ummisco.gama.ui.experiment/src/ummisco/gama/ui/menus/AgentsMenu.java
  107. +11 −21 ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/GamaViewPart.java
  108. +0 −2 ummisco.gama.ui.experiment/src/ummisco/gama/ui/views/inspectors/AgentInspectView.java
  109. +2 −1 ummisco.gama.ui.shared/src/ummisco/gama/ui/interfaces/IAgentMenuFactory.java
  110. +4 −2 ...extensions.maths/src/ummisco/gaml/extensions/maths/ode/statements/SystemOfEquationsStatement.java
  111. +7 −7 ...tensions.maths/src/ummisco/gaml/extensions/maths/pde/diffusion/statements/DiffusionStatement.java
  112. +1 −3 ummisco.gaml.extensions.sound/src/ummisco/gaml/extensions/sound/PauseSoundStatement.java
  113. +1 −3 ummisco.gaml.extensions.sound/src/ummisco/gaml/extensions/sound/ResumeSoundStatement.java
  114. +1 −2 ummisco.gaml.extensions.sound/src/ummisco/gaml/extensions/sound/StartSoundStatement.java
  115. +1 −3 ummisco.gaml.extensions.sound/src/ummisco/gaml/extensions/sound/StopSoundStatement.java
@@ -55,8 +55,8 @@ public boolean acceptSource(final Object source) {
* java.util.List, int, java.lang.Object)
*/
@Override
- public boolean createFrom(final IScope scope, final List<Map> inits, final Integer max, final Object source,
- final Arguments init, final CreateStatement statement) {
+ public boolean createFrom(final IScope scope, final List<Map<String, Object>> inits, final Integer max,
+ final Object source, final Arguments init, final CreateStatement statement) {
final IList<GamaList<Object>> input = (IList<GamaList<Object>>) source;
// get Column name
final GamaList<Object> colNames = input.get(0);
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
ummisco.gama.annotations;bundle-version="1.7.0";visibility:=reexport,
msi.gama.processor;bundle-version="1.4.0";visibility:=reexport,
- org.apache.commons.compress;bundle-version="1.6.0"
+ org.apache.commons.compress;bundle-version="1.6.0",
+ com.google.guava
Bundle-ActivationPolicy: lazy
Export-Package: msi.gama.common,
msi.gama.common.interfaces;
@@ -45,7 +45,7 @@
*/
@SuppressWarnings("rawtypes")
- boolean createFrom(IScope scope, List<Map> inits, Integer max, Object source, Arguments init,
+ boolean createFrom(IScope scope, List<Map<String, Object>> inits, Integer max, Object source, Arguments init,
CreateStatement statement);
/**
@@ -12,6 +12,7 @@
package msi.gama.common.interfaces;
import msi.gama.kernel.experiment.IExperimentAgent;
+import msi.gama.metamodel.agent.IAgent;
import msi.gama.metamodel.population.IPopulation;
import msi.gama.precompiler.GamlProperties;
@@ -22,23 +23,26 @@
private final IExperimentAgentCreator original;
private final String name, plugin;
- public ExperimentAgentDescription(final IExperimentAgentCreator original, final String name, final String plugin) {
+ public ExperimentAgentDescription(final IExperimentAgentCreator original, final String name,
+ final String plugin) {
this.original = original;
this.name = name;
this.plugin = plugin;
}
/**
* Method create()
+ *
* @see msi.gama.common.interfaces.IExperimentAgentCreator#create(java.lang.Object[])
*/
@Override
- public IExperimentAgent create(final IPopulation pop) {
+ public IExperimentAgent create(final IPopulation<? extends IAgent> pop) {
return original.create(pop);
}
/**
* Method getName()
+ *
* @see msi.gama.common.interfaces.INamed#getName()
*/
@Override
@@ -48,13 +52,16 @@ public String getName() {
/**
* Method setName()
+ *
* @see msi.gama.common.interfaces.INamed#setName(java.lang.String)
*/
@Override
- public void setName(final String newName) {}
+ public void setName(final String newName) {
+ }
/**
* Method serialize()
+ *
* @see msi.gama.common.interfaces.IGamlable#serialize(boolean)
*/
@Override
@@ -64,6 +71,7 @@ public String serialize(final boolean includingBuiltIn) {
/**
* Method getTitle()
+ *
* @see msi.gama.common.interfaces.IGamlDescription#getTitle()
*/
@Override
@@ -73,6 +81,7 @@ public String getTitle() {
/**
* Method getDocumentation()
+ *
* @see msi.gama.common.interfaces.IGamlDescription#getDocumentation()
*/
@Override
@@ -82,6 +91,7 @@ public String getDocumentation() {
/**
* Method getDefiningPlugin()
+ *
* @see msi.gama.common.interfaces.IGamlDescription#getDefiningPlugin()
*/
@Override
@@ -91,6 +101,7 @@ public String getDefiningPlugin() {
/**
* Method collectPlugins()
+ *
* @see msi.gama.common.interfaces.IGamlDescription#collectPlugins(java.util.Set)
*/
@Override
@@ -99,6 +110,6 @@ public void collectMetaInformation(final GamlProperties meta) {
}
}
- IExperimentAgent create(IPopulation pop);
+ IExperimentAgent create(IPopulation<? extends IAgent> pop);
}
@@ -11,33 +11,36 @@
**********************************************************************************************/
package msi.gama.kernel.batch;
-import java.util.List;
import msi.gama.common.interfaces.IKeyword;
import msi.gama.precompiler.GamlAnnotations.facet;
import msi.gama.precompiler.GamlAnnotations.facets;
import msi.gama.precompiler.GamlAnnotations.inside;
import msi.gama.precompiler.GamlAnnotations.symbol;
-import msi.gama.precompiler.*;
-import msi.gaml.compilation.*;
+import msi.gama.precompiler.IConcept;
+import msi.gama.precompiler.ISymbolKind;
+import msi.gaml.compilation.ISymbol;
+import msi.gaml.compilation.Symbol;
import msi.gaml.descriptions.IDescription;
import msi.gaml.types.IType;
-@symbol(name = IKeyword.SAVE_BATCH, kind = ISymbolKind.BATCH_METHOD, with_sequence = false, concept = {IConcept.BATCH})
+@symbol(name = IKeyword.SAVE_BATCH, kind = ISymbolKind.BATCH_METHOD, with_sequence = false, concept = {
+ IConcept.BATCH })
@inside(kinds = { ISymbolKind.EXPERIMENT })
@facets(value = { @facet(name = IKeyword.TO, type = IType.LABEL, optional = false),
- @facet(name = IKeyword.REWRITE, type = IType.BOOL, optional = true),
- @facet(name = IKeyword.DATA, type = IType.NONE, optional = true) }, omissible = IKeyword.DATA)
+ @facet(name = IKeyword.REWRITE, type = IType.BOOL, optional = true),
+ @facet(name = IKeyword.DATA, type = IType.NONE, optional = true) }, omissible = IKeyword.DATA)
public class BatchOutput extends Symbol {
// A placeholder for a file output
// TODO To be replaced by a proper "save" command, now that it accepts
// new file types.
- public BatchOutput(/* final ISymbol context, */final IDescription desc) {
+ public BatchOutput(final IDescription desc) {
super(desc);
}
@Override
- public void setChildren(final List<? extends ISymbol> commands) {}
+ public void setChildren(final Iterable<? extends ISymbol> commands) {
+ }
}
@@ -121,7 +121,7 @@ public void run(final IScope scope) {
// }
@Override
- public void setChildren(final List<? extends ISymbol> commands) {
+ public void setChildren(final Iterable<? extends ISymbol> commands) {
}
protected boolean isMaximize() {
@@ -13,11 +13,14 @@
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.Platform;
+import com.google.common.collect.Iterables;
+
import msi.gama.common.GamaPreferences;
import msi.gama.common.interfaces.IGui;
import msi.gama.common.interfaces.IKeyword;
@@ -51,6 +54,7 @@
import msi.gama.runtime.exceptions.GamaRuntimeException;
import msi.gama.util.GamaColor;
import msi.gama.util.GamaListFactory;
+import msi.gama.util.Guava;
import msi.gama.util.IList;
import msi.gama.util.TOrderedHashMap;
import msi.gaml.descriptions.IDescription;
@@ -107,7 +111,7 @@
private Boolean scheduled = false;
private volatile boolean isOnUserHold = false;
- public ExperimentAgent(final IPopulation s) throws GamaRuntimeException {
+ public ExperimentAgent(final IPopulation<? extends IAgent> s) throws GamaRuntimeException {
super(s);
super.setGeometry(GamaGeometryType.createPoint(new GamaPoint(-1, -1)));
scope = new ExperimentAgentScope();
@@ -202,7 +206,7 @@ public Object _init_(final IScope scope) {
@Override
public boolean init(final IScope scope) {
super.init(scope);
- final IOutputManager outputs = getSpecies().getExperimentOutputs();
+ final IOutputManager outputs = getOutputManager();
if (outputs != null) {
outputs.init(scope);
}
@@ -224,13 +228,13 @@ public Object primDie(final IScope scope) throws GamaRuntimeException {
}
public void createSimulation(final ParametersSet parameters, final boolean scheduleIt) {
- final IPopulation pop = getSimulationPopulation();
+ final IPopulation<? extends IAgent> pop = getSimulationPopulation();
if (pop == null) {
return;
}
final ParametersSet ps = getParameterValues();
ps.putAll(parameters);
- final IList<Map<?, ?>> list = GamaListFactory.create(Types.MAP);
+ final IList<Map<String, Object>> list = GamaListFactory.create(Types.MAP);
list.add(ps);
pop.createAgents(scope, 1, list, false, scheduleIt);
}
@@ -481,7 +485,7 @@ public SimulationPopulation getSimulationPopulation() {
}
@getter(IKeyword.SIMULATIONS)
- public IList<IAgent> getSimulations() {
+ public IList<? extends IAgent> getSimulations() {
return getSimulationPopulation().copy(scope);
}
@@ -513,7 +517,7 @@ public void setOnUserHold(final boolean state) {
}
@Override
- public IPopulation getPopulationFor(final ISpecies species) {
+ public IPopulation<? extends IAgent> getPopulationFor(final ISpecies species) {
if (species == getModel()) {
return getSimulationPopulation();
}
@@ -531,7 +535,7 @@ public boolean step(final IScope scope) {
result = super.step(this.scope);
executer.executeEndActions();
executer.executeOneShotActions();
- final IOutputManager outputs = getSpecies().getExperimentOutputs();
+ final IOutputManager outputs = getOutputManager();
if (outputs != null) {
outputs.step(scope);
}
@@ -682,16 +686,11 @@ public IGui getGui() {
/**
* @return
*/
- public List<IOutputManager> getAllSimulationOutputs() {
- final IList<IOutputManager> list = GamaListFactory.create();
- for (final IAgent a : getSimulationPopulation()) {
- final SimulationAgent sim = (SimulationAgent) a;
- final IOutputManager man = sim.getOutputManager();
- if (man != null) {
- list.add(man);
- }
- }
- return list;
+ public Iterable<IOutputManager> getAllSimulationOutputs() {
+ return Iterables.concat(
+ Iterables.filter(Iterables.transform(getSimulationPopulation(), each -> each.getOutputManager()),
+ Guava.NOT_NULL),
+ Collections.singletonList(getOutputManager()));
}
/**
@@ -11,47 +11,40 @@
**********************************************************************************************/
package msi.gama.kernel.experiment;
-import java.util.*;
-
import msi.gama.common.interfaces.IKeyword;
-import msi.gama.common.util.*;
-import msi.gama.kernel.experiment.IParameter;
-import msi.gama.kernel.experiment.IParameter.Batch;
import msi.gama.precompiler.GamlAnnotations.facet;
import msi.gama.precompiler.GamlAnnotations.facets;
import msi.gama.precompiler.GamlAnnotations.inside;
import msi.gama.precompiler.GamlAnnotations.symbol;
-import msi.gama.precompiler.*;
-import msi.gama.runtime.*;
+import msi.gama.precompiler.IConcept;
+import msi.gama.precompiler.ISymbolKind;
import msi.gama.runtime.exceptions.GamaRuntimeException;
-import msi.gaml.compilation.*;
-import msi.gaml.descriptions.*;
+import msi.gaml.compilation.ISymbol;
+import msi.gaml.compilation.Symbol;
+import msi.gaml.descriptions.IDescription;
import msi.gaml.expressions.IExpression;
-import msi.gaml.operators.Cast;
-import msi.gaml.types.*;
+import msi.gaml.types.IType;
@facets(value = { @facet(name = IKeyword.NAME, type = IType.STRING, optional = true),
- @facet(name = IKeyword.VAR, type = IType.ID, optional = false),
- @facet(name = IKeyword.FRAMERATE, type = IType.INT, optional = true)}, omissible = IKeyword.VAR)
-@symbol(name = { IKeyword.EXPORT }, kind = ISymbolKind.SINGLE_STATEMENT, with_sequence = true, concept = { IConcept.EXPERIMENT })
+ @facet(name = IKeyword.VAR, type = IType.ID, optional = false),
+ @facet(name = IKeyword.FRAMERATE, type = IType.INT, optional = true) }, omissible = IKeyword.VAR)
+@symbol(name = { IKeyword.EXPORT }, kind = ISymbolKind.SINGLE_STATEMENT, with_sequence = true, concept = {
+ IConcept.EXPERIMENT })
@inside(kinds = { ISymbolKind.EXPERIMENT })
-
-public class ExperimentExport extends Symbol {
+
+public class ExperimentExport extends Symbol {
final IExpression listenedVariable;
- public ExperimentExport(final IDescription sd) throws GamaRuntimeException
- {
+ public ExperimentExport(final IDescription sd) throws GamaRuntimeException {
super(sd);
- this.listenedVariable=getFacet(IKeyword.VAR);
+ this.listenedVariable = getFacet(IKeyword.VAR);
}
@Override
- public void setChildren(List<? extends ISymbol> children) {
+ public void setChildren(final Iterable<? extends ISymbol> children) {
// TODO Auto-generated method stub
-
- }
-
+ }
}
@@ -407,7 +407,7 @@ public String serialize(final boolean includingBuiltIn) {
}
@Override
- public void setChildren(final List<? extends ISymbol> commands) {
+ public void setChildren(final Iterable<? extends ISymbol> commands) {
}
@Override
Oops, something went wrong.

0 comments on commit a291734

Please sign in to comment.