diff options
Diffstat (limited to 'extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java')
| -rw-r--r-- | extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java | 732 |
1 files changed, 345 insertions, 387 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java index 49fd4a8b5f2..bd16d9db593 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java @@ -15,58 +15,15 @@ import java.util.Map; import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.ResourceLocator; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; + import org.eclipse.emf.ecore.util.EObjectValidator; -import org.eclipse.papyrus.dd.dg.Canvas; -import org.eclipse.papyrus.dd.dg.Circle; -import org.eclipse.papyrus.dd.dg.ClipPath; -import org.eclipse.papyrus.dd.dg.ClosePath; -import org.eclipse.papyrus.dd.dg.CubicCurveTo; -import org.eclipse.papyrus.dd.dg.DGPackage; -import org.eclipse.papyrus.dd.dg.Definition; -import org.eclipse.papyrus.dd.dg.Definitions; -import org.eclipse.papyrus.dd.dg.ElementKind; -import org.eclipse.papyrus.dd.dg.Ellipse; -import org.eclipse.papyrus.dd.dg.EllipticalArcTo; -import org.eclipse.papyrus.dd.dg.FontDecoration; -import org.eclipse.papyrus.dd.dg.Gradient; -import org.eclipse.papyrus.dd.dg.GradientStop; -import org.eclipse.papyrus.dd.dg.GraphicalElement; -import org.eclipse.papyrus.dd.dg.Group; -import org.eclipse.papyrus.dd.dg.Image; -import org.eclipse.papyrus.dd.dg.Line; -import org.eclipse.papyrus.dd.dg.LineTo; -import org.eclipse.papyrus.dd.dg.LinearGradient; -import org.eclipse.papyrus.dd.dg.MarkedElement; -import org.eclipse.papyrus.dd.dg.Marker; -import org.eclipse.papyrus.dd.dg.Matrix; -import org.eclipse.papyrus.dd.dg.MoveTo; -import org.eclipse.papyrus.dd.dg.Paint; -import org.eclipse.papyrus.dd.dg.PaintServer; -import org.eclipse.papyrus.dd.dg.Path; -import org.eclipse.papyrus.dd.dg.PathCommand; -import org.eclipse.papyrus.dd.dg.Pattern; -import org.eclipse.papyrus.dd.dg.Polygon; -import org.eclipse.papyrus.dd.dg.Polyline; -import org.eclipse.papyrus.dd.dg.QuadraticCurveTo; -import org.eclipse.papyrus.dd.dg.RadialGradient; -import org.eclipse.papyrus.dd.dg.Rectangle; -import org.eclipse.papyrus.dd.dg.RootCanvas; -import org.eclipse.papyrus.dd.dg.Rotate; -import org.eclipse.papyrus.dd.dg.Scale; -import org.eclipse.papyrus.dd.dg.Skew; -import org.eclipse.papyrus.dd.dg.Style; -import org.eclipse.papyrus.dd.dg.StyleRule; -import org.eclipse.papyrus.dd.dg.StyleSelector; -import org.eclipse.papyrus.dd.dg.StyleSheet; -import org.eclipse.papyrus.dd.dg.Text; -import org.eclipse.papyrus.dd.dg.TextAnchor; -import org.eclipse.papyrus.dd.dg.Transform; -import org.eclipse.papyrus.dd.dg.Translate; -import org.eclipse.papyrus.dd.dg.Use; + +import org.eclipse.papyrus.dd.dg.*; /** * <!-- begin-user-doc --> The <b>Validator</b> for the model. <!-- end-user-doc @@ -86,7 +43,8 @@ public class DGValidator extends EObjectValidator { public static final DGValidator INSTANCE = new DGValidator(); /** - * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. + * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic + * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.common.util.Diagnostic#getSource() @@ -379,99 +337,99 @@ public class DGValidator extends EObjectValidator { */ @Override protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) { - switch (classifierID) { + switch(classifierID) { case DGPackage.CANVAS: - return validateCanvas((Canvas) value, diagnostics, context); + return validateCanvas((Canvas)value, diagnostics, context); case DGPackage.GROUP: - return validateGroup((Group) value, diagnostics, context); + return validateGroup((Group)value, diagnostics, context); case DGPackage.GRAPHICAL_ELEMENT: - return validateGraphicalElement((GraphicalElement) value, diagnostics, context); + return validateGraphicalElement((GraphicalElement)value, diagnostics, context); case DGPackage.DEFINITION: - return validateDefinition((Definition) value, diagnostics, context); + return validateDefinition((Definition)value, diagnostics, context); case DGPackage.MOVE_TO: - return validateMoveTo((MoveTo) value, diagnostics, context); + return validateMoveTo((MoveTo)value, diagnostics, context); case DGPackage.PATH_COMMAND: - return validatePathCommand((PathCommand) value, diagnostics, context); + return validatePathCommand((PathCommand)value, diagnostics, context); case DGPackage.CLIP_PATH: - return validateClipPath((ClipPath) value, diagnostics, context); + return validateClipPath((ClipPath)value, diagnostics, context); case DGPackage.STYLE: - return validateStyle((Style) value, diagnostics, context); + return validateStyle((Style)value, diagnostics, context); case DGPackage.PAINT: - return validatePaint((Paint) value, diagnostics, context); + return validatePaint((Paint)value, diagnostics, context); case DGPackage.PAINT_SERVER: - return validatePaintServer((PaintServer) value, diagnostics, context); + return validatePaintServer((PaintServer)value, diagnostics, context); case DGPackage.TRANSFORM: - return validateTransform((Transform) value, diagnostics, context); + return validateTransform((Transform)value, diagnostics, context); case DGPackage.CIRCLE: - return validateCircle((Circle) value, diagnostics, context); + return validateCircle((Circle)value, diagnostics, context); case DGPackage.CLOSE_PATH: - return validateClosePath((ClosePath) value, diagnostics, context); + return validateClosePath((ClosePath)value, diagnostics, context); case DGPackage.CUBIC_CURVE_TO: - return validateCubicCurveTo((CubicCurveTo) value, diagnostics, context); + return validateCubicCurveTo((CubicCurveTo)value, diagnostics, context); case DGPackage.DEFINITIONS: - return validateDefinitions((Definitions) value, diagnostics, context); + return validateDefinitions((Definitions)value, diagnostics, context); case DGPackage.STYLE_SHEET: - return validateStyleSheet((StyleSheet) value, diagnostics, context); + return validateStyleSheet((StyleSheet)value, diagnostics, context); case DGPackage.STYLE_RULE: - return validateStyleRule((StyleRule) value, diagnostics, context); + return validateStyleRule((StyleRule)value, diagnostics, context); case DGPackage.STYLE_SELECTOR: - return validateStyleSelector((StyleSelector) value, diagnostics, context); + return validateStyleSelector((StyleSelector)value, diagnostics, context); case DGPackage.ELLIPSE: - return validateEllipse((Ellipse) value, diagnostics, context); + return validateEllipse((Ellipse)value, diagnostics, context); case DGPackage.ELLIPTICAL_ARC_TO: - return validateEllipticalArcTo((EllipticalArcTo) value, diagnostics, context); + return validateEllipticalArcTo((EllipticalArcTo)value, diagnostics, context); case DGPackage.QUADRATIC_CURVE_TO: - return validateQuadraticCurveTo((QuadraticCurveTo) value, diagnostics, context); + return validateQuadraticCurveTo((QuadraticCurveTo)value, diagnostics, context); case DGPackage.GRADIENT: - return validateGradient((Gradient) value, diagnostics, context); + return validateGradient((Gradient)value, diagnostics, context); case DGPackage.GRADIENT_STOP: - return validateGradientStop((GradientStop) value, diagnostics, context); + return validateGradientStop((GradientStop)value, diagnostics, context); case DGPackage.IMAGE: - return validateImage((Image) value, diagnostics, context); + return validateImage((Image)value, diagnostics, context); case DGPackage.LINE: - return validateLine((Line) value, diagnostics, context); + return validateLine((Line)value, diagnostics, context); case DGPackage.MARKED_ELEMENT: - return validateMarkedElement((MarkedElement) value, diagnostics, context); + return validateMarkedElement((MarkedElement)value, diagnostics, context); case DGPackage.MARKER: - return validateMarker((Marker) value, diagnostics, context); + return validateMarker((Marker)value, diagnostics, context); case DGPackage.LINEAR_GRADIENT: - return validateLinearGradient((LinearGradient) value, diagnostics, context); + return validateLinearGradient((LinearGradient)value, diagnostics, context); case DGPackage.LINE_TO: - return validateLineTo((LineTo) value, diagnostics, context); + return validateLineTo((LineTo)value, diagnostics, context); case DGPackage.MATRIX: - return validateMatrix((Matrix) value, diagnostics, context); + return validateMatrix((Matrix)value, diagnostics, context); case DGPackage.PATH: - return validatePath((Path) value, diagnostics, context); + return validatePath((Path)value, diagnostics, context); case DGPackage.PATTERN: - return validatePattern((Pattern) value, diagnostics, context); + return validatePattern((Pattern)value, diagnostics, context); case DGPackage.POLYGON: - return validatePolygon((Polygon) value, diagnostics, context); + return validatePolygon((Polygon)value, diagnostics, context); case DGPackage.POLYLINE: - return validatePolyline((Polyline) value, diagnostics, context); + return validatePolyline((Polyline)value, diagnostics, context); case DGPackage.RADIAL_GRADIENT: - return validateRadialGradient((RadialGradient) value, diagnostics, context); + return validateRadialGradient((RadialGradient)value, diagnostics, context); case DGPackage.RECTANGLE: - return validateRectangle((Rectangle) value, diagnostics, context); + return validateRectangle((Rectangle)value, diagnostics, context); case DGPackage.ROOT_CANVAS: - return validateRootCanvas((RootCanvas) value, diagnostics, context); + return validateRootCanvas((RootCanvas)value, diagnostics, context); case DGPackage.ROTATE: - return validateRotate((Rotate) value, diagnostics, context); + return validateRotate((Rotate)value, diagnostics, context); case DGPackage.SCALE: - return validateScale((Scale) value, diagnostics, context); + return validateScale((Scale)value, diagnostics, context); case DGPackage.SKEW: - return validateSkew((Skew) value, diagnostics, context); + return validateSkew((Skew)value, diagnostics, context); case DGPackage.TEXT: - return validateText((Text) value, diagnostics, context); + return validateText((Text)value, diagnostics, context); case DGPackage.TRANSLATE: - return validateTranslate((Translate) value, diagnostics, context); + return validateTranslate((Translate)value, diagnostics, context); case DGPackage.USE: - return validateUse((Use) value, diagnostics, context); + return validateUse((Use)value, diagnostics, context); case DGPackage.FONT_DECORATION: - return validateFontDecoration((FontDecoration) value, diagnostics, context); + return validateFontDecoration((FontDecoration)value, diagnostics, context); case DGPackage.ELEMENT_KIND: - return validateElementKind((ElementKind) value, diagnostics, context); + return validateElementKind((ElementKind)value, diagnostics, context); case DGPackage.TEXT_ANCHOR: - return validateTextAnchor((TextAnchor) value, diagnostics, context); + return validateTextAnchor((TextAnchor)value, diagnostics, context); default: return true; } @@ -483,38 +441,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateCanvas(Canvas canvas, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(canvas, diagnostics, context)) { + if(!validate_NoCircularContainment(canvas, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(canvas, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(canvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateCanvas_canvasCannotHaveTransforms(canvas, diagnostics, context); } return result; @@ -536,35 +494,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateGroup(Group group, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(group, diagnostics, context)) { + if(!validate_NoCircularContainment(group, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(group, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(group, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(group, diagnostics, context); } return result; @@ -576,35 +534,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateGraphicalElement(GraphicalElement graphicalElement, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(graphicalElement, diagnostics, context)) { + if(!validate_NoCircularContainment(graphicalElement, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(graphicalElement, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(graphicalElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(graphicalElement, diagnostics, context); } return result; @@ -626,32 +584,32 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateDefinition(Definition definition, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(definition, diagnostics, context)) { + if(!validate_NoCircularContainment(definition, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(definition, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(definition, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(definition, diagnostics, context); } return result; @@ -673,35 +631,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateClipPath(ClipPath clipPath, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(clipPath, diagnostics, context)) { + if(!validate_NoCircularContainment(clipPath, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(clipPath, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(clipPath, diagnostics, context); } return result; @@ -713,44 +671,44 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateStyle(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(style, diagnostics, context)) { + if(!validate_NoCircularContainment(style, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(style, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateStyle_validFontSize(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateStyle_validFillOpacity(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateStyle_validStrokeWidth(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateStyle_validDashLengthSize(style, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateStyle_validStrokeOpacity(style, diagnostics, context); } return result; @@ -812,32 +770,32 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validatePaint(Paint paint, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(paint, diagnostics, context)) { + if(!validate_NoCircularContainment(paint, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(paint, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(paint, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validatePaint_referencedPaintServerHasId(paint, diagnostics, context); } return result; @@ -859,32 +817,32 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validatePaintServer(PaintServer paintServer, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(paintServer, diagnostics, context)) { + if(!validate_NoCircularContainment(paintServer, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(paintServer, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(paintServer, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(paintServer, diagnostics, context); } return result; @@ -932,35 +890,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateMarker(Marker marker, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(marker, diagnostics, context)) { + if(!validate_NoCircularContainment(marker, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(marker, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(marker, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(marker, diagnostics, context); } return result; @@ -999,38 +957,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateCircle(Circle circle, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(circle, diagnostics, context)) { + if(!validate_NoCircularContainment(circle, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(circle, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(circle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateCircle_nonNegativeRadius(circle, diagnostics, context); } return result; @@ -1061,35 +1019,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateEllipse(Ellipse ellipse, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(ellipse, diagnostics, context)) { + if(!validate_NoCircularContainment(ellipse, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(ellipse, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(ellipse, diagnostics, context); } return result; @@ -1119,32 +1077,32 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateGradient(Gradient gradient, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(gradient, diagnostics, context)) { + if(!validate_NoCircularContainment(gradient, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(gradient, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(gradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics, context); } return result; @@ -1156,35 +1114,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateGradientStop(GradientStop gradientStop, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(gradientStop, diagnostics, context)) { + if(!validate_NoCircularContainment(gradientStop, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(gradientStop, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGradientStop_validOffset(gradientStop, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGradientStop_validOpacity(gradientStop, diagnostics, context); } return result; @@ -1216,38 +1174,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateImage(Image image, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(image, diagnostics, context)) { + if(!validate_NoCircularContainment(image, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(image, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(image, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateImage_sourceCannotBeEmpty(image, diagnostics, context); } return result; @@ -1269,44 +1227,44 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateLine(Line line, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(line, diagnostics, context)) { + if(!validate_NoCircularContainment(line, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(line, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedStartMarkerHasId(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedMidMarkerHasId(line, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedEndMarkerHasId(line, diagnostics, context); } return result; @@ -1318,44 +1276,44 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateMarkedElement(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(markedElement, diagnostics, context)) { + if(!validate_NoCircularContainment(markedElement, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(markedElement, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedStartMarkerHasId(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedMidMarkerHasId(markedElement, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedEndMarkerHasId(markedElement, diagnostics, context); } return result; @@ -1397,35 +1355,35 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateLinearGradient(LinearGradient linearGradient, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(linearGradient, diagnostics, context)) { + if(!validate_NoCircularContainment(linearGradient, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(linearGradient, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(linearGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateLinearGradient_validGradientVector(linearGradient, diagnostics, context); } return result; @@ -1474,47 +1432,47 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validatePath(Path path, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(path, diagnostics, context)) { + if(!validate_NoCircularContainment(path, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(path, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedStartMarkerHasId(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedMidMarkerHasId(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedEndMarkerHasId(path, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validatePath_firstCommandMustBeMove(path, diagnostics, context); } return result; @@ -1536,32 +1494,32 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validatePattern(Pattern pattern, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(pattern, diagnostics, context)) { + if(!validate_NoCircularContainment(pattern, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(pattern, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(pattern, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics, context); } return result; @@ -1573,44 +1531,44 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validatePolygon(Polygon polygon, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(polygon, diagnostics, context)) { + if(!validate_NoCircularContainment(polygon, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(polygon, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedStartMarkerHasId(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedMidMarkerHasId(polygon, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedEndMarkerHasId(polygon, diagnostics, context); } return result; @@ -1622,44 +1580,44 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validatePolyline(Polyline polyline, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(polyline, diagnostics, context)) { + if(!validate_NoCircularContainment(polyline, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(polyline, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedStartMarkerHasId(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedMidMarkerHasId(polyline, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateMarkedElement_referencedEndMarkerHasId(polyline, diagnostics, context); } return result; @@ -1671,41 +1629,41 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateRadialGradient(RadialGradient radialGradient, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(radialGradient, diagnostics, context)) { + if(!validate_NoCircularContainment(radialGradient, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(radialGradient, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateRadialGradient_validCenterPoint(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateRadialGradient_validFocusPoint(radialGradient, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateRadialGradient_validRadius(radialGradient, diagnostics, context); } return result; @@ -1747,38 +1705,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateRectangle(Rectangle rectangle, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(rectangle, diagnostics, context)) { + if(!validate_NoCircularContainment(rectangle, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(rectangle, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(rectangle, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateRectangle_nonNegativeCornerRadius(rectangle, diagnostics, context); } return result; @@ -1800,38 +1758,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateRootCanvas(RootCanvas rootCanvas, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(rootCanvas, diagnostics, context)) { + if(!validate_NoCircularContainment(rootCanvas, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(rootCanvas, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(rootCanvas, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas, diagnostics, context); } return result; @@ -1852,32 +1810,32 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateScale(Scale scale, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(scale, diagnostics, context)) { + if(!validate_NoCircularContainment(scale, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(scale, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(scale, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateScale_nonnegativescale(scale, diagnostics, context); } return result; @@ -1908,38 +1866,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateText(Text text, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(text, diagnostics, context)) { + if(!validate_NoCircularContainment(text, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(text, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(text, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateText_dataCannotBeEmpty(text, diagnostics, context); } return result; @@ -1970,38 +1928,38 @@ public class DGValidator extends EObjectValidator { * @generated */ public boolean validateUse(Use use, DiagnosticChain diagnostics, Map<Object, Object> context) { - if (!validate_NoCircularContainment(use, diagnostics, context)) { + if(!validate_NoCircularContainment(use, diagnostics, context)) { return false; } boolean result = validate_EveryMultiplicityConforms(use, diagnostics, context); - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryDataValueConforms(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryReferenceIsContained(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryBidirectionalReferenceIsPaired(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryProxyResolves(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_UniqueID(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryKeyUnique(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validate_EveryMapEntryUnique(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateDefinition_idCannotBeEmpty(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateGraphicalElement_referencedClippathHasId(use, diagnostics, context); } - if (result || diagnostics != null) { + if(result || diagnostics != null) { result &= validateUse_referencedElementHasId(use, diagnostics, context); } return result; |