Commit f61cd07b authored by Klaus Becker's avatar Klaus Becker
Browse files

review, set some to green, rename a method (this one is deprecated and has to be changed/removed)

refs 304
parent 4919d62f
......@@ -34,7 +34,7 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: DF51E68F0F3B49BD6AE2F99AF9320DC3
* @ConQAT.Rating GREEN Hash: 6EE25901F01F47F2D82302FFFEBF74EB
*/
abstract class TypeCheckConstraintCheckerBase<T extends EObject, V extends EObject>
extends MultiViolationConstraintCheckerBase<T, V> {
......
......@@ -40,7 +40,7 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 1320BC613573EFA61491CA9856CC1AFC
* @ConQAT.Rating GREEN Hash: DD5A409CFE6913FEE73B83793D01B8F3
*/
public class WeakCausalityCycleConstraintChecker extends
MultiViolationConstraintCheckerBase<ComponentArchitecture, Component> {
......
<!--
$Id$
@version $Rev$
@ConQAT.Rating YELLOW Hash: 1E6E3D66674144EFC10936F09B587172
@ConQAT.Rating GREEN Hash: 32BF9536251AF983BE8979BC407D5F9A
-->
<body>
......
......@@ -31,7 +31,7 @@ import org.fortiss.af3.project.utils.VariableScopeUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 68426CC4CF2388607D6B44BC81E1F373
* @ConQAT.Rating GREEN Hash: 23C68483CDAFCE91AACC9316D28B263A
*/
public class DataStateVariableStaticImpl {
......
<!--
$Id$
@version $Rev$
@ConQAT.Rating YELLOW Hash: 1ACC43A5EB45DF79D5B8356EC7D9E05B
@ConQAT.Rating GREEN Hash: 7344021001E6EFA8FAF0C627E262B08F
-->
<body>
......
......@@ -44,7 +44,7 @@ import org.fortiss.tooling.base.model.element.IModelElementSpecification;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: D6BFE6CB19F659D6F7208878479A86B4
* @ConQAT.Rating GREEN Hash: 74EC855431853203256026442178A5E9
*/
public abstract class ExecutableAtomicComponentBase<S extends IModelElementSpecification>
extends ExecutableComponent<S> {
......
......@@ -49,7 +49,7 @@ import org.fortiss.tooling.base.model.element.IModelElementSpecification;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: EB51FCCD129FE5D8D3FFB0C084082BCF
* @ConQAT.Rating GREEN Hash: 5BF4ED12643932135A34C58E4F918F5F
*/
public abstract class ExecutableComponent<S extends IModelElementSpecification> {
......
......@@ -29,7 +29,7 @@ import org.fortiss.af3.component.model.Component;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 4BF033510D2321537D0F0D78686BCF09
* @ConQAT.Rating GREEN Hash: F5EE83E8C9BAE113B986BE004615A774
*/
public final class ExecutableCompositeComponent extends
ExecutableCompositeComponentBase {
......
......@@ -40,7 +40,7 @@ import org.fortiss.tooling.base.model.element.IModelElementSpecification;
* @author li
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 0D18DA183604DE2D5F5A9BA29A3F61AD
* @ConQAT.Rating GREEN Hash: 32C861057F2ADAEDD17820AA3BB1821C
*/
public class ExecutableCompositeComponentBase extends
ExecutableComponent<IModelElementSpecification> {
......
......@@ -34,7 +34,7 @@ import org.fortiss.af3.project.model.typesystem.IType;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: A39D81C3D3A2D55B07970024BB91FC68
* @ConQAT.Rating GREEN Hash: BC605FB8D281480600414C7D57356506
*/
public class BehaviorModelElementFactory {
/**
......
......@@ -39,7 +39,7 @@ import org.fortiss.af3.component.model.Port;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 3F623E101A82C0ED39645C26E3662F88
* @ConQAT.Rating GREEN Hash: 7DDF710640EC4432DC0624D40E10B626
*/
public class CausalityUtils {
......@@ -99,7 +99,7 @@ public class CausalityUtils {
* @param boundary
* the boundary component
* @param weak
* the list pf weakly causal components
* the list of weakly causal components
* @param strong
* the list of strongly components
* @return the list of linearized components
......
......@@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.model.IProjectRootElement;
* @author ratiu
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: D7DFECB82C4810267BDBAA2FAA1B9D93
* @ConQAT.Rating GREEN Hash: CB0630276245DF5598B9D321176CC827
*/
public class ComponentArchitectureUtils {
......
......@@ -38,7 +38,7 @@ import org.fortiss.tooling.base.utils.LayoutModelElementFactory;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 62924F5C5291184EEADE8B371A676A45
* @ConQAT.Rating RED Hash: A43A0831D71049B525333134A9755E96
*/
public final class ComponentModelElementFactory {
......@@ -90,16 +90,17 @@ public final class ComponentModelElementFactory {
return component;
}
/** Creates a {@link Component} within the given parent. */
/** Creates a strong causal {@link Component} within the given parent. */
// TODO(review): resolve deprecacy
@Deprecated
public static Component createComponent(Component parent, String name,
String comment) {
return createComponent(parent, name, comment, true);
public static Component createComponentAndAttach(Component parent,
String name, String comment) {
return createComponentAndAttach(parent, name, comment, true);
}
/** Creates a {@link Component} within the given parent. */
public static Component createComponent(Component parent, String name,
String comment, boolean stronglyCausal) {
public static Component createComponentAndAttach(Component parent,
String name, String comment, boolean stronglyCausal) {
Component sub = createComponent(name, comment, stronglyCausal);
parent.getContainedElementsList().add(sub);
return sub;
......
......@@ -79,12 +79,13 @@ public class CounterTestModel extends ComponentTestModelBase {
inputPort = createInputPortAndAttach(counterComponent, "Input",
TIntStaticImpl.create(), NoVal.NOVAL.toITerm());
feedbackInputPort = createInputPortAndAttach(counterComponent, "Feedback",
TIntStaticImpl.create(), IntConstStaticImpl.create(0));
feedbackInputPort = createInputPortAndAttach(counterComponent,
"Feedback", TIntStaticImpl.create(),
IntConstStaticImpl.create(0));
outputPort = createOutputPortAndAttach(counterComponent, "Output",
TIntStaticImpl.create(), NoVal.NOVAL.toITerm());
feedbackChannel = createChannelAndAttach(rootComponent, "Feedback", outputPort,
feedbackInputPort);
feedbackChannel = createChannelAndAttach(rootComponent, "Feedback",
outputPort, feedbackInputPort);
createCounterComponentBehavior();
}
......
......@@ -20,7 +20,7 @@ package test.org.fortiss.af3.component.model;
import static org.fortiss.af3.component.utils.ComponentArchitectureUtils.findInputPort;
import static org.fortiss.af3.component.utils.ComponentArchitectureUtils.findOutputPort;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createChannelAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponent;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponentAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createInputPortAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createOutputPortAndAttach;
......@@ -41,7 +41,7 @@ import org.fortiss.af3.expression.model.types.impl.TBoolStaticImpl;
* @author ratiu
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating GREEN Hash: 932CC1C440198679F9B0B33197A91446
* @ConQAT.Rating RED Hash: 90EFB936F9E7575F8828DDAEA1BBC786
*/
public class OneBitFullAdderTestModel extends ComponentTestModelBase {
......@@ -76,7 +76,7 @@ public class OneBitFullAdderTestModel extends ComponentTestModelBase {
/** Creates the component. */
private void createOneBitFullAdderComponent() {
// build component
oneBitFullAdderComponent = createComponent(rootComponent,
oneBitFullAdderComponent = createComponentAndAttach(rootComponent,
"OneBitFullAdder", "");
inputBit1 = createInputPortAndAttach(oneBitFullAdderComponent, "InputBit1",
......@@ -147,7 +147,7 @@ public class OneBitFullAdderTestModel extends ComponentTestModelBase {
/** Creates a UnitDelay component. */
private Component createUnitDelayComponent(Component parent, String name) {
Component unitDelayComponent = createComponent(parent, name, "");
Component unitDelayComponent = createComponentAndAttach(parent, name, "");
createInputPortAndAttach(unitDelayComponent, "InputBit",
TBoolStaticImpl.create(), NoVal.NOVAL.toITerm());
......@@ -165,7 +165,7 @@ public class OneBitFullAdderTestModel extends ComponentTestModelBase {
/** Creates an Or component. */
private Component createOrComponent(Component parent, String name) {
Component orComponent = createComponent(parent, name, "");
Component orComponent = createComponentAndAttach(parent, name, "");
createInputPortAndAttach(orComponent, "InputBit1", TBoolStaticImpl.create(),
NoVal.NOVAL.toITerm());
......
......@@ -18,7 +18,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
package test.org.fortiss.af3.component.model;
import static org.fortiss.af3.component.utils.BehaviorModelElementFactory.createCodeSpecification;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponent;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponentAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createInputPortAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createOutputPortAndAttach;
......@@ -36,7 +36,7 @@ import org.fortiss.af3.expression.model.types.impl.TBoolStaticImpl;
* @author ratiu
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating GREEN Hash: 38736FB1B9B64025F4BA31DD81C6B9BB
* @ConQAT.Rating RED Hash: 26FD07AD6FDA5E643E7702B94CBD70E9
*/
public class OneBitHalfAdderTestModel extends ComponentTestModelBase {
......@@ -66,7 +66,7 @@ public class OneBitHalfAdderTestModel extends ComponentTestModelBase {
/** Creates a "one bit half adder" component with a certain name. */
public Component createOneBitHalfAdder(Component parent, String name) {
Component twoBitsAdderComponent = createComponent(parent, name, "");
Component twoBitsAdderComponent = createComponentAndAttach(parent, name, "");
inputBit1 = createInputPortAndAttach(twoBitsAdderComponent, "InputBit1",
TBoolStaticImpl.create(), NoVal.NOVAL.toITerm());
......
......@@ -21,6 +21,7 @@ import static org.conqat.lib.commons.reflect.ReflectionUtils.pickInstanceOf;
import static org.fortiss.af3.component.ui.utils.NodeLayoutUtils.setNodeLayoutData;
import static org.fortiss.af3.component.ui.utils.NodeLayoutUtils.setStickyPortLayoutData;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponent;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponentAndAttach;
import static org.fortiss.af3.mode.utils.ModeAutomatonUtils.setGuard;
import static org.fortiss.af3.mode.utils.ModeModelElementFactory.createModeCompStruSpec;
import static org.fortiss.tooling.kernel.utils.KernelModelElementUtils.findContentElementByNameAndClass;
......@@ -132,7 +133,7 @@ public class SimpleTrafficLightsModesExample extends
setNodeLayoutData(system_Out_IndicatorB, GRIDSIZE * 65, GRIDSIZE * 24);
// create the TLC component, which contains the mode automaton.
Component tlc = createComponent(system, "TLC", "");
Component tlc = createComponentAndAttach(system, "TLC", "");
tlc.setId(entityID++);
setNodeLayoutData(tlc, GRIDSIZE * 10, GRIDSIZE * 6,
DefaultLayoutConstants.DEFAULT_SHAPE_MINIMUM_WIDTH * 2,
......
......@@ -23,7 +23,7 @@ import static org.fortiss.af3.component.ui.utils.NodeLayoutUtils.setNodeLayoutDa
import static org.fortiss.af3.component.ui.utils.NodeLayoutUtils.setStickyPortLayoutData;
import static org.fortiss.af3.component.utils.BehaviorModelElementFactory.createAction;
import static org.fortiss.af3.component.utils.BehaviorModelElementFactory.createGuard;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponent;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponentAndAttach;
import static org.fortiss.af3.operatorpanel.utils.OperatorPanelModelElementFactory.createOPColorDisplay;
import static org.fortiss.af3.operatorpanel.utils.OperatorPanelModelElementFactory.createOPColorReaction;
import static org.fortiss.af3.operatorpanel.utils.OperatorPanelModelElementFactory.createOPPushButton;
......@@ -86,7 +86,7 @@ public class SimpleTrafficLightsOperatorPanelExample extends
"Controller", Component.class);
// add component
Component op = createComponent(facility, "Panel", "Operator Panel");
Component op = createComponentAndAttach(facility, "Panel", "Operator Panel");
setNodeLayoutData(op, GRIDSIZE * 24, GRIDSIZE * 32,
DEFAULT_SHAPE_MINIMUM_WIDTH * 2,
DEFAULT_SHAPE_MINIMUM_HEIGHT * 2);
......
......@@ -17,7 +17,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
+--------------------------------------------------------------------------*/
package test.org.fortiss.af3.state.model;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponent;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponentAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createInputPortAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createOutputPortAndAttach;
import static org.fortiss.af3.state.utils.StateModelElementFactory.createAction;
......@@ -53,7 +53,7 @@ import test.org.fortiss.af3.component.model.ComponentTestModelBase;
* @author ratiu
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: 0D876B9EC8B185973BF0F5242FA0FFB0
* @ConQAT.Rating RED Hash: 2826C40AF31363BE4D0579D66144FB48
*/
public class HierarchicalStatesTestModel extends ComponentTestModelBase {
......@@ -99,7 +99,7 @@ public class HierarchicalStatesTestModel extends ComponentTestModelBase {
/** Creates the component. */
private void createICarComponent() {
icarComponent = createComponent(rootComponent, "iCar", "");
icarComponent = createComponentAndAttach(rootComponent, "iCar", "");
startPort = createInputPortAndAttach(icarComponent, "Start",
TBoolStaticImpl.create(), NoVal.NOVAL.toITerm());
......
......@@ -17,7 +17,7 @@ $Id: codetemplates.xml 1 2011-01-01 00:00:01Z hoelzl $
+--------------------------------------------------------------------------*/
package test.org.fortiss.af3.state.model;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponent;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createComponentAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createInputPortAndAttach;
import static org.fortiss.af3.component.utils.ComponentModelElementFactory.createOutputPortAndAttach;
import static org.fortiss.af3.state.utils.StateModelElementFactory.createDataStateVariable;
......@@ -61,7 +61,7 @@ import test.org.fortiss.af3.component.model.ComponentTestModelBase;
* @author trachtenherz
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: D34D38F0C7E80B5310CD88121AB6247A
* @ConQAT.Rating RED Hash: AA9320A1459FC841DCC5500F3DB37DF4
*/
// TODO (FH): code contains undocumented parts and warnings
// DT: Done
......@@ -184,7 +184,7 @@ public abstract class IntVarBaseOutputTestModel extends ComponentTestModelBase {
/** Creates the integer variable component. */
private void createIntVarComponent() {
// build component
intVarComponent = createComponent(rootComponent, "IntVar", "");
intVarComponent = createComponentAndAttach(rootComponent, "IntVar", "");
InputPort[] inPorts = new InputPort[inPortNames.length];
for (int i = 0; i < inPortNames.length; ++i)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment