Commit f9bd3dad authored by Johannes Eder's avatar Johannes Eder
Browse files

YELLOW

Issue-Ref: 3886
Issue-Url: https://af3-developer.fortiss.org/issues/3886

Signed-off-by: Johannes Eder's avatarJohannes Eder <eder@fortiss.org>
parent 521d3aa1
ContextElementStringValidator.java 1d1523a4a836e4cedc40f703d755ad228d2464e6 GREEN
ContextElementStringValidator.java f900cba2a3004e99dcc22b052175637c238d17ba YELLOW
GlossaryEntryEditorBase.java 9d0e3e04cff47fdb54bb429170bcd5bb6e985af4 YELLOW
TrimStringConverter.java e207497003e1e974bebc5ba9f06d66b42db8e64a GREEN
WordElementEditingSupport.java e801c2b9314d934be5c7497fab2850887a5eac2b GREEN
TrimStringConverter.java 3a29fd38dc2dc31545fbc78dc7e18b46f295e003 YELLOW
WordElementEditingSupport.java cf229cc57cbf6260b9124a06e3aea09cee9682ca YELLOW
......@@ -30,7 +30,7 @@ import org.eclipse.core.runtime.IStatus;
*
* @author kisslinger
*/
public class ContextElementStringValidator implements IValidator {
public class ContextElementStringValidator<T extends Object> implements IValidator<T> {
/** {@inheritDoc} */
@Override
......
......@@ -23,7 +23,7 @@ import org.eclipse.core.databinding.conversion.Converter;
*
* @author kisslinger
*/
public class TrimStringConverter extends Converter {
public class TrimStringConverter<T extends Object, V extends Object> extends Converter<T, V> {
/** Constructor */
public TrimStringConverter() {
......@@ -31,10 +31,11 @@ public class TrimStringConverter extends Converter {
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public Object convert(Object fromObject) {
public V convert(T fromObject) {
if(fromObject instanceof String)
return ((String)fromObject).trim();
return (V)((String)fromObject).trim();
return null;
}
}
......@@ -70,6 +70,7 @@ public class WordElementEditingSupport
}
/** {@inheritDoc} */
@SuppressWarnings({"unchecked", "rawtypes"})
@Override
protected Binding[] createBinding(CellEditor cellEditor, ViewerCell cell, CellEditor editor,
DataBindingContext context) {
......@@ -95,14 +96,14 @@ public class WordElementEditingSupport
/** {@inheritDoc} */
@Override
protected IConverter getModelToTextConverter() {
protected IConverter<Object, Object> getModelToTextConverter() {
return null;
}
/** {@inheritDoc} */
@Override
protected IConverter getTextToModelConverter() {
return new TrimStringConverter();
protected IConverter<Object, Object> getTextToModelConverter() {
return new TrimStringConverter<Object, Object>();
}
/** {@inheritDoc} */
......@@ -119,7 +120,7 @@ public class WordElementEditingSupport
/** {@inheritDoc} */
@Override
protected IValidator getTextValidator(Object object) {
return new ContextElementStringValidator();
protected IValidator<Object> getTextValidator(Object object) {
return new ContextElementStringValidator<Object>();
}
}
AnalysisToWordRuleConverter.java f270728259bcb3e3948e806dbc22025bf78dbb9e GREEN
AnalysisToWordRuleConverter.java a675f9f3c3df9aaf93045fadfbe6193256cf257f YELLOW
ConnectionContentAssistProcessor.java 683858c8fd83d7377c644fc567c3521e1a92a6be YELLOW
ConnectionHighlightColorConstants.java bcb80e57a0cd0c448bdc4713d3d2b7e07ad5964f GREEN
ConnectionHighlightConfiguration.java 14c9a5b8e5c5522634de665a7aaedfeeb1e2c1c6 GREEN
ConnectionHighlightScanner.java bd1ba0a420475f2fe3ecd2f6465cf379c22302ff YELLOW
ConnectionHoverInformationControl.java 4b742ce99b43c31c9864420ed4d6a711cb3d3631 GREEN
ConnectionTextHover.java 65c999c4d1020d9d20c4a5e62eb633f26be9bac9 YELLOW
ListToWordRuleUpdateStrategy.java ab8265125263558e2f5f45f3a9a0b6c3721606f3 GREEN
ListToWordRuleUpdateStrategy.java 08e21f1b7e0979afcbc5ecd2dae612786966a656 YELLOW
MiraWordRule.java f8a6910146270ae4b85f162845a0cc7c86b4ff05 GREEN
ScannerManager.java a1480c24630bec3ef782a0df84de64517820ba91 YELLOW
......@@ -26,7 +26,8 @@ import org.fortiss.af3.mira.model.Analysis;
*
* @author mou
*/
public class AnalysisToWordRuleConverter extends Converter {
public class AnalysisToWordRuleConverter<F extends Object, T extends Object>
extends Converter<F, T> {
/** the input analysis */
private Analysis analysis;
......@@ -37,8 +38,9 @@ public class AnalysisToWordRuleConverter extends Converter {
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override
public Object convert(Object fromObject) {
return createNewWordRule(analysis);
public T convert(F fromObject) {
return (T)createNewWordRule(analysis);
}
}
......@@ -31,7 +31,8 @@ import org.fortiss.af3.mira.model.Analysis;
*
* @author kisslinger
*/
public class ListToWordRuleUpdateStrategy extends UpdateListStrategy {
public class ListToWordRuleUpdateStrategy<S extends Object, D extends Object>
extends UpdateListStrategy<S, D> {
/** root element analysis of which entries should be used for highlighting */
Analysis analysis;
......
mira.ecore 3f52bfc3f6c4ae99e4d2374bc083ed3399500efc RED
mira.ecore fdc8127493cfcc0cfca979eacde63a7e655fab2f YELLOW
......@@ -43,9 +43,6 @@
<modelElementCompositor compositor="org.fortiss.af3.mira.compose.RequirementsPackageCompositor">
<modelElementClass modelElementClass="org.fortiss.af3.mira.model.RequirementsPackage"/>
</modelElementCompositor>
<modelElementCompositor compositor="org.fortiss.af3.mira.compose.RequirementCompositor">
<modelElementClass modelElementClass="org.fortiss.af3.mira.model.Requirement"/>
</modelElementCompositor>
<modelElementCompositor compositor="org.fortiss.af3.mira.compose.GlossaryCompositor">
<modelElementClass modelElementClass="org.fortiss.af3.mira.model.glossary.Glossary"/>
</modelElementCompositor>
......@@ -93,10 +90,4 @@
<modelElementClass modelElementClass="org.fortiss.af3.mira.model.relations.DefinedDirectedRequirementRelationType"/>
</relation>
</extension>
<extension point="org.fortiss.tooling.base.annotation">
<annotation binding="org.fortiss.af3.safety.annotation.valueprovider.SafetyIntegrityLevelValueProvider">
<modelElementClass modelElementClass="org.fortiss.af3.mira.model.Requirement"/>
</annotation>
</extension>
</plugin>
MiraModelElementFactory.java 56d8d40d6697d168ddfc8de71cd257a8a3492f7e GREEN
MiraModelElementFactory.java 79d6f8f50a1902eb95dcd679251ca8a2a2b27e79 YELLOW
MiraUtils.java cf61520498fd6c761471d45c2595c17ff5d983ed YELLOW
ParameterUtils.java 5f8e05cf290bbc1c6e958657f918e26a169d44df GREEN
......@@ -157,5 +157,4 @@ public final class MiraModelElementFactory {
createDefinedUndirectedRequirementRelationType() {
return RelationsFactory.eINSTANCE.createDefinedUndirectedRequirementRelationType();
}
}
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