Commit b7380cb0 authored by Christoph Döbber's avatar Christoph Döbber
Browse files

resolved conflict

parent 36cf13d4
......@@ -20,6 +20,7 @@ package org.fortiss.af3.operatorpanel.ui.simulator.views;
import static org.eclipse.swt.SWT.DEFAULT;
import static org.eclipse.swt.SWT.NONE;
import static org.fortiss.tooling.base.ui.utils.LayoutDataUtils.getNodeBounds;
import static org.fortiss.tooling.kernel.utils.TransformationUtils.createTransformedObjectWithoutExceptionFor;
import java.util.ArrayList;
import java.util.List;
......@@ -41,6 +42,7 @@ import org.fortiss.af3.operatorpanel.model.OperatorPanelItem;
import org.fortiss.af3.operatorpanel.model.OperatorPanelSpecification;
import org.fortiss.af3.operatorpanel.simulator.ExecutableOperatorPanelSpecification;
import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
import org.fortiss.tooling.kernel.extension.data.ITransformationContext;
/**
* Composite for operator panels.
......@@ -49,13 +51,9 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
* @author hoelzl
* @author $Author$
* @version $Rev$
<<<<<<< .mine
* @ConQAT.Rating GREEN Hash: 783F9B9442AAF5C3FF7FD2F0AB1B362B
=======
* @ConQAT.Rating YELLOW Hash: F49AE1BBDE1E267D48C149E3299E775E
>>>>>>> .r4927
*/
/* package */class OperationPanelSimulationComposite extends Composite {
public class OperationPanelSimulationComposite extends Composite {
/** The key storing the OP item. */
public static final String ITEM_KEY = "OPItem";
......@@ -108,7 +106,8 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
return new OPVCAreaInput((OPAreaInput)item, this);
}
// try transformation service
return null;
return createTransformedObjectWithoutExceptionFor(item, OPViewControlBase.class,
new OperatorPanelTransformationContext(this));
}
/** Determines the size of the composite. */
......@@ -174,4 +173,15 @@ import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
}
}
}
/** Transformation context for operator panel item extensions. */
public class OperatorPanelTransformationContext implements ITransformationContext {
/** The simulation composite. */
public OperationPanelSimulationComposite composite;
/** Constructor. */
public OperatorPanelTransformationContext(OperationPanelSimulationComposite composite) {
this.composite = composite;
}
}
}
Supports Markdown
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