Formatted for slides
diff --git a/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/States.xtext b/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/States.xtext
index b6f7eb1..2f0ddee 100644
--- a/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/States.xtext
+++ b/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/States.xtext
@@ -12,39 +12,22 @@
*
* </copyright>
*
- * $Id: States.xtext,v 1.2 2011/03/12 22:29:41 ewillink Exp $
+ * $Id: States.xtext,v 1.3 2011/03/13 16:24:24 ewillink Exp $
*/
-grammar org.eclipse.ocl.tutorial.eclipsecon2011.States with org.eclipse.xtext.common.Terminals
-
+grammar org.eclipse.ocl.tutorial.eclipsecon2011.States
+ with org.eclipse.xtext.common.Terminals
generate states "http://ocl.eclipse.org/tutorial/eclipsecon2011/States"
-
-Module:
- 'module' name=STRING
- (machines+=Statemachine)*
-;
-
-Statemachine:
- (initial?='initial')? 'statemachine' name=ID ('value' value=INT)? '{'
- 'events' (events+=Event)* ';'
- (states+=State)* '}'
-;
-
-Event:
- name=ID;
-
-State: SimpleState | CompoundState;
-
-SimpleState:
- (initial?='initial')? 'state' name=ID ('value' value=INT)?
- '{' (transitions+=Transition)* '}'
-;
-
-CompoundState:
- 'compound' (initial?='initial')? 'state' name=ID
- 'machine' machine=[Statemachine]
- '{' (transitions+=Transition)* '}'
-;
-
-Transition:
- event=[Event] '=>' state=[State]
-;
+Module: 'module' name=STRING
+ (machines+=Statemachine)*;
+Statemachine: (initial?='initial')? 'statemachine' name=ID
+ ('value' value=INT)? '{'
+ 'events' (events+=Event)* ';'
+ (states+=State)* '}';
+Event: name=ID;
+State: SimpleState | CompoundState;
+SimpleState: (initial?='initial')? 'state' name=ID ('value' value=INT)?
+ '{' (transitions+=Transition)* '}';
+CompoundState: 'compound' (initial?='initial')? 'state' name=ID
+ 'machine' machine=[Statemachine]
+ '{' (transitions+=Transition)* '}';
+Transition: event=[Event] '=>' state=[State];
diff --git a/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/validation/StatesJavaValidator.java b/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/validation/StatesJavaValidator.java
index c9fdc3c..c9099aa 100644
--- a/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/validation/StatesJavaValidator.java
+++ b/docs/publications/EclipseCon2011Tutorial/org.eclipse.ocl.tutorial.eclipsecon2011.states/src/org/eclipse/ocl/tutorial/eclipsecon2011/validation/StatesJavaValidator.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: StatesJavaValidator.java,v 1.1 2011/03/12 20:46:06 ewillink Exp $
+ * $Id: StatesJavaValidator.java,v 1.2 2011/03/13 16:24:24 ewillink Exp $
*/
package org.eclipse.ocl.tutorial.eclipsecon2011.validation;
@@ -20,15 +20,16 @@
import org.eclipse.ocl.examples.xtext.completeocl.validation.CompleteOCLEObjectValidator;
import org.eclipse.ocl.tutorial.eclipsecon2011.states.StatesPackage;
import org.eclipse.xtext.validation.EValidatorRegistrar;
-
public class StatesJavaValidator extends AbstractStatesJavaValidator
{
- @Override
- public void register(EValidatorRegistrar registrar) {
- super.register(registrar);
- StatesPackage ePackage = StatesPackage.eINSTANCE;
- URI oclURI = URI.createPlatformResourceURI("/org.eclipse.ocl.tutorial.eclipsecon2011.states.ocl/model/States.ocl", true);
- registrar.register(ePackage, new CompleteOCLEObjectValidator(ePackage, oclURI));
- }
+ @Override
+ public void register(EValidatorRegistrar registrar) {
+ super.register(registrar);
+ StatesPackage ePackage = StatesPackage.eINSTANCE;
+ URI oclURI = URI.createPlatformResourceURI(
+ "/org.eclipse.ocl.tutorial.eclipsecon2011.states.ocl/model/States.ocl", true);
+ registrar.register(ePackage,
+ new CompleteOCLEObjectValidator(ePackage, oclURI));
+ }
}
