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

fixed for now - rework to come

refs 909
parent ed9c3fcd
......@@ -74,7 +74,7 @@ import org.fortiss.tooling.kernel.ui.service.IActionService;
* @author doebber
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: 319F9DEB6C08E66DB58946A6D74B1DCE
* @ConQAT.Rating YELLOW Hash: 7E47DCA0C584B6D9AD74176FCD04D59A
*/
public class CodeSpecificationEditor extends EditorBase<CodeSpecification> {
......
......@@ -50,7 +50,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* @author eder
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 6B55C6459BED2EB10EB4E9BA22231D2A
* @ConQAT.Rating YELLOW Hash: C1C2B71C1E8E94E921628E80C33B12DD
*/
public final class PortSpecificationPropertySection extends PropertySectionBase implements
PortDataPropagation.PortDataAccess {
......@@ -116,6 +116,8 @@ public final class PortSpecificationPropertySection extends PropertySectionBase
return;
}
setupFieldAssist();
IObservableValue modelObservable =
observeValue(specification, AF3ComponentPackage.Literals.PORT_SPECIFICATION__TYPE);
performComplexTextBinding(dbc, typeText, modelObservable, new TypeToStringConverter(),
......
......@@ -32,7 +32,7 @@ import org.fortiss.tooling.base.ui.fieldassist.ProposalProviderBase;
* @author doebber
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 7369FBC11F59D0FA281F16753563F5D6
* @ConQAT.Rating YELLOW Hash: FF7D56EC9310FCA989071A8872750A3A
*/
public class CompletionProposalProviderFactory {
......@@ -43,6 +43,9 @@ public class CompletionProposalProviderFactory {
/** {@inheritDoc} */
@Override
public String[] getProposals(String currentWord) {
if(specification == null) {
return new String[0];
}
ArrayList<String> proposals = getTypeDefinitions(specification);
proposals.addAll(getPrimitiveTypes());
return proposals.toArray(new String[0]);
......@@ -58,6 +61,9 @@ public class CompletionProposalProviderFactory {
/** {@inheritDoc} */
@Override
public String[] getProposals(String currentWord) {
if(specification == null) {
return new String[0];
}
ArrayList<String> proposals =
getConstructorsForType(specification.getType().toString(), true,
specification);
......
......@@ -53,7 +53,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* @author eder
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 7745AAF2410663AECAB16EB9F845BAF1
* @ConQAT.Rating YELLOW Hash: 6AFF6CCB2168B473DFA3623A56E40ED0
*/
public final class FunctionDefinitionPropertySection extends PropertySectionBase {
......@@ -114,6 +114,8 @@ public final class FunctionDefinitionPropertySection extends PropertySectionBase
public void refresh() {
super.refresh();
setupFieldAssist();
IObservableValue modelObservable =
observeValue(function.getFunction(),
FortissToolingKernelPackage.Literals.INAMED_ELEMENT__NAME);
......
......@@ -35,7 +35,7 @@ import org.fortiss.tooling.base.ui.fieldassist.ProposalProviderBase;
* @author doebber
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 878E6B6399242159AD5C5CAAC55BA9AB
* @ConQAT.Rating YELLOW Hash: BF78FA1A9CA9F48FA92112A7842881AB
*/
public class CompletionProposalProviderFactory {
......@@ -46,6 +46,9 @@ public class CompletionProposalProviderFactory {
/** {@inheritDoc} */
@Override
public String[] getProposals(String currentWord) {
if(function == null) {
return new String[0];
}
ArrayList<String> proposals = getTypeDefinitions(function);
proposals.addAll(getPrimitiveTypes());
return proposals.toArray(new String[0]);
......@@ -66,6 +69,9 @@ public class CompletionProposalProviderFactory {
/** {@inheritDoc} */
@Override
public String[] getProposals(String currentWord) {
if(function == null) {
return new String[0];
}
ArrayList<String> proposals = getTypeDefinitions(function);
proposals.addAll(getPrimitiveTypes());
return proposals.toArray(new String[0]);
......@@ -79,6 +85,9 @@ public class CompletionProposalProviderFactory {
@Override
/** {@inheritDoc} */
public String[] getProposals(String currentWord) {
if(function == null) {
return new String[0];
}
ArrayList<String> prop = getFunctions(function);
prop.addAll(getAllConstructors(function, true));
prop.addAll(getPrimitiveValues());
......
......@@ -45,7 +45,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author li
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 1840D1DD4E16CC4C74E1293CB3B47A6C
* @ConQAT.Rating YELLOW Hash: BB25C4E47EFDC65E57FEB0A7B8B96129
*/
public class SwitchSegmentSpecificationPropertySection extends
PropertySectionWithCopyPasteBase<SwitchSegmentSpecification> {
......@@ -85,6 +85,8 @@ public class SwitchSegmentSpecificationPropertySection extends
public void refresh() {
super.refresh();
setupFieldAssist();
final IObservableValue guardObservable =
observeValue(specification, SWITCH_SEGMENT_SPECIFICATION__GUARD);
performComplexTextBinding(dbc, guardText, guardObservable, new GuardToStringConverter(),
......
......@@ -37,7 +37,7 @@ import org.fortiss.tooling.base.ui.fieldassist.ProposalProviderBase;
* @author doebber
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: AEFB9219DFF0A08665BE806FD4014AE1
* @ConQAT.Rating YELLOW Hash: 6A27E6F6BA57D380D74B809E91413C35
*/
public class CompletionProposalProviderFactory {
......@@ -48,6 +48,9 @@ public class CompletionProposalProviderFactory {
@Override
/** {@inheritDoc} */
public String[] getProposals(String currentWord) {
if(specification == null) {
return new String[0];
}
ArrayList<String> prop =
getModeDataStateVariables(getEnclosingModeAutomaton(specification));
prop.addAll(getInputPortNames(getEnclosingComponent(specification)));
......
......@@ -48,7 +48,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils;
* @author ratiu
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: E5549F092B2DF0837B55D78D54CFFF19
* @ConQAT.Rating YELLOW Hash: 8D7469EEB311F879B69CB8B326E527E5
*/
public class StateSpecificationPropertySection extends PropertySectionBase {
......@@ -109,6 +109,8 @@ public class StateSpecificationPropertySection extends PropertySectionBase {
return;
}
setupFieldAssist();
// create actions data binding
IObservableValue actionsObservable =
observeValue(idleTransitionSpecification, TRANSITION_SEGMENT_SPECIFICATION__ACTIONS);
......
......@@ -51,7 +51,7 @@ import org.fortiss.tooling.kernel.service.IPersistencyService;
* @author ratiu
* @author $Author: ratiu $
* @version $Rev: 5320 $
* @ConQAT.Rating YELLOW Hash: B04532FBBE423045EAA4F9BE21056DCF
* @ConQAT.Rating YELLOW Hash: CFD93774DCC69978F137904B1AE9C3A2
*/
public class TransitionSegmentSpecificationPropertySection extends
PropertySectionWithCopyPasteBase<TransitionSegmentSpecification> {
......@@ -95,6 +95,8 @@ public class TransitionSegmentSpecificationPropertySection extends
public void refresh() {
super.refresh();
setupFieldAssist();
// create guard data binding
IObservableValue guardObservable =
observeValue(specification, TRANSITION_SEGMENT_SPECIFICATION__GUARD);
......
......@@ -38,7 +38,7 @@ import org.fortiss.tooling.base.ui.fieldassist.ProposalProviderBase;
* @author doebber
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: AFE68BBD4CEDF30AEC9100D21958FF9A
* @ConQAT.Rating YELLOW Hash: 375E0E263344A18AA43BC80A800A5228
*/
public class CompletionProposalProviderFactory {
......@@ -68,6 +68,9 @@ public class CompletionProposalProviderFactory {
@Override
/** {@inheritDoc} */
public String[] getProposals(String currentWord) {
if(specification == null) {
return new String[0];
}
ArrayList<String> prop =
getDataStateVariables(getEnclosingAutomaton(specification));
prop.addAll(getInputPortNames(getEnclosingComponent(specification)));
......@@ -87,6 +90,9 @@ public class CompletionProposalProviderFactory {
@Override
/** {@inheritDoc} */
public String[] getProposals(String currentWord) {
if(state == null) {
return new String[0];
}
ArrayList<String> prop = getDataStateVariables(getEnclosingAutomaton(state));
prop.addAll(getInputPortNames(getEnclosingComponent(state)));
prop.addAll(getOutputPortNames(getEnclosingComponent(state)));
......
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