Commit 67a411ac authored by Daniel Ratiu's avatar Daniel Ratiu
Browse files

code is now GREEN

refs 862
parent 7b2c499c
......@@ -26,7 +26,7 @@ import org.fortiss.af3.project.model.typesystem.IType;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 6CFE76D62ED86F87FEA49CE6A0FA6E02
* @ConQAT.Rating GREEN Hash: 143C2A16153DEC301AC3393C490C8419
*/
public class TypedIExpressionTermValidator extends
StringToIExpressionTermWithTypeCheckValidatorBase {
......
......@@ -38,7 +38,7 @@ import org.fortiss.af3.project.model.typesystem.IType;
* @author doebber
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: FDB6D44D22B35A6811F1843B442A24E0
* @ConQAT.Rating GREEN Hash: BC68192C32B1D70D9F697D59FB8640D8
*/
public class TypedIExpressionTermValidatorForAllTypes extends TypedIExpressionTermValidator {
......@@ -70,9 +70,8 @@ public class TypedIExpressionTermValidatorForAllTypes extends TypedIExpressionTe
return CANCEL_STATUS;
}
for(TypeDefinition td : dict.getTypeDefinitionsList()) {
IType t = td.createIType();
type = t;
if(tc.typecheck(term, t, dict) && validateAtomic(value)) {
type = td.createIType();
if(tc.typecheck(term, type, dict) && validateAtomic(value)) {
return OK_STATUS;
}
}
......
......@@ -17,6 +17,7 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.af3.expression.ui.properties;
import static org.eclipse.jface.databinding.swt.SWTObservables.observeText;
import static org.fortiss.af3.expression.ui.utils.ExpressionCompletionProposalUtils.createDefinitionProposals;
import static org.fortiss.af3.expression.ui.utils.ExpressionCompletionProposalUtils.createParametersProposals;
import static org.fortiss.af3.expression.ui.utils.ExpressionCompletionProposalUtils.createReturnTypeProposals;
......@@ -25,7 +26,6 @@ import static org.fortiss.tooling.kernel.ui.util.DataBindingUtils.performComplex
import static org.fortiss.tooling.kernel.ui.util.ObservableUtils.observeValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
......@@ -54,7 +54,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
* @author eder
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: BADC1B281FA9744235E9B4355DB7F6FF
* @ConQAT.Rating GREEN Hash: 0996A3E55E6208350AD29EF4BBACE56E
*/
public final class FunctionDefinitionPropertySection extends PropertySectionBase {
......@@ -143,14 +143,12 @@ public final class FunctionDefinitionPropertySection extends PropertySectionBase
IObservableValue modelObservable =
observeValue(function.getFunction(),
FortissToolingKernelPackage.Literals.INAMED_ELEMENT__NAME);
dbc.bindValue(SWTObservables.observeText(nameText, SWT.FocusOut), modelObservable, null,
null);
dbc.bindValue(observeText(nameText, SWT.FocusOut), modelObservable, null, null);
modelObservable =
observeValue(function.getFunction(),
FortissToolingKernelPackage.Literals.INAMED_COMMENTED_ELEMENT__COMMENT);
dbc.bindValue(SWTObservables.observeText(commentText, SWT.FocusOut), modelObservable, null,
null);
dbc.bindValue(observeText(commentText, SWT.FocusOut), modelObservable, null, null);
modelObservable =
observeValue(function, DefinitionsPackage.Literals.FUNCTION_DEFINITION__RETURN_TYPE);
......
......@@ -35,7 +35,7 @@ import org.fortiss.tooling.base.ui.fieldassist.ProposalProviderBase;
* @author doebber
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 4B1806776E94016D0556A44D15E9EF19
* @ConQAT.Rating GREEN Hash: 5DDB9421E5CB84416553FA26F436B1F6
*/
public class ExpressionCompletionProposalUtils {
......
......@@ -40,12 +40,12 @@ import org.fortiss.af3.expression.model.types.impl.TIntStaticImpl;
import org.fortiss.tooling.base.ui.fieldassist.FieldAssistImageRegistry;
/**
* Utils class for assembling expression related proposals for FieldAssist.
* Utility class for assembling expression related proposals for FieldAssist.
*
* @author doebber
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: 723D1026C22D27899E09C82397B0C169
* @ConQAT.Rating GREEN Hash: F77B3A15A8260780B763ADACC1A9FC96
*/
public class ExpressionFieldAssistUtils {
......@@ -200,18 +200,24 @@ public class ExpressionFieldAssistUtils {
/** Icon for primitive types. */
static Image PRIMITIVE_TYPE_ICON = getImageDescriptor("/icons/primitivetype.gif").createImage();
/** Icon for primitive values. */
static Image PRIMITIVE_VALUE_ICON = getImageDescriptor("/icons/primitivevalue.gif")
.createImage();
/** Icon for useful expressions. */
static Image USEFUL_EXPRESSION_ICON = getImageDescriptor("/icons/usefulexpression.gif")
.createImage();
/** Icon for NoVal keyword. */
static Image NOVAL_ICON = getImageDescriptor("/icons/noval.gif").createImage();
/** Icon for functions. */
static Image FUNCTION_ICON = getImageDescriptor("/icons/function.png").createImage();
/** Icon for types. */
static Image ENUMERATION_ICON = getImageDescriptor("/icons/enumeration.gif").createImage();
/** Icon for constructors. */
static Image MEMBER_ICON = getImageDescriptor("/icons/member.png").createImage();
......
......@@ -28,7 +28,7 @@ import org.fortiss.af3.expression.model.terms.imperative.ImperativeFactory;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 0C8E18BEAE65D92C67CFDA4B07FE22F3
* @ConQAT.Rating GREEN Hash: 209AD059857D66C5BE2C61DA2C6F6AA1
*/
public final class AssignmentStaticImpl {
......
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