update copyrights
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLDefinedKeywordCompletionTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLDefinedKeywordCompletionTool.java
index 655dd46..506fc47 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLDefinedKeywordCompletionTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLDefinedKeywordCompletionTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLFlex2EGLKeywordTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLFlex2EGLKeywordTool.java
index 116e419..dfcb7ab 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLFlex2EGLKeywordTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLFlex2EGLKeywordTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordHashSetTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordHashSetTool.java
index e8dd1ea..4d9e5d9 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordHashSetTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordHashSetTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordTool.java
index 6cbb67e..5f00543 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLKeywordTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLMnemonicTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLMnemonicTool.java
index cdc4be0..537c46b 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLMnemonicTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLMnemonicTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertiesTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertiesTool.java
index f0f2a4a..7ebf1fb 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertiesTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertiesTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertyEnumerator.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertyEnumerator.java
index c104a08..fdbc9f4 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertyEnumerator.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLPropertyEnumerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSQLKeywordTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSQLKeywordTool.java
index 7e73cda..e782044 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSQLKeywordTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSQLKeywordTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSystemWordTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSystemWordTool.java
index 84a8a87..e1a6b41 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSystemWordTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/EGLSystemWordTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsPropertiesToJavaTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsPropertiesToJavaTool.java
index ce3a0ea..8182f51 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsPropertiesToJavaTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsPropertiesToJavaTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsTool.java b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsTool.java
index 9d8b1af..df1121a 100644
--- a/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsTool.java
+++ b/core/org.eclipse.edt.compiler/developmentTools/org/eclipse/edt/compiler/dev/tools/NLSStringsTool.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ClassType.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ClassType.egl
index 565ba71..3c6b20f 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ClassType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ClassType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,4 +20,4 @@
 	name string;
 	isAbstract boolean;
 	typeParameters string[];
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Containment.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Containment.egl
index 82ef275..08e55ca 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Containment.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Containment.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Dynamic.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Dynamic.egl
index e27b591..cd2b378 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Dynamic.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Dynamic.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/EClassProxy.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/EClassProxy.egl
index 3c96b2f..3daab38 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/EClassProxy.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/EClassProxy.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,4 +18,4 @@
 	@PartType{"org.eclipse.edt.mof.egl.EClassProxy"}
 }
 	proxiedEClassName String;
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/InterfacePartType.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/InterfacePartType.egl
index e105588..fede624 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/InterfacePartType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/InterfacePartType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,4 +19,4 @@
 }
 	name string;
 	typeParameters string[];
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/MofClass.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/MofClass.egl
index 220a57d..a7dce0b 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/MofClass.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/MofClass.egl
@@ -1,26 +1,26 @@
-/*******************************************************************************

- * Copyright © 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package egl.lang.reflect;

-

-import egl.lang.reflect.PartType;

-

-Record MofClass type Stereotype {

-	targets = [ElementKind.ExternalTypePart],

-	@PartType{"org.eclipse.edt.mof.EClass"}

-}

-	packageName String;

-	name string;

-	isAbstract boolean;

-	isInterface boolean;

-	typeParameters string[];

-	isProxy boolean;

-end
\ No newline at end of file
+/*******************************************************************************
+ * Copyright © 2012, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package egl.lang.reflect;
+
+import egl.lang.reflect.PartType;
+
+Record MofClass type Stereotype {
+	targets = [ElementKind.ExternalTypePart],
+	@PartType{"org.eclipse.edt.mof.EClass"}
+}
+	packageName String;
+	name string;
+	isAbstract boolean;
+	isInterface boolean;
+	typeParameters string[];
+	isProxy boolean;
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/NoReflect.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/NoReflect.egl
index 3782bd2..2b0edc4 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/NoReflect.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/NoReflect.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Operation.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Operation.egl
index bfe8366..6606da5 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Operation.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/Operation.egl
@@ -1,18 +1,18 @@
-/*******************************************************************************

- * Copyright © 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package egl.lang.reflect;

-

-record Operation type Annotation {

-	targets=[ElementKind.FunctionMbr]

-}

-	opSymbol string;

-end

+/*******************************************************************************
+ * Copyright © 2012, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package egl.lang.reflect;
+
+record Operation type Annotation {
+	targets=[ElementKind.FunctionMbr]
+}
+	opSymbol string;
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ParameterizableType.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ParameterizableType.egl
index 8a064a1..7d04673 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ParameterizableType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ParameterizableType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,4 +19,4 @@
 }
 	name string;
 	parameterizedType egl.lang.reflect.TypeType;
-end 
\ No newline at end of file
+end 
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/PartType.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/PartType.egl
index e94e373..5cab36d 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/PartType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/PartType.egl
@@ -1,18 +1,18 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package egl.lang.reflect;

-

-Record PartType type Annotation {

-	targets = [ElementKind.RecordPart]

-}

-	value string;

-end
\ No newline at end of file
+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package egl.lang.reflect;
+
+Record PartType type Annotation {
+	targets = [ElementKind.RecordPart]
+}
+	value string;
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ProxyTypes.egl b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ProxyTypes.egl
index 36715bd..9573002 100644
--- a/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ProxyTypes.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/egl/lang/reflect/ProxyTypes.egl
@@ -1,188 +1,188 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package egl.lang.reflect;

-

-// Part types

-externalType TypeType type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Type"

-}

-end

-

-externalType Part type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Part"

-}

-end

-

-externalType ClassPart extends Part type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.EGLClass"

-}

-end

-

-externalType RecordPart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Record"

-}

-end

-

-externalType DelegatePart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Delegate"

-}

-end

-

-externalType HandlerPart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Handler"

-}

-end

-

-externalType ProgramPart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Program"

-}

-end

-

-externalType LibraryPart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Library"

-}

-end

-

-externalType InterfacePart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Interface"

-}

-end

-

-externalType ServicePart extends ClassPart type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Service"

-}

-end

-

-// Members

-externalType Member type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Member"

-}

-end

-

-externalType FieldMbr extends Member type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Field"

-}

-end

-

-externalType FunctionMbr extends Member type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Function"

-}

-end

-

-externalType ConstructorMbr extends Member type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Constructor"

-}

-end

-

-externalType SequenceType type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.SequenceType"

-}

-end

-

-externalType FixedPrecisionType type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.FixedPrecisionType"

-}

-end

-

-externalType TimestampType type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.TimestampType"

-}

-end

-

-externalType IntervalType type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.IntervalType"

-}

-end

-

-externalType CallStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.CallStatement"

-}

-end

-

-externalType AddStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.AddStatement"

-}

-end

-

-externalType CloseStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.CloseStatement"

-}

-end

-

-externalType DeleteStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.DeleteStatement"

-}

-end

-

-externalType ExecuteStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.ExecuteStatement"

-}

-end

-

-externalType Expression type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.Expression"

-}

-end

-

-externalType ForEachStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.ForEachStatement"

-}

-end

-

-externalType GetByKeyStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.GetByKeyStatement"

-}

-end

-

-externalType IOStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.IOStatement"

-}

-end

-

-externalType OpenStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.OpenStatement"

-}

-end

-

-externalType PrepareStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.PrepareStatement"

-}

-end

-

-externalType ReplaceStatement type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.ReplaceStatement"

-}

-end

-

-externalType FunctionReference type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.FunctionReference"

-}

-end

-

-externalType FieldReference type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.FieldReference"

-}

-end

-

-externalType MemberReference type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.MemberReference"

-}

-end

-

-externalType PartReference type EClassProxy {

-	proxiedEClassName = "org.eclipse.edt.mof.egl.PartReference"

-}

-end

-

-

-

-

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package egl.lang.reflect;
+
+// Part types
+externalType TypeType type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Type"
+}
+end
+
+externalType Part type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Part"
+}
+end
+
+externalType ClassPart extends Part type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.EGLClass"
+}
+end
+
+externalType RecordPart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Record"
+}
+end
+
+externalType DelegatePart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Delegate"
+}
+end
+
+externalType HandlerPart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Handler"
+}
+end
+
+externalType ProgramPart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Program"
+}
+end
+
+externalType LibraryPart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Library"
+}
+end
+
+externalType InterfacePart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Interface"
+}
+end
+
+externalType ServicePart extends ClassPart type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Service"
+}
+end
+
+// Members
+externalType Member type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Member"
+}
+end
+
+externalType FieldMbr extends Member type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Field"
+}
+end
+
+externalType FunctionMbr extends Member type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Function"
+}
+end
+
+externalType ConstructorMbr extends Member type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Constructor"
+}
+end
+
+externalType SequenceType type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.SequenceType"
+}
+end
+
+externalType FixedPrecisionType type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.FixedPrecisionType"
+}
+end
+
+externalType TimestampType type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.TimestampType"
+}
+end
+
+externalType IntervalType type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.IntervalType"
+}
+end
+
+externalType CallStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.CallStatement"
+}
+end
+
+externalType AddStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.AddStatement"
+}
+end
+
+externalType CloseStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.CloseStatement"
+}
+end
+
+externalType DeleteStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.DeleteStatement"
+}
+end
+
+externalType ExecuteStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.ExecuteStatement"
+}
+end
+
+externalType Expression type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.Expression"
+}
+end
+
+externalType ForEachStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.ForEachStatement"
+}
+end
+
+externalType GetByKeyStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.GetByKeyStatement"
+}
+end
+
+externalType IOStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.IOStatement"
+}
+end
+
+externalType OpenStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.OpenStatement"
+}
+end
+
+externalType PrepareStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.PrepareStatement"
+}
+end
+
+externalType ReplaceStatement type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.ReplaceStatement"
+}
+end
+
+externalType FunctionReference type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.FunctionReference"
+}
+end
+
+externalType FieldReference type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.FieldReference"
+}
+end
+
+externalType MemberReference type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.MemberReference"
+}
+end
+
+externalType PartReference type EClassProxy {
+	proxiedEClassName = "org.eclipse.edt.mof.egl.PartReference"
+}
+end
+
+
+
+
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/java/Exceptions.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/java/Exceptions.egl
index 4968bad..4309590 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/java/Exceptions.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/java/Exceptions.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,4 +15,4 @@
 
 Record JavaObjectException type Exception
 	exceptionType string;
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/java/JavaObject.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/java/JavaObject.egl
index be1fc61..121f409 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/java/JavaObject.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/java/JavaObject.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Exceptions.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Exceptions.egl
index 32de34f..4726dad 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Exceptions.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Exceptions.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,4 +15,4 @@
 
 Record JavaScriptObjectException type Exception
 	name String;
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/JavaScriptObject.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/JavaScriptObject.egl
index 750c05d..ee6f86f 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/JavaScriptObject.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/JavaScriptObject.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Job.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Job.egl
index be9f9ad..a9161d1 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Job.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/javascript/Job.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonLib.egl
index 63c3e10..5258058 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonName.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonName.egl
index 04378cc..112ba36 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonName.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/json/JsonName.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Annotations.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Annotations.egl
index 61e367f..92173c8 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Annotations.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Annotations.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyDelegate.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyDelegate.egl
index 11e7b06..d5dc7c4 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyDelegate.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyDelegate.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyEnumeration.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyEnumeration.egl
index 8b6f3b8..69acda6 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyEnumeration.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyEnumeration.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyException.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyException.egl
index 7900f68..84aee06 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyException.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyException.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyRecord.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyRecord.egl
index 8a3a9a9..b340d55 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyRecord.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyRecord.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyStruct.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyStruct.egl
index 3abebbd..37e9fed 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyStruct.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyStruct.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyText.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyText.egl
index 9398cff..ee47ddb 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyText.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyText.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyValue.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyValue.egl
index 9eb6b71..e03b520 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyValue.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/AnyValue.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Constants.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Constants.egl
index 5ca3f09..4c21b25 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Constants.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Constants.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,4 +24,4 @@
     const db2TimeStampFormat string = 	"yyyy-MM-dd-HH.mm.ss.SSSSSS";
     const odbcTimeStampFormat string = 	"yyyy-MM-dd HH:mm:ss.SSSSSS";
 
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/DateTimeLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/DateTimeLib.egl
index 69ef1ed..fb06628 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/DateTimeLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/DateTimeLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -59,4 +59,4 @@
 	 * @return a new date.
 	 */
 	static function mdy(monthValue int in, dayValue int in, yearValue int in) returns(date);
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EAny.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EAny.egl
index 9db1c5d..decf44d 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EAny.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EAny.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBigint.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBigint.egl
index 89d9134..cfe1084 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBigint.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBigint.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -156,4 +156,4 @@
 	 * {@Operation widen} Converts a bigint to a number.
 	 */
 	static function asNumber(value EBigint? in) returns(ENumber?) {@Operation{"widen"}};
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBoolean.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBoolean.egl
index 3916395..8e27223 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBoolean.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBoolean.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -52,4 +52,4 @@
 	 * {@Operation !} Negates a boolean.
 	 */
 	static function $NOT(value EBoolean in) returns (EBoolean) {@Operation{"!"}};
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBytes.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBytes.egl
index 5f784a1..38e71c1 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBytes.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EBytes.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDate.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDate.egl
index 04aa609..440706b 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDate.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDate.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -123,4 +123,4 @@
 	 * @return the year portion of this date field.
 	 */
 	function yearOf() returns(EInt);
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDecimal.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDecimal.egl
index bdfd86a..f336887 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDecimal.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDecimal.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDictionary.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDictionary.egl
index 5387b32..a9351a1 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDictionary.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EDictionary.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -120,4 +120,4 @@
 	byKey = 1,
 	byInsertion = 2,
 	none = 3
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EFloat.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EFloat.egl
index 9fb7d39..0c5b327 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EFloat.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EFloat.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EInt.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EInt.egl
index 609f9d0..b47bbeb 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EInt.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EInt.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EList.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EList.egl
index 44a9a6f..70b650f 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EList.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EList.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -165,4 +165,4 @@
  */
 Delegate
 	SortFunction(a any in, b any in) returns (int)
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ENumber.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ENumber.egl
index 13243d8..57d3379 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ENumber.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ENumber.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallfloat.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallfloat.egl
index bb952a8..2b7d74d 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallfloat.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallfloat.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -118,4 +118,4 @@
 	 * @throws TypeCastException if the bytes are not valid format for a smallfloat.
 	 */
 	static function asSmallfloat(value EBytes? in) returns(ESmallfloat?) {@Operation{"narrow"}};
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallint.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallint.egl
index ff57160..461937c 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallint.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ESmallint.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -201,4 +201,4 @@
 	 * @throws TypeCastException if the bytes are not valid format for a smallint.
 	 */
 	static function asSmallint(value EBytes? in) returns(ESmallint?) {@Operation{"narrow"}};
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EString.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EString.egl
index 08c8f38..ebf0988 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EString.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/EString.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETime.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETime.egl
index 32ef828..818f44e 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETime.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETime.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,4 +86,4 @@
 	 * @return a new timestamp.
 	 */
 	function extend(timeSpanMask EString in) returns(ETimestamp);
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETimestamp.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETimestamp.egl
index a260b1a..b44d27a 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETimestamp.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/ETimestamp.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -160,4 +160,4 @@
 	 * @throws InvalidArgumentException if the mask is not valid.
 	 */
 	function extend(timeSpanMask EString in) returns(ETimestamp);
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Exceptions.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Exceptions.egl
index 6daeebd..1c3f010 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Exceptions.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Exceptions.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/MathLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/MathLib.egl
index 33d8546..09b9481 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/MathLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/MathLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NativeType.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NativeType.egl
index b6e28c2..468cff4 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NativeType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NativeType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NullType.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NullType.egl
index e95529e..c655c71 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NullType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/NullType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -18,4 +18,4 @@
  */
 externalType NullType extends EAny type ClassType
 
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resource.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resource.egl
index 89609f4..25e9a90 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resource.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resource.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,4 +17,4 @@
 //	targetTypes = [InterfacePart, ServicePart]
 }
   	uri string;
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resources.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resources.egl
index 7f7cf07..b7f91ea 100755
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resources.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Resources.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,4 +15,4 @@
 
 externalType Resources type NativeType
 	static function getResource(uri string const in)returns(any);
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Stereotypes.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Stereotypes.egl
index ef98dc4..8a4fc31 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Stereotypes.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/Stereotypes.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/StringLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/StringLib.egl
index 43d20a4..1f35c5d 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/StringLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/StringLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -139,4 +139,4 @@
 	 * @return a string of spaces.
 	 */
 	static function spaces(characterCount int in) returns(string);
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/SysLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/SysLib.egl
index 39325da..81b37f5 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/lang/SysLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/lang/SysLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/DataSource.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/DataSource.egl
index dc8d782..1d751ee 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/DataSource.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/DataSource.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,4 +14,4 @@
 
 externalType DataSource type NativeType
 	private constructor();
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Entity.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Entity.egl
index eac42c1..2c9b5af 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Entity.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Entity.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,4 +14,4 @@
 record Entity type Stereotype {
 	targets=[ExternalTypePart, RecordPart, HandlerPart]
 }
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Id.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Id.egl
index 5492967..707b7f5 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Id.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Id.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,4 +14,4 @@
 record Id type Annotation {
 	targets=[FieldMbr]
 }
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToMany.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToMany.egl
index 9e8042c..d61d500 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToMany.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToMany.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,4 +16,4 @@
 //}
 //	mappedBy egl.lang.reflect.FieldReference?;
 //	joinTable egl.lang.reflect.PartReference[]?;
-//end
\ No newline at end of file
+//end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToOne.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToOne.egl
index d1aa039..3ae0079 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToOne.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ManyToOne.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,4 +16,4 @@
 //}
 //	fk_field egl.lang.reflect.FieldReference?;
 //	fk_fields egl.lang.reflect.FieldReference[];
-//end
\ No newline at end of file
+//end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToMany.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToMany.egl
index 8bc1fe3..45d479b 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToMany.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToMany.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,4 +16,4 @@
 //}
 //	mappedBy egl.lang.reflect.FieldReference?;
 //	joinColumns egl.lang.reflect.FieldReference[];
-//end
\ No newline at end of file
+//end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToOne.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToOne.egl
index 8fc8de9..34f840d 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToOne.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/OneToOne.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,4 +16,4 @@
 //}
 //	mappedBy egl.lang.reflect.FieldReference?;
 //	joinColumns egl.lang.reflect.FieldReference[];
-//end
\ No newline at end of file
+//end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ScrollableDataSource.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ScrollableDataSource.egl
index 9a12671..ca1e1db 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ScrollableDataSource.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/ScrollableDataSource.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,4 +26,4 @@
 	
 	function isFirst() returns (boolean);
 	function isLast() returns (boolean); 
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Transient.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Transient.egl
index 0e743ae..5439de2 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Transient.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/persistence/Transient.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,4 +14,4 @@
 record Transient type Annotation {
 	targets=[FieldMbr]
 }
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/rbd/StrLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/rbd/StrLib.egl
index c5ea930..9973b7b 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/rbd/StrLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/rbd/StrLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/ui/Enumerations.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/ui/Enumerations.egl
index c98b129..6097845 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/ui/Enumerations.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/ui/Enumerations.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/XmlLib.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/XmlLib.egl
index 7eb77e5..6bb7ae4 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/XmlLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/XmlLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLArray.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLArray.egl
index 331afe6..35130f7 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLArray.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLArray.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLAttribute.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLAttribute.egl
index 2a9a56f..8f2b5b5 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLAttribute.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLAttribute.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLElement.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLElement.egl
index dbd803d..7355f75 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLElement.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLElement.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLRootElement.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLRootElement.egl
index 34159bc..6e6b685 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLRootElement.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLRootElement.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLSchemaType.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLSchemaType.egl
index 8d89986..cccf5db 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLSchemaType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLSchemaType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,4 +15,4 @@
 { targets = [ ElementKind.fieldMbr ]}
   name string;
   namespace string?= "http://www.w3.org/2001/XMLSchema";
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLStructureKind.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLStructureKind.egl
index 6008288..ce6153a 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLStructureKind.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLStructureKind.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLType.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLType.egl
index 33fe444..c764e08 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLType.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLType.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLValue.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLValue.egl
index bd00959..eb6ef15 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLValue.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XMLValue.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,4 +20,4 @@
 	]
 }
 	kind XMLStructureKind = XMLStructureKind.simpleContent;
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XmlJavaTypeAdapter.egl b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XmlJavaTypeAdapter.egl
index 50a1348..4ed6c2c 100644
--- a/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XmlJavaTypeAdapter.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/eglx/xml/binding/annotation/XmlJavaTypeAdapter.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,4 +15,4 @@
 { targets = [ ElementKind.fieldMbr ]}
   value string;
   _type string? = null;
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/ConstantsLib.egl b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/ConstantsLib.egl
index db67be3..f919cd1 100644
--- a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/ConstantsLib.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/ConstantsLib.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/LogResult.egl b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/LogResult.egl
index 87ab128..409fdf3 100644
--- a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/LogResult.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/LogResult.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -348,4 +348,4 @@
         end
         return(aFloat);
     end
-end
\ No newline at end of file
+end
diff --git a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/MultiStatus.egl b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/MultiStatus.egl
index 7873544..70a46c1 100644
--- a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/MultiStatus.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/MultiStatus.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/TestListMgr.egl b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/TestListMgr.egl
index 306b9f8..9402485 100644
--- a/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/TestListMgr.egl
+++ b/core/org.eclipse.edt.compiler/eglsource/org/eclipse/edt/eunit/runtime/TestListMgr.egl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/plugin.properties b/core/org.eclipse.edt.compiler/plugin.properties
index 20dcf22..5abea9c 100644
--- a/core/org.eclipse.edt.compiler/plugin.properties
+++ b/core/org.eclipse.edt.compiler/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright © 2011, 2012 IBM Corporation and others.
+# Copyright © 2011, 2013 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/java_cup/runtime/Scanner.java b/core/org.eclipse.edt.compiler/src/java_cup/runtime/Scanner.java
index b07be0d..fd76eb3 100644
--- a/core/org.eclipse.edt.compiler/src/java_cup/runtime/Scanner.java
+++ b/core/org.eclipse.edt.compiler/src/java_cup/runtime/Scanner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/java_cup/runtime/Symbol.java b/core/org.eclipse.edt.compiler/src/java_cup/runtime/Symbol.java
index dcaee35..49112fe 100644
--- a/core/org.eclipse.edt.compiler/src/java_cup/runtime/Symbol.java
+++ b/core/org.eclipse.edt.compiler/src/java_cup/runtime/Symbol.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/java_cup/runtime/lr_parser.java b/core/org.eclipse.edt.compiler/src/java_cup/runtime/lr_parser.java
index b5136a3..ae49b52 100644
--- a/core/org.eclipse.edt.compiler/src/java_cup/runtime/lr_parser.java
+++ b/core/org.eclipse.edt.compiler/src/java_cup/runtime/lr_parser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/java_cup/runtime/virtual_parse_stack.java b/core/org.eclipse.edt.compiler/src/java_cup/runtime/virtual_parse_stack.java
index 1dcb5e5..0eac2a0 100644
--- a/core/org.eclipse.edt.compiler/src/java_cup/runtime/virtual_parse_stack.java
+++ b/core/org.eclipse.edt.compiler/src/java_cup/runtime/virtual_parse_stack.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ASTValidator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ASTValidator.java
index 5e6d721..69b45ca 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ASTValidator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ASTValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractGenerator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractGenerator.java
index 2c56bdb..c468d30 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractGenerator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractProcessingQueue.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractProcessingQueue.java
index 6323c0c..07e1f8c 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractProcessingQueue.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/AbstractProcessingQueue.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompiler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompiler.java
index ee7ccb2..4cb303c 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompiler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompiler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompilerExtension.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompilerExtension.java
index cd31f2d..2b30210 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompilerExtension.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/BaseCompilerExtension.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Context.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Context.java
index f185de6..1d2a97d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Context.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Context.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EDTCompiler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EDTCompiler.java
index 376606a..519ee6f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EDTCompiler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EDTCompiler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IRArgumentProcessor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IRArgumentProcessor.java
index 3d5b736..1564c0f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IRArgumentProcessor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IRArgumentProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IREnvironment.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IREnvironment.java
index f910bc9..e766429 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IREnvironment.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EGL2IREnvironment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2005, 2012 IBM Corporation and others.
+ * Copyright © 2005, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EglarBuildPathEntry.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EglarBuildPathEntry.java
index 2261362..9f6aeb9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EglarBuildPathEntry.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/EglarBuildPathEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/FunctionValidator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/FunctionValidator.java
index e1ebfed..4a60d02 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/FunctionValidator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/FunctionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompiler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompiler.java
index fcc69d3..6544f4e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompiler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompiler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompilerExtension.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompilerExtension.java
index f1aa62f..80dac00 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompilerExtension.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ICompilerExtension.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/IGenerator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/IGenerator.java
index ed3e3bc..da31274 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/IGenerator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/IGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/MofarBuildPathEntry.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/MofarBuildPathEntry.java
index 683a58d..359feec 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/MofarBuildPathEntry.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/MofarBuildPathEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartEnvironmentStack.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartEnvironmentStack.java
index 0d1ea21..533c032 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartEnvironmentStack.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartEnvironmentStack.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler;
 
 import java.util.Stack;
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartValidator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartValidator.java
index 91e2b04..fd00cff 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartValidator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/PartValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Processor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Processor.java
index ea45a50..9e56512 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Processor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Processor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/RBDCompiler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/RBDCompiler.java
index ec40c8c..f6c0485 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/RBDCompiler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/RBDCompiler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SDKContext.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SDKContext.java
index 63a8116..37cf378 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SDKContext.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SDKContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/StatementValidator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/StatementValidator.java
index 4dbbfce..bd4b8da 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/StatementValidator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/StatementValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SystemLibraryUtil.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SystemLibraryUtil.java
index 4594949..fb81dc5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SystemLibraryUtil.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/SystemLibraryUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/TypeValidator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/TypeValidator.java
index f1ceee3..9b21da3 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/TypeValidator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/TypeValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Util.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Util.java
index 8f06b4a..3d8df47 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Util.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/Util.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ZipFileBindingBuildPathEntry.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ZipFileBindingBuildPathEntry.java
index 3a33ff6..4ec60b7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ZipFileBindingBuildPathEntry.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/ZipFileBindingBuildPathEntry.java
@@ -1,205 +1,205 @@
-/*******************************************************************************

- * Copyright © 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.edt.compiler.binding.IPartBinding;

-import org.eclipse.edt.compiler.binding.IRPartBinding;

-import org.eclipse.edt.compiler.binding.ITypeBinding;

-import org.eclipse.edt.compiler.internal.core.builder.BuildException;

-import org.eclipse.edt.compiler.internal.core.lookup.IEnvironment;

-import org.eclipse.edt.compiler.internal.core.lookup.IZipFileBindingBuildPathEntry;

-import org.eclipse.edt.compiler.internal.io.ZipFileBuildPathEntry;

-import org.eclipse.edt.compiler.internal.util.BindingUtil;

-import org.eclipse.edt.mof.EObject;

-import org.eclipse.edt.mof.egl.Part;

-import org.eclipse.edt.mof.egl.PartNotFoundException;

-import org.eclipse.edt.mof.serialization.CachingObjectStore;

-import org.eclipse.edt.mof.serialization.DeserializationException;

-import org.eclipse.edt.mof.serialization.IZipFileEntryManager;

-import org.eclipse.edt.mof.serialization.ObjectStore;

-

-public abstract class ZipFileBindingBuildPathEntry extends ZipFileBuildPathEntry implements IZipFileBindingBuildPathEntry, IZipFileEntryManager{

-

-	private ObjectStore store;

-	private String fileExtension;

-	

-	public ZipFileBindingBuildPathEntry(String path, String fileExtension) {

-		super(path);

-		this.fileExtension = fileExtension;

-		processEntries();

-	}

-

-

-	private Map<String, Map<String, IRPartBinding>> partBindingsByPackage = new HashMap<String, Map<String,IRPartBinding>>();

-	

-	protected abstract IEnvironment getEnvironment();

-	

-	public void clear(){

-		super.clear();

-		partBindingsByPackage.clear();

-		

-		if (store instanceof CachingObjectStore) {

-			((CachingObjectStore)store).clearCache();

-		}

-	}

-

-	public IPartBinding getPartBinding(String packageName,String partName){

-		IPartBinding partBinding = getCachedPartBinding(packageName,partName);

-		

-		if (partBinding == null){

-			partBinding = getPartBinding(getEntry(packageName,partName));

-		}

-

-		return partBinding;

-	}

-	

-	public IRPartBinding getCachedPartBinding(String packageName,String partName){

-		IRPartBinding partBinding = null;

-		if (packageName == null){

-			packageName = "";

-		}

-

-		Map<String, IRPartBinding> partpackage = partBindingsByPackage.get(packageName);

-		if (partpackage != null){

-			partBinding = partpackage.get(partName);

-		}

-		

-		return partBinding;

-	}

-	

-	public boolean isProject(){

-		return false;

-	}

-

-	public int hasPart(String packageName,String partName){

-		IPartBinding partBinding = getPartBinding(packageName,partName);

-		if (partBinding != null){

-			return partBinding.getKind();

-		}

-		

-		return ITypeBinding.NOT_FOUND_BINDING;

-	}

-	

-	public Part findPart(String packageName, String partName) throws PartNotFoundException {

-		if (hasPart(packageName, partName) != ITypeBinding.NOT_FOUND_BINDING) {

-			EObject obj = getPartObject(getEntry(packageName, partName));

-			if (obj instanceof Part) {

-				return (Part)obj;

-			}

-		}

-		return null;

-	}

-	

-	protected Map<String, IRPartBinding> getPackagePartBinding(String packageName) {

-		if (packageName == null) {

-			packageName = "";

-		}

-		

-		Map<String, IRPartBinding> map = partBindingsByPackage.get(packageName);

-	    if (map == null) {

-	        map = new HashMap<String, IRPartBinding>();

-	        partBindingsByPackage.put(packageName, map);

-	    }

-	    return map;

-	}

-

-	public IEnvironment getRealizingEnvironment(){

-		throw new UnsupportedOperationException();

-	}

-	

-	protected String getFileExtension() {

-		return fileExtension;

-	}

-	

-	

-	public void setStore(ObjectStore store) {

-		this.store = store;

-	}

-		

-	public IRPartBinding getPartBinding(String entry){

-		if (entry == null || entry.length() == 0){

-			return null;

-		}

-		

-		IRPartBinding retVal = null;

-		

-		String partname = getPartName(entry);

-		String packageName = getPackageName(entry);

-

-		retVal = getCachedPartBinding(packageName, partname);

-		if (retVal != null) {

-			return retVal;

-		}

-		

-		EObject part = getPartObject(entry);

-		if(part != null){

-			

-    		retVal = BindingUtil.createPartBinding(part);

-    		if (retVal != null){

-    			Map<String, IRPartBinding> partpackage = getPackagePartBinding(packageName);

-    			partpackage.put(retVal.getIrPart().getName(),retVal);

-    			retVal.setEnvironment(getEnvironment());

-    			if (shouldSetEnvironmentOnIr()) {

-    				BindingUtil.setEnvironment(retVal.getIrPart(), getEnvironment());

-    			}

-    			bindingLoaded(retVal);   			

-    		}

-    	}

-    	return retVal;

-	}

-	

-	protected boolean shouldSetEnvironmentOnIr() {

-		return false;

-	}

-

-	protected EObject getPartObject(String entry){

-		

-		if (entry == null || entry.length() == 0){

-			return null;

-		}			

-		String key = convertToStoreKey(entry);

-		try {

-			return store.get(key);

-		} catch (DeserializationException e) {

-			e.printStackTrace();

-			throw new BuildException(e);

-		}

-	}

-	

-	protected void bindingLoaded(IRPartBinding partBinding) {

-		//default is to do nothing

-	}

-	

-	public ObjectStore[] getObjectStores() {

-		return new ObjectStore[]{store};

-	}

-

-	public boolean hasEntry(String entry) {

-		

-		entry = entry.toUpperCase().toLowerCase();

-		String[] entries = getAllEntries();

-		for (int i = 0; i < entries.length; i++) {

-			if (entry.equalsIgnoreCase(entries[i])) {

-				return true;

-			}

-		}

-		return false;

-	}

-	

-	public ObjectStore getObjectStore() {

-		return store;

-	}

-	

-}

+/*******************************************************************************
+ * Copyright © 2012, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.edt.compiler.binding.IPartBinding;
+import org.eclipse.edt.compiler.binding.IRPartBinding;
+import org.eclipse.edt.compiler.binding.ITypeBinding;
+import org.eclipse.edt.compiler.internal.core.builder.BuildException;
+import org.eclipse.edt.compiler.internal.core.lookup.IEnvironment;
+import org.eclipse.edt.compiler.internal.core.lookup.IZipFileBindingBuildPathEntry;
+import org.eclipse.edt.compiler.internal.io.ZipFileBuildPathEntry;
+import org.eclipse.edt.compiler.internal.util.BindingUtil;
+import org.eclipse.edt.mof.EObject;
+import org.eclipse.edt.mof.egl.Part;
+import org.eclipse.edt.mof.egl.PartNotFoundException;
+import org.eclipse.edt.mof.serialization.CachingObjectStore;
+import org.eclipse.edt.mof.serialization.DeserializationException;
+import org.eclipse.edt.mof.serialization.IZipFileEntryManager;
+import org.eclipse.edt.mof.serialization.ObjectStore;
+
+public abstract class ZipFileBindingBuildPathEntry extends ZipFileBuildPathEntry implements IZipFileBindingBuildPathEntry, IZipFileEntryManager{
+
+	private ObjectStore store;
+	private String fileExtension;
+	
+	public ZipFileBindingBuildPathEntry(String path, String fileExtension) {
+		super(path);
+		this.fileExtension = fileExtension;
+		processEntries();
+	}
+
+
+	private Map<String, Map<String, IRPartBinding>> partBindingsByPackage = new HashMap<String, Map<String,IRPartBinding>>();
+	
+	protected abstract IEnvironment getEnvironment();
+	
+	public void clear(){
+		super.clear();
+		partBindingsByPackage.clear();
+		
+		if (store instanceof CachingObjectStore) {
+			((CachingObjectStore)store).clearCache();
+		}
+	}
+
+	public IPartBinding getPartBinding(String packageName,String partName){
+		IPartBinding partBinding = getCachedPartBinding(packageName,partName);
+		
+		if (partBinding == null){
+			partBinding = getPartBinding(getEntry(packageName,partName));
+		}
+
+		return partBinding;
+	}
+	
+	public IRPartBinding getCachedPartBinding(String packageName,String partName){
+		IRPartBinding partBinding = null;
+		if (packageName == null){
+			packageName = "";
+		}
+
+		Map<String, IRPartBinding> partpackage = partBindingsByPackage.get(packageName);
+		if (partpackage != null){
+			partBinding = partpackage.get(partName);
+		}
+		
+		return partBinding;
+	}
+	
+	public boolean isProject(){
+		return false;
+	}
+
+	public int hasPart(String packageName,String partName){
+		IPartBinding partBinding = getPartBinding(packageName,partName);
+		if (partBinding != null){
+			return partBinding.getKind();
+		}
+		
+		return ITypeBinding.NOT_FOUND_BINDING;
+	}
+	
+	public Part findPart(String packageName, String partName) throws PartNotFoundException {
+		if (hasPart(packageName, partName) != ITypeBinding.NOT_FOUND_BINDING) {
+			EObject obj = getPartObject(getEntry(packageName, partName));
+			if (obj instanceof Part) {
+				return (Part)obj;
+			}
+		}
+		return null;
+	}
+	
+	protected Map<String, IRPartBinding> getPackagePartBinding(String packageName) {
+		if (packageName == null) {
+			packageName = "";
+		}
+		
+		Map<String, IRPartBinding> map = partBindingsByPackage.get(packageName);
+	    if (map == null) {
+	        map = new HashMap<String, IRPartBinding>();
+	        partBindingsByPackage.put(packageName, map);
+	    }
+	    return map;
+	}
+
+	public IEnvironment getRealizingEnvironment(){
+		throw new UnsupportedOperationException();
+	}
+	
+	protected String getFileExtension() {
+		return fileExtension;
+	}
+	
+	
+	public void setStore(ObjectStore store) {
+		this.store = store;
+	}
+		
+	public IRPartBinding getPartBinding(String entry){
+		if (entry == null || entry.length() == 0){
+			return null;
+		}
+		
+		IRPartBinding retVal = null;
+		
+		String partname = getPartName(entry);
+		String packageName = getPackageName(entry);
+
+		retVal = getCachedPartBinding(packageName, partname);
+		if (retVal != null) {
+			return retVal;
+		}
+		
+		EObject part = getPartObject(entry);
+		if(part != null){
+			
+    		retVal = BindingUtil.createPartBinding(part);
+    		if (retVal != null){
+    			Map<String, IRPartBinding> partpackage = getPackagePartBinding(packageName);
+    			partpackage.put(retVal.getIrPart().getName(),retVal);
+    			retVal.setEnvironment(getEnvironment());
+    			if (shouldSetEnvironmentOnIr()) {
+    				BindingUtil.setEnvironment(retVal.getIrPart(), getEnvironment());
+    			}
+    			bindingLoaded(retVal);   			
+    		}
+    	}
+    	return retVal;
+	}
+	
+	protected boolean shouldSetEnvironmentOnIr() {
+		return false;
+	}
+
+	protected EObject getPartObject(String entry){
+		
+		if (entry == null || entry.length() == 0){
+			return null;
+		}			
+		String key = convertToStoreKey(entry);
+		try {
+			return store.get(key);
+		} catch (DeserializationException e) {
+			e.printStackTrace();
+			throw new BuildException(e);
+		}
+	}
+	
+	protected void bindingLoaded(IRPartBinding partBinding) {
+		//default is to do nothing
+	}
+	
+	public ObjectStore[] getObjectStores() {
+		return new ObjectStore[]{store};
+	}
+
+	public boolean hasEntry(String entry) {
+		
+		entry = entry.toUpperCase().toLowerCase();
+		String[] entries = getAllEntries();
+		for (int i = 0; i < entries.length; i++) {
+			if (entry.equalsIgnoreCase(entries[i])) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public ObjectStore getObjectStore() {
+		return store;
+	}
+	
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationProxy.java
index e0dff50..04cddea 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationProxy.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;
 
 import java.util.Collections;
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationRule.java
index 6291e2c..53d96d4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AbstractValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeCompletor.java
index ca71a0c..00e88ba 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeCompletor.java
@@ -1,309 +1,309 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.binding;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.edt.compiler.core.ast.AnnotationExpression;

-import org.eclipse.edt.compiler.core.ast.ArrayType;

-import org.eclipse.edt.compiler.core.ast.DefaultASTVisitor;

-import org.eclipse.edt.compiler.core.ast.NameType;

-import org.eclipse.edt.compiler.core.ast.Record;

-import org.eclipse.edt.compiler.core.ast.SettingsBlock;

-import org.eclipse.edt.compiler.core.ast.SimpleName;

-import org.eclipse.edt.compiler.core.ast.StructureItem;

-import org.eclipse.edt.compiler.internal.core.builder.IMarker;

-import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

-import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationRightHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.DefaultBinder;

-import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;

-import org.eclipse.edt.compiler.internal.core.lookup.NullScope;

-import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;

-import org.eclipse.edt.compiler.internal.core.lookup.Scope;

-import org.eclipse.edt.compiler.internal.util.BindingUtil;

-import org.eclipse.edt.mof.EClassifier;

-import org.eclipse.edt.mof.EField;

-import org.eclipse.edt.mof.EGenericType;

-import org.eclipse.edt.mof.EObject;

-import org.eclipse.edt.mof.EType;

-import org.eclipse.edt.mof.MofFactory;

-import org.eclipse.edt.mof.egl.AccessKind;

-import org.eclipse.edt.mof.egl.Annotation;

-import org.eclipse.edt.mof.egl.Classifier;

-import org.eclipse.edt.mof.egl.EClassProxy;

-import org.eclipse.edt.mof.egl.MofConversion;

-import org.eclipse.edt.mof.egl.Type;

-import org.eclipse.edt.mof.egl.utils.TypeUtils;

-import org.eclipse.edt.mof.serialization.Environment;

-import org.eclipse.edt.mof.utils.NameUtile;

-

-

-public class AnnotationTypeCompletor extends DefaultBinder {

-

-    private org.eclipse.edt.mof.egl.AnnotationType annotationType;

-	private IRPartBinding irBinding;

-    

-    public AnnotationTypeCompletor(Scope currentScope, IRPartBinding irBinding, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {

-        super(currentScope, (org.eclipse.edt.mof.egl.AnnotationType)irBinding.getIrPart(), dependencyRequestor, problemRequestor, compilerOptions);

-        this.annotationType = (org.eclipse.edt.mof.egl.AnnotationType)irBinding.getIrPart();

-        this.irBinding = irBinding;

-    }

-

-    public boolean visit(Record record) {

-    	

-    	//Set bindAttempted on the subType so we dont try to resolve to it

-    	record.getSubType().setBindAttempted(true);

-    	        

-        if (record.isPrivate()) {

-        	annotationType.setAccessKind(AccessKind.ACC_PRIVATE);

-        }

-        record.getName().setType(annotationType);

-        

-        processFields(record);

-        processSettingsBlocks(record);

-        

-        return false;

-    }

-    

-    private void processSettingsBlocks(Record record) {

-    	

-    	record.accept(new DefaultASTVisitor() {

-    		public boolean visit(Record record) {

-    			return true;

-    		}

-    		

-    		public boolean visit(SettingsBlock settingsBlock) {

-    			return true;

-    		}

-    		

-    		public boolean visit(org.eclipse.edt.compiler.core.ast.Assignment assignment) {

-    			if (assignment.getLeftHandSide() instanceof SimpleName) {

-    				SimpleName simpName = (SimpleName)assignment.getLeftHandSide();

-    				EField field = annotationType.getEClass().getEField(simpName.getIdentifier());

-    				if (field != null) {

-    					

-        				AnnotationRightHandScope rhScope = new AnnotationRightHandScope(currentScope, field);

-        				Object obj =  new AnnotationTypeValueGatherer(assignment.getRightHandSide(), field, rhScope, annotationType, dependencyRequestor, problemRequestor, compilerOptions).getValue();

-        				AnnotationValueValidator validator =  new AnnotationValueValidator(problemRequestor);

-        				Object result = validator.validateValue(obj, assignment.getRightHandSide(), field, field.getEType(), field.isNullable());

-        				if (result != null) {

-        					annotationType.eSet(field, result);

-        				}

-

-        				simpName.setBindAttempted(true);

-    				}

-    			}

-    			return false;

-    		}

-    		public void endVisit(SettingsBlock settingsBlock) {

-    	    	//Now that we are done processing the field settings for the annotationType, process any annotations on the 

-    	    	//annotationType

-    	        AnnotationLeftHandScope scope = new AnnotationLeftHandScope(NullScope.INSTANCE, annotationType, annotationType, annotationType);

-    	        SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(currentScope, annotationType, scope,

-    	                dependencyRequestor, problemRequestor, compilerOptions);

-    	        settingsBlock.accept(blockCompletor);

-    		}

-    		

-		});

- 

-    }

-    

-    private void processFields(Record record) {

-    	

-    	final Set<String> definedNames = new HashSet<String>();

-    	

-    	record.accept(new DefaultASTVisitor() {

-    		public boolean visit(Record record) {

-    			return true;

-    		}

-    		public boolean visit(StructureItem structureItem) {

-    			

-    			EType eType = null;

-    			try {

-	    			eType = bindEType(structureItem.getType());

-    	        } catch (ResolutionException e) {

-    	            problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());

-    	            if(structureItem.hasSettingsBlock()) {

-    	            	setBindAttemptedForNames(structureItem.getSettingsBlock());

-    	            }

-    	            return false; // Do not create the field binding if its type cannot be resolved

-    	        }

-    			

-    			final EField field = createEField(structureItem, eType);

-    			if (definedNames.contains(NameUtile.getAsName(field.getName()))) {

-    	    		problemRequestor.acceptProblem(

-    	        			structureItem.getName(),

-    	    				IProblemRequestor.DUPLICATE_VARIABLE_NAME,

-    	    				new String[] {

-    	        				structureItem.getName().getCanonicalName(),

-    	    					annotationType.getCaseSensitiveName()

-    	        			});

-    			}

-    			else {

-    				definedNames.add(NameUtile.getAsName(field.getName()));

-    				annotationType.getEFields().add(field);

-    				structureItem.getName().setElement(field);

-    			}

-    			

-    			if (structureItem.hasSettingsBlock()) {

-    				

-    				AnnotationLeftHandScope lhScope =  new AnnotationLeftHandScope(NullScope.INSTANCE, null, null, null);

-    	            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(currentScope, annotationType, lhScope,

-    	                    dependencyRequestor, problemRequestor, compilerOptions);

-    	            structureItem.getSettingsBlock().accept(blockCompletor);

-    	            //copy put the annotations from the settingsBlock into the metatData for the EField

-    	            structureItem.getSettingsBlock().accept(new DefaultASTVisitor() {

-    	            	public boolean visit(SettingsBlock settingsBlock) {

-    	            		return true;

-    	            	}

-						public boolean visit(AnnotationExpression annExpr) {

-							if (annExpr.resolveAnnotation() != null) {

-								field.getMetadataList().add(annExpr.resolveAnnotation());

-							}

-							return false;

-						}

-

-					});

-    			}

-

-    			    			    			

-    			if (structureItem.hasInitializer()) {

-    				AnnotationRightHandScope rhScope = new AnnotationRightHandScope(currentScope, field);

-    				Object obj =  new AnnotationValueGatherer(structureItem.getInitializer(), rhScope, annotationType, dependencyRequestor, problemRequestor, compilerOptions).getValue();

-    				AnnotationValueValidator validator =  new AnnotationValueValidator(problemRequestor);

-    				Object result = validator.validateValue(obj, structureItem.getInitializer(), field, field.getEType(), field.isNullable());

-    				if (result != null) {

-    					field.setInitialValue(result);

-    				}

-    				

-    			}

-    			

-    			return false;

-    		}

-    		

-    	    public EField createEField(StructureItem structureItem, EType etype) {

-

-    	        String fieldName = structureItem.getName().getCaseSensitiveIdentifier();

-

-    	        EField field = MofFactory.INSTANCE.createEField(true);

-    	        field.setName(fieldName);

-    	        field.setDeclarer(annotationType);

-    	        field.setEType(etype);

-    	        field.setIsNullable(structureItem.isNullable());

-    	        

-    	        structureItem.getName().setBindAttempted(true);

-    	        return field;

-    	    }

-    		

-		});

-    }

-

-	public void endVisit(Record record) {

-    	irBinding.setValid(true);

-        super.endVisit(record);

-    }

-	

-    public EType bindEType(org.eclipse.edt.compiler.core.ast.Type type) throws ResolutionException {

-        switch(type.getKind()) {

-            case org.eclipse.edt.compiler.core.ast.Type.ARRAYTYPE:

-                ArrayType arrayType = (ArrayType) type;

-                

-                if (arrayType.hasInitialSize()) {

-    	    		problemRequestor.acceptProblem(

-    	    				arrayType.getInitialSize(),

-    	    				IProblemRequestor.ARRAY_DIMENSION_NOT_ALLOWED,

-    	    				new String[] {});

-                }

-                

-                EType elementType = bindEType(arrayType.getElementType());

-                EGenericType genType = MofFactory.INSTANCE.createEGenericType(true);

-				try {

-					genType.setEClassifier((EClassifier)Environment.getCurrentEnv().findType(MofConversion.Type_EList));

-				} catch (Exception e) {

-				}

-				genType.getETypeArguments().add(elementType);

-                

-                return genType;

-

-            case org.eclipse.edt.compiler.core.ast.Type.NAMETYPE:

-            	

-                NameType nameType = (NameType) type;

-                org.eclipse.edt.mof.egl.Type result =  bindTypeName(nameType.getName());  

-                if (nameType.getArguments() != null && nameType.getArguments().size() > 0) {

-     	    		problemRequestor.acceptProblem(

-    	    				type,

-    	    				IProblemRequestor.STEREOTYPE_NO_PARMS,

-    	    				new String[] {});

-                }

-                return translateToEType(result, nameType);

-                

-            default: throw new RuntimeException("Shouldn't come into here");            

-        }

-    }

-    

-    private EType translateToEType(Type type, NameType nameType) throws ResolutionException{

-    	if (type == null || type.getClassifier() == null) {

-    		return null;

-    	}

-    	try {

-    		Classifier classifier = type.getClassifier();

-			//handle any, string, boolean, int, float, decimal

-			if (classifier.equals(TypeUtils.Type_ANY)) {

-				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_JavaObject);

-			}

-			if (classifier.equals(TypeUtils.Type_BOOLEAN)) {

-				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EBoolean);

-			}

-			if (classifier.equals(TypeUtils.Type_STRING)) {

-				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EString);

-			}

-			if (classifier.equals(TypeUtils.Type_INT) || type.equals(TypeUtils.Type_SMALLINT) || type.equals(TypeUtils.Type_BIGINT)) {

-				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EInteger);

-			}

-			if (classifier.equals(TypeUtils.Type_FLOAT) || type.equals(TypeUtils.Type_SMALLFLOAT)) {

-				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EFloat);

-			}

-			if (classifier.equals(TypeUtils.Type_DECIMAL)) {

-				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EDecimal);

-			}

-			

-			//handle proxy types

-			EType etype = BindingUtil.getETypeFromProxy(type);

-			if (etype != null) {

-				return etype;

-			}

-			

-			//If the type is an annotationType or an Enumeration, it is already an EType

-			if (type instanceof EType) {

-				return ((EType) type);

-			}

-			

-			if (type instanceof Classifier) {

-				EObject proxiedType = BindingUtil.getMofClassProxyFor((Classifier)type);

-				if (proxiedType instanceof EType) {

-					return (EType)proxiedType;

-				}

-			}

-			

-		} catch (Exception e) {

-		}

-    	

-    	//IF we get here, the type is not valid for use on an annotation field

-    	throw new ResolutionException(nameType.getName().getOffset(), nameType.getName().getOffset() + nameType.getName().getLength(), IProblemRequestor.STEREOTYPE_BAD_TYPE, new String[] {nameType.getName().getCanonicalName(), annotationType.getCaseSensitiveName()});    	

-    }

-

-	    

-

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.binding;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.edt.compiler.core.ast.AnnotationExpression;
+import org.eclipse.edt.compiler.core.ast.ArrayType;
+import org.eclipse.edt.compiler.core.ast.DefaultASTVisitor;
+import org.eclipse.edt.compiler.core.ast.NameType;
+import org.eclipse.edt.compiler.core.ast.Record;
+import org.eclipse.edt.compiler.core.ast.SettingsBlock;
+import org.eclipse.edt.compiler.core.ast.SimpleName;
+import org.eclipse.edt.compiler.core.ast.StructureItem;
+import org.eclipse.edt.compiler.internal.core.builder.IMarker;
+import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;
+import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationRightHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.DefaultBinder;
+import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;
+import org.eclipse.edt.compiler.internal.core.lookup.NullScope;
+import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;
+import org.eclipse.edt.compiler.internal.core.lookup.Scope;
+import org.eclipse.edt.compiler.internal.util.BindingUtil;
+import org.eclipse.edt.mof.EClassifier;
+import org.eclipse.edt.mof.EField;
+import org.eclipse.edt.mof.EGenericType;
+import org.eclipse.edt.mof.EObject;
+import org.eclipse.edt.mof.EType;
+import org.eclipse.edt.mof.MofFactory;
+import org.eclipse.edt.mof.egl.AccessKind;
+import org.eclipse.edt.mof.egl.Annotation;
+import org.eclipse.edt.mof.egl.Classifier;
+import org.eclipse.edt.mof.egl.EClassProxy;
+import org.eclipse.edt.mof.egl.MofConversion;
+import org.eclipse.edt.mof.egl.Type;
+import org.eclipse.edt.mof.egl.utils.TypeUtils;
+import org.eclipse.edt.mof.serialization.Environment;
+import org.eclipse.edt.mof.utils.NameUtile;
+
+
+public class AnnotationTypeCompletor extends DefaultBinder {
+
+    private org.eclipse.edt.mof.egl.AnnotationType annotationType;
+	private IRPartBinding irBinding;
+    
+    public AnnotationTypeCompletor(Scope currentScope, IRPartBinding irBinding, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {
+        super(currentScope, (org.eclipse.edt.mof.egl.AnnotationType)irBinding.getIrPart(), dependencyRequestor, problemRequestor, compilerOptions);
+        this.annotationType = (org.eclipse.edt.mof.egl.AnnotationType)irBinding.getIrPart();
+        this.irBinding = irBinding;
+    }
+
+    public boolean visit(Record record) {
+    	
+    	//Set bindAttempted on the subType so we dont try to resolve to it
+    	record.getSubType().setBindAttempted(true);
+    	        
+        if (record.isPrivate()) {
+        	annotationType.setAccessKind(AccessKind.ACC_PRIVATE);
+        }
+        record.getName().setType(annotationType);
+        
+        processFields(record);
+        processSettingsBlocks(record);
+        
+        return false;
+    }
+    
+    private void processSettingsBlocks(Record record) {
+    	
+    	record.accept(new DefaultASTVisitor() {
+    		public boolean visit(Record record) {
+    			return true;
+    		}
+    		
+    		public boolean visit(SettingsBlock settingsBlock) {
+    			return true;
+    		}
+    		
+    		public boolean visit(org.eclipse.edt.compiler.core.ast.Assignment assignment) {
+    			if (assignment.getLeftHandSide() instanceof SimpleName) {
+    				SimpleName simpName = (SimpleName)assignment.getLeftHandSide();
+    				EField field = annotationType.getEClass().getEField(simpName.getIdentifier());
+    				if (field != null) {
+    					
+        				AnnotationRightHandScope rhScope = new AnnotationRightHandScope(currentScope, field);
+        				Object obj =  new AnnotationTypeValueGatherer(assignment.getRightHandSide(), field, rhScope, annotationType, dependencyRequestor, problemRequestor, compilerOptions).getValue();
+        				AnnotationValueValidator validator =  new AnnotationValueValidator(problemRequestor);
+        				Object result = validator.validateValue(obj, assignment.getRightHandSide(), field, field.getEType(), field.isNullable());
+        				if (result != null) {
+        					annotationType.eSet(field, result);
+        				}
+
+        				simpName.setBindAttempted(true);
+    				}
+    			}
+    			return false;
+    		}
+    		public void endVisit(SettingsBlock settingsBlock) {
+    	    	//Now that we are done processing the field settings for the annotationType, process any annotations on the 
+    	    	//annotationType
+    	        AnnotationLeftHandScope scope = new AnnotationLeftHandScope(NullScope.INSTANCE, annotationType, annotationType, annotationType);
+    	        SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(currentScope, annotationType, scope,
+    	                dependencyRequestor, problemRequestor, compilerOptions);
+    	        settingsBlock.accept(blockCompletor);
+    		}
+    		
+		});
+ 
+    }
+    
+    private void processFields(Record record) {
+    	
+    	final Set<String> definedNames = new HashSet<String>();
+    	
+    	record.accept(new DefaultASTVisitor() {
+    		public boolean visit(Record record) {
+    			return true;
+    		}
+    		public boolean visit(StructureItem structureItem) {
+    			
+    			EType eType = null;
+    			try {
+	    			eType = bindEType(structureItem.getType());
+    	        } catch (ResolutionException e) {
+    	            problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());
+    	            if(structureItem.hasSettingsBlock()) {
+    	            	setBindAttemptedForNames(structureItem.getSettingsBlock());
+    	            }
+    	            return false; // Do not create the field binding if its type cannot be resolved
+    	        }
+    			
+    			final EField field = createEField(structureItem, eType);
+    			if (definedNames.contains(NameUtile.getAsName(field.getName()))) {
+    	    		problemRequestor.acceptProblem(
+    	        			structureItem.getName(),
+    	    				IProblemRequestor.DUPLICATE_VARIABLE_NAME,
+    	    				new String[] {
+    	        				structureItem.getName().getCanonicalName(),
+    	    					annotationType.getCaseSensitiveName()
+    	        			});
+    			}
+    			else {
+    				definedNames.add(NameUtile.getAsName(field.getName()));
+    				annotationType.getEFields().add(field);
+    				structureItem.getName().setElement(field);
+    			}
+    			
+    			if (structureItem.hasSettingsBlock()) {
+    				
+    				AnnotationLeftHandScope lhScope =  new AnnotationLeftHandScope(NullScope.INSTANCE, null, null, null);
+    	            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(currentScope, annotationType, lhScope,
+    	                    dependencyRequestor, problemRequestor, compilerOptions);
+    	            structureItem.getSettingsBlock().accept(blockCompletor);
+    	            //copy put the annotations from the settingsBlock into the metatData for the EField
+    	            structureItem.getSettingsBlock().accept(new DefaultASTVisitor() {
+    	            	public boolean visit(SettingsBlock settingsBlock) {
+    	            		return true;
+    	            	}
+						public boolean visit(AnnotationExpression annExpr) {
+							if (annExpr.resolveAnnotation() != null) {
+								field.getMetadataList().add(annExpr.resolveAnnotation());
+							}
+							return false;
+						}
+
+					});
+    			}
+
+    			    			    			
+    			if (structureItem.hasInitializer()) {
+    				AnnotationRightHandScope rhScope = new AnnotationRightHandScope(currentScope, field);
+    				Object obj =  new AnnotationValueGatherer(structureItem.getInitializer(), rhScope, annotationType, dependencyRequestor, problemRequestor, compilerOptions).getValue();
+    				AnnotationValueValidator validator =  new AnnotationValueValidator(problemRequestor);
+    				Object result = validator.validateValue(obj, structureItem.getInitializer(), field, field.getEType(), field.isNullable());
+    				if (result != null) {
+    					field.setInitialValue(result);
+    				}
+    				
+    			}
+    			
+    			return false;
+    		}
+    		
+    	    public EField createEField(StructureItem structureItem, EType etype) {
+
+    	        String fieldName = structureItem.getName().getCaseSensitiveIdentifier();
+
+    	        EField field = MofFactory.INSTANCE.createEField(true);
+    	        field.setName(fieldName);
+    	        field.setDeclarer(annotationType);
+    	        field.setEType(etype);
+    	        field.setIsNullable(structureItem.isNullable());
+    	        
+    	        structureItem.getName().setBindAttempted(true);
+    	        return field;
+    	    }
+    		
+		});
+    }
+
+	public void endVisit(Record record) {
+    	irBinding.setValid(true);
+        super.endVisit(record);
+    }
+	
+    public EType bindEType(org.eclipse.edt.compiler.core.ast.Type type) throws ResolutionException {
+        switch(type.getKind()) {
+            case org.eclipse.edt.compiler.core.ast.Type.ARRAYTYPE:
+                ArrayType arrayType = (ArrayType) type;
+                
+                if (arrayType.hasInitialSize()) {
+    	    		problemRequestor.acceptProblem(
+    	    				arrayType.getInitialSize(),
+    	    				IProblemRequestor.ARRAY_DIMENSION_NOT_ALLOWED,
+    	    				new String[] {});
+                }
+                
+                EType elementType = bindEType(arrayType.getElementType());
+                EGenericType genType = MofFactory.INSTANCE.createEGenericType(true);
+				try {
+					genType.setEClassifier((EClassifier)Environment.getCurrentEnv().findType(MofConversion.Type_EList));
+				} catch (Exception e) {
+				}
+				genType.getETypeArguments().add(elementType);
+                
+                return genType;
+
+            case org.eclipse.edt.compiler.core.ast.Type.NAMETYPE:
+            	
+                NameType nameType = (NameType) type;
+                org.eclipse.edt.mof.egl.Type result =  bindTypeName(nameType.getName());  
+                if (nameType.getArguments() != null && nameType.getArguments().size() > 0) {
+     	    		problemRequestor.acceptProblem(
+    	    				type,
+    	    				IProblemRequestor.STEREOTYPE_NO_PARMS,
+    	    				new String[] {});
+                }
+                return translateToEType(result, nameType);
+                
+            default: throw new RuntimeException("Shouldn't come into here");            
+        }
+    }
+    
+    private EType translateToEType(Type type, NameType nameType) throws ResolutionException{
+    	if (type == null || type.getClassifier() == null) {
+    		return null;
+    	}
+    	try {
+    		Classifier classifier = type.getClassifier();
+			//handle any, string, boolean, int, float, decimal
+			if (classifier.equals(TypeUtils.Type_ANY)) {
+				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_JavaObject);
+			}
+			if (classifier.equals(TypeUtils.Type_BOOLEAN)) {
+				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EBoolean);
+			}
+			if (classifier.equals(TypeUtils.Type_STRING)) {
+				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EString);
+			}
+			if (classifier.equals(TypeUtils.Type_INT) || type.equals(TypeUtils.Type_SMALLINT) || type.equals(TypeUtils.Type_BIGINT)) {
+				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EInteger);
+			}
+			if (classifier.equals(TypeUtils.Type_FLOAT) || type.equals(TypeUtils.Type_SMALLFLOAT)) {
+				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EFloat);
+			}
+			if (classifier.equals(TypeUtils.Type_DECIMAL)) {
+				return (EType)Environment.getCurrentEnv().find(MofConversion.Type_EDecimal);
+			}
+			
+			//handle proxy types
+			EType etype = BindingUtil.getETypeFromProxy(type);
+			if (etype != null) {
+				return etype;
+			}
+			
+			//If the type is an annotationType or an Enumeration, it is already an EType
+			if (type instanceof EType) {
+				return ((EType) type);
+			}
+			
+			if (type instanceof Classifier) {
+				EObject proxiedType = BindingUtil.getMofClassProxyFor((Classifier)type);
+				if (proxiedType instanceof EType) {
+					return (EType)proxiedType;
+				}
+			}
+			
+		} catch (Exception e) {
+		}
+    	
+    	//IF we get here, the type is not valid for use on an annotation field
+    	throw new ResolutionException(nameType.getName().getOffset(), nameType.getName().getOffset() + nameType.getName().getLength(), IProblemRequestor.STEREOTYPE_BAD_TYPE, new String[] {nameType.getName().getCanonicalName(), annotationType.getCaseSensitiveName()});    	
+    }
+
+	    
+
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeValueGatherer.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeValueGatherer.java
index 8c667e9..6c222e3 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeValueGatherer.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationTypeValueGatherer.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;

 

 import org.eclipse.edt.compiler.core.ast.Expression;

diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValidationRule.java
index 77c5fee..0b81edb 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueGatherer.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueGatherer.java
index bd76d24..ff378b9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueGatherer.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueGatherer.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;

 

 import java.math.BigDecimal;

diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueValidator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueValidator.java
index 15b4b2e..1dc62d7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueValidator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/AnnotationValueValidator.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;

 

 import java.math.BigDecimal;

diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/Binding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/Binding.java
index b42ab7c..4744ca0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/Binding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/Binding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingComparator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingComparator.java
index 2692a95..a331554 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingComparator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingComparator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingNameComparator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingNameComparator.java
index e237c8f..406a8cc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingNameComparator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/BindingNameComparator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ClassBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ClassBindingCompletor.java
index e3bb0b5..645f38d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ClassBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ClassBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ContentValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ContentValidationRule.java
index eb7d386..4485c69 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ContentValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ContentValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/DelegateBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/DelegateBindingCompletor.java
index dd61af6..6f13198 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/DelegateBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/DelegateBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/EnumerationBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/EnumerationBindingCompletor.java
index 7355961..3148bdf 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/EnumerationBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/EnumerationBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ExternalTypeBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ExternalTypeBindingCompletor.java
index 79fa551..4685bf0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ExternalTypeBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ExternalTypeBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldAccessValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldAccessValidationRule.java
index d5a17c9..1d8a93e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldAccessValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldAccessValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldContentValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldContentValidationRule.java
index 7100a07..fc1a89f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldContentValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FieldContentValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBinding.java
index 66dfb29..ad684c8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBindingCompletor.java
index 2368c98..fabd899 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FileBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionBindingCompletor.java
index d2d84c0..e24406b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionContainerBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionContainerBindingCompletor.java
index bb80b78..481ebbc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionContainerBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/FunctionContainerBindingCompletor.java
@@ -1,377 +1,377 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.binding;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.edt.compiler.core.IEGLConstants;

-import org.eclipse.edt.compiler.core.ast.AbstractASTVisitor;

-import org.eclipse.edt.compiler.core.ast.ClassDataDeclaration;

-import org.eclipse.edt.compiler.core.ast.Constructor;

-import org.eclipse.edt.compiler.core.ast.FunctionParameter;

-import org.eclipse.edt.compiler.core.ast.Name;

-import org.eclipse.edt.compiler.core.ast.NestedFunction;

-import org.eclipse.edt.compiler.core.ast.Part;

-import org.eclipse.edt.compiler.core.ast.SettingsBlock;

-import org.eclipse.edt.compiler.core.ast.UseStatement;

-import org.eclipse.edt.compiler.internal.core.builder.IMarker;

-import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

-import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;

-import org.eclipse.edt.compiler.internal.core.lookup.AbstractBinder;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.FunctionContainerScope;

-import org.eclipse.edt.compiler.internal.core.lookup.FunctionScope;

-import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;

-import org.eclipse.edt.compiler.internal.core.lookup.NullScope;

-import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;

-import org.eclipse.edt.compiler.internal.core.lookup.Scope;

-import org.eclipse.edt.compiler.internal.util.BindingUtil;

-import org.eclipse.edt.mof.egl.AccessKind;

-import org.eclipse.edt.mof.egl.Container;

-import org.eclipse.edt.mof.egl.Field;

-import org.eclipse.edt.mof.egl.Function;

-import org.eclipse.edt.mof.egl.IrFactory;

-import org.eclipse.edt.mof.egl.LogicAndDataPart;

-import org.eclipse.edt.mof.egl.MofConversion;

-import org.eclipse.edt.mof.egl.ParameterKind;

-import org.eclipse.edt.mof.egl.Stereotype;

-import org.eclipse.edt.mof.egl.StereotypeType;

-import org.eclipse.edt.mof.egl.StructPart;

-import org.eclipse.edt.mof.egl.Type;

-import org.eclipse.edt.mof.egl.utils.TypeUtils;

-import org.eclipse.edt.mof.utils.NameUtile;

-

-

-/**

- * @author winghong

- */

-public abstract class FunctionContainerBindingCompletor extends AbstractBinder {

-

-    private org.eclipse.edt.mof.egl.Part functionContainerBinding;

-

-    protected IProblemRequestor problemRequestor;

-

-    protected Set<String> definedDataNames = new HashSet<String>();

-

-    protected Set<String> definedFunctionNames = new HashSet<String>();

-

-    protected PartSubTypeAndAnnotationCollector partSubTypeAndAnnotationCollector;

-

-    private Set<Type> usedTypes = new HashSet<Type>();

-

-    private List<ClassDataDeclaration> dataDeclarations = new ArrayList<ClassDataDeclaration>();

-

-	private FunctionContainerScope functionContainerScope;

-	

-	private IRPartBinding irBinding;

-

-    public FunctionContainerBindingCompletor(IRPartBinding irBinding, Scope currentScope,

-            IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {

-        super(currentScope, irBinding.getIrPart(), dependencyRequestor, compilerOptions);

-        this.problemRequestor = problemRequestor;

-        this.irBinding = irBinding;

-        this.functionContainerBinding = irBinding.getIrPart();

-    }

-

-    public PartSubTypeAndAnnotationCollector getPartSubTypeAndAnnotationCollector() {

-        if (partSubTypeAndAnnotationCollector == null) {

-            partSubTypeAndAnnotationCollector = new PartSubTypeAndAnnotationCollector(functionContainerBinding, this, problemRequestor);

-        }

-        return partSubTypeAndAnnotationCollector;

-    }

-

-    void setDefaultSuperType() {

-    	

-		BindingUtil.setDefaultSupertype((StructPart)functionContainerBinding, getPartSubTypeAndAnnotationCollector().getStereotype(), getDefaultSuperType());

-    }

-    

-    void endVisitFunctionContainer(Part part) {

-    	irBinding.setValid(true);

-    }

-    

-    StructPart getDefaultSuperType() {

-    	StructPart eany = (StructPart)BindingUtil.getEAny();

-    	if (irBinding.getIrPart() instanceof StructPart && !eany.equals(irBinding.getIrPart())) {

-    		StructPart anyStruct = (StructPart)BindingUtil.findPart(NameUtile.getAsName(MofConversion.EGLX_lang_package), NameUtile.getAsName("AnyStruct"));

-    		return anyStruct;

-    	}

-    	return eany;

-    }

-

-    public boolean visit(ClassDataDeclaration classDataDeclaration) {

-        Type type = null;

-        try {

-            type = bindType(classDataDeclaration.getType());

-        } catch (ResolutionException e) {

-            problemRequestor

-                    .acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());

-            if(classDataDeclaration.hasSettingsBlock()) {

-            	setBindAttemptedForNames(classDataDeclaration.getSettingsBlockOpt());

-            }

-            for (Name name : classDataDeclaration.getNames()) {

-            	name.setBindAttempted(true);

-            }

-

-            return false; // Do not create the class field bindings if the type

-            // cannot be resolved

-        }

-

-        dataDeclarations.add(classDataDeclaration);

-        boolean isConstantDeclaration = classDataDeclaration.isConstant();

-        

-        for (Name name : classDataDeclaration.getNames()) {

-            String dataName = name.getIdentifier();

-            

-            Field field;

-            if (isConstantDeclaration) {

-            	field = IrFactory.INSTANCE.createConstantField();

-            }

-            else {

-            	field = IrFactory.INSTANCE.createField();

-            }

-

-            if (classDataDeclaration.isPrivate() || membersPrivateByDefault()) {

-            	field.setAccessKind(AccessKind.ACC_PRIVATE);

-            }

-                        

-            field.setContainer((Container)functionContainerBinding);

-            field.setType(type);

-            field.setIsNullable(classDataDeclaration.isNullable());

-            field.setName(name.getCaseSensitiveIdentifier());

-            field.setIsStatic(classDataDeclaration.isStatic() || membersStaticByDefault());

-            

-            if (definedDataNames.contains(dataName) || definedFunctionNames.contains(dataName)) {

-                problemRequestor.acceptProblem(name, IProblemRequestor.DUPLICATE_NAME_ACROSS_LISTS, new String[] { name.getCanonicalName(),

-                        functionContainerBinding.getName() });

-            } else {

-            	((LogicAndDataPart)functionContainerBinding).getFields().add(field);

-                definedDataNames.add(dataName);

-            }

-            name.setMember(field);

-            name.setType(type);

-        }

-

-        return false;

-    }

-

-    

-    private void processDataDeclarationsSettingsBlocks() {

-    	for (ClassDataDeclaration decl : dataDeclarations) {

-            processSettingsBlock(decl, functionContainerBinding, getFunctionContainerScope(), problemRequestor);

-    	}

-    }

-        

-    public boolean visit(NestedFunction nestedFunction) {

-        String name = nestedFunction.getName().getIdentifier();

-        

-        Function function = IrFactory.INSTANCE.createFunction();

-        function.setName(nestedFunction.getName().getCaseSensitiveIdentifier());

-        function.setContainer((Container)functionContainerBinding);

-        

-        FunctionBindingCompletor functionBindingCompletor = new FunctionBindingCompletor(functionContainerBinding, getFunctionContainerScope(),

-                function, dependencyRequestor, problemRequestor, compilerOptions);

-        nestedFunction.accept(functionBindingCompletor);

-        

-        nestedFunction.getName().setMember(function);

-        function.setIsStatic(function.isStatic() || membersStaticByDefault());

-        if (membersPrivateByDefault()) {

-        	function.setAccessKind(AccessKind.ACC_PRIVATE);

-        }

-                

-        if (definedDataNames.contains(name)) {

-        	problemRequestor.acceptProblem(nestedFunction.getName(), IProblemRequestor.DUPLICATE_NAME_ACROSS_LISTS, new String[] { nestedFunction.getName().getCanonicalName(), functionContainerBinding.getCaseSensitiveName() });

-        } else if(definedFunctionNames.contains(name)) {

-        	

-        	for (Function func : ((StructPart)functionContainerBinding).getFunctions()) {

-        		if(BindingUtil.functionSignituresAreIdentical(func, function, false, false)) {

-	        			problemRequestor.acceptProblem(

-	        				nestedFunction.getName(),

-	        				IProblemRequestor.DUPLICATE_NAME_IN_FILE,

-	        				new String[] {

-	        					IEGLConstants.KEYWORD_FUNCTION,

-	        					nestedFunction.getName().getCanonicalName()

-	        				});

-	        			return false;

-        		}

-        	}

-        } else {

-            definedFunctionNames.add(name);

-        }        

-        

-        ((StructPart)functionContainerBinding).getFunctions().add(function);

-        

-        return false;

-    }

-    

-    protected void processSettingsBlocks() {

-        processDataDeclarationsSettingsBlocks();

-        

-        if (getPartSubTypeAndAnnotationCollector().getSettingsBlocks().size() > 0) {

-        	FunctionContainerScope funcContScope = new FunctionContainerScope(NullScope.INSTANCE, functionContainerBinding);

-            AnnotationLeftHandScope scope = new AnnotationLeftHandScope(funcContScope, functionContainerBinding, functionContainerBinding, functionContainerBinding);

-            //If the part type is specified on the part (as opposed to with an

-            // annotation),

-            //then create an annotation scope to handle resolution of subtype

-            // dependent properties

-            if (!getPartSubTypeAndAnnotationCollector().isFoundSubTypeInSettingsBlock()) {

-                if (getPartSubTypeAndAnnotationCollector().getStereotype() == null) {

-                	StereotypeType stereoTypeType = getDefaultStereotypeType();

-                    if (stereoTypeType != null) {                   	

-                    	Stereotype stereotype = (Stereotype) stereoTypeType.newInstance();

-                        functionContainerBinding.addAnnotation(stereotype);

-                        scope = new AnnotationLeftHandScope(scope, stereotype, stereoTypeType, stereotype);

-                    }

-                } else {

-                    scope = new AnnotationLeftHandScope(scope, getPartSubTypeAndAnnotationCollector().getStereotype(), (StereotypeType)getPartSubTypeAndAnnotationCollector().getStereotype().getEClass(),

-                            getPartSubTypeAndAnnotationCollector().getStereotype());

-                }

-            }

-            Scope fcScope = getFunctionContainerScope();

-            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(fcScope, functionContainerBinding, scope,

-                    dependencyRequestor, problemRequestor, compilerOptions);

-            for(SettingsBlock block : getPartSubTypeAndAnnotationCollector().getSettingsBlocks()) {

-                block.accept(blockCompletor);

-            }

-        } else {

-            if (getPartSubTypeAndAnnotationCollector().getStereotype() == null) {

-            	StereotypeType stereoTypeType = getDefaultStereotypeType();

-                if (stereoTypeType != null) {

-                	Stereotype stereoType = (Stereotype) stereoTypeType.newInstance();

-                    functionContainerBinding.addAnnotation(stereoType);

-                }

-            }

-        }

-    }

-

-    protected abstract StereotypeType getDefaultStereotypeType();

-

-    public boolean visit(UseStatement useStatement) {

-        for (Name nextName : useStatement.getNames()) {

- 

-            Type typeBinding = null;

-            try {

-                typeBinding = bindTypeName(nextName); 

-            } catch (ResolutionException e) {

-                problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e

-                        .getInserts());

-                if (useStatement.hasSettingsBlock()) {

-                	setBindAttemptedForNames(useStatement.getSettingsBlock());

-                }

-                continue;

-            }

-

-            if (usedTypes.contains(typeBinding)) {

-                problemRequestor.acceptProblem(nextName, IProblemRequestor.DUPLICATE_USE_NAME, new String[] {

-                        nextName.getCanonicalString(), functionContainerBinding.getCaseSensitiveName() });

-

-            } else {

-                usedTypes.add(typeBinding);

-            }

-            

-            if(typeBinding instanceof org.eclipse.edt.mof.egl.Part) {

-            	getFunctionContainerScope().addUsedPart((org.eclipse.edt.mof.egl.Part)typeBinding);

-            }

-        }

-        return false;

-    }

-    

-    protected FunctionContainerScope getFunctionContainerScope() {

-    	if(functionContainerScope == null) {

-    		functionContainerScope = new FunctionContainerScope(currentScope, functionContainerBinding);

-    	}

-    	return functionContainerScope;

-    }

-    

-    protected boolean membersStaticByDefault() {

-    	return false;

-    }

-

-    protected boolean membersPrivateByDefault() {

-    	return false;

-    }

-    

-    public boolean visit(Constructor constructor) {

-    	final org.eclipse.edt.mof.egl.Constructor constructorBinding = IrFactory.INSTANCE.createConstructor();

-    	constructorBinding.setName(NameUtile.getAsCaseSensitiveName(IEGLConstants.KEYWORD_CONSTRUCTOR));

-    	constructorBinding.setType(functionContainerBinding);

-    	constructorBinding.setContainer((Container)functionContainerBinding);

-    	final Set<String> definedParameters = new HashSet<String>();

-    	

-    	constructor.setBinding(constructorBinding);

-    	

-    	if (constructor.isPrivate()) {

-    		constructorBinding.setAccessKind(AccessKind.ACC_PRIVATE);

-    	}

-    	

-    	constructor.accept(new AbstractASTVisitor() {

-    		public boolean visit(FunctionParameter functionParameter) {

-    			String parmName = functionParameter.getName().getIdentifier();

-    	        org.eclipse.edt.compiler.core.ast.Type parmType = functionParameter.getType();        

-    	        org.eclipse.edt.mof.egl.Type typeBinding = null;

-    	        try {

-    	            typeBinding = bindType(parmType);

-    	        } catch (ResolutionException e) {

-    	            problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());

-    	            return false;

-    	        }

-    	        

-    	        org.eclipse.edt.mof.egl.FunctionParameter funcParmBinding = IrFactory.INSTANCE.createFunctionParameter();

-    	        funcParmBinding.setName(functionParameter.getName().getCaseSensitiveIdentifier());

-    	        functionParameter.getName().setMember(funcParmBinding);

-    	        funcParmBinding.setType(typeBinding);

-    	        funcParmBinding.setIsNullable(functionParameter.isNullable());   	        

-    	        

-    	        funcParmBinding.setIsConst(functionParameter.isParmConst());

-    	        

-    	        FunctionParameter.UseType useType = functionParameter.getUseType();

-    	        if (useType == FunctionParameter.UseType.IN) {

-    	            funcParmBinding.setParameterKind(ParameterKind.PARM_IN);

-    	        } else if (useType == FunctionParameter.UseType.OUT) {

-    	            funcParmBinding.setParameterKind(ParameterKind.PARM_OUT);

-    	        } else if (useType == null && typeBinding != null && TypeUtils.isReferenceType(typeBinding)) {

-    	        	funcParmBinding.setParameterKind(ParameterKind.PARM_IN);

-    	        }

-    	        else {

-    	        	funcParmBinding.setParameterKind(ParameterKind.PARM_INOUT);

-    	        }

- 

-    	        if (definedParameters.contains(parmName)) {

-    	            problemRequestor.acceptProblem(functionParameter, IProblemRequestor.DUPLICATE_NAME_ACROSS_LISTS, new String[] { functionParameter.getName().getCanonicalName(), IEGLConstants.KEYWORD_CONSTRUCTOR });

-    	        } else {

-    	            constructorBinding.addParameter(funcParmBinding);

-    	            definedParameters.add(parmName);

-    	        }

-    	        

-    	        return false;

-    		}

-    	});

-    	

-    	((StructPart)functionContainerBinding).getConstructors().add(constructorBinding);

-    	

-    	if (constructor.hasSettingsBlock()) {

-            FunctionScope functionScope = new FunctionScope(NullScope.INSTANCE, constructorBinding);

-            AnnotationLeftHandScope scope = new AnnotationLeftHandScope(functionScope, constructorBinding, null, constructorBinding);

-            functionScope = new FunctionScope(currentScope, constructorBinding);

-            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(functionScope, functionContainerBinding, scope,

-                    dependencyRequestor, problemRequestor, compilerOptions);

-            constructor.getSettingsBlock().accept(blockCompletor);

-    		

-    	}

-    	

-    	return false;

-    }

-

-    

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.binding;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.edt.compiler.core.IEGLConstants;
+import org.eclipse.edt.compiler.core.ast.AbstractASTVisitor;
+import org.eclipse.edt.compiler.core.ast.ClassDataDeclaration;
+import org.eclipse.edt.compiler.core.ast.Constructor;
+import org.eclipse.edt.compiler.core.ast.FunctionParameter;
+import org.eclipse.edt.compiler.core.ast.Name;
+import org.eclipse.edt.compiler.core.ast.NestedFunction;
+import org.eclipse.edt.compiler.core.ast.Part;
+import org.eclipse.edt.compiler.core.ast.SettingsBlock;
+import org.eclipse.edt.compiler.core.ast.UseStatement;
+import org.eclipse.edt.compiler.internal.core.builder.IMarker;
+import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;
+import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;
+import org.eclipse.edt.compiler.internal.core.lookup.AbstractBinder;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.FunctionContainerScope;
+import org.eclipse.edt.compiler.internal.core.lookup.FunctionScope;
+import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;
+import org.eclipse.edt.compiler.internal.core.lookup.NullScope;
+import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;
+import org.eclipse.edt.compiler.internal.core.lookup.Scope;
+import org.eclipse.edt.compiler.internal.util.BindingUtil;
+import org.eclipse.edt.mof.egl.AccessKind;
+import org.eclipse.edt.mof.egl.Container;
+import org.eclipse.edt.mof.egl.Field;
+import org.eclipse.edt.mof.egl.Function;
+import org.eclipse.edt.mof.egl.IrFactory;
+import org.eclipse.edt.mof.egl.LogicAndDataPart;
+import org.eclipse.edt.mof.egl.MofConversion;
+import org.eclipse.edt.mof.egl.ParameterKind;
+import org.eclipse.edt.mof.egl.Stereotype;
+import org.eclipse.edt.mof.egl.StereotypeType;
+import org.eclipse.edt.mof.egl.StructPart;
+import org.eclipse.edt.mof.egl.Type;
+import org.eclipse.edt.mof.egl.utils.TypeUtils;
+import org.eclipse.edt.mof.utils.NameUtile;
+
+
+/**
+ * @author winghong
+ */
+public abstract class FunctionContainerBindingCompletor extends AbstractBinder {
+
+    private org.eclipse.edt.mof.egl.Part functionContainerBinding;
+
+    protected IProblemRequestor problemRequestor;
+
+    protected Set<String> definedDataNames = new HashSet<String>();
+
+    protected Set<String> definedFunctionNames = new HashSet<String>();
+
+    protected PartSubTypeAndAnnotationCollector partSubTypeAndAnnotationCollector;
+
+    private Set<Type> usedTypes = new HashSet<Type>();
+
+    private List<ClassDataDeclaration> dataDeclarations = new ArrayList<ClassDataDeclaration>();
+
+	private FunctionContainerScope functionContainerScope;
+	
+	private IRPartBinding irBinding;
+
+    public FunctionContainerBindingCompletor(IRPartBinding irBinding, Scope currentScope,
+            IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {
+        super(currentScope, irBinding.getIrPart(), dependencyRequestor, compilerOptions);
+        this.problemRequestor = problemRequestor;
+        this.irBinding = irBinding;
+        this.functionContainerBinding = irBinding.getIrPart();
+    }
+
+    public PartSubTypeAndAnnotationCollector getPartSubTypeAndAnnotationCollector() {
+        if (partSubTypeAndAnnotationCollector == null) {
+            partSubTypeAndAnnotationCollector = new PartSubTypeAndAnnotationCollector(functionContainerBinding, this, problemRequestor);
+        }
+        return partSubTypeAndAnnotationCollector;
+    }
+
+    void setDefaultSuperType() {
+    	
+		BindingUtil.setDefaultSupertype((StructPart)functionContainerBinding, getPartSubTypeAndAnnotationCollector().getStereotype(), getDefaultSuperType());
+    }
+    
+    void endVisitFunctionContainer(Part part) {
+    	irBinding.setValid(true);
+    }
+    
+    StructPart getDefaultSuperType() {
+    	StructPart eany = (StructPart)BindingUtil.getEAny();
+    	if (irBinding.getIrPart() instanceof StructPart && !eany.equals(irBinding.getIrPart())) {
+    		StructPart anyStruct = (StructPart)BindingUtil.findPart(NameUtile.getAsName(MofConversion.EGLX_lang_package), NameUtile.getAsName("AnyStruct"));
+    		return anyStruct;
+    	}
+    	return eany;
+    }
+
+    public boolean visit(ClassDataDeclaration classDataDeclaration) {
+        Type type = null;
+        try {
+            type = bindType(classDataDeclaration.getType());
+        } catch (ResolutionException e) {
+            problemRequestor
+                    .acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());
+            if(classDataDeclaration.hasSettingsBlock()) {
+            	setBindAttemptedForNames(classDataDeclaration.getSettingsBlockOpt());
+            }
+            for (Name name : classDataDeclaration.getNames()) {
+            	name.setBindAttempted(true);
+            }
+
+            return false; // Do not create the class field bindings if the type
+            // cannot be resolved
+        }
+
+        dataDeclarations.add(classDataDeclaration);
+        boolean isConstantDeclaration = classDataDeclaration.isConstant();
+        
+        for (Name name : classDataDeclaration.getNames()) {
+            String dataName = name.getIdentifier();
+            
+            Field field;
+            if (isConstantDeclaration) {
+            	field = IrFactory.INSTANCE.createConstantField();
+            }
+            else {
+            	field = IrFactory.INSTANCE.createField();
+            }
+
+            if (classDataDeclaration.isPrivate() || membersPrivateByDefault()) {
+            	field.setAccessKind(AccessKind.ACC_PRIVATE);
+            }
+                        
+            field.setContainer((Container)functionContainerBinding);
+            field.setType(type);
+            field.setIsNullable(classDataDeclaration.isNullable());
+            field.setName(name.getCaseSensitiveIdentifier());
+            field.setIsStatic(classDataDeclaration.isStatic() || membersStaticByDefault());
+            
+            if (definedDataNames.contains(dataName) || definedFunctionNames.contains(dataName)) {
+                problemRequestor.acceptProblem(name, IProblemRequestor.DUPLICATE_NAME_ACROSS_LISTS, new String[] { name.getCanonicalName(),
+                        functionContainerBinding.getName() });
+            } else {
+            	((LogicAndDataPart)functionContainerBinding).getFields().add(field);
+                definedDataNames.add(dataName);
+            }
+            name.setMember(field);
+            name.setType(type);
+        }
+
+        return false;
+    }
+
+    
+    private void processDataDeclarationsSettingsBlocks() {
+    	for (ClassDataDeclaration decl : dataDeclarations) {
+            processSettingsBlock(decl, functionContainerBinding, getFunctionContainerScope(), problemRequestor);
+    	}
+    }
+        
+    public boolean visit(NestedFunction nestedFunction) {
+        String name = nestedFunction.getName().getIdentifier();
+        
+        Function function = IrFactory.INSTANCE.createFunction();
+        function.setName(nestedFunction.getName().getCaseSensitiveIdentifier());
+        function.setContainer((Container)functionContainerBinding);
+        
+        FunctionBindingCompletor functionBindingCompletor = new FunctionBindingCompletor(functionContainerBinding, getFunctionContainerScope(),
+                function, dependencyRequestor, problemRequestor, compilerOptions);
+        nestedFunction.accept(functionBindingCompletor);
+        
+        nestedFunction.getName().setMember(function);
+        function.setIsStatic(function.isStatic() || membersStaticByDefault());
+        if (membersPrivateByDefault()) {
+        	function.setAccessKind(AccessKind.ACC_PRIVATE);
+        }
+                
+        if (definedDataNames.contains(name)) {
+        	problemRequestor.acceptProblem(nestedFunction.getName(), IProblemRequestor.DUPLICATE_NAME_ACROSS_LISTS, new String[] { nestedFunction.getName().getCanonicalName(), functionContainerBinding.getCaseSensitiveName() });
+        } else if(definedFunctionNames.contains(name)) {
+        	
+        	for (Function func : ((StructPart)functionContainerBinding).getFunctions()) {
+        		if(BindingUtil.functionSignituresAreIdentical(func, function, false, false)) {
+	        			problemRequestor.acceptProblem(
+	        				nestedFunction.getName(),
+	        				IProblemRequestor.DUPLICATE_NAME_IN_FILE,
+	        				new String[] {
+	        					IEGLConstants.KEYWORD_FUNCTION,
+	        					nestedFunction.getName().getCanonicalName()
+	        				});
+	        			return false;
+        		}
+        	}
+        } else {
+            definedFunctionNames.add(name);
+        }        
+        
+        ((StructPart)functionContainerBinding).getFunctions().add(function);
+        
+        return false;
+    }
+    
+    protected void processSettingsBlocks() {
+        processDataDeclarationsSettingsBlocks();
+        
+        if (getPartSubTypeAndAnnotationCollector().getSettingsBlocks().size() > 0) {
+        	FunctionContainerScope funcContScope = new FunctionContainerScope(NullScope.INSTANCE, functionContainerBinding);
+            AnnotationLeftHandScope scope = new AnnotationLeftHandScope(funcContScope, functionContainerBinding, functionContainerBinding, functionContainerBinding);
+            //If the part type is specified on the part (as opposed to with an
+            // annotation),
+            //then create an annotation scope to handle resolution of subtype
+            // dependent properties
+            if (!getPartSubTypeAndAnnotationCollector().isFoundSubTypeInSettingsBlock()) {
+                if (getPartSubTypeAndAnnotationCollector().getStereotype() == null) {
+                	StereotypeType stereoTypeType = getDefaultStereotypeType();
+                    if (stereoTypeType != null) {                   	
+                    	Stereotype stereotype = (Stereotype) stereoTypeType.newInstance();
+                        functionContainerBinding.addAnnotation(stereotype);
+                        scope = new AnnotationLeftHandScope(scope, stereotype, stereoTypeType, stereotype);
+                    }
+                } else {
+                    scope = new AnnotationLeftHandScope(scope, getPartSubTypeAndAnnotationCollector().getStereotype(), (StereotypeType)getPartSubTypeAndAnnotationCollector().getStereotype().getEClass(),
+                            getPartSubTypeAndAnnotationCollector().getStereotype());
+                }
+            }
+            Scope fcScope = getFunctionContainerScope();
+            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(fcScope, functionContainerBinding, scope,
+                    dependencyRequestor, problemRequestor, compilerOptions);
+            for(SettingsBlock block : getPartSubTypeAndAnnotationCollector().getSettingsBlocks()) {
+                block.accept(blockCompletor);
+            }
+        } else {
+            if (getPartSubTypeAndAnnotationCollector().getStereotype() == null) {
+            	StereotypeType stereoTypeType = getDefaultStereotypeType();
+                if (stereoTypeType != null) {
+                	Stereotype stereoType = (Stereotype) stereoTypeType.newInstance();
+                    functionContainerBinding.addAnnotation(stereoType);
+                }
+            }
+        }
+    }
+
+    protected abstract StereotypeType getDefaultStereotypeType();
+
+    public boolean visit(UseStatement useStatement) {
+        for (Name nextName : useStatement.getNames()) {
+ 
+            Type typeBinding = null;
+            try {
+                typeBinding = bindTypeName(nextName); 
+            } catch (ResolutionException e) {
+                problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e
+                        .getInserts());
+                if (useStatement.hasSettingsBlock()) {
+                	setBindAttemptedForNames(useStatement.getSettingsBlock());
+                }
+                continue;
+            }
+
+            if (usedTypes.contains(typeBinding)) {
+                problemRequestor.acceptProblem(nextName, IProblemRequestor.DUPLICATE_USE_NAME, new String[] {
+                        nextName.getCanonicalString(), functionContainerBinding.getCaseSensitiveName() });
+
+            } else {
+                usedTypes.add(typeBinding);
+            }
+            
+            if(typeBinding instanceof org.eclipse.edt.mof.egl.Part) {
+            	getFunctionContainerScope().addUsedPart((org.eclipse.edt.mof.egl.Part)typeBinding);
+            }
+        }
+        return false;
+    }
+    
+    protected FunctionContainerScope getFunctionContainerScope() {
+    	if(functionContainerScope == null) {
+    		functionContainerScope = new FunctionContainerScope(currentScope, functionContainerBinding);
+    	}
+    	return functionContainerScope;
+    }
+    
+    protected boolean membersStaticByDefault() {
+    	return false;
+    }
+
+    protected boolean membersPrivateByDefault() {
+    	return false;
+    }
+    
+    public boolean visit(Constructor constructor) {
+    	final org.eclipse.edt.mof.egl.Constructor constructorBinding = IrFactory.INSTANCE.createConstructor();
+    	constructorBinding.setName(NameUtile.getAsCaseSensitiveName(IEGLConstants.KEYWORD_CONSTRUCTOR));
+    	constructorBinding.setType(functionContainerBinding);
+    	constructorBinding.setContainer((Container)functionContainerBinding);
+    	final Set<String> definedParameters = new HashSet<String>();
+    	
+    	constructor.setBinding(constructorBinding);
+    	
+    	if (constructor.isPrivate()) {
+    		constructorBinding.setAccessKind(AccessKind.ACC_PRIVATE);
+    	}
+    	
+    	constructor.accept(new AbstractASTVisitor() {
+    		public boolean visit(FunctionParameter functionParameter) {
+    			String parmName = functionParameter.getName().getIdentifier();
+    	        org.eclipse.edt.compiler.core.ast.Type parmType = functionParameter.getType();        
+    	        org.eclipse.edt.mof.egl.Type typeBinding = null;
+    	        try {
+    	            typeBinding = bindType(parmType);
+    	        } catch (ResolutionException e) {
+    	            problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());
+    	            return false;
+    	        }
+    	        
+    	        org.eclipse.edt.mof.egl.FunctionParameter funcParmBinding = IrFactory.INSTANCE.createFunctionParameter();
+    	        funcParmBinding.setName(functionParameter.getName().getCaseSensitiveIdentifier());
+    	        functionParameter.getName().setMember(funcParmBinding);
+    	        funcParmBinding.setType(typeBinding);
+    	        funcParmBinding.setIsNullable(functionParameter.isNullable());   	        
+    	        
+    	        funcParmBinding.setIsConst(functionParameter.isParmConst());
+    	        
+    	        FunctionParameter.UseType useType = functionParameter.getUseType();
+    	        if (useType == FunctionParameter.UseType.IN) {
+    	            funcParmBinding.setParameterKind(ParameterKind.PARM_IN);
+    	        } else if (useType == FunctionParameter.UseType.OUT) {
+    	            funcParmBinding.setParameterKind(ParameterKind.PARM_OUT);
+    	        } else if (useType == null && typeBinding != null && TypeUtils.isReferenceType(typeBinding)) {
+    	        	funcParmBinding.setParameterKind(ParameterKind.PARM_IN);
+    	        }
+    	        else {
+    	        	funcParmBinding.setParameterKind(ParameterKind.PARM_INOUT);
+    	        }
+ 
+    	        if (definedParameters.contains(parmName)) {
+    	            problemRequestor.acceptProblem(functionParameter, IProblemRequestor.DUPLICATE_NAME_ACROSS_LISTS, new String[] { functionParameter.getName().getCanonicalName(), IEGLConstants.KEYWORD_CONSTRUCTOR });
+    	        } else {
+    	            constructorBinding.addParameter(funcParmBinding);
+    	            definedParameters.add(parmName);
+    	        }
+    	        
+    	        return false;
+    		}
+    	});
+    	
+    	((StructPart)functionContainerBinding).getConstructors().add(constructorBinding);
+    	
+    	if (constructor.hasSettingsBlock()) {
+            FunctionScope functionScope = new FunctionScope(NullScope.INSTANCE, constructorBinding);
+            AnnotationLeftHandScope scope = new AnnotationLeftHandScope(functionScope, constructorBinding, null, constructorBinding);
+            functionScope = new FunctionScope(currentScope, constructorBinding);
+            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(functionScope, functionContainerBinding, scope,
+                    dependencyRequestor, problemRequestor, compilerOptions);
+            constructor.getSettingsBlock().accept(blockCompletor);
+    		
+    	}
+    	
+    	return false;
+    }
+
+    
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/HandlerBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/HandlerBindingCompletor.java
index f03660f..189409f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/HandlerBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/HandlerBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IBinding.java
index 8e14e9b..54c822e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPackageBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPackageBinding.java
index 8e99245..4257c55 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPackageBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPackageBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPartBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPartBinding.java
index 72b8b02..55deff8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPartBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IPartBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IRPartBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IRPartBinding.java
index f6e9217..792609a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IRPartBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IRPartBinding.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;
 
 import org.eclipse.edt.compiler.internal.core.lookup.IEnvironment;
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ITypeBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ITypeBinding.java
index 6dac2f9..3af6735 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ITypeBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ITypeBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IValidationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IValidationProxy.java
index f9d9423..b1e687e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IValidationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/IValidationProxy.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;
 
 import java.util.List;
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InterfaceBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InterfaceBindingCompletor.java
index a909b52..cb4f87a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InterfaceBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InterfaceBindingCompletor.java
@@ -1,78 +1,78 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.binding;

-

-import org.eclipse.edt.compiler.core.ast.Interface;

-import org.eclipse.edt.compiler.core.ast.Name;

-import org.eclipse.edt.compiler.internal.core.builder.IMarker;

-import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

-import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;

-import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;

-import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;

-import org.eclipse.edt.compiler.internal.core.lookup.Scope;

-import org.eclipse.edt.mof.egl.AccessKind;

-import org.eclipse.edt.mof.egl.StereotypeType;

-import org.eclipse.edt.mof.egl.Type;

-

-

-/**

- * @author winghong

- */

-public class InterfaceBindingCompletor extends FunctionContainerBindingCompletor {

-

-    private org.eclipse.edt.mof.egl.Interface interfaceBinding;

-

-    public InterfaceBindingCompletor(Scope currentScope, IRPartBinding irBinding, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {

-        super(irBinding, currentScope, dependencyRequestor, problemRequestor, compilerOptions);

-        this.interfaceBinding = (org.eclipse.edt.mof.egl.Interface)irBinding.getIrPart();

-    }

-    

-    public boolean visit(Interface interfaceAST) {

-    	interfaceAST.getName().setType(interfaceBinding);

-    	interfaceAST.accept(getPartSubTypeAndAnnotationCollector());

-        

-        if (interfaceAST.isPrivate()) {

-        	interfaceBinding.setAccessKind(AccessKind.ACC_PRIVATE);

-    	}

-

-        processExtends(interfaceAST);

-        setDefaultSuperType();

-        

-    	return true;

-    }

-    

-    private void processExtends(Interface interfaceAST) {

-        if(interfaceAST.hasExtendedType()) {

-    		for(Name name : interfaceAST.getExtendedTypes()) {

-            	try {          		

-        			Type typeBinding = bindTypeName(name);

-        			if (typeBinding instanceof org.eclipse.edt.mof.egl.Interface) {

-        				interfaceBinding.getSuperTypes().add((org.eclipse.edt.mof.egl.Interface)typeBinding);

-        			}      			

-            	}

-        		catch (ResolutionException e) {

-        			problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());

-        		}

-    		}

-        }

-    }

-    

-	public void endVisit(Interface interfaceNode) {

-		processSettingsBlocks();

-		endVisitFunctionContainer(interfaceNode);

-	}

-    

-    @Override

-	protected StereotypeType getDefaultStereotypeType() {

-		return null;

-	}

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.binding;
+
+import org.eclipse.edt.compiler.core.ast.Interface;
+import org.eclipse.edt.compiler.core.ast.Name;
+import org.eclipse.edt.compiler.internal.core.builder.IMarker;
+import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;
+import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;
+import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;
+import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;
+import org.eclipse.edt.compiler.internal.core.lookup.Scope;
+import org.eclipse.edt.mof.egl.AccessKind;
+import org.eclipse.edt.mof.egl.StereotypeType;
+import org.eclipse.edt.mof.egl.Type;
+
+
+/**
+ * @author winghong
+ */
+public class InterfaceBindingCompletor extends FunctionContainerBindingCompletor {
+
+    private org.eclipse.edt.mof.egl.Interface interfaceBinding;
+
+    public InterfaceBindingCompletor(Scope currentScope, IRPartBinding irBinding, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {
+        super(irBinding, currentScope, dependencyRequestor, problemRequestor, compilerOptions);
+        this.interfaceBinding = (org.eclipse.edt.mof.egl.Interface)irBinding.getIrPart();
+    }
+    
+    public boolean visit(Interface interfaceAST) {
+    	interfaceAST.getName().setType(interfaceBinding);
+    	interfaceAST.accept(getPartSubTypeAndAnnotationCollector());
+        
+        if (interfaceAST.isPrivate()) {
+        	interfaceBinding.setAccessKind(AccessKind.ACC_PRIVATE);
+    	}
+
+        processExtends(interfaceAST);
+        setDefaultSuperType();
+        
+    	return true;
+    }
+    
+    private void processExtends(Interface interfaceAST) {
+        if(interfaceAST.hasExtendedType()) {
+    		for(Name name : interfaceAST.getExtendedTypes()) {
+            	try {          		
+        			Type typeBinding = bindTypeName(name);
+        			if (typeBinding instanceof org.eclipse.edt.mof.egl.Interface) {
+        				interfaceBinding.getSuperTypes().add((org.eclipse.edt.mof.egl.Interface)typeBinding);
+        			}      			
+            	}
+        		catch (ResolutionException e) {
+        			problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());
+        		}
+    		}
+        }
+    }
+    
+	public void endVisit(Interface interfaceNode) {
+		processSettingsBlocks();
+		endVisitFunctionContainer(interfaceNode);
+	}
+    
+    @Override
+	protected StereotypeType getDefaultStereotypeType() {
+		return null;
+	}
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InvocationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InvocationValidationRule.java
index 0058f91..4d12adc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InvocationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/InvocationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/LibraryBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/LibraryBindingCompletor.java
index c0cc036..91a08ea 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/LibraryBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/LibraryBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PackageBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PackageBinding.java
index f069303..9b58b59 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PackageBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PackageBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartBinding.java
index bafa07e..f9dbdc0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartContentValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartContentValidationRule.java
index c005fb5..1287e20 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartContentValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartContentValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartSubTypeAndAnnotationCollector.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartSubTypeAndAnnotationCollector.java
index 8369ce3..e758f59 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartSubTypeAndAnnotationCollector.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/PartSubTypeAndAnnotationCollector.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ProgramBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ProgramBindingCompletor.java
index d174113..1162c0f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ProgramBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ProgramBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingCompletor.java
index 8001fb3..3d6cf6d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingCompletor.java
@@ -1,112 +1,112 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.binding;

-

-import org.eclipse.edt.compiler.core.ast.Record;

-import org.eclipse.edt.compiler.core.ast.SettingsBlock;

-import org.eclipse.edt.compiler.core.ast.StructureItem;

-import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

-import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.DefaultBinder;

-import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;

-import org.eclipse.edt.compiler.internal.core.lookup.NullScope;

-import org.eclipse.edt.compiler.internal.core.lookup.RecordScope;

-import org.eclipse.edt.compiler.internal.core.lookup.Scope;

-import org.eclipse.edt.compiler.internal.util.BindingUtil;

-import org.eclipse.edt.mof.egl.AccessKind;

-import org.eclipse.edt.mof.egl.MofConversion;

-import org.eclipse.edt.mof.egl.Stereotype;

-import org.eclipse.edt.mof.egl.StereotypeType;

-import org.eclipse.edt.mof.egl.StructPart;

-import org.eclipse.edt.mof.utils.NameUtile;

-

-

-public class RecordBindingCompletor extends DefaultBinder {

-

-    private org.eclipse.edt.mof.egl.Record recordBinding;

-	private IRPartBinding irBinding;

-    

-    private Stereotype partStereotype;

-

-	private RecordBindingFieldsCompletor flexibleRecordBindingFieldsCompletor;

-

-    public RecordBindingCompletor(Scope currentScope, IRPartBinding irBinding, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {

-        super(currentScope, (org.eclipse.edt.mof.egl.Record)irBinding.getIrPart(), dependencyRequestor, problemRequestor, compilerOptions);

-        this.recordBinding = (org.eclipse.edt.mof.egl.Record)irBinding.getIrPart();

-        this.irBinding = irBinding;

-    }

-

-    public boolean visit(Record record) {

-        //First, we need to look for record subType on the AST or in the

-        // settings block

-        PartSubTypeAndAnnotationCollector collector = new PartSubTypeAndAnnotationCollector(recordBinding, this, problemRequestor);

-        record.accept(collector);

-        processSubType(collector);

-        flexibleRecordBindingFieldsCompletor = new RecordBindingFieldsCompletor(currentScope, recordBinding, record.getName().getCanonicalName(), dependencyRequestor, problemRequestor, compilerOptions);

-		//Next, we need to complete the fields in the record

-        record.accept(flexibleRecordBindingFieldsCompletor);

-        

-        //now we will need to process the SettingsBlock for the

-        // record...the collector has already gathered those for us.

-

-        processSettingsBlocksFromCollector(collector);

-        

-        if (record.isPrivate()) {

-        	recordBinding.setAccessKind(AccessKind.ACC_PRIVATE);

-        }

-        record.getName().setType(recordBinding);

-        

-        return false;

-    }

-

-	public void endVisit(Record record) {

-    	irBinding.setValid(true);

-        super.endVisit(record);

-    }

-	

-	private void setDefaultSuperType(Stereotype subType) {

-		StructPart anyRec = (StructPart)BindingUtil.findPart(NameUtile.getAsName(MofConversion.EGLX_lang_package), NameUtile.getAsName("AnyRecord"));

-		BindingUtil.setDefaultSupertype(recordBinding, subType, anyRec);

-	}

-    

-

-    protected void processSubType(PartSubTypeAndAnnotationCollector collector) {

-    	partStereotype = collector.getStereotype();

-    	setDefaultSuperType(partStereotype);

-    }

-

-    private void processSettingsBlocksFromCollector(PartSubTypeAndAnnotationCollector collector) {

-

-        if (collector.getSettingsBlocks().size() > 0) {

-            AnnotationLeftHandScope scope = new AnnotationLeftHandScope(new RecordScope(NullScope.INSTANCE, recordBinding), recordBinding, recordBinding, recordBinding);

-            if (!collector.isFoundSubTypeInSettingsBlock() && partStereotype != null) {

-                scope = new AnnotationLeftHandScope(scope, partStereotype, (StereotypeType)partStereotype.getEClass(), partStereotype);

-            }

-            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(currentScope, recordBinding, scope,

-                    dependencyRequestor, problemRequestor, compilerOptions);

-            

-            for (SettingsBlock block : collector.getSettingsBlocks()) {

-            	block.accept(blockCompletor);

-            }

-        }

-    }

-

-    public boolean visit(StructureItem structureItem) {

-        return false;

-    }

-

-    public boolean visit(SettingsBlock settingsBlock) {

-        return false;

-    }

-

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.binding;
+
+import org.eclipse.edt.compiler.core.ast.Record;
+import org.eclipse.edt.compiler.core.ast.SettingsBlock;
+import org.eclipse.edt.compiler.core.ast.StructureItem;
+import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;
+import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.DefaultBinder;
+import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;
+import org.eclipse.edt.compiler.internal.core.lookup.NullScope;
+import org.eclipse.edt.compiler.internal.core.lookup.RecordScope;
+import org.eclipse.edt.compiler.internal.core.lookup.Scope;
+import org.eclipse.edt.compiler.internal.util.BindingUtil;
+import org.eclipse.edt.mof.egl.AccessKind;
+import org.eclipse.edt.mof.egl.MofConversion;
+import org.eclipse.edt.mof.egl.Stereotype;
+import org.eclipse.edt.mof.egl.StereotypeType;
+import org.eclipse.edt.mof.egl.StructPart;
+import org.eclipse.edt.mof.utils.NameUtile;
+
+
+public class RecordBindingCompletor extends DefaultBinder {
+
+    private org.eclipse.edt.mof.egl.Record recordBinding;
+	private IRPartBinding irBinding;
+    
+    private Stereotype partStereotype;
+
+	private RecordBindingFieldsCompletor flexibleRecordBindingFieldsCompletor;
+
+    public RecordBindingCompletor(Scope currentScope, IRPartBinding irBinding, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {
+        super(currentScope, (org.eclipse.edt.mof.egl.Record)irBinding.getIrPart(), dependencyRequestor, problemRequestor, compilerOptions);
+        this.recordBinding = (org.eclipse.edt.mof.egl.Record)irBinding.getIrPart();
+        this.irBinding = irBinding;
+    }
+
+    public boolean visit(Record record) {
+        //First, we need to look for record subType on the AST or in the
+        // settings block
+        PartSubTypeAndAnnotationCollector collector = new PartSubTypeAndAnnotationCollector(recordBinding, this, problemRequestor);
+        record.accept(collector);
+        processSubType(collector);
+        flexibleRecordBindingFieldsCompletor = new RecordBindingFieldsCompletor(currentScope, recordBinding, record.getName().getCanonicalName(), dependencyRequestor, problemRequestor, compilerOptions);
+		//Next, we need to complete the fields in the record
+        record.accept(flexibleRecordBindingFieldsCompletor);
+        
+        //now we will need to process the SettingsBlock for the
+        // record...the collector has already gathered those for us.
+
+        processSettingsBlocksFromCollector(collector);
+        
+        if (record.isPrivate()) {
+        	recordBinding.setAccessKind(AccessKind.ACC_PRIVATE);
+        }
+        record.getName().setType(recordBinding);
+        
+        return false;
+    }
+
+	public void endVisit(Record record) {
+    	irBinding.setValid(true);
+        super.endVisit(record);
+    }
+	
+	private void setDefaultSuperType(Stereotype subType) {
+		StructPart anyRec = (StructPart)BindingUtil.findPart(NameUtile.getAsName(MofConversion.EGLX_lang_package), NameUtile.getAsName("AnyRecord"));
+		BindingUtil.setDefaultSupertype(recordBinding, subType, anyRec);
+	}
+    
+
+    protected void processSubType(PartSubTypeAndAnnotationCollector collector) {
+    	partStereotype = collector.getStereotype();
+    	setDefaultSuperType(partStereotype);
+    }
+
+    private void processSettingsBlocksFromCollector(PartSubTypeAndAnnotationCollector collector) {
+
+        if (collector.getSettingsBlocks().size() > 0) {
+            AnnotationLeftHandScope scope = new AnnotationLeftHandScope(new RecordScope(NullScope.INSTANCE, recordBinding), recordBinding, recordBinding, recordBinding);
+            if (!collector.isFoundSubTypeInSettingsBlock() && partStereotype != null) {
+                scope = new AnnotationLeftHandScope(scope, partStereotype, (StereotypeType)partStereotype.getEClass(), partStereotype);
+            }
+            SettingsBlockAnnotationBindingsCompletor blockCompletor = new SettingsBlockAnnotationBindingsCompletor(currentScope, recordBinding, scope,
+                    dependencyRequestor, problemRequestor, compilerOptions);
+            
+            for (SettingsBlock block : collector.getSettingsBlocks()) {
+            	block.accept(blockCompletor);
+            }
+        }
+    }
+
+    public boolean visit(StructureItem structureItem) {
+        return false;
+    }
+
+    public boolean visit(SettingsBlock settingsBlock) {
+        return false;
+    }
+
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingFieldsCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingFieldsCompletor.java
index a8dc9dd..45c0b68 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingFieldsCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/RecordBindingFieldsCompletor.java
@@ -1,143 +1,143 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.binding;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.edt.compiler.core.ast.AbstractASTVisitor;

-import org.eclipse.edt.compiler.core.ast.DefaultASTVisitor;

-import org.eclipse.edt.compiler.core.ast.IASTVisitor;

-import org.eclipse.edt.compiler.core.ast.Record;

-import org.eclipse.edt.compiler.core.ast.SettingsBlock;

-import org.eclipse.edt.compiler.core.ast.StructureItem;

-import org.eclipse.edt.compiler.internal.core.builder.IMarker;

-import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

-import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;

-import org.eclipse.edt.compiler.internal.core.lookup.AbstractBinder;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;

-import org.eclipse.edt.compiler.internal.core.lookup.MemberScope;

-import org.eclipse.edt.compiler.internal.core.lookup.NullScope;

-import org.eclipse.edt.compiler.internal.core.lookup.RecordScope;

-import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;

-import org.eclipse.edt.compiler.internal.core.lookup.Scope;

-import org.eclipse.edt.mof.egl.Field;

-import org.eclipse.edt.mof.egl.IrFactory;

-import org.eclipse.edt.mof.egl.Type;

-

-

-public class RecordBindingFieldsCompletor extends AbstractBinder {

-

-    private org.eclipse.edt.mof.egl.Record recordBinding;

-    private String canonicalRecordName;

-

-    private IProblemRequestor problemRequestor;

-    

-    private Set<String> definedNames = new HashSet<String>();

-    

-    public RecordBindingFieldsCompletor(Scope currentScope, org.eclipse.edt.mof.egl.Record recordBinding,

-    		String canonicalRecordName, IDependencyRequestor dependencyRequestor,

-			IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {

-        super(currentScope, recordBinding, dependencyRequestor, compilerOptions);

-        this.recordBinding = recordBinding;

-        this.canonicalRecordName = canonicalRecordName;

-        this.problemRequestor = problemRequestor;

-    }

-

-    public boolean visit(Record record) {

-        return true;

-    }

-

-    @Override

-    public void endVisit(Record record) {

-    	IASTVisitor visitor = new AbstractASTVisitor() {

-    		public boolean visit(StructureItem structureItem) {

-    			if (structureItem.hasSettingsBlock()) {

-    				Field field = null;

-					if (structureItem.getName() != null) {

-						field = (Field)structureItem.getName().resolveMember();

-					}

-    				

-    				if (field != null) {

-    					final Field fld = field;

-     					IASTVisitor sbVisitor = new DefaultASTVisitor() {

-    				        public boolean visit(SettingsBlock settingsBlock) {

-    				        	Scope fieldScope = new MemberScope(NullScope.INSTANCE, fld);

-    				            AnnotationLeftHandScope annotationScope = new AnnotationLeftHandScope(fieldScope, fld, fld.getType(), fld);

-    				            settingsBlock.accept(new SettingsBlockAnnotationBindingsCompletor(new RecordScope(currentScope, recordBinding), recordBinding, annotationScope, dependencyRequestor,

-    				                    problemRequestor, compilerOptions));

-    				            return false;

-    				        }

-						};

-						structureItem.getSettingsBlock().accept(sbVisitor);

-    				}

-    				

-    			}

-    			

-    			return false;

-    		}

-		};

-		

-		record.accept(visitor);

-    }

-

-    public boolean visit(SettingsBlock settingsBlock) {

-        return false;

-    }

-

-    public boolean visit(StructureItem structureItem) {

-        Type type = null;

-        try {

-            type = bindType(structureItem.getType());

-        } catch (ResolutionException e) {

-            problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());

-            if(structureItem.hasSettingsBlock()) {

-            	setBindAttemptedForNames(structureItem.getSettingsBlock());

-            }

-            return false; // Do not create the field binding if its type cannot be resolved

-        }

-        

-        Field fieldBinding = createField(structureItem, type);

-    	if(definedNames.contains(fieldBinding.getName())) {

-    		problemRequestor.acceptProblem(

-    			structureItem.getName(),

-				IProblemRequestor.DUPLICATE_VARIABLE_NAME,

-				new String[] {

-    				structureItem.getName().getCanonicalName(),

-					canonicalRecordName

-    			});

-    	}

-    	else {

-    		definedNames.add(fieldBinding.getName());

-    		recordBinding.getFields().add(fieldBinding);

-    	}

-        

-        return false;

-    }

-

-    public Field createField(StructureItem structureItem, Type type) {

-

-        String fieldName = structureItem.getName().getCaseSensitiveIdentifier();

-

-        Field field = IrFactory.INSTANCE.createField();

-        field.setName(fieldName);

-        field.setContainer(recordBinding);

-        field.setType(type);

-        field.setIsNullable(structureItem.isNullable());

-        

-        structureItem.getName().setMember(field);

-        structureItem.getName().setType(type);

-        return field;

-    }

-    

-  }

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.binding;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.edt.compiler.core.ast.AbstractASTVisitor;
+import org.eclipse.edt.compiler.core.ast.DefaultASTVisitor;
+import org.eclipse.edt.compiler.core.ast.IASTVisitor;
+import org.eclipse.edt.compiler.core.ast.Record;
+import org.eclipse.edt.compiler.core.ast.SettingsBlock;
+import org.eclipse.edt.compiler.core.ast.StructureItem;
+import org.eclipse.edt.compiler.internal.core.builder.IMarker;
+import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;
+import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;
+import org.eclipse.edt.compiler.internal.core.lookup.AbstractBinder;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;
+import org.eclipse.edt.compiler.internal.core.lookup.MemberScope;
+import org.eclipse.edt.compiler.internal.core.lookup.NullScope;
+import org.eclipse.edt.compiler.internal.core.lookup.RecordScope;
+import org.eclipse.edt.compiler.internal.core.lookup.ResolutionException;
+import org.eclipse.edt.compiler.internal.core.lookup.Scope;
+import org.eclipse.edt.mof.egl.Field;
+import org.eclipse.edt.mof.egl.IrFactory;
+import org.eclipse.edt.mof.egl.Type;
+
+
+public class RecordBindingFieldsCompletor extends AbstractBinder {
+
+    private org.eclipse.edt.mof.egl.Record recordBinding;
+    private String canonicalRecordName;
+
+    private IProblemRequestor problemRequestor;
+    
+    private Set<String> definedNames = new HashSet<String>();
+    
+    public RecordBindingFieldsCompletor(Scope currentScope, org.eclipse.edt.mof.egl.Record recordBinding,
+    		String canonicalRecordName, IDependencyRequestor dependencyRequestor,
+			IProblemRequestor problemRequestor, ICompilerOptions compilerOptions) {
+        super(currentScope, recordBinding, dependencyRequestor, compilerOptions);
+        this.recordBinding = recordBinding;
+        this.canonicalRecordName = canonicalRecordName;
+        this.problemRequestor = problemRequestor;
+    }
+
+    public boolean visit(Record record) {
+        return true;
+    }
+
+    @Override
+    public void endVisit(Record record) {
+    	IASTVisitor visitor = new AbstractASTVisitor() {
+    		public boolean visit(StructureItem structureItem) {
+    			if (structureItem.hasSettingsBlock()) {
+    				Field field = null;
+					if (structureItem.getName() != null) {
+						field = (Field)structureItem.getName().resolveMember();
+					}
+    				
+    				if (field != null) {
+    					final Field fld = field;
+     					IASTVisitor sbVisitor = new DefaultASTVisitor() {
+    				        public boolean visit(SettingsBlock settingsBlock) {
+    				        	Scope fieldScope = new MemberScope(NullScope.INSTANCE, fld);
+    				            AnnotationLeftHandScope annotationScope = new AnnotationLeftHandScope(fieldScope, fld, fld.getType(), fld);
+    				            settingsBlock.accept(new SettingsBlockAnnotationBindingsCompletor(new RecordScope(currentScope, recordBinding), recordBinding, annotationScope, dependencyRequestor,
+    				                    problemRequestor, compilerOptions));
+    				            return false;
+    				        }
+						};
+						structureItem.getSettingsBlock().accept(sbVisitor);
+    				}
+    				
+    			}
+    			
+    			return false;
+    		}
+		};
+		
+		record.accept(visitor);
+    }
+
+    public boolean visit(SettingsBlock settingsBlock) {
+        return false;
+    }
+
+    public boolean visit(StructureItem structureItem) {
+        Type type = null;
+        try {
+            type = bindType(structureItem.getType());
+        } catch (ResolutionException e) {
+            problemRequestor.acceptProblem(e.getStartOffset(), e.getEndOffset(), IMarker.SEVERITY_ERROR, e.getProblemKind(), e.getInserts());
+            if(structureItem.hasSettingsBlock()) {
+            	setBindAttemptedForNames(structureItem.getSettingsBlock());
+            }
+            return false; // Do not create the field binding if its type cannot be resolved
+        }
+        
+        Field fieldBinding = createField(structureItem, type);
+    	if(definedNames.contains(fieldBinding.getName())) {
+    		problemRequestor.acceptProblem(
+    			structureItem.getName(),
+				IProblemRequestor.DUPLICATE_VARIABLE_NAME,
+				new String[] {
+    				structureItem.getName().getCanonicalName(),
+					canonicalRecordName
+    			});
+    	}
+    	else {
+    		definedNames.add(fieldBinding.getName());
+    		recordBinding.getFields().add(fieldBinding);
+    	}
+        
+        return false;
+    }
+
+    public Field createField(StructureItem structureItem, Type type) {
+
+        String fieldName = structureItem.getName().getCaseSensitiveIdentifier();
+
+        Field field = IrFactory.INSTANCE.createField();
+        field.setName(fieldName);
+        field.setContainer(recordBinding);
+        field.setType(type);
+        field.setIsNullable(structureItem.isNullable());
+        
+        structureItem.getName().setMember(field);
+        structureItem.getName().setType(type);
+        return field;
+    }
+    
+  }
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ServiceBindingCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ServiceBindingCompletor.java
index 9dd955a..4a7e79a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ServiceBindingCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ServiceBindingCompletor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/SettingsBlockAnnotationBindingsCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/SettingsBlockAnnotationBindingsCompletor.java
index a4867f4..6fd3bdc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/SettingsBlockAnnotationBindingsCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/SettingsBlockAnnotationBindingsCompletor.java
@@ -1,219 +1,219 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.binding;

-

-import org.eclipse.edt.compiler.core.ast.AbstractASTExpressionVisitor;

-import org.eclipse.edt.compiler.core.ast.AnnotationExpression;

-import org.eclipse.edt.compiler.core.ast.Assignment;

-import org.eclipse.edt.compiler.core.ast.Expression;

-import org.eclipse.edt.compiler.core.ast.SetValuesExpression;

-import org.eclipse.edt.compiler.core.ast.SettingsBlock;

-import org.eclipse.edt.compiler.core.ast.SimpleName;

-import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

-import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.AnnotationRightHandScope;

-import org.eclipse.edt.compiler.internal.core.lookup.DefaultBinder;

-import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;

-import org.eclipse.edt.compiler.internal.core.lookup.Scope;

-import org.eclipse.edt.compiler.internal.util.BindingUtil;

-import org.eclipse.edt.mof.EField;

-import org.eclipse.edt.mof.egl.Annotation;

-import org.eclipse.edt.mof.egl.AnnotationType;

-import org.eclipse.edt.mof.egl.Classifier;

-import org.eclipse.edt.mof.egl.Element;

-import org.eclipse.edt.mof.egl.Part;

-import org.eclipse.edt.mof.egl.SubType;

-

-public class SettingsBlockAnnotationBindingsCompletor extends DefaultBinder {

-

-	private AnnotationLeftHandScope annotationLeftHandScope;

-	private Binder lhsBinder;

-	private Binder rhsBinder;

-

-	private Part partBinding;

-	

-	private static class Binder extends DefaultBinder {

-

-		public Binder(Scope currentScope, Part currentBinding,

-				IDependencyRequestor dependencyRequestor,

-				IProblemRequestor problemRequestor,

-				ICompilerOptions compilerOptions) {

-			super(currentScope, currentBinding, dependencyRequestor, problemRequestor,

-					compilerOptions);

-		}		

-	}

-

-	private static class LHSBinder extends Binder {

-

-		public LHSBinder(Scope currentScope, Part currentBinding,

-				IDependencyRequestor dependencyRequestor,

-				IProblemRequestor problemRequestor,

-				ICompilerOptions compilerOptions) {

-			super(currentScope, currentBinding, dependencyRequestor, problemRequestor,

-					compilerOptions);

-		}	

-		

-		public boolean visit(org.eclipse.edt.compiler.core.ast.ThisExpression thisExpression) {

-			if (currentScope.getType() != null) {

-				thisExpression.setType(currentScope.getType());

-				return false;

-			}

-			return super.visit(thisExpression);

-		}

-

-		public boolean visit(org.eclipse.edt.compiler.core.ast.SuperExpression superExpression) {

-			if (currentScope.getType() != null) {

-				

-				Classifier classifier = currentScope.getType().getClassifier();

-				if (classifier instanceof SubType) {

-					SubType sub = (SubType) classifier;

-					if (sub.getSuperTypes().size() > 0) {

-						superExpression.setType(sub.getSuperTypes().get(0));

-						return false;

-					}

-				}

-			}

-			return super.visit(superExpression);

-		}

-

-		

-	}

-

-	public SettingsBlockAnnotationBindingsCompletor(Scope currentScope, Part partBinding,

-			AnnotationLeftHandScope annotationLeftHandScope, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor,

-			ICompilerOptions compilerOptions) {

-		super(currentScope, partBinding, dependencyRequestor, problemRequestor, compilerOptions);

-		this.partBinding = partBinding;

-		this.annotationLeftHandScope = annotationLeftHandScope;

-		rhsBinder = new Binder(currentScope, partBinding, dependencyRequestor, problemRequestor, compilerOptions);

-		lhsBinder = new LHSBinder(annotationLeftHandScope.getTopLevelAnnotationLeftHandScope().getScopeToUseWhenResolving(), partBinding, dependencyRequestor, problemRequestor, compilerOptions);

-	}

-

-	public boolean visit(SettingsBlock settingsBlock) {

-		settingsBlock.accept(new AbstractASTExpressionVisitor() {

-

-			private EField getEField(AnnotationType annType, String name) {

-				for (EField f : annType.getEFields()) {

-					if (f.getName().equalsIgnoreCase(name))

-						return f;

-				}

-				return null;

-			}

-			

-			public boolean visit(Assignment assignment) {

-				

-				if (annotationLeftHandScope.getElementBeingAnnotated() instanceof Annotation && assignment.getLeftHandSide() instanceof SimpleName) {

-					Annotation ann = (Annotation) annotationLeftHandScope.getElementBeingAnnotated();

-					AnnotationType annType = (AnnotationType)ann.getEClass();

-					String fieldName = ((SimpleName)assignment.getLeftHandSide()).getIdentifier();

-					EField field = getEField(annType, fieldName);

-					if (field != null) {

-						Object obj = getValue(assignment.getRightHandSide(), ann, field);

-						setValueIntoAnnotation(obj, assignment.getRightHandSide(), ann, field);

-						assignment.getLeftHandSide().setElement(ann);

-						assignment.getLeftHandSide().setType(annType);

-						assignment.setBinding(ann);

-						return false;

-					}

-

-				}

-				assignment.getLeftHandSide().accept(lhsBinder);

-				assignment.getRightHandSide().accept(rhsBinder);

-				return false;

-			}

-

-			public boolean visit(AnnotationExpression annotationExpression) {

-				Annotation ann = getAnnotation(annotationExpression, problemRequestor);

-				setAnnotationOnElement(annotationLeftHandScope.getTopLevelAnnotationLeftHandScope().getElementBeingAnnotated(), ann, annotationExpression);

-				

-				return false;

-			}

-

-			public boolean visit(SetValuesExpression setValuesExpression) {

-				if (setValuesExpression.getExpression() instanceof AnnotationExpression) {

-					setValuesExpression.getExpression().accept(this);

-					Annotation ann = ((AnnotationExpression)setValuesExpression.getExpression()).resolveAnnotation();

-					if (ann == null) {

-						setBindAttemptedForNames(setValuesExpression.getSettingsBlock());

-					}

-					else {

-						AnnotationLeftHandScope newScope = new AnnotationLeftHandScope(annotationLeftHandScope, ann, null, ann);

-						SettingsBlockAnnotationBindingsCompletor completor = new SettingsBlockAnnotationBindingsCompletor(currentScope, partBinding, newScope, dependencyRequestor, problemRequestor, compilerOptions);

-						setValuesExpression.getSettingsBlock().accept(completor);

-					}

-					

-				}

-				else {

-					setValuesExpression.getExpression().accept(lhsBinder);

-					setValuesExpression.accept(rhsBinder);

-					

-				}

-				return false;

-			}

-

-			public boolean visitExpression(Expression expression) {

-				//If the current element is an annotation and the annotationType has a single field, set the value of the expression into the field

-				if (annotationLeftHandScope.getElementBeingAnnotated() instanceof Annotation) {

-					Annotation ann = (Annotation) annotationLeftHandScope.getElementBeingAnnotated();

-					AnnotationType annType = (AnnotationType)ann.getEClass();

-					if (annType.getEFields().size() == 1) {

-						Object obj = getValue(expression, ann, annType.getEFields().get(0));

-						setValueIntoAnnotation(obj, expression, ann, annType.getEFields().get(0));

-					}

-					else {

-						problemRequestor.acceptProblem(expression, IProblemRequestor.POSITIONAL_PROPERTY_NOT_VALID_FOR,

-								new String[] { annType.getCaseSensitiveName() });

-					}

-				}

-				return false;

-			}

-			

-			

-		});

-

-		return false;

-	}

-	

-	private Object getValue(Expression expr, Annotation ann, EField field) {

-		AnnotationRightHandScope rhScope = new AnnotationRightHandScope(currentScope, field);

-		return new AnnotationValueGatherer(expr, rhScope, partBinding, dependencyRequestor, problemRequestor, compilerOptions).getValue();

-	}

-				

-	private void setValueIntoAnnotation(Object value, Expression expr, Annotation ann, EField field) {

-		AnnotationValueValidator validator =  new AnnotationValueValidator(problemRequestor);

-		Object result = validator.validateValue(value, expr, field, field.getEType(), field.isNullable());

-		if (result != null) {

-			ann.eSet(field, result);			

-		}

-	}

-		

-	private void setAnnotationOnElement(Element elem, Annotation ann, AnnotationExpression annotationExpression) {

-		if (ann == null || elem == null) {

-			return;

-		}

-		

-		if (isApplicableFor(elem, ann)) {

-			elem.addAnnotation(ann);

-		}

-		else {

-			problemRequestor.acceptProblem(annotationExpression, IProblemRequestor.ANNOTATION_NOT_APPLICABLE,

-					new String[] {annotationExpression.getName().getCanonicalString()});

-		}

-	}

-

-	private boolean isApplicableFor(Element elem, Annotation ann) {

-		AnnotationType annType = (AnnotationType)ann.getEClass();

-		return BindingUtil.isApplicableFor(elem, annType.getTargets());

-	}

-	

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.binding;
+
+import org.eclipse.edt.compiler.core.ast.AbstractASTExpressionVisitor;
+import org.eclipse.edt.compiler.core.ast.AnnotationExpression;
+import org.eclipse.edt.compiler.core.ast.Assignment;
+import org.eclipse.edt.compiler.core.ast.Expression;
+import org.eclipse.edt.compiler.core.ast.SetValuesExpression;
+import org.eclipse.edt.compiler.core.ast.SettingsBlock;
+import org.eclipse.edt.compiler.core.ast.SimpleName;
+import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;
+import org.eclipse.edt.compiler.internal.core.dependency.IDependencyRequestor;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationLeftHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.AnnotationRightHandScope;
+import org.eclipse.edt.compiler.internal.core.lookup.DefaultBinder;
+import org.eclipse.edt.compiler.internal.core.lookup.ICompilerOptions;
+import org.eclipse.edt.compiler.internal.core.lookup.Scope;
+import org.eclipse.edt.compiler.internal.util.BindingUtil;
+import org.eclipse.edt.mof.EField;
+import org.eclipse.edt.mof.egl.Annotation;
+import org.eclipse.edt.mof.egl.AnnotationType;
+import org.eclipse.edt.mof.egl.Classifier;
+import org.eclipse.edt.mof.egl.Element;
+import org.eclipse.edt.mof.egl.Part;
+import org.eclipse.edt.mof.egl.SubType;
+
+public class SettingsBlockAnnotationBindingsCompletor extends DefaultBinder {
+
+	private AnnotationLeftHandScope annotationLeftHandScope;
+	private Binder lhsBinder;
+	private Binder rhsBinder;
+
+	private Part partBinding;
+	
+	private static class Binder extends DefaultBinder {
+
+		public Binder(Scope currentScope, Part currentBinding,
+				IDependencyRequestor dependencyRequestor,
+				IProblemRequestor problemRequestor,
+				ICompilerOptions compilerOptions) {
+			super(currentScope, currentBinding, dependencyRequestor, problemRequestor,
+					compilerOptions);
+		}		
+	}
+
+	private static class LHSBinder extends Binder {
+
+		public LHSBinder(Scope currentScope, Part currentBinding,
+				IDependencyRequestor dependencyRequestor,
+				IProblemRequestor problemRequestor,
+				ICompilerOptions compilerOptions) {
+			super(currentScope, currentBinding, dependencyRequestor, problemRequestor,
+					compilerOptions);
+		}	
+		
+		public boolean visit(org.eclipse.edt.compiler.core.ast.ThisExpression thisExpression) {
+			if (currentScope.getType() != null) {
+				thisExpression.setType(currentScope.getType());
+				return false;
+			}
+			return super.visit(thisExpression);
+		}
+
+		public boolean visit(org.eclipse.edt.compiler.core.ast.SuperExpression superExpression) {
+			if (currentScope.getType() != null) {
+				
+				Classifier classifier = currentScope.getType().getClassifier();
+				if (classifier instanceof SubType) {
+					SubType sub = (SubType) classifier;
+					if (sub.getSuperTypes().size() > 0) {
+						superExpression.setType(sub.getSuperTypes().get(0));
+						return false;
+					}
+				}
+			}
+			return super.visit(superExpression);
+		}
+
+		
+	}
+
+	public SettingsBlockAnnotationBindingsCompletor(Scope currentScope, Part partBinding,
+			AnnotationLeftHandScope annotationLeftHandScope, IDependencyRequestor dependencyRequestor, IProblemRequestor problemRequestor,
+			ICompilerOptions compilerOptions) {
+		super(currentScope, partBinding, dependencyRequestor, problemRequestor, compilerOptions);
+		this.partBinding = partBinding;
+		this.annotationLeftHandScope = annotationLeftHandScope;
+		rhsBinder = new Binder(currentScope, partBinding, dependencyRequestor, problemRequestor, compilerOptions);
+		lhsBinder = new LHSBinder(annotationLeftHandScope.getTopLevelAnnotationLeftHandScope().getScopeToUseWhenResolving(), partBinding, dependencyRequestor, problemRequestor, compilerOptions);
+	}
+
+	public boolean visit(SettingsBlock settingsBlock) {
+		settingsBlock.accept(new AbstractASTExpressionVisitor() {
+
+			private EField getEField(AnnotationType annType, String name) {
+				for (EField f : annType.getEFields()) {
+					if (f.getName().equalsIgnoreCase(name))
+						return f;
+				}
+				return null;
+			}
+			
+			public boolean visit(Assignment assignment) {
+				
+				if (annotationLeftHandScope.getElementBeingAnnotated() instanceof Annotation && assignment.getLeftHandSide() instanceof SimpleName) {
+					Annotation ann = (Annotation) annotationLeftHandScope.getElementBeingAnnotated();
+					AnnotationType annType = (AnnotationType)ann.getEClass();
+					String fieldName = ((SimpleName)assignment.getLeftHandSide()).getIdentifier();
+					EField field = getEField(annType, fieldName);
+					if (field != null) {
+						Object obj = getValue(assignment.getRightHandSide(), ann, field);
+						setValueIntoAnnotation(obj, assignment.getRightHandSide(), ann, field);
+						assignment.getLeftHandSide().setElement(ann);
+						assignment.getLeftHandSide().setType(annType);
+						assignment.setBinding(ann);
+						return false;
+					}
+
+				}
+				assignment.getLeftHandSide().accept(lhsBinder);
+				assignment.getRightHandSide().accept(rhsBinder);
+				return false;
+			}
+
+			public boolean visit(AnnotationExpression annotationExpression) {
+				Annotation ann = getAnnotation(annotationExpression, problemRequestor);
+				setAnnotationOnElement(annotationLeftHandScope.getTopLevelAnnotationLeftHandScope().getElementBeingAnnotated(), ann, annotationExpression);
+				
+				return false;
+			}
+
+			public boolean visit(SetValuesExpression setValuesExpression) {
+				if (setValuesExpression.getExpression() instanceof AnnotationExpression) {
+					setValuesExpression.getExpression().accept(this);
+					Annotation ann = ((AnnotationExpression)setValuesExpression.getExpression()).resolveAnnotation();
+					if (ann == null) {
+						setBindAttemptedForNames(setValuesExpression.getSettingsBlock());
+					}
+					else {
+						AnnotationLeftHandScope newScope = new AnnotationLeftHandScope(annotationLeftHandScope, ann, null, ann);
+						SettingsBlockAnnotationBindingsCompletor completor = new SettingsBlockAnnotationBindingsCompletor(currentScope, partBinding, newScope, dependencyRequestor, problemRequestor, compilerOptions);
+						setValuesExpression.getSettingsBlock().accept(completor);
+					}
+					
+				}
+				else {
+					setValuesExpression.getExpression().accept(lhsBinder);
+					setValuesExpression.accept(rhsBinder);
+					
+				}
+				return false;
+			}
+
+			public boolean visitExpression(Expression expression) {
+				//If the current element is an annotation and the annotationType has a single field, set the value of the expression into the field
+				if (annotationLeftHandScope.getElementBeingAnnotated() instanceof Annotation) {
+					Annotation ann = (Annotation) annotationLeftHandScope.getElementBeingAnnotated();
+					AnnotationType annType = (AnnotationType)ann.getEClass();
+					if (annType.getEFields().size() == 1) {
+						Object obj = getValue(expression, ann, annType.getEFields().get(0));
+						setValueIntoAnnotation(obj, expression, ann, annType.getEFields().get(0));
+					}
+					else {
+						problemRequestor.acceptProblem(expression, IProblemRequestor.POSITIONAL_PROPERTY_NOT_VALID_FOR,
+								new String[] { annType.getCaseSensitiveName() });
+					}
+				}
+				return false;
+			}
+			
+			
+		});
+
+		return false;
+	}
+	
+	private Object getValue(Expression expr, Annotation ann, EField field) {
+		AnnotationRightHandScope rhScope = new AnnotationRightHandScope(currentScope, field);
+		return new AnnotationValueGatherer(expr, rhScope, partBinding, dependencyRequestor, problemRequestor, compilerOptions).getValue();
+	}
+				
+	private void setValueIntoAnnotation(Object value, Expression expr, Annotation ann, EField field) {
+		AnnotationValueValidator validator =  new AnnotationValueValidator(problemRequestor);
+		Object result = validator.validateValue(value, expr, field, field.getEType(), field.isNullable());
+		if (result != null) {
+			ann.eSet(field, result);			
+		}
+	}
+		
+	private void setAnnotationOnElement(Element elem, Annotation ann, AnnotationExpression annotationExpression) {
+		if (ann == null || elem == null) {
+			return;
+		}
+		
+		if (isApplicableFor(elem, ann)) {
+			elem.addAnnotation(ann);
+		}
+		else {
+			problemRequestor.acceptProblem(annotationExpression, IProblemRequestor.ANNOTATION_NOT_APPLICABLE,
+					new String[] {annotationExpression.getName().getCanonicalString()});
+		}
+	}
+
+	private boolean isApplicableFor(Element elem, Annotation ann) {
+		AnnotationType annType = (AnnotationType)ann.getEClass();
+		return BindingUtil.isApplicableFor(elem, annType.getTargets());
+	}
+	
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/StereotypeTypeCompletor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/StereotypeTypeCompletor.java
index d94097d..a2ff57e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/StereotypeTypeCompletor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/StereotypeTypeCompletor.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;

 

 import org.eclipse.edt.compiler.internal.core.builder.IProblemRequestor;

diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/TypeBinding.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/TypeBinding.java
index c46274e..242853e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/TypeBinding.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/TypeBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedAnnotationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedAnnotationValidationRule.java
index 6d7adc2..8985792 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedAnnotationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedAnnotationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldAccessAnnotationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldAccessAnnotationValidationRule.java
index 87e652d..a4962f6 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldAccessAnnotationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldAccessAnnotationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldContentAnnotationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldContentAnnotationValidationRule.java
index f3ac2fc..021396d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldContentAnnotationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedFieldContentAnnotationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedInvocationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedInvocationValidationRule.java
index 6929fb8..89863e8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedInvocationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedInvocationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedPartContentAnnotationValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedPartContentAnnotationValidationRule.java
index 17f35a0..f050a2a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedPartContentAnnotationValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedPartContentAnnotationValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedValueValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedValueValidationRule.java
index 99b71c0..3c94bff 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedValueValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/UserDefinedValueValidationRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ValueValidationRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ValueValidationRule.java
index ca340b6..76eebda 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ValueValidationRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/ValueValidationRule.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 package org.eclipse.edt.compiler.binding;
 
 import org.eclipse.edt.compiler.core.ast.Node;
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/EGLPropertyAnnotationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/EGLPropertyAnnotationProxy.java
index 1c74fd5..d65ffb4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/EGLPropertyAnnotationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/EGLPropertyAnnotationProxy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaObjectAnnotationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaObjectAnnotationProxy.java
index f05b500..7b6f2e9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaObjectAnnotationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaObjectAnnotationProxy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaScriptObjectAnnotationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaScriptObjectAnnotationProxy.java
index 2be8118..7494f56 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaScriptObjectAnnotationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/JavaScriptObjectAnnotationProxy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/PropertyAnnotationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/PropertyAnnotationProxy.java
index c3ebcc9..0ae56c5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/PropertyAnnotationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/PropertyAnnotationProxy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/ThrowsAnnotationProxy.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/ThrowsAnnotationProxy.java
index 3bae1a1..a6971a7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/ThrowsAnnotationProxy.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/binding/annotationType/ThrowsAnnotationProxy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/Boolean.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/Boolean.java
index 2fdd6bb..735d528 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/Boolean.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/Boolean.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLKeywordHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLKeywordHandler.java
index 665bc75..11a477e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLKeywordHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLKeywordHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLSQLKeywordHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLSQLKeywordHandler.java
index 516c418..301a85d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLSQLKeywordHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/EGLSQLKeywordHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/IEGLConstants.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/IEGLConstants.java
index 103fe9c..2ab8505 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/IEGLConstants.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/IEGLConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ASTParser.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ASTParser.java
index 7b01b95..5eeb0a9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ASTParser.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ASTParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTExpressionVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTExpressionVisitor.java
index aafa56f..25e3c82 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTExpressionVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTExpressionVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTNodeVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTNodeVisitor.java
index 7cb7144..9310bca 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTNodeVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTNodeVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTPartVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTPartVisitor.java
index 27db470..a623731 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTPartVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTPartVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTStatementVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTStatementVisitor.java
index 43460d5..0b3cd4a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTStatementVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTStatementVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTVisitor.java
index cb484a2..9523e8e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractASTVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractRecovery.java
index ee4639e..7df3798 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AbstractRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorMessageRequestor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorMessageRequestor.java
index c958646..6683798 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorMessageRequestor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorMessageRequestor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorRequestor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorRequestor.java
index f739f7d..0d5c551 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorRequestor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AccumulatingSyntaxErrorRequestor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AddStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AddStatement.java
index c5561ed..effaa8c 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AddStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AddStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AdvancedPhraseRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AdvancedPhraseRecovery.java
index 6d18128..1619d12 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AdvancedPhraseRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AdvancedPhraseRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AnnotationExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AnnotationExpression.java
index 0281499..df955e1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AnnotationExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AnnotationExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayAccess.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayAccess.java
index 93b88c7..384e611 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayAccess.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayAccess.java
@@ -1,122 +1,122 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.core.ast;

-

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.edt.mof.egl.Member;

-

-

-/**

- * ArrayAccess AST node type.

- *

- * @author Albert Ho

- * @author David Murray

- */

-public class ArrayAccess extends Expression {

-

-	private Expression array;

-	private List<Expression> subscripts;

-	private Object element;

-

-	public ArrayAccess(Expression primary, List<Expression> subscripts, int startOffset, int endOffset) {

-		super(startOffset, endOffset);

-		

-		this.array = primary;

-		array.setParent(this);

-		this.subscripts = subscripts;

-		setParent(subscripts);

-	}

-	

-	public Expression getArray() {

-		return array;

-	}

-	

-	public List<Expression> getIndices() {

-		return subscripts;

-	}

-	

-	@Override

-	public void accept(IASTVisitor visitor) {

-		boolean visitChildren = visitor.visit(this);

-		if(visitChildren) {

-			array.accept(visitor);

-			acceptChildren(visitor, subscripts);

-		}

-		visitor.endVisit(this);

-	}

-	

-	@Override

-	public String getCanonicalString() {

-		StringBuffer sb = new StringBuffer();

-		sb.append(getArray().getCanonicalString());

-		sb.append("[");

-		for(Iterator iter = subscripts.iterator(); iter.hasNext();) {

-			sb.append(((Expression) iter.next()).getCanonicalString());

-			if(iter.hasNext()) {

-				sb.append(",");

-			}

-		}

-		sb.append("]");

-		return sb.toString();

-	}

-	

-	@Override

-	public void setAttributeOnName(int attr, Object value) {

-		array.setAttributeOnName(attr, value);

-	}

-	

-	@Override

-	protected Object clone() throws CloneNotSupportedException {

-		return new ArrayAccess((Expression)array.clone(), cloneList(subscripts), getOffset(), getOffset() + getLength());

-	}

-	

-	@Override

-	public Member resolveMember() {

-		Member mbr = super.resolveMember();

-		if (mbr != null) {

-			return mbr;

-		}

-		return getArray().resolveMember();

-	}

-	

-	@Override

-	public void setElement(Object elem) {

-        this.element = elem;

-        super.setElement(elem);

-    }

-	

-	@Override

-    public Object resolveElement() {

-    	return element;

-    }

-	

-	@Override

-	public String toString() {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(array.toString());

-		buffer.append("[");

-		Iterator i = subscripts.iterator();

-		boolean first = true;

-		while (i.hasNext()) {

-			Expression ex = (Expression) i.next();

-			if (!first) {

-				buffer.append(",");

-			}

-			first = false;

-			buffer.append(ex.toString());

-		}

-		buffer.append("]");

-		return buffer.toString();

-	}

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.core.ast;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.edt.mof.egl.Member;
+
+
+/**
+ * ArrayAccess AST node type.
+ *
+ * @author Albert Ho
+ * @author David Murray
+ */
+public class ArrayAccess extends Expression {
+
+	private Expression array;
+	private List<Expression> subscripts;
+	private Object element;
+
+	public ArrayAccess(Expression primary, List<Expression> subscripts, int startOffset, int endOffset) {
+		super(startOffset, endOffset);
+		
+		this.array = primary;
+		array.setParent(this);
+		this.subscripts = subscripts;
+		setParent(subscripts);
+	}
+	
+	public Expression getArray() {
+		return array;
+	}
+	
+	public List<Expression> getIndices() {
+		return subscripts;
+	}
+	
+	@Override
+	public void accept(IASTVisitor visitor) {
+		boolean visitChildren = visitor.visit(this);
+		if(visitChildren) {
+			array.accept(visitor);
+			acceptChildren(visitor, subscripts);
+		}
+		visitor.endVisit(this);
+	}
+	
+	@Override
+	public String getCanonicalString() {
+		StringBuffer sb = new StringBuffer();
+		sb.append(getArray().getCanonicalString());
+		sb.append("[");
+		for(Iterator iter = subscripts.iterator(); iter.hasNext();) {
+			sb.append(((Expression) iter.next()).getCanonicalString());
+			if(iter.hasNext()) {
+				sb.append(",");
+			}
+		}
+		sb.append("]");
+		return sb.toString();
+	}
+	
+	@Override
+	public void setAttributeOnName(int attr, Object value) {
+		array.setAttributeOnName(attr, value);
+	}
+	
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return new ArrayAccess((Expression)array.clone(), cloneList(subscripts), getOffset(), getOffset() + getLength());
+	}
+	
+	@Override
+	public Member resolveMember() {
+		Member mbr = super.resolveMember();
+		if (mbr != null) {
+			return mbr;
+		}
+		return getArray().resolveMember();
+	}
+	
+	@Override
+	public void setElement(Object elem) {
+        this.element = elem;
+        super.setElement(elem);
+    }
+	
+	@Override
+    public Object resolveElement() {
+    	return element;
+    }
+	
+	@Override
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(array.toString());
+		buffer.append("[");
+		Iterator i = subscripts.iterator();
+		boolean first = true;
+		while (i.hasNext()) {
+			Expression ex = (Expression) i.next();
+			if (!first) {
+				buffer.append(",");
+			}
+			first = false;
+			buffer.append(ex.toString());
+		}
+		buffer.append("]");
+		return buffer.toString();
+	}
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayLiteral.java
index faa49cf..fe81723 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayStack.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayStack.java
index a803eca..948b1ce 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayStack.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayStack.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayType.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayType.java
index 8065528..83512d3 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayType.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ArrayType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AsExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AsExpression.java
index 87be028..0bf4ae9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AsExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AsExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Assignment.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Assignment.java
index 1b08595..b5a71ea 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Assignment.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Assignment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AssignmentStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AssignmentStatement.java
index ce30245..580777b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AssignmentStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/AssignmentStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BinaryExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BinaryExpression.java
index a5c8c8c..54714be 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BinaryExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BinaryExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BooleanLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BooleanLiteral.java
index 55dd7b3..f6f1662 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BooleanLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BooleanLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BytesLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BytesLiteral.java
index 72a92b5..44c48c8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BytesLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/BytesLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallReturns.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallReturns.java
index 72ec486..04447c6 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallReturns.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallReturns.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallStatement.java
index 6b2d1e9..cadf6f5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallSynchronizationValues.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallSynchronizationValues.java
index 3b13f83..3389817 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallSynchronizationValues.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallSynchronizationValues.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallbackTarget.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallbackTarget.java
index ba76681..588457b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallbackTarget.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CallbackTarget.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CaseStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CaseStatement.java
index e0284d4..fef8268 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CaseStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CaseStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Class.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Class.java
index 83b6e0d..447b080 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Class.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Class.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ClassDataDeclaration.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ClassDataDeclaration.java
index 1a3813e..aa17190 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ClassDataDeclaration.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ClassDataDeclaration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CloseStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CloseStatement.java
index b6bf961..c9233a9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CloseStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/CloseStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Constructor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Constructor.java
index c839a53..d61f7ce 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Constructor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Constructor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ContinueStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ContinueStatement.java
index b7ea2b1..47b8084 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ContinueStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ContinueStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DataItem.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DataItem.java
index 2242586..869ff88 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DataItem.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DataItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DecimalLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DecimalLiteral.java
index 5f97627..4ac77c1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DecimalLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DecimalLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultASTVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultASTVisitor.java
index c6c3806..7a1938d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultASTVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultASTVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultForUpdateClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultForUpdateClause.java
index 14475fc..9561064 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultForUpdateClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DefaultForUpdateClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Delegate.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Delegate.java
index 0671b58..564f833 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Delegate.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Delegate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DeleteStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DeleteStatement.java
index 994c9e5..1a96da9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DeleteStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/DeleteStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ElseBlock.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ElseBlock.java
index 4fc4710..bf2ecf7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ElseBlock.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ElseBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Enumeration.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Enumeration.java
index 1ef9f38..8710dc2 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Enumeration.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Enumeration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/EnumerationField.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/EnumerationField.java
index faa60dd..9cc333c 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/EnumerationField.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/EnumerationField.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ErrorCorrectingParser.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ErrorCorrectingParser.java
index a4bc57e..1fc68b7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ErrorCorrectingParser.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ErrorCorrectingParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExecuteStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExecuteStatement.java
index 8cd413e..08a86e5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExecuteStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExecuteStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExitStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExitStatement.java
index d606a17..e23cdf0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExitStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExitStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Expression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Expression.java
index e383e1b..d8ef3a5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Expression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Expression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternalType.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternalType.java
index ab1e7fa..1c24ba4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternalType.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternalType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternallyDefinedClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternallyDefinedClause.java
index 0081698..1c86449 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternallyDefinedClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ExternallyDefinedClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FieldAccess.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FieldAccess.java
index b999407..606449a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FieldAccess.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FieldAccess.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/File.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/File.java
index 7f0f7b2..216f426 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/File.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/File.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FloatLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FloatLiteral.java
index d32e9dd..ccab91e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FloatLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FloatLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForEachStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForEachStatement.java
index c39d629..6b2583d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForEachStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForEachStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForExpressionClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForExpressionClause.java
index 11007a3..38c3b4a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForExpressionClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForExpressionClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForMoveModifier.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForMoveModifier.java
index d0c40b8..38fefa4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForMoveModifier.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForMoveModifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForStatement.java
index ce73ee6..cd7f21c 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateClause.java
index 7f9d99c..9963b54 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateWithIDClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateWithIDClause.java
index d6dd758..bd3ea56 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateWithIDClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForUpdateWithIDClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForwardStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForwardStatement.java
index 80802c9..de15479 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForwardStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ForwardStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromExpressionClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromExpressionClause.java
index 2a0010e..77ab4de 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromExpressionClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromExpressionClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromOrToExpressionClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromOrToExpressionClause.java
index 1f62b6e..531cdc5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromOrToExpressionClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FromOrToExpressionClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2005, 2012 IBM Corporation and others.
+ * Copyright © 2005, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionDataDeclaration.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionDataDeclaration.java
index a11cd49..96da0da 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionDataDeclaration.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionDataDeclaration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocation.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocation.java
index 4b0b9e8..c188256 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocation.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocationStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocationStatement.java
index e91454a..9092c04 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocationStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionInvocationStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionParameter.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionParameter.java
index 75c2722..2a373a0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionParameter.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/FunctionParameter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByKeyStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByKeyStatement.java
index 60f9973..4010e11 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByKeyStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByKeyStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByPositionStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByPositionStatement.java
index d49f231..54dd80a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByPositionStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GetByPositionStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GotoStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GotoStatement.java
index 4a762d6..d66645d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GotoStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/GotoStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Handler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Handler.java
index 8f973bc..f304164 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Handler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Handler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IASTVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IASTVisitor.java
index 755d3ae..c75e205 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IASTVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IASTVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IOStatementClauseInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IOStatementClauseInfo.java
index 698c34e..6261a89 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IOStatementClauseInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IOStatementClauseInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ISyntaxErrorRequestor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ISyntaxErrorRequestor.java
index bbcdb7f..70308b3 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ISyntaxErrorRequestor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ISyntaxErrorRequestor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ITokenStream.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ITokenStream.java
index 2a8b8b0..945bd1f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ITokenStream.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ITokenStream.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IfStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IfStatement.java
index 577a055..a8261ef 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IfStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IfStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ImportDeclaration.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ImportDeclaration.java
index e319146..6820ae2 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ImportDeclaration.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ImportDeclaration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/InlineSQLStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/InlineSQLStatement.java
index 4e1e195..f764f76 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/InlineSQLStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/InlineSQLStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntegerLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntegerLiteral.java
index 0935df3..d952718 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntegerLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntegerLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Interface.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Interface.java
index f5de3dc..88974fe 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Interface.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Interface.java
@@ -1,91 +1,91 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.core.ast;

-

-import java.util.List;

-

-import org.eclipse.edt.compiler.core.IEGLConstants;

-

-

-/**

- * Interface AST node type.

- *

- * @author Albert Ho

- * @author David Murray

- */

-public class Interface extends Part {

-

-	private List<Name> extendsOpt;

-	private boolean hasExplicitAbstractModifier;

-

-	public Interface(Boolean privateAccessModifierOpt, Boolean explicitAbstractModifier, SimpleName name, List extendsOpt, List interfaceContents, int startOffset, int endOffset) {

-		super(privateAccessModifierOpt, name, interfaceContents, startOffset, endOffset);

-

-		this.extendsOpt = setParent(extendsOpt);

-		this.hasExplicitAbstractModifier = explicitAbstractModifier.booleanValue();

-	}

-	

-	public boolean hasSubType() {

-		return false;

-	}

-

-	public boolean hasExtendedType() {

-		return extendsOpt != null && !extendsOpt.isEmpty();

-	}

-

-	/**

-	 * @return A List of Name objects

-	 */

-	public List<Name> getExtendedTypes() {

-		return extendsOpt;

-	}

-

-	public Name getSubType() {

-		return null;

-	}

-	

-	@Override

-	public boolean isAbstract() {

-		return true;

-	}

-	

-	public boolean hasExplicitAbstractModifier() {

-		return hasExplicitAbstractModifier;

-	}

-	

-	public void accept(IASTVisitor visitor) {

-		boolean visitChildren = visitor.visit(this);

-		if(visitChildren) {

-			name.accept(visitor);

-			acceptChildren(visitor, extendsOpt);

-			acceptChildren(visitor, contents);

-		}

-		visitor.endVisit(this);

-	}

-	

-	protected Object clone() throws CloneNotSupportedException {

-		return new Interface(new Boolean(isPrivate), new Boolean(hasExplicitAbstractModifier), (SimpleName)name.clone(), cloneList(extendsOpt), cloneContents(), getOffset(), getOffset() + getLength());

-	}

-

-	public String getPartTypeName() {

-		return  IEGLConstants.KEYWORD_INTERFACE;

-	}

-	

-	public int getPartType() {

-		return INTERFACE;

-	}

-	

-	@Override

-	public String toString() {

-		return (hasExplicitAbstractModifier ? "abstract " : "") + getPartTypeName() + " " + getName();

-	}

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.core.ast;
+
+import java.util.List;
+
+import org.eclipse.edt.compiler.core.IEGLConstants;
+
+
+/**
+ * Interface AST node type.
+ *
+ * @author Albert Ho
+ * @author David Murray
+ */
+public class Interface extends Part {
+
+	private List<Name> extendsOpt;
+	private boolean hasExplicitAbstractModifier;
+
+	public Interface(Boolean privateAccessModifierOpt, Boolean explicitAbstractModifier, SimpleName name, List extendsOpt, List interfaceContents, int startOffset, int endOffset) {
+		super(privateAccessModifierOpt, name, interfaceContents, startOffset, endOffset);
+
+		this.extendsOpt = setParent(extendsOpt);
+		this.hasExplicitAbstractModifier = explicitAbstractModifier.booleanValue();
+	}
+	
+	public boolean hasSubType() {
+		return false;
+	}
+
+	public boolean hasExtendedType() {
+		return extendsOpt != null && !extendsOpt.isEmpty();
+	}
+
+	/**
+	 * @return A List of Name objects
+	 */
+	public List<Name> getExtendedTypes() {
+		return extendsOpt;
+	}
+
+	public Name getSubType() {
+		return null;
+	}
+	
+	@Override
+	public boolean isAbstract() {
+		return true;
+	}
+	
+	public boolean hasExplicitAbstractModifier() {
+		return hasExplicitAbstractModifier;
+	}
+	
+	public void accept(IASTVisitor visitor) {
+		boolean visitChildren = visitor.visit(this);
+		if(visitChildren) {
+			name.accept(visitor);
+			acceptChildren(visitor, extendsOpt);
+			acceptChildren(visitor, contents);
+		}
+		visitor.endVisit(this);
+	}
+	
+	protected Object clone() throws CloneNotSupportedException {
+		return new Interface(new Boolean(isPrivate), new Boolean(hasExplicitAbstractModifier), (SimpleName)name.clone(), cloneList(extendsOpt), cloneContents(), getOffset(), getOffset() + getLength());
+	}
+
+	public String getPartTypeName() {
+		return  IEGLConstants.KEYWORD_INTERFACE;
+	}
+	
+	public int getPartType() {
+		return INTERFACE;
+	}
+	
+	@Override
+	public String toString() {
+		return (hasExplicitAbstractModifier ? "abstract " : "") + getPartTypeName() + " " + getName();
+	}
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntoClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntoClause.java
index 2bce1ae..f725dab 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntoClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IntoClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsAExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsAExpression.java
index 5db88a5..9ae9804 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsAExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsAExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsNotExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsNotExpression.java
index 4d9ec48..06b7cb9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsNotExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/IsNotExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LabelStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LabelStatement.java
index c36e28b..0bb4df9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LabelStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LabelStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Lexer.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Lexer.java
index a1f8b9f..25b0407 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Lexer.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Lexer.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 /* The following code was generated by JFlex 1.4.3 on 11/19/12 4:04 PM */
 
 package org.eclipse.edt.compiler.core.ast;
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Library.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Library.java
index 52cd56e..60b05ad 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Library.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Library.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LiteralExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LiteralExpression.java
index d4adfd7..cacda0d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LiteralExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/LiteralExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveModifier.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveModifier.java
index 2908da0..efac4d0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveModifier.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveModifier.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveStatement.java
index 6e1dedb..eea53c5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/MoveStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Name.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Name.java
index 5e35c6c..9ae5dab 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Name.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Name.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NameType.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NameType.java
index b9b5eef..5e16df2 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NameType.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NameType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NestedFunction.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NestedFunction.java
index 7927f07..6da4c35 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NestedFunction.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NestedFunction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NewExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NewExpression.java
index 008c408..cfd6bae 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NewExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NewExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoCursorClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoCursorClause.java
index fb7ef5f..45c458d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoCursorClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoCursorClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoRefreshClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoRefreshClause.java
index 78841eb..9e54e70 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoRefreshClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NoRefreshClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Node.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Node.java
index cf06655..6eeb56a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Node.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Node.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeNameUtility.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeNameUtility.java
index d6fdfaa..816b703 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeNameUtility.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeNameUtility.java
@@ -1,670 +1,670 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.core.ast;

-

-import java.util.*;

-

-public class NodeNameUtility {

-

-private static Map terminalIntToStringMap = new HashMap();

-private static Map nonterminalIntToStringMap = new HashMap();

-private static Map terminalStringToIntMap = new HashMap();

-private static Map nonterminalStringToIntMap = new HashMap();

-

-static {

-terminalIntToStringMap.put(new Integer(85), "IMPLEMENTS");

-terminalStringToIntMap.put("IMPLEMENTS", new Integer(85));

-terminalIntToStringMap.put(new Integer(115), "EXIT");

-terminalStringToIntMap.put("EXIT", new Integer(115));

-terminalIntToStringMap.put(new Integer(107), "BIGINTLIT");

-terminalStringToIntMap.put("BIGINTLIT", new Integer(107));

-terminalIntToStringMap.put(new Integer(20), ">");

-terminalStringToIntMap.put(">", new Integer(20));

-terminalIntToStringMap.put(new Integer(129), "GET");

-terminalStringToIntMap.put("GET", new Integer(129));

-terminalIntToStringMap.put(new Integer(168), "HOLD");

-terminalStringToIntMap.put("HOLD", new Integer(168));

-terminalIntToStringMap.put(new Integer(44), "BITANDEQ");

-terminalStringToIntMap.put("BITANDEQ", new Integer(44));

-terminalIntToStringMap.put(new Integer(49), "DIVEQ");

-terminalStringToIntMap.put("DIVEQ", new Integer(49));

-terminalIntToStringMap.put(new Integer(7), "ERRORSQLSTMTLIT");

-terminalStringToIntMap.put("ERRORSQLSTMTLIT", new Integer(7));

-terminalIntToStringMap.put(new Integer(29), ">=");

-terminalStringToIntMap.put(">=", new Integer(29));

-terminalIntToStringMap.put(new Integer(112), "CALL");

-terminalStringToIntMap.put("CALL", new Integer(112));

-terminalIntToStringMap.put(new Integer(51), "CONCATEQ");

-terminalStringToIntMap.put("CONCATEQ", new Integer(51));

-terminalIntToStringMap.put(new Integer(157), "STACK");

-terminalStringToIntMap.put("STACK", new Integer(157));

-terminalIntToStringMap.put(new Integer(6), "ERRORBLOCKCOMMENT");

-terminalStringToIntMap.put("ERRORBLOCKCOMMENT", new Integer(6));

-terminalIntToStringMap.put(new Integer(11), "BITAND");

-terminalStringToIntMap.put("BITAND", new Integer(11));

-terminalIntToStringMap.put(new Integer(56), ")");

-terminalStringToIntMap.put(")", new Integer(56));

-terminalIntToStringMap.put(new Integer(136), "INTO");

-terminalStringToIntMap.put("INTO", new Integer(136));

-terminalIntToStringMap.put(new Integer(159), "BYPOSITION");

-terminalStringToIntMap.put("BYPOSITION", new Integer(159));

-terminalIntToStringMap.put(new Integer(138), "DECREMENT");

-terminalStringToIntMap.put("DECREMENT", new Integer(138));

-terminalIntToStringMap.put(new Integer(175), "WHERE");

-terminalStringToIntMap.put("WHERE", new Integer(175));

-terminalIntToStringMap.put(new Integer(35), "*");

-terminalStringToIntMap.put("*", new Integer(35));

-terminalIntToStringMap.put(new Integer(48), "TIMESEQ");

-terminalStringToIntMap.put("TIMESEQ", new Integer(48));

-terminalIntToStringMap.put(new Integer(74), "RECORD");

-terminalStringToIntMap.put("RECORD", new Integer(74));

-terminalIntToStringMap.put(new Integer(69), "BLOCK_COMMENT");

-terminalStringToIntMap.put("BLOCK_COMMENT", new Integer(69));

-terminalIntToStringMap.put(new Integer(116), "GOTO");

-terminalStringToIntMap.put("GOTO", new Integer(116));

-terminalIntToStringMap.put(new Integer(66), "UMINUS");

-terminalStringToIntMap.put("UMINUS", new Integer(66));

-terminalIntToStringMap.put(new Integer(132), "REPLACE");

-terminalStringToIntMap.put("REPLACE", new Integer(132));

-terminalIntToStringMap.put(new Integer(17), "==");

-terminalStringToIntMap.put("==", new Integer(17));

-terminalIntToStringMap.put(new Integer(45), "BITOREQ");

-terminalStringToIntMap.put("BITOREQ", new Integer(45));

-terminalIntToStringMap.put(new Integer(77), "PROGRAM");

-terminalStringToIntMap.put("PROGRAM", new Integer(77));

-terminalIntToStringMap.put(new Integer(104), "BYTESLIT");

-terminalStringToIntMap.put("BYTESLIT", new Integer(104));

-terminalIntToStringMap.put(new Integer(37), "**");

-terminalStringToIntMap.put("**", new Integer(37));

-terminalIntToStringMap.put(new Integer(126), "ADD");

-terminalStringToIntMap.put("ADD", new Integer(126));

-terminalIntToStringMap.put(new Integer(50), "TIMESTIMESEQ");

-terminalStringToIntMap.put("TIMESTIMESEQ", new Integer(50));

-terminalIntToStringMap.put(new Integer(87), "TYPE");

-terminalStringToIntMap.put("TYPE", new Integer(87));

-terminalIntToStringMap.put(new Integer(151), "RELATIVE");

-terminalStringToIntMap.put("RELATIVE", new Integer(151));

-terminalIntToStringMap.put(new Integer(36), "/");

-terminalStringToIntMap.put("/", new Integer(36));

-terminalIntToStringMap.put(new Integer(3), "EOS");

-terminalStringToIntMap.put("EOS", new Integer(3));

-terminalIntToStringMap.put(new Integer(63), "=");

-terminalStringToIntMap.put("=", new Integer(63));

-terminalIntToStringMap.put(new Integer(164), "LABEL");

-terminalStringToIntMap.put("LABEL", new Integer(164));

-terminalIntToStringMap.put(new Integer(109), "NULL");

-terminalStringToIntMap.put("NULL", new Integer(109));

-terminalIntToStringMap.put(new Integer(131), "PREPARE");

-terminalStringToIntMap.put("PREPARE", new Integer(131));

-terminalIntToStringMap.put(new Integer(147), "PREVIOUS");

-terminalStringToIntMap.put("PREVIOUS", new Integer(147));

-terminalIntToStringMap.put(new Integer(95), "PRIVATE");

-terminalStringToIntMap.put("PRIVATE", new Integer(95));

-terminalIntToStringMap.put(new Integer(0), "EOF");

-terminalStringToIntMap.put("EOF", new Integer(0));

-terminalIntToStringMap.put(new Integer(33), "-");

-terminalStringToIntMap.put("-", new Integer(33));

-terminalIntToStringMap.put(new Integer(78), "LIBRARY");

-terminalStringToIntMap.put("LIBRARY", new Integer(78));

-terminalIntToStringMap.put(new Integer(172), "LANGUAGEBUNDLE");

-terminalStringToIntMap.put("LANGUAGEBUNDLE", new Integer(172));

-terminalIntToStringMap.put(new Integer(42), "QUESTION");

-terminalStringToIntMap.put("QUESTION", new Integer(42));

-terminalIntToStringMap.put(new Integer(118), "MOVE");

-terminalStringToIntMap.put("MOVE", new Integer(118));

-terminalIntToStringMap.put(new Integer(72), "IMPORT");

-terminalStringToIntMap.put("IMPORT", new Integer(72));

-terminalIntToStringMap.put(new Integer(71), "PACKAGE");

-terminalStringToIntMap.put("PACKAGE", new Integer(71));

-terminalIntToStringMap.put(new Integer(144), "USING");

-terminalStringToIntMap.put("USING", new Integer(144));

-terminalIntToStringMap.put(new Integer(38), "::");

-terminalStringToIntMap.put("::", new Integer(38));

-terminalIntToStringMap.put(new Integer(167), "ELSE");

-terminalStringToIntMap.put("ELSE", new Integer(167));

-terminalIntToStringMap.put(new Integer(158), "BYNAME");

-terminalStringToIntMap.put("BYNAME", new Integer(158));

-terminalIntToStringMap.put(new Integer(122), "TRY");

-terminalStringToIntMap.put("TRY", new Integer(122));

-terminalIntToStringMap.put(new Integer(53), "MODULOEQ");

-terminalStringToIntMap.put("MODULOEQ", new Integer(53));

-terminalIntToStringMap.put(new Integer(152), "ABSOLUTE");

-terminalStringToIntMap.put("ABSOLUTE", new Integer(152));

-terminalIntToStringMap.put(new Integer(82), "DELEGATE");

-terminalStringToIntMap.put("DELEGATE", new Integer(82));

-terminalIntToStringMap.put(new Integer(73), "END");

-terminalStringToIntMap.put("END", new Integer(73));

-terminalIntToStringMap.put(new Integer(8), "||");

-terminalStringToIntMap.put("||", new Integer(8));

-terminalIntToStringMap.put(new Integer(148), "FIRST");

-terminalStringToIntMap.put("FIRST", new Integer(148));

-terminalIntToStringMap.put(new Integer(26), "RIGHTSHIFTLOGICALEQ");

-terminalStringToIntMap.put("RIGHTSHIFTLOGICALEQ", new Integer(26));

-terminalIntToStringMap.put(new Integer(75), "HANDLER");

-terminalStringToIntMap.put("HANDLER", new Integer(75));

-terminalIntToStringMap.put(new Integer(154), "WHEN");

-terminalStringToIntMap.put("WHEN", new Integer(154));

-terminalIntToStringMap.put(new Integer(9), "&&");

-terminalStringToIntMap.put("&&", new Integer(9));

-terminalIntToStringMap.put(new Integer(150), "CURRENT");

-terminalStringToIntMap.put("CURRENT", new Integer(150));

-terminalIntToStringMap.put(new Integer(92), "THIS");

-terminalStringToIntMap.put("THIS", new Integer(92));

-terminalIntToStringMap.put(new Integer(173), "OF");

-terminalStringToIntMap.put("OF", new Integer(173));

-terminalIntToStringMap.put(new Integer(137), "BY");

-terminalStringToIntMap.put("BY", new Integer(137));

-terminalIntToStringMap.put(new Integer(146), "NEXT");

-terminalStringToIntMap.put("NEXT", new Integer(146));

-terminalIntToStringMap.put(new Integer(89), "RETURNS");

-terminalStringToIntMap.put("RETURNS", new Integer(89));

-terminalIntToStringMap.put(new Integer(61), ";");

-terminalStringToIntMap.put(";", new Integer(61));

-terminalIntToStringMap.put(new Integer(171), "GROUP");

-terminalStringToIntMap.put("GROUP", new Integer(171));

-terminalIntToStringMap.put(new Integer(149), "LAST");

-terminalStringToIntMap.put("LAST", new Integer(149));

-terminalIntToStringMap.put(new Integer(125), "CLOSE");

-terminalStringToIntMap.put("CLOSE", new Integer(125));

-terminalIntToStringMap.put(new Integer(93), "NEW");

-terminalStringToIntMap.put("NEW", new Integer(93));

-terminalIntToStringMap.put(new Integer(127), "DELETE");

-terminalStringToIntMap.put("DELETE", new Integer(127));

-terminalIntToStringMap.put(new Integer(174), "REF");

-terminalStringToIntMap.put("REF", new Integer(174));

-terminalIntToStringMap.put(new Integer(83), "EXTERNALTYPE");

-terminalStringToIntMap.put("EXTERNALTYPE", new Integer(83));

-terminalIntToStringMap.put(new Integer(94), "SUPER");

-terminalStringToIntMap.put("SUPER", new Integer(94));

-terminalIntToStringMap.put(new Integer(47), "MINUSEQ");

-terminalStringToIntMap.put("MINUSEQ", new Integer(47));

-terminalIntToStringMap.put(new Integer(81), "INTERFACE");

-terminalStringToIntMap.put("INTERFACE", new Integer(81));

-terminalIntToStringMap.put(new Integer(60), "}");

-terminalStringToIntMap.put("}", new Integer(60));

-terminalIntToStringMap.put(new Integer(18), "!=");

-terminalStringToIntMap.put("!=", new Integer(18));

-terminalIntToStringMap.put(new Integer(40), "@");

-terminalStringToIntMap.put("@", new Integer(40));

-terminalIntToStringMap.put(new Integer(30), "AS");

-terminalStringToIntMap.put("AS", new Integer(30));

-terminalIntToStringMap.put(new Integer(113), "CASE");

-terminalStringToIntMap.put("CASE", new Integer(113));

-terminalIntToStringMap.put(new Integer(46), "PLUSEQ");

-terminalStringToIntMap.put("PLUSEQ", new Integer(46));

-terminalIntToStringMap.put(new Integer(24), "LEFTSHIFTEQ");

-terminalStringToIntMap.put("LEFTSHIFTEQ", new Integer(24));

-terminalIntToStringMap.put(new Integer(32), "+");

-terminalStringToIntMap.put("+", new Integer(32));

-terminalIntToStringMap.put(new Integer(123), "THROW");

-terminalStringToIntMap.put("THROW", new Integer(123));

-terminalIntToStringMap.put(new Integer(76), "CLASS");

-terminalStringToIntMap.put("CLASS", new Integer(76));

-terminalIntToStringMap.put(new Integer(55), "(");

-terminalStringToIntMap.put("(", new Integer(55));

-terminalIntToStringMap.put(new Integer(161), "ALL");

-terminalStringToIntMap.put("ALL", new Integer(161));

-terminalIntToStringMap.put(new Integer(58), "]");

-terminalStringToIntMap.put("]", new Integer(58));

-terminalIntToStringMap.put(new Integer(124), "WHILE");

-terminalStringToIntMap.put("WHILE", new Integer(124));

-terminalIntToStringMap.put(new Integer(67), "UPLUS");

-terminalStringToIntMap.put("UPLUS", new Integer(67));

-terminalIntToStringMap.put(new Integer(62), "CONST");

-terminalStringToIntMap.put("CONST", new Integer(62));

-terminalIntToStringMap.put(new Integer(12), "XOR");

-terminalStringToIntMap.put("XOR", new Integer(12));

-terminalIntToStringMap.put(new Integer(130), "OPEN");

-terminalStringToIntMap.put("OPEN", new Integer(130));

-terminalIntToStringMap.put(new Integer(156), "RUNUNIT");

-terminalStringToIntMap.put("RUNUNIT", new Integer(156));

-terminalIntToStringMap.put(new Integer(153), "INPARENT");

-terminalStringToIntMap.put("INPARENT", new Integer(153));

-terminalIntToStringMap.put(new Integer(65), ",");

-terminalStringToIntMap.put(",", new Integer(65));

-terminalIntToStringMap.put(new Integer(19), "<");

-terminalStringToIntMap.put("<", new Integer(19));

-terminalIntToStringMap.put(new Integer(108), "SMALLINTLIT");

-terminalStringToIntMap.put("SMALLINTLIT", new Integer(108));

-terminalIntToStringMap.put(new Integer(176), "WRAP");

-terminalStringToIntMap.put("WRAP", new Integer(176));

-terminalIntToStringMap.put(new Integer(139), "RETURNING");

-terminalStringToIntMap.put("RETURNING", new Integer(139));

-terminalIntToStringMap.put(new Integer(34), "%");

-terminalStringToIntMap.put("%", new Integer(34));

-terminalIntToStringMap.put(new Integer(80), "SERVICE");

-terminalStringToIntMap.put("SERVICE", new Integer(80));

-terminalIntToStringMap.put(new Integer(84), "ENUMERATION");

-terminalStringToIntMap.put("ENUMERATION", new Integer(84));

-terminalIntToStringMap.put(new Integer(21), "<=");

-terminalStringToIntMap.put("<=", new Integer(21));

-terminalIntToStringMap.put(new Integer(169), "SCROLL");

-terminalStringToIntMap.put("SCROLL", new Integer(169));

-terminalIntToStringMap.put(new Integer(14), "NOT");

-terminalStringToIntMap.put("NOT", new Integer(14));

-terminalIntToStringMap.put(new Integer(91), "OUT");

-terminalStringToIntMap.put("OUT", new Integer(91));

-terminalIntToStringMap.put(new Integer(57), "[");

-terminalStringToIntMap.put("[", new Integer(57));

-terminalIntToStringMap.put(new Integer(70), "LINEBREAKS");

-terminalStringToIntMap.put("LINEBREAKS", new Integer(70));

-terminalIntToStringMap.put(new Integer(28), "RIGHTSHIFTARITHMETICEQ");

-terminalStringToIntMap.put("RIGHTSHIFTARITHMETICEQ", new Integer(28));

-terminalIntToStringMap.put(new Integer(140), "WITH");

-terminalStringToIntMap.put("WITH", new Integer(140));

-terminalIntToStringMap.put(new Integer(23), "LEFTSHIFT");

-terminalStringToIntMap.put("LEFTSHIFT", new Integer(23));

-terminalIntToStringMap.put(new Integer(16), "!");

-terminalStringToIntMap.put("!", new Integer(16));

-terminalIntToStringMap.put(new Integer(143), "SINGLEROW");

-terminalStringToIntMap.put("SINGLEROW", new Integer(143));

-terminalIntToStringMap.put(new Integer(43), "QUESTIONQUESTION");

-terminalStringToIntMap.put("QUESTIONQUESTION", new Integer(43));

-terminalIntToStringMap.put(new Integer(141), "FORUPDATE");

-terminalStringToIntMap.put("FORUPDATE", new Integer(141));

-terminalIntToStringMap.put(new Integer(120), "RETURN");

-terminalStringToIntMap.put("RETURN", new Integer(120));

-terminalIntToStringMap.put(new Integer(4), "WS");

-terminalStringToIntMap.put("WS", new Integer(4));

-terminalIntToStringMap.put(new Integer(105), "FLOATLIT");

-terminalStringToIntMap.put("FLOATLIT", new Integer(105));

-terminalIntToStringMap.put(new Integer(68), "LINE_COMMENT");

-terminalStringToIntMap.put("LINE_COMMENT", new Integer(68));

-terminalIntToStringMap.put(new Integer(133), "FOR");

-terminalStringToIntMap.put("FOR", new Integer(133));

-terminalIntToStringMap.put(new Integer(79), "FUNCTION");

-terminalStringToIntMap.put("FUNCTION", new Integer(79));

-terminalIntToStringMap.put(new Integer(162), "TRANSACTION");

-terminalStringToIntMap.put("TRANSACTION", new Integer(162));

-terminalIntToStringMap.put(new Integer(54), "XOREQ");

-terminalStringToIntMap.put("XOREQ", new Integer(54));

-terminalIntToStringMap.put(new Integer(100), "INTEGER");

-terminalStringToIntMap.put("INTEGER", new Integer(100));

-terminalIntToStringMap.put(new Integer(41), ".");

-terminalStringToIntMap.put(".", new Integer(41));

-terminalIntToStringMap.put(new Integer(160), "WITHV60COMPAT");

-terminalStringToIntMap.put("WITHV60COMPAT", new Integer(160));

-terminalIntToStringMap.put(new Integer(145), "USINGKEYS");

-terminalStringToIntMap.put("USINGKEYS", new Integer(145));

-terminalIntToStringMap.put(new Integer(97), "ABSTRACT");

-terminalStringToIntMap.put("ABSTRACT", new Integer(97));

-terminalIntToStringMap.put(new Integer(103), "STRING");

-terminalStringToIntMap.put("STRING", new Integer(103));

-terminalIntToStringMap.put(new Integer(2), "BOS");

-terminalStringToIntMap.put("BOS", new Integer(2));

-terminalIntToStringMap.put(new Integer(166), "INSERT");

-terminalStringToIntMap.put("INSERT", new Integer(166));

-terminalIntToStringMap.put(new Integer(98), "CONSTRUCTOR");

-terminalStringToIntMap.put("CONSTRUCTOR", new Integer(98));

-terminalIntToStringMap.put(new Integer(114), "CONTINUE");

-terminalStringToIntMap.put("CONTINUE", new Integer(114));

-terminalIntToStringMap.put(new Integer(25), "RIGHTSHIFTLOGICAL");

-terminalStringToIntMap.put("RIGHTSHIFTLOGICAL", new Integer(25));

-terminalIntToStringMap.put(new Integer(88), "USE");

-terminalStringToIntMap.put("USE", new Integer(88));

-terminalIntToStringMap.put(new Integer(135), "FROM");

-terminalStringToIntMap.put("FROM", new Integer(135));

-terminalIntToStringMap.put(new Integer(10), "BITOR");

-terminalStringToIntMap.put("BITOR", new Integer(10));

-terminalIntToStringMap.put(new Integer(155), "OTHERWISE");

-terminalStringToIntMap.put("OTHERWISE", new Integer(155));

-terminalIntToStringMap.put(new Integer(134), "FOREACH");

-terminalStringToIntMap.put("FOREACH", new Integer(134));

-terminalIntToStringMap.put(new Integer(13), "IS");

-terminalStringToIntMap.put("IS", new Integer(13));

-terminalIntToStringMap.put(new Integer(39), "NULLCONCAT");

-terminalStringToIntMap.put("NULLCONCAT", new Integer(39));

-terminalIntToStringMap.put(new Integer(163), "URL");

-terminalStringToIntMap.put("URL", new Integer(163));

-terminalIntToStringMap.put(new Integer(106), "SMALLFLOATLIT");

-terminalStringToIntMap.put("SMALLFLOATLIT", new Integer(106));

-terminalIntToStringMap.put(new Integer(15), "IN");

-terminalStringToIntMap.put("IN", new Integer(15));

-terminalIntToStringMap.put(new Integer(101), "DECIMALLIT");

-terminalStringToIntMap.put("DECIMALLIT", new Integer(101));

-terminalIntToStringMap.put(new Integer(1), "error");

-terminalStringToIntMap.put("error", new Integer(1));

-terminalIntToStringMap.put(new Integer(117), "IF");

-terminalStringToIntMap.put("IF", new Integer(117));

-terminalIntToStringMap.put(new Integer(99), "ID");

-terminalStringToIntMap.put("ID", new Integer(99));

-terminalIntToStringMap.put(new Integer(96), "STATIC");

-terminalStringToIntMap.put("STATIC", new Integer(96));

-terminalIntToStringMap.put(new Integer(102), "BOOLEANLIT");

-terminalStringToIntMap.put("BOOLEANLIT", new Integer(102));

-terminalIntToStringMap.put(new Integer(27), "RIGHTSHIFTARITHMETIC");

-terminalStringToIntMap.put("RIGHTSHIFTARITHMETIC", new Integer(27));

-terminalIntToStringMap.put(new Integer(22), "NEGATE");

-terminalStringToIntMap.put("NEGATE", new Integer(22));

-terminalIntToStringMap.put(new Integer(110), "SQLSTMTLIT");

-terminalStringToIntMap.put("SQLSTMTLIT", new Integer(110));

-terminalIntToStringMap.put(new Integer(142), "NOCURSOR");

-terminalStringToIntMap.put("NOCURSOR", new Integer(142));

-terminalIntToStringMap.put(new Integer(64), ":");

-terminalStringToIntMap.put(":", new Integer(64));

-terminalIntToStringMap.put(new Integer(121), "SET");

-terminalStringToIntMap.put("SET", new Integer(121));

-terminalIntToStringMap.put(new Integer(31), "ISA");

-terminalStringToIntMap.put("ISA", new Integer(31));

-terminalIntToStringMap.put(new Integer(111), "SQLCONDITION");

-terminalStringToIntMap.put("SQLCONDITION", new Integer(111));

-terminalIntToStringMap.put(new Integer(59), "{");

-terminalStringToIntMap.put("{", new Integer(59));

-terminalIntToStringMap.put(new Integer(128), "EXECUTE");

-terminalStringToIntMap.put("EXECUTE", new Integer(128));

-terminalIntToStringMap.put(new Integer(5), "ERRORSTRING");

-terminalStringToIntMap.put("ERRORSTRING", new Integer(5));

-terminalIntToStringMap.put(new Integer(52), "NULLCONCATEQ");

-terminalStringToIntMap.put("NULLCONCATEQ", new Integer(52));

-terminalIntToStringMap.put(new Integer(86), "EXTENDS");

-terminalStringToIntMap.put("EXTENDS", new Integer(86));

-terminalIntToStringMap.put(new Integer(170), "ONEXCEPTION");

-terminalStringToIntMap.put("ONEXCEPTION", new Integer(170));

-terminalIntToStringMap.put(new Integer(165), "UPDATE");

-terminalStringToIntMap.put("UPDATE", new Integer(165));

-terminalIntToStringMap.put(new Integer(119), "TO");

-terminalStringToIntMap.put("TO", new Integer(119));

-terminalIntToStringMap.put(new Integer(90), "INOUT");

-terminalStringToIntMap.put("INOUT", new Integer(90));

-nonterminalIntToStringMap.put(new Integer(24), "executeOption");

-nonterminalStringToIntMap.put("executeOption", new Integer(24));

-nonterminalIntToStringMap.put(new Integer(81), "whenClause");

-nonterminalStringToIntMap.put("whenClause", new Integer(81));

-nonterminalIntToStringMap.put(new Integer(42), "importDecl");

-nonterminalStringToIntMap.put("importDecl", new Integer(42));

-nonterminalIntToStringMap.put(new Integer(41), "implementsOpt");

-nonterminalStringToIntMap.put("implementsOpt", new Integer(41));

-nonterminalIntToStringMap.put(new Integer(96), "executeOption_plus");

-nonterminalStringToIntMap.put("executeOption_plus", new Integer(96));

-nonterminalIntToStringMap.put(new Integer(2), "connector");

-nonterminalStringToIntMap.put("connector", new Integer(2));

-nonterminalIntToStringMap.put(new Integer(117), "openTarget_star");

-nonterminalStringToIntMap.put("openTarget_star", new Integer(117));

-nonterminalIntToStringMap.put(new Integer(100), "externalTypeContent_star");

-nonterminalStringToIntMap.put("externalTypeContent_star", new Integer(100));

-nonterminalIntToStringMap.put(new Integer(94), "enumerationField_plus");

-nonterminalStringToIntMap.put("enumerationField_plus", new Integer(94));

-nonterminalIntToStringMap.put(new Integer(77), "stmt");

-nonterminalStringToIntMap.put("stmt", new Integer(77));

-nonterminalIntToStringMap.put(new Integer(1), "UltraRoot");

-nonterminalStringToIntMap.put("UltraRoot", new Integer(1));

-nonterminalIntToStringMap.put(new Integer(80), "useTypeOpt");

-nonterminalStringToIntMap.put("useTypeOpt", new Integer(80));

-nonterminalIntToStringMap.put(new Integer(26), "expr");

-nonterminalStringToIntMap.put("expr", new Integer(26));

-nonterminalIntToStringMap.put(new Integer(127), "settingsBlock_plus");

-nonterminalStringToIntMap.put("settingsBlock_plus", new Integer(127));

-nonterminalIntToStringMap.put(new Integer(105), "getByKeyOption_plus");

-nonterminalStringToIntMap.put("getByKeyOption_plus", new Integer(105));

-nonterminalIntToStringMap.put(new Integer(15), "handlerContent");

-nonterminalStringToIntMap.put("handlerContent", new Integer(15));

-nonterminalIntToStringMap.put(new Integer(95), "executeOption_star");

-nonterminalStringToIntMap.put("executeOption_star", new Integer(95));

-nonterminalIntToStringMap.put(new Integer(9), "callSynchronizationOpt");

-nonterminalStringToIntMap.put("callSynchronizationOpt", new Integer(9));

-nonterminalIntToStringMap.put(new Integer(93), "enumerationField_star");

-nonterminalStringToIntMap.put("enumerationField_star", new Integer(93));

-nonterminalIntToStringMap.put(new Integer(98), "expr_plus");

-nonterminalStringToIntMap.put("expr_plus", new Integer(98));

-nonterminalIntToStringMap.put(new Integer(76), "stepOpt");

-nonterminalStringToIntMap.put("stepOpt", new Integer(76));

-nonterminalIntToStringMap.put(new Integer(131), "structureContent_plus");

-nonterminalStringToIntMap.put("structureContent_plus", new Integer(131));

-nonterminalIntToStringMap.put(new Integer(34), "functionInvocation");

-nonterminalStringToIntMap.put("functionInvocation", new Integer(34));

-nonterminalIntToStringMap.put(new Integer(114), "name_plus");

-nonterminalStringToIntMap.put("name_plus", new Integer(114));

-nonterminalIntToStringMap.put(new Integer(126), "settingsBlock_star");

-nonterminalStringToIntMap.put("settingsBlock_star", new Integer(126));

-nonterminalIntToStringMap.put(new Integer(104), "getByKeyOption_star");

-nonterminalStringToIntMap.put("getByKeyOption_star", new Integer(104));

-nonterminalIntToStringMap.put(new Integer(92), "deleteOption_plus");

-nonterminalStringToIntMap.put("deleteOption_plus", new Integer(92));

-nonterminalIntToStringMap.put(new Integer(14), "classContent");

-nonterminalStringToIntMap.put("classContent", new Integer(14));

-nonterminalIntToStringMap.put(new Integer(97), "expr_star");

-nonterminalStringToIntMap.put("expr_star", new Integer(97));

-nonterminalIntToStringMap.put(new Integer(28), "singleExtendsOpt");

-nonterminalStringToIntMap.put("singleExtendsOpt", new Integer(28));

-nonterminalIntToStringMap.put(new Integer(43), "initializerOpt");

-nonterminalStringToIntMap.put("initializerOpt", new Integer(43));

-nonterminalIntToStringMap.put(new Integer(51), "lvalue");

-nonterminalStringToIntMap.put("lvalue", new Integer(51));

-nonterminalIntToStringMap.put(new Integer(84), "addOption_plus");

-nonterminalStringToIntMap.put("addOption_plus", new Integer(84));

-nonterminalIntToStringMap.put(new Integer(58), "openTarget");

-nonterminalStringToIntMap.put("openTarget", new Integer(58));

-nonterminalIntToStringMap.put(new Integer(130), "structureContent_star");

-nonterminalStringToIntMap.put("structureContent_star", new Integer(130));

-nonterminalIntToStringMap.put(new Integer(122), "replaceOption_plus");

-nonterminalStringToIntMap.put("replaceOption_plus", new Integer(122));

-nonterminalIntToStringMap.put(new Integer(71), "settingsBlock");

-nonterminalStringToIntMap.put("settingsBlock", new Integer(71));

-nonterminalIntToStringMap.put(new Integer(22), "enumerationField");

-nonterminalStringToIntMap.put("enumerationField", new Integer(22));

-nonterminalIntToStringMap.put(new Integer(113), "setTarget_plus");

-nonterminalStringToIntMap.put("setTarget_plus", new Integer(113));

-nonterminalIntToStringMap.put(new Integer(90), "eglClassContent_plus");

-nonterminalStringToIntMap.put("eglClassContent_plus", new Integer(90));

-nonterminalIntToStringMap.put(new Integer(75), "abstractModifierOpt");

-nonterminalStringToIntMap.put("abstractModifierOpt", new Integer(75));

-nonterminalIntToStringMap.put(new Integer(91), "deleteOption_star");

-nonterminalStringToIntMap.put("deleteOption_star", new Integer(91));

-nonterminalIntToStringMap.put(new Integer(79), "structureContent");

-nonterminalStringToIntMap.put("structureContent", new Integer(79));

-nonterminalIntToStringMap.put(new Integer(6), "arrayAccess");

-nonterminalStringToIntMap.put("arrayAccess", new Integer(6));

-nonterminalIntToStringMap.put(new Integer(4), "wsPair");

-nonterminalStringToIntMap.put("wsPair", new Integer(4));

-nonterminalIntToStringMap.put(new Integer(31), "file");

-nonterminalStringToIntMap.put("file", new Integer(31));

-nonterminalIntToStringMap.put(new Integer(133), "whenClause_plus");

-nonterminalStringToIntMap.put("whenClause_plus", new Integer(133));

-nonterminalIntToStringMap.put(new Integer(83), "addOption_star");

-nonterminalStringToIntMap.put("addOption_star", new Integer(83));

-nonterminalIntToStringMap.put(new Integer(25), "exitModifierOpt");

-nonterminalStringToIntMap.put("exitModifierOpt", new Integer(25));

-nonterminalIntToStringMap.put(new Integer(86), "classContent_plus");

-nonterminalStringToIntMap.put("classContent_plus", new Integer(86));

-nonterminalIntToStringMap.put(new Integer(121), "replaceOption_star");

-nonterminalStringToIntMap.put("replaceOption_star", new Integer(121));

-nonterminalIntToStringMap.put(new Integer(23), "integerLiteralEnumValue");

-nonterminalStringToIntMap.put("integerLiteralEnumValue", new Integer(23));

-nonterminalIntToStringMap.put(new Integer(10), "callReturnTo");

-nonterminalStringToIntMap.put("callReturnTo", new Integer(10));

-nonterminalIntToStringMap.put(new Integer(37), "getByPositionOption");

-nonterminalStringToIntMap.put("getByPositionOption", new Integer(37));

-nonterminalIntToStringMap.put(new Integer(89), "eglClassContent_star");

-nonterminalStringToIntMap.put("eglClassContent_star", new Integer(89));

-nonterminalIntToStringMap.put(new Integer(99), "argumentsOpt");

-nonterminalStringToIntMap.put("argumentsOpt", new Integer(99));

-nonterminalIntToStringMap.put(new Integer(48), "interfaceContent");

-nonterminalStringToIntMap.put("interfaceContent", new Integer(48));

-nonterminalIntToStringMap.put(new Integer(35), "functionParameter");

-nonterminalStringToIntMap.put("functionParameter", new Integer(35));

-nonterminalIntToStringMap.put(new Integer(29), "fieldAccess");

-nonterminalStringToIntMap.put("fieldAccess", new Integer(29));

-nonterminalIntToStringMap.put(new Integer(132), "whenClause_star");

-nonterminalStringToIntMap.put("whenClause_star", new Integer(132));

-nonterminalIntToStringMap.put(new Integer(36), "getByKeyOption");

-nonterminalStringToIntMap.put("getByKeyOption", new Integer(36));

-nonterminalIntToStringMap.put(new Integer(85), "classContent_star");

-nonterminalStringToIntMap.put("classContent_star", new Integer(85));

-nonterminalIntToStringMap.put(new Integer(17), "continueModifierOpt");

-nonterminalStringToIntMap.put("continueModifierOpt", new Integer(17));

-nonterminalIntToStringMap.put(new Integer(0), "$START");

-nonterminalStringToIntMap.put("$START", new Integer(0));

-nonterminalIntToStringMap.put(new Integer(82), "withNameOpt");

-nonterminalStringToIntMap.put("withNameOpt", new Integer(82));

-nonterminalIntToStringMap.put(new Integer(33), "fromExprOpt");

-nonterminalStringToIntMap.put("fromExprOpt", new Integer(33));

-nonterminalIntToStringMap.put(new Integer(107), "getByPositionOption_plus");

-nonterminalStringToIntMap.put("getByPositionOption_plus", new Integer(107));

-nonterminalIntToStringMap.put(new Integer(18), "defaultClauseOpt");

-nonterminalStringToIntMap.put("defaultClauseOpt", new Integer(18));

-nonterminalIntToStringMap.put(new Integer(45), "inlineSQLStatementOpt");

-nonterminalStringToIntMap.put("inlineSQLStatementOpt", new Integer(45));

-nonterminalIntToStringMap.put(new Integer(125), "objExprEntry_plus");

-nonterminalStringToIntMap.put("objExprEntry_plus", new Integer(125));

-nonterminalIntToStringMap.put(new Integer(70), "objExprEntry");

-nonterminalStringToIntMap.put("objExprEntry", new Integer(70));

-nonterminalIntToStringMap.put(new Integer(72), "settingsBlockOpt");

-nonterminalStringToIntMap.put("settingsBlockOpt", new Integer(72));

-nonterminalIntToStringMap.put(new Integer(56), "onException");

-nonterminalStringToIntMap.put("onException", new Integer(56));

-nonterminalIntToStringMap.put(new Integer(21), "elseOpt");

-nonterminalStringToIntMap.put("elseOpt", new Integer(21));

-nonterminalIntToStringMap.put(new Integer(120), "part_plus");

-nonterminalStringToIntMap.put("part_plus", new Integer(120));

-nonterminalIntToStringMap.put(new Integer(106), "getByPositionOption_star");

-nonterminalStringToIntMap.put("getByPositionOption_star", new Integer(106));

-nonterminalIntToStringMap.put(new Integer(30), "fieldsOpt");

-nonterminalStringToIntMap.put("fieldsOpt", new Integer(30));

-nonterminalIntToStringMap.put(new Integer(62), "withClause");

-nonterminalStringToIntMap.put("withClause", new Integer(62));

-nonterminalIntToStringMap.put(new Integer(124), "setting_plus");

-nonterminalStringToIntMap.put("setting_plus", new Integer(124));

-nonterminalIntToStringMap.put(new Integer(16), "eglClassContent");

-nonterminalStringToIntMap.put("eglClassContent", new Integer(16));

-nonterminalIntToStringMap.put(new Integer(119), "part_star");

-nonterminalStringToIntMap.put("part_star", new Integer(119));

-nonterminalIntToStringMap.put(new Integer(103), "functionParameter_plus");

-nonterminalStringToIntMap.put("functionParameter_plus", new Integer(103));

-nonterminalIntToStringMap.put(new Integer(108), "ID_plus");

-nonterminalStringToIntMap.put("ID_plus", new Integer(108));

-nonterminalIntToStringMap.put(new Integer(88), "handlerContent_plus");

-nonterminalStringToIntMap.put("handlerContent_plus", new Integer(88));

-nonterminalIntToStringMap.put(new Integer(8), "callParametersOpt");

-nonterminalStringToIntMap.put("callParametersOpt", new Integer(8));

-nonterminalIntToStringMap.put(new Integer(53), "name");

-nonterminalStringToIntMap.put("name", new Integer(53));

-nonterminalIntToStringMap.put(new Integer(123), "setting_star");

-nonterminalStringToIntMap.put("setting_star", new Integer(123));

-nonterminalIntToStringMap.put(new Integer(112), "interfaceContent_plus");

-nonterminalStringToIntMap.put("interfaceContent_plus", new Integer(112));

-nonterminalIntToStringMap.put(new Integer(59), "packageDeclarationOpt");

-nonterminalStringToIntMap.put("packageDeclarationOpt", new Integer(59));

-nonterminalIntToStringMap.put(new Integer(66), "replaceOption");

-nonterminalStringToIntMap.put("replaceOption", new Integer(66));

-nonterminalIntToStringMap.put(new Integer(116), "onException_plus");

-nonterminalStringToIntMap.put("onException_plus", new Integer(116));

-nonterminalIntToStringMap.put(new Integer(102), "functionParameter_star");

-nonterminalStringToIntMap.put("functionParameter_star", new Integer(102));

-nonterminalIntToStringMap.put(new Integer(13), "callReturns");

-nonterminalStringToIntMap.put("callReturns", new Integer(13));

-nonterminalIntToStringMap.put(new Integer(55), "constOpt");

-nonterminalStringToIntMap.put("constOpt", new Integer(55));

-nonterminalIntToStringMap.put(new Integer(87), "handlerContent_star");

-nonterminalStringToIntMap.put("handlerContent_star", new Integer(87));

-nonterminalIntToStringMap.put(new Integer(7), "assignment");

-nonterminalStringToIntMap.put("assignment", new Integer(7));

-nonterminalIntToStringMap.put(new Integer(67), "returnsOpt");

-nonterminalStringToIntMap.put("returnsOpt", new Integer(67));

-nonterminalIntToStringMap.put(new Integer(5), "addOption");

-nonterminalStringToIntMap.put("addOption", new Integer(5));

-nonterminalIntToStringMap.put(new Integer(63), "primary");

-nonterminalStringToIntMap.put("primary", new Integer(63));

-nonterminalIntToStringMap.put(new Integer(111), "interfaceContent_star");

-nonterminalStringToIntMap.put("interfaceContent_star", new Integer(111));

-nonterminalIntToStringMap.put(new Integer(19), "deleteOption");

-nonterminalStringToIntMap.put("deleteOption", new Integer(19));

-nonterminalIntToStringMap.put(new Integer(49), "intoClauseOpt");

-nonterminalStringToIntMap.put("intoClauseOpt", new Integer(49));

-nonterminalIntToStringMap.put(new Integer(115), "onException_star");

-nonterminalStringToIntMap.put("onException_star", new Integer(115));

-nonterminalIntToStringMap.put(new Integer(39), "IDOpt");

-nonterminalStringToIntMap.put("IDOpt", new Integer(39));

-nonterminalIntToStringMap.put(new Integer(69), "setting");

-nonterminalStringToIntMap.put("setting", new Integer(69));

-nonterminalIntToStringMap.put(new Integer(78), "strItemDecl");

-nonterminalStringToIntMap.put("strItemDecl", new Integer(78));

-nonterminalIntToStringMap.put(new Integer(11), "callOnException");

-nonterminalStringToIntMap.put("callOnException", new Integer(11));

-nonterminalIntToStringMap.put(new Integer(129), "stmt_plus");

-nonterminalStringToIntMap.put("stmt_plus", new Integer(129));

-nonterminalIntToStringMap.put(new Integer(57), "openModifierOpt");

-nonterminalStringToIntMap.put("openModifierOpt", new Integer(57));

-nonterminalIntToStringMap.put(new Integer(60), "part");

-nonterminalStringToIntMap.put("part", new Integer(60));

-nonterminalIntToStringMap.put(new Integer(3), "ErrorNode");

-nonterminalStringToIntMap.put("ErrorNode", new Integer(3));

-nonterminalIntToStringMap.put(new Integer(20), "direction");

-nonterminalStringToIntMap.put("direction", new Integer(20));

-nonterminalIntToStringMap.put(new Integer(73), "simpleNameOpt");

-nonterminalStringToIntMap.put("simpleNameOpt", new Integer(73));

-nonterminalIntToStringMap.put(new Integer(27), "extendsOpt");

-nonterminalStringToIntMap.put("extendsOpt", new Integer(27));

-nonterminalIntToStringMap.put(new Integer(46), "inparentOpt");

-nonterminalStringToIntMap.put("inparentOpt", new Integer(46));

-nonterminalIntToStringMap.put(new Integer(110), "importDecl_plus");

-nonterminalStringToIntMap.put("importDecl_plus", new Integer(110));

-nonterminalIntToStringMap.put(new Integer(52), "moveModifierOpt");

-nonterminalStringToIntMap.put("moveModifierOpt", new Integer(52));

-nonterminalIntToStringMap.put(new Integer(65), "privateAccessModifierOpt");

-nonterminalStringToIntMap.put("privateAccessModifierOpt", new Integer(65));

-nonterminalIntToStringMap.put(new Integer(44), "inlineSQLStatement");

-nonterminalStringToIntMap.put("inlineSQLStatement", new Integer(44));

-nonterminalIntToStringMap.put(new Integer(47), "externalTypeContent");

-nonterminalStringToIntMap.put("externalTypeContent", new Integer(47));

-nonterminalIntToStringMap.put(new Integer(128), "stmt_star");

-nonterminalStringToIntMap.put("stmt_star", new Integer(128));

-nonterminalIntToStringMap.put(new Integer(40), "questionOpt");

-nonterminalStringToIntMap.put("questionOpt", new Integer(40));

-nonterminalIntToStringMap.put(new Integer(109), "importDecl_star");

-nonterminalStringToIntMap.put("importDecl_star", new Integer(109));

-nonterminalIntToStringMap.put(new Integer(68), "setTarget");

-nonterminalStringToIntMap.put("setTarget", new Integer(68));

-nonterminalIntToStringMap.put(new Integer(32), "foreachTarget");

-nonterminalStringToIntMap.put("foreachTarget", new Integer(32));

-nonterminalIntToStringMap.put(new Integer(38), "getByPositionSource");

-nonterminalStringToIntMap.put("getByPositionSource", new Integer(38));

-nonterminalIntToStringMap.put(new Integer(61), "partSubTypeOpt");

-nonterminalStringToIntMap.put("partSubTypeOpt", new Integer(61));

-nonterminalIntToStringMap.put(new Integer(64), "primaryNoNew");

-nonterminalStringToIntMap.put("primaryNoNew", new Integer(64));

-nonterminalIntToStringMap.put(new Integer(50), "literal");

-nonterminalStringToIntMap.put("literal", new Integer(50));

-nonterminalIntToStringMap.put(new Integer(118), "openTarget_plus");

-nonterminalStringToIntMap.put("openTarget_plus", new Integer(118));

-nonterminalIntToStringMap.put(new Integer(101), "externalTypeContent_plus");

-nonterminalStringToIntMap.put("externalTypeContent_plus", new Integer(101));

-nonterminalIntToStringMap.put(new Integer(12), "callUsingOpt");

-nonterminalStringToIntMap.put("callUsingOpt", new Integer(12));

-nonterminalIntToStringMap.put(new Integer(54), "namedType");

-nonterminalStringToIntMap.put("namedType", new Integer(54));

-nonterminalIntToStringMap.put(new Integer(74), "staticAccessModifierOpt");

-nonterminalStringToIntMap.put("staticAccessModifierOpt", new Integer(74));

-}

-

-private NodeNameUtility() { }

-

-public static int getNonterminalCount() {

-return nonterminalStringToIntMap.size();

-}

-

-public static String getTerminalName(int terminalType) {

-return (String)(terminalIntToStringMap.get(new Integer(terminalType)));

-}

-

-public static String getNonterminalName(int nonterminalType) {

-return (String)(nonterminalIntToStringMap.get(new Integer(nonterminalType)));

-}

-

-public static int getTerminalType(String terminalName) {

-return ((Integer)(terminalStringToIntMap.get(terminalName))).intValue();

-}

-

-public static int getNonterminalType(String nonterminalName) {

-return ((Integer)(nonterminalStringToIntMap.get(nonterminalName))).intValue();

-}

-

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.core.ast;
+
+import java.util.*;
+
+public class NodeNameUtility {
+
+private static Map terminalIntToStringMap = new HashMap();
+private static Map nonterminalIntToStringMap = new HashMap();
+private static Map terminalStringToIntMap = new HashMap();
+private static Map nonterminalStringToIntMap = new HashMap();
+
+static {
+terminalIntToStringMap.put(new Integer(85), "IMPLEMENTS");
+terminalStringToIntMap.put("IMPLEMENTS", new Integer(85));
+terminalIntToStringMap.put(new Integer(115), "EXIT");
+terminalStringToIntMap.put("EXIT", new Integer(115));
+terminalIntToStringMap.put(new Integer(107), "BIGINTLIT");
+terminalStringToIntMap.put("BIGINTLIT", new Integer(107));
+terminalIntToStringMap.put(new Integer(20), ">");
+terminalStringToIntMap.put(">", new Integer(20));
+terminalIntToStringMap.put(new Integer(129), "GET");
+terminalStringToIntMap.put("GET", new Integer(129));
+terminalIntToStringMap.put(new Integer(168), "HOLD");
+terminalStringToIntMap.put("HOLD", new Integer(168));
+terminalIntToStringMap.put(new Integer(44), "BITANDEQ");
+terminalStringToIntMap.put("BITANDEQ", new Integer(44));
+terminalIntToStringMap.put(new Integer(49), "DIVEQ");
+terminalStringToIntMap.put("DIVEQ", new Integer(49));
+terminalIntToStringMap.put(new Integer(7), "ERRORSQLSTMTLIT");
+terminalStringToIntMap.put("ERRORSQLSTMTLIT", new Integer(7));
+terminalIntToStringMap.put(new Integer(29), ">=");
+terminalStringToIntMap.put(">=", new Integer(29));
+terminalIntToStringMap.put(new Integer(112), "CALL");
+terminalStringToIntMap.put("CALL", new Integer(112));
+terminalIntToStringMap.put(new Integer(51), "CONCATEQ");
+terminalStringToIntMap.put("CONCATEQ", new Integer(51));
+terminalIntToStringMap.put(new Integer(157), "STACK");
+terminalStringToIntMap.put("STACK", new Integer(157));
+terminalIntToStringMap.put(new Integer(6), "ERRORBLOCKCOMMENT");
+terminalStringToIntMap.put("ERRORBLOCKCOMMENT", new Integer(6));
+terminalIntToStringMap.put(new Integer(11), "BITAND");
+terminalStringToIntMap.put("BITAND", new Integer(11));
+terminalIntToStringMap.put(new Integer(56), ")");
+terminalStringToIntMap.put(")", new Integer(56));
+terminalIntToStringMap.put(new Integer(136), "INTO");
+terminalStringToIntMap.put("INTO", new Integer(136));
+terminalIntToStringMap.put(new Integer(159), "BYPOSITION");
+terminalStringToIntMap.put("BYPOSITION", new Integer(159));
+terminalIntToStringMap.put(new Integer(138), "DECREMENT");
+terminalStringToIntMap.put("DECREMENT", new Integer(138));
+terminalIntToStringMap.put(new Integer(175), "WHERE");
+terminalStringToIntMap.put("WHERE", new Integer(175));
+terminalIntToStringMap.put(new Integer(35), "*");
+terminalStringToIntMap.put("*", new Integer(35));
+terminalIntToStringMap.put(new Integer(48), "TIMESEQ");
+terminalStringToIntMap.put("TIMESEQ", new Integer(48));
+terminalIntToStringMap.put(new Integer(74), "RECORD");
+terminalStringToIntMap.put("RECORD", new Integer(74));
+terminalIntToStringMap.put(new Integer(69), "BLOCK_COMMENT");
+terminalStringToIntMap.put("BLOCK_COMMENT", new Integer(69));
+terminalIntToStringMap.put(new Integer(116), "GOTO");
+terminalStringToIntMap.put("GOTO", new Integer(116));
+terminalIntToStringMap.put(new Integer(66), "UMINUS");
+terminalStringToIntMap.put("UMINUS", new Integer(66));
+terminalIntToStringMap.put(new Integer(132), "REPLACE");
+terminalStringToIntMap.put("REPLACE", new Integer(132));
+terminalIntToStringMap.put(new Integer(17), "==");
+terminalStringToIntMap.put("==", new Integer(17));
+terminalIntToStringMap.put(new Integer(45), "BITOREQ");
+terminalStringToIntMap.put("BITOREQ", new Integer(45));
+terminalIntToStringMap.put(new Integer(77), "PROGRAM");
+terminalStringToIntMap.put("PROGRAM", new Integer(77));
+terminalIntToStringMap.put(new Integer(104), "BYTESLIT");
+terminalStringToIntMap.put("BYTESLIT", new Integer(104));
+terminalIntToStringMap.put(new Integer(37), "**");
+terminalStringToIntMap.put("**", new Integer(37));
+terminalIntToStringMap.put(new Integer(126), "ADD");
+terminalStringToIntMap.put("ADD", new Integer(126));
+terminalIntToStringMap.put(new Integer(50), "TIMESTIMESEQ");
+terminalStringToIntMap.put("TIMESTIMESEQ", new Integer(50));
+terminalIntToStringMap.put(new Integer(87), "TYPE");
+terminalStringToIntMap.put("TYPE", new Integer(87));
+terminalIntToStringMap.put(new Integer(151), "RELATIVE");
+terminalStringToIntMap.put("RELATIVE", new Integer(151));
+terminalIntToStringMap.put(new Integer(36), "/");
+terminalStringToIntMap.put("/", new Integer(36));
+terminalIntToStringMap.put(new Integer(3), "EOS");
+terminalStringToIntMap.put("EOS", new Integer(3));
+terminalIntToStringMap.put(new Integer(63), "=");
+terminalStringToIntMap.put("=", new Integer(63));
+terminalIntToStringMap.put(new Integer(164), "LABEL");
+terminalStringToIntMap.put("LABEL", new Integer(164));
+terminalIntToStringMap.put(new Integer(109), "NULL");
+terminalStringToIntMap.put("NULL", new Integer(109));
+terminalIntToStringMap.put(new Integer(131), "PREPARE");
+terminalStringToIntMap.put("PREPARE", new Integer(131));
+terminalIntToStringMap.put(new Integer(147), "PREVIOUS");
+terminalStringToIntMap.put("PREVIOUS", new Integer(147));
+terminalIntToStringMap.put(new Integer(95), "PRIVATE");
+terminalStringToIntMap.put("PRIVATE", new Integer(95));
+terminalIntToStringMap.put(new Integer(0), "EOF");
+terminalStringToIntMap.put("EOF", new Integer(0));
+terminalIntToStringMap.put(new Integer(33), "-");
+terminalStringToIntMap.put("-", new Integer(33));
+terminalIntToStringMap.put(new Integer(78), "LIBRARY");
+terminalStringToIntMap.put("LIBRARY", new Integer(78));
+terminalIntToStringMap.put(new Integer(172), "LANGUAGEBUNDLE");
+terminalStringToIntMap.put("LANGUAGEBUNDLE", new Integer(172));
+terminalIntToStringMap.put(new Integer(42), "QUESTION");
+terminalStringToIntMap.put("QUESTION", new Integer(42));
+terminalIntToStringMap.put(new Integer(118), "MOVE");
+terminalStringToIntMap.put("MOVE", new Integer(118));
+terminalIntToStringMap.put(new Integer(72), "IMPORT");
+terminalStringToIntMap.put("IMPORT", new Integer(72));
+terminalIntToStringMap.put(new Integer(71), "PACKAGE");
+terminalStringToIntMap.put("PACKAGE", new Integer(71));
+terminalIntToStringMap.put(new Integer(144), "USING");
+terminalStringToIntMap.put("USING", new Integer(144));
+terminalIntToStringMap.put(new Integer(38), "::");
+terminalStringToIntMap.put("::", new Integer(38));
+terminalIntToStringMap.put(new Integer(167), "ELSE");
+terminalStringToIntMap.put("ELSE", new Integer(167));
+terminalIntToStringMap.put(new Integer(158), "BYNAME");
+terminalStringToIntMap.put("BYNAME", new Integer(158));
+terminalIntToStringMap.put(new Integer(122), "TRY");
+terminalStringToIntMap.put("TRY", new Integer(122));
+terminalIntToStringMap.put(new Integer(53), "MODULOEQ");
+terminalStringToIntMap.put("MODULOEQ", new Integer(53));
+terminalIntToStringMap.put(new Integer(152), "ABSOLUTE");
+terminalStringToIntMap.put("ABSOLUTE", new Integer(152));
+terminalIntToStringMap.put(new Integer(82), "DELEGATE");
+terminalStringToIntMap.put("DELEGATE", new Integer(82));
+terminalIntToStringMap.put(new Integer(73), "END");
+terminalStringToIntMap.put("END", new Integer(73));
+terminalIntToStringMap.put(new Integer(8), "||");
+terminalStringToIntMap.put("||", new Integer(8));
+terminalIntToStringMap.put(new Integer(148), "FIRST");
+terminalStringToIntMap.put("FIRST", new Integer(148));
+terminalIntToStringMap.put(new Integer(26), "RIGHTSHIFTLOGICALEQ");
+terminalStringToIntMap.put("RIGHTSHIFTLOGICALEQ", new Integer(26));
+terminalIntToStringMap.put(new Integer(75), "HANDLER");
+terminalStringToIntMap.put("HANDLER", new Integer(75));
+terminalIntToStringMap.put(new Integer(154), "WHEN");
+terminalStringToIntMap.put("WHEN", new Integer(154));
+terminalIntToStringMap.put(new Integer(9), "&&");
+terminalStringToIntMap.put("&&", new Integer(9));
+terminalIntToStringMap.put(new Integer(150), "CURRENT");
+terminalStringToIntMap.put("CURRENT", new Integer(150));
+terminalIntToStringMap.put(new Integer(92), "THIS");
+terminalStringToIntMap.put("THIS", new Integer(92));
+terminalIntToStringMap.put(new Integer(173), "OF");
+terminalStringToIntMap.put("OF", new Integer(173));
+terminalIntToStringMap.put(new Integer(137), "BY");
+terminalStringToIntMap.put("BY", new Integer(137));
+terminalIntToStringMap.put(new Integer(146), "NEXT");
+terminalStringToIntMap.put("NEXT", new Integer(146));
+terminalIntToStringMap.put(new Integer(89), "RETURNS");
+terminalStringToIntMap.put("RETURNS", new Integer(89));
+terminalIntToStringMap.put(new Integer(61), ";");
+terminalStringToIntMap.put(";", new Integer(61));
+terminalIntToStringMap.put(new Integer(171), "GROUP");
+terminalStringToIntMap.put("GROUP", new Integer(171));
+terminalIntToStringMap.put(new Integer(149), "LAST");
+terminalStringToIntMap.put("LAST", new Integer(149));
+terminalIntToStringMap.put(new Integer(125), "CLOSE");
+terminalStringToIntMap.put("CLOSE", new Integer(125));
+terminalIntToStringMap.put(new Integer(93), "NEW");
+terminalStringToIntMap.put("NEW", new Integer(93));
+terminalIntToStringMap.put(new Integer(127), "DELETE");
+terminalStringToIntMap.put("DELETE", new Integer(127));
+terminalIntToStringMap.put(new Integer(174), "REF");
+terminalStringToIntMap.put("REF", new Integer(174));
+terminalIntToStringMap.put(new Integer(83), "EXTERNALTYPE");
+terminalStringToIntMap.put("EXTERNALTYPE", new Integer(83));
+terminalIntToStringMap.put(new Integer(94), "SUPER");
+terminalStringToIntMap.put("SUPER", new Integer(94));
+terminalIntToStringMap.put(new Integer(47), "MINUSEQ");
+terminalStringToIntMap.put("MINUSEQ", new Integer(47));
+terminalIntToStringMap.put(new Integer(81), "INTERFACE");
+terminalStringToIntMap.put("INTERFACE", new Integer(81));
+terminalIntToStringMap.put(new Integer(60), "}");
+terminalStringToIntMap.put("}", new Integer(60));
+terminalIntToStringMap.put(new Integer(18), "!=");
+terminalStringToIntMap.put("!=", new Integer(18));
+terminalIntToStringMap.put(new Integer(40), "@");
+terminalStringToIntMap.put("@", new Integer(40));
+terminalIntToStringMap.put(new Integer(30), "AS");
+terminalStringToIntMap.put("AS", new Integer(30));
+terminalIntToStringMap.put(new Integer(113), "CASE");
+terminalStringToIntMap.put("CASE", new Integer(113));
+terminalIntToStringMap.put(new Integer(46), "PLUSEQ");
+terminalStringToIntMap.put("PLUSEQ", new Integer(46));
+terminalIntToStringMap.put(new Integer(24), "LEFTSHIFTEQ");
+terminalStringToIntMap.put("LEFTSHIFTEQ", new Integer(24));
+terminalIntToStringMap.put(new Integer(32), "+");
+terminalStringToIntMap.put("+", new Integer(32));
+terminalIntToStringMap.put(new Integer(123), "THROW");
+terminalStringToIntMap.put("THROW", new Integer(123));
+terminalIntToStringMap.put(new Integer(76), "CLASS");
+terminalStringToIntMap.put("CLASS", new Integer(76));
+terminalIntToStringMap.put(new Integer(55), "(");
+terminalStringToIntMap.put("(", new Integer(55));
+terminalIntToStringMap.put(new Integer(161), "ALL");
+terminalStringToIntMap.put("ALL", new Integer(161));
+terminalIntToStringMap.put(new Integer(58), "]");
+terminalStringToIntMap.put("]", new Integer(58));
+terminalIntToStringMap.put(new Integer(124), "WHILE");
+terminalStringToIntMap.put("WHILE", new Integer(124));
+terminalIntToStringMap.put(new Integer(67), "UPLUS");
+terminalStringToIntMap.put("UPLUS", new Integer(67));
+terminalIntToStringMap.put(new Integer(62), "CONST");
+terminalStringToIntMap.put("CONST", new Integer(62));
+terminalIntToStringMap.put(new Integer(12), "XOR");
+terminalStringToIntMap.put("XOR", new Integer(12));
+terminalIntToStringMap.put(new Integer(130), "OPEN");
+terminalStringToIntMap.put("OPEN", new Integer(130));
+terminalIntToStringMap.put(new Integer(156), "RUNUNIT");
+terminalStringToIntMap.put("RUNUNIT", new Integer(156));
+terminalIntToStringMap.put(new Integer(153), "INPARENT");
+terminalStringToIntMap.put("INPARENT", new Integer(153));
+terminalIntToStringMap.put(new Integer(65), ",");
+terminalStringToIntMap.put(",", new Integer(65));
+terminalIntToStringMap.put(new Integer(19), "<");
+terminalStringToIntMap.put("<", new Integer(19));
+terminalIntToStringMap.put(new Integer(108), "SMALLINTLIT");
+terminalStringToIntMap.put("SMALLINTLIT", new Integer(108));
+terminalIntToStringMap.put(new Integer(176), "WRAP");
+terminalStringToIntMap.put("WRAP", new Integer(176));
+terminalIntToStringMap.put(new Integer(139), "RETURNING");
+terminalStringToIntMap.put("RETURNING", new Integer(139));
+terminalIntToStringMap.put(new Integer(34), "%");
+terminalStringToIntMap.put("%", new Integer(34));
+terminalIntToStringMap.put(new Integer(80), "SERVICE");
+terminalStringToIntMap.put("SERVICE", new Integer(80));
+terminalIntToStringMap.put(new Integer(84), "ENUMERATION");
+terminalStringToIntMap.put("ENUMERATION", new Integer(84));
+terminalIntToStringMap.put(new Integer(21), "<=");
+terminalStringToIntMap.put("<=", new Integer(21));
+terminalIntToStringMap.put(new Integer(169), "SCROLL");
+terminalStringToIntMap.put("SCROLL", new Integer(169));
+terminalIntToStringMap.put(new Integer(14), "NOT");
+terminalStringToIntMap.put("NOT", new Integer(14));
+terminalIntToStringMap.put(new Integer(91), "OUT");
+terminalStringToIntMap.put("OUT", new Integer(91));
+terminalIntToStringMap.put(new Integer(57), "[");
+terminalStringToIntMap.put("[", new Integer(57));
+terminalIntToStringMap.put(new Integer(70), "LINEBREAKS");
+terminalStringToIntMap.put("LINEBREAKS", new Integer(70));
+terminalIntToStringMap.put(new Integer(28), "RIGHTSHIFTARITHMETICEQ");
+terminalStringToIntMap.put("RIGHTSHIFTARITHMETICEQ", new Integer(28));
+terminalIntToStringMap.put(new Integer(140), "WITH");
+terminalStringToIntMap.put("WITH", new Integer(140));
+terminalIntToStringMap.put(new Integer(23), "LEFTSHIFT");
+terminalStringToIntMap.put("LEFTSHIFT", new Integer(23));
+terminalIntToStringMap.put(new Integer(16), "!");
+terminalStringToIntMap.put("!", new Integer(16));
+terminalIntToStringMap.put(new Integer(143), "SINGLEROW");
+terminalStringToIntMap.put("SINGLEROW", new Integer(143));
+terminalIntToStringMap.put(new Integer(43), "QUESTIONQUESTION");
+terminalStringToIntMap.put("QUESTIONQUESTION", new Integer(43));
+terminalIntToStringMap.put(new Integer(141), "FORUPDATE");
+terminalStringToIntMap.put("FORUPDATE", new Integer(141));
+terminalIntToStringMap.put(new Integer(120), "RETURN");
+terminalStringToIntMap.put("RETURN", new Integer(120));
+terminalIntToStringMap.put(new Integer(4), "WS");
+terminalStringToIntMap.put("WS", new Integer(4));
+terminalIntToStringMap.put(new Integer(105), "FLOATLIT");
+terminalStringToIntMap.put("FLOATLIT", new Integer(105));
+terminalIntToStringMap.put(new Integer(68), "LINE_COMMENT");
+terminalStringToIntMap.put("LINE_COMMENT", new Integer(68));
+terminalIntToStringMap.put(new Integer(133), "FOR");
+terminalStringToIntMap.put("FOR", new Integer(133));
+terminalIntToStringMap.put(new Integer(79), "FUNCTION");
+terminalStringToIntMap.put("FUNCTION", new Integer(79));
+terminalIntToStringMap.put(new Integer(162), "TRANSACTION");
+terminalStringToIntMap.put("TRANSACTION", new Integer(162));
+terminalIntToStringMap.put(new Integer(54), "XOREQ");
+terminalStringToIntMap.put("XOREQ", new Integer(54));
+terminalIntToStringMap.put(new Integer(100), "INTEGER");
+terminalStringToIntMap.put("INTEGER", new Integer(100));
+terminalIntToStringMap.put(new Integer(41), ".");
+terminalStringToIntMap.put(".", new Integer(41));
+terminalIntToStringMap.put(new Integer(160), "WITHV60COMPAT");
+terminalStringToIntMap.put("WITHV60COMPAT", new Integer(160));
+terminalIntToStringMap.put(new Integer(145), "USINGKEYS");
+terminalStringToIntMap.put("USINGKEYS", new Integer(145));
+terminalIntToStringMap.put(new Integer(97), "ABSTRACT");
+terminalStringToIntMap.put("ABSTRACT", new Integer(97));
+terminalIntToStringMap.put(new Integer(103), "STRING");
+terminalStringToIntMap.put("STRING", new Integer(103));
+terminalIntToStringMap.put(new Integer(2), "BOS");
+terminalStringToIntMap.put("BOS", new Integer(2));
+terminalIntToStringMap.put(new Integer(166), "INSERT");
+terminalStringToIntMap.put("INSERT", new Integer(166));
+terminalIntToStringMap.put(new Integer(98), "CONSTRUCTOR");
+terminalStringToIntMap.put("CONSTRUCTOR", new Integer(98));
+terminalIntToStringMap.put(new Integer(114), "CONTINUE");
+terminalStringToIntMap.put("CONTINUE", new Integer(114));
+terminalIntToStringMap.put(new Integer(25), "RIGHTSHIFTLOGICAL");
+terminalStringToIntMap.put("RIGHTSHIFTLOGICAL", new Integer(25));
+terminalIntToStringMap.put(new Integer(88), "USE");
+terminalStringToIntMap.put("USE", new Integer(88));
+terminalIntToStringMap.put(new Integer(135), "FROM");
+terminalStringToIntMap.put("FROM", new Integer(135));
+terminalIntToStringMap.put(new Integer(10), "BITOR");
+terminalStringToIntMap.put("BITOR", new Integer(10));
+terminalIntToStringMap.put(new Integer(155), "OTHERWISE");
+terminalStringToIntMap.put("OTHERWISE", new Integer(155));
+terminalIntToStringMap.put(new Integer(134), "FOREACH");
+terminalStringToIntMap.put("FOREACH", new Integer(134));
+terminalIntToStringMap.put(new Integer(13), "IS");
+terminalStringToIntMap.put("IS", new Integer(13));
+terminalIntToStringMap.put(new Integer(39), "NULLCONCAT");
+terminalStringToIntMap.put("NULLCONCAT", new Integer(39));
+terminalIntToStringMap.put(new Integer(163), "URL");
+terminalStringToIntMap.put("URL", new Integer(163));
+terminalIntToStringMap.put(new Integer(106), "SMALLFLOATLIT");
+terminalStringToIntMap.put("SMALLFLOATLIT", new Integer(106));
+terminalIntToStringMap.put(new Integer(15), "IN");
+terminalStringToIntMap.put("IN", new Integer(15));
+terminalIntToStringMap.put(new Integer(101), "DECIMALLIT");
+terminalStringToIntMap.put("DECIMALLIT", new Integer(101));
+terminalIntToStringMap.put(new Integer(1), "error");
+terminalStringToIntMap.put("error", new Integer(1));
+terminalIntToStringMap.put(new Integer(117), "IF");
+terminalStringToIntMap.put("IF", new Integer(117));
+terminalIntToStringMap.put(new Integer(99), "ID");
+terminalStringToIntMap.put("ID", new Integer(99));
+terminalIntToStringMap.put(new Integer(96), "STATIC");
+terminalStringToIntMap.put("STATIC", new Integer(96));
+terminalIntToStringMap.put(new Integer(102), "BOOLEANLIT");
+terminalStringToIntMap.put("BOOLEANLIT", new Integer(102));
+terminalIntToStringMap.put(new Integer(27), "RIGHTSHIFTARITHMETIC");
+terminalStringToIntMap.put("RIGHTSHIFTARITHMETIC", new Integer(27));
+terminalIntToStringMap.put(new Integer(22), "NEGATE");
+terminalStringToIntMap.put("NEGATE", new Integer(22));
+terminalIntToStringMap.put(new Integer(110), "SQLSTMTLIT");
+terminalStringToIntMap.put("SQLSTMTLIT", new Integer(110));
+terminalIntToStringMap.put(new Integer(142), "NOCURSOR");
+terminalStringToIntMap.put("NOCURSOR", new Integer(142));
+terminalIntToStringMap.put(new Integer(64), ":");
+terminalStringToIntMap.put(":", new Integer(64));
+terminalIntToStringMap.put(new Integer(121), "SET");
+terminalStringToIntMap.put("SET", new Integer(121));
+terminalIntToStringMap.put(new Integer(31), "ISA");
+terminalStringToIntMap.put("ISA", new Integer(31));
+terminalIntToStringMap.put(new Integer(111), "SQLCONDITION");
+terminalStringToIntMap.put("SQLCONDITION", new Integer(111));
+terminalIntToStringMap.put(new Integer(59), "{");
+terminalStringToIntMap.put("{", new Integer(59));
+terminalIntToStringMap.put(new Integer(128), "EXECUTE");
+terminalStringToIntMap.put("EXECUTE", new Integer(128));
+terminalIntToStringMap.put(new Integer(5), "ERRORSTRING");
+terminalStringToIntMap.put("ERRORSTRING", new Integer(5));
+terminalIntToStringMap.put(new Integer(52), "NULLCONCATEQ");
+terminalStringToIntMap.put("NULLCONCATEQ", new Integer(52));
+terminalIntToStringMap.put(new Integer(86), "EXTENDS");
+terminalStringToIntMap.put("EXTENDS", new Integer(86));
+terminalIntToStringMap.put(new Integer(170), "ONEXCEPTION");
+terminalStringToIntMap.put("ONEXCEPTION", new Integer(170));
+terminalIntToStringMap.put(new Integer(165), "UPDATE");
+terminalStringToIntMap.put("UPDATE", new Integer(165));
+terminalIntToStringMap.put(new Integer(119), "TO");
+terminalStringToIntMap.put("TO", new Integer(119));
+terminalIntToStringMap.put(new Integer(90), "INOUT");
+terminalStringToIntMap.put("INOUT", new Integer(90));
+nonterminalIntToStringMap.put(new Integer(24), "executeOption");
+nonterminalStringToIntMap.put("executeOption", new Integer(24));
+nonterminalIntToStringMap.put(new Integer(81), "whenClause");
+nonterminalStringToIntMap.put("whenClause", new Integer(81));
+nonterminalIntToStringMap.put(new Integer(42), "importDecl");
+nonterminalStringToIntMap.put("importDecl", new Integer(42));
+nonterminalIntToStringMap.put(new Integer(41), "implementsOpt");
+nonterminalStringToIntMap.put("implementsOpt", new Integer(41));
+nonterminalIntToStringMap.put(new Integer(96), "executeOption_plus");
+nonterminalStringToIntMap.put("executeOption_plus", new Integer(96));
+nonterminalIntToStringMap.put(new Integer(2), "connector");
+nonterminalStringToIntMap.put("connector", new Integer(2));
+nonterminalIntToStringMap.put(new Integer(117), "openTarget_star");
+nonterminalStringToIntMap.put("openTarget_star", new Integer(117));
+nonterminalIntToStringMap.put(new Integer(100), "externalTypeContent_star");
+nonterminalStringToIntMap.put("externalTypeContent_star", new Integer(100));
+nonterminalIntToStringMap.put(new Integer(94), "enumerationField_plus");
+nonterminalStringToIntMap.put("enumerationField_plus", new Integer(94));
+nonterminalIntToStringMap.put(new Integer(77), "stmt");
+nonterminalStringToIntMap.put("stmt", new Integer(77));
+nonterminalIntToStringMap.put(new Integer(1), "UltraRoot");
+nonterminalStringToIntMap.put("UltraRoot", new Integer(1));
+nonterminalIntToStringMap.put(new Integer(80), "useTypeOpt");
+nonterminalStringToIntMap.put("useTypeOpt", new Integer(80));
+nonterminalIntToStringMap.put(new Integer(26), "expr");
+nonterminalStringToIntMap.put("expr", new Integer(26));
+nonterminalIntToStringMap.put(new Integer(127), "settingsBlock_plus");
+nonterminalStringToIntMap.put("settingsBlock_plus", new Integer(127));
+nonterminalIntToStringMap.put(new Integer(105), "getByKeyOption_plus");
+nonterminalStringToIntMap.put("getByKeyOption_plus", new Integer(105));
+nonterminalIntToStringMap.put(new Integer(15), "handlerContent");
+nonterminalStringToIntMap.put("handlerContent", new Integer(15));
+nonterminalIntToStringMap.put(new Integer(95), "executeOption_star");
+nonterminalStringToIntMap.put("executeOption_star", new Integer(95));
+nonterminalIntToStringMap.put(new Integer(9), "callSynchronizationOpt");
+nonterminalStringToIntMap.put("callSynchronizationOpt", new Integer(9));
+nonterminalIntToStringMap.put(new Integer(93), "enumerationField_star");
+nonterminalStringToIntMap.put("enumerationField_star", new Integer(93));
+nonterminalIntToStringMap.put(new Integer(98), "expr_plus");
+nonterminalStringToIntMap.put("expr_plus", new Integer(98));
+nonterminalIntToStringMap.put(new Integer(76), "stepOpt");
+nonterminalStringToIntMap.put("stepOpt", new Integer(76));
+nonterminalIntToStringMap.put(new Integer(131), "structureContent_plus");
+nonterminalStringToIntMap.put("structureContent_plus", new Integer(131));
+nonterminalIntToStringMap.put(new Integer(34), "functionInvocation");
+nonterminalStringToIntMap.put("functionInvocation", new Integer(34));
+nonterminalIntToStringMap.put(new Integer(114), "name_plus");
+nonterminalStringToIntMap.put("name_plus", new Integer(114));
+nonterminalIntToStringMap.put(new Integer(126), "settingsBlock_star");
+nonterminalStringToIntMap.put("settingsBlock_star", new Integer(126));
+nonterminalIntToStringMap.put(new Integer(104), "getByKeyOption_star");
+nonterminalStringToIntMap.put("getByKeyOption_star", new Integer(104));
+nonterminalIntToStringMap.put(new Integer(92), "deleteOption_plus");
+nonterminalStringToIntMap.put("deleteOption_plus", new Integer(92));
+nonterminalIntToStringMap.put(new Integer(14), "classContent");
+nonterminalStringToIntMap.put("classContent", new Integer(14));
+nonterminalIntToStringMap.put(new Integer(97), "expr_star");
+nonterminalStringToIntMap.put("expr_star", new Integer(97));
+nonterminalIntToStringMap.put(new Integer(28), "singleExtendsOpt");
+nonterminalStringToIntMap.put("singleExtendsOpt", new Integer(28));
+nonterminalIntToStringMap.put(new Integer(43), "initializerOpt");
+nonterminalStringToIntMap.put("initializerOpt", new Integer(43));
+nonterminalIntToStringMap.put(new Integer(51), "lvalue");
+nonterminalStringToIntMap.put("lvalue", new Integer(51));
+nonterminalIntToStringMap.put(new Integer(84), "addOption_plus");
+nonterminalStringToIntMap.put("addOption_plus", new Integer(84));
+nonterminalIntToStringMap.put(new Integer(58), "openTarget");
+nonterminalStringToIntMap.put("openTarget", new Integer(58));
+nonterminalIntToStringMap.put(new Integer(130), "structureContent_star");
+nonterminalStringToIntMap.put("structureContent_star", new Integer(130));
+nonterminalIntToStringMap.put(new Integer(122), "replaceOption_plus");
+nonterminalStringToIntMap.put("replaceOption_plus", new Integer(122));
+nonterminalIntToStringMap.put(new Integer(71), "settingsBlock");
+nonterminalStringToIntMap.put("settingsBlock", new Integer(71));
+nonterminalIntToStringMap.put(new Integer(22), "enumerationField");
+nonterminalStringToIntMap.put("enumerationField", new Integer(22));
+nonterminalIntToStringMap.put(new Integer(113), "setTarget_plus");
+nonterminalStringToIntMap.put("setTarget_plus", new Integer(113));
+nonterminalIntToStringMap.put(new Integer(90), "eglClassContent_plus");
+nonterminalStringToIntMap.put("eglClassContent_plus", new Integer(90));
+nonterminalIntToStringMap.put(new Integer(75), "abstractModifierOpt");
+nonterminalStringToIntMap.put("abstractModifierOpt", new Integer(75));
+nonterminalIntToStringMap.put(new Integer(91), "deleteOption_star");
+nonterminalStringToIntMap.put("deleteOption_star", new Integer(91));
+nonterminalIntToStringMap.put(new Integer(79), "structureContent");
+nonterminalStringToIntMap.put("structureContent", new Integer(79));
+nonterminalIntToStringMap.put(new Integer(6), "arrayAccess");
+nonterminalStringToIntMap.put("arrayAccess", new Integer(6));
+nonterminalIntToStringMap.put(new Integer(4), "wsPair");
+nonterminalStringToIntMap.put("wsPair", new Integer(4));
+nonterminalIntToStringMap.put(new Integer(31), "file");
+nonterminalStringToIntMap.put("file", new Integer(31));
+nonterminalIntToStringMap.put(new Integer(133), "whenClause_plus");
+nonterminalStringToIntMap.put("whenClause_plus", new Integer(133));
+nonterminalIntToStringMap.put(new Integer(83), "addOption_star");
+nonterminalStringToIntMap.put("addOption_star", new Integer(83));
+nonterminalIntToStringMap.put(new Integer(25), "exitModifierOpt");
+nonterminalStringToIntMap.put("exitModifierOpt", new Integer(25));
+nonterminalIntToStringMap.put(new Integer(86), "classContent_plus");
+nonterminalStringToIntMap.put("classContent_plus", new Integer(86));
+nonterminalIntToStringMap.put(new Integer(121), "replaceOption_star");
+nonterminalStringToIntMap.put("replaceOption_star", new Integer(121));
+nonterminalIntToStringMap.put(new Integer(23), "integerLiteralEnumValue");
+nonterminalStringToIntMap.put("integerLiteralEnumValue", new Integer(23));
+nonterminalIntToStringMap.put(new Integer(10), "callReturnTo");
+nonterminalStringToIntMap.put("callReturnTo", new Integer(10));
+nonterminalIntToStringMap.put(new Integer(37), "getByPositionOption");
+nonterminalStringToIntMap.put("getByPositionOption", new Integer(37));
+nonterminalIntToStringMap.put(new Integer(89), "eglClassContent_star");
+nonterminalStringToIntMap.put("eglClassContent_star", new Integer(89));
+nonterminalIntToStringMap.put(new Integer(99), "argumentsOpt");
+nonterminalStringToIntMap.put("argumentsOpt", new Integer(99));
+nonterminalIntToStringMap.put(new Integer(48), "interfaceContent");
+nonterminalStringToIntMap.put("interfaceContent", new Integer(48));
+nonterminalIntToStringMap.put(new Integer(35), "functionParameter");
+nonterminalStringToIntMap.put("functionParameter", new Integer(35));
+nonterminalIntToStringMap.put(new Integer(29), "fieldAccess");
+nonterminalStringToIntMap.put("fieldAccess", new Integer(29));
+nonterminalIntToStringMap.put(new Integer(132), "whenClause_star");
+nonterminalStringToIntMap.put("whenClause_star", new Integer(132));
+nonterminalIntToStringMap.put(new Integer(36), "getByKeyOption");
+nonterminalStringToIntMap.put("getByKeyOption", new Integer(36));
+nonterminalIntToStringMap.put(new Integer(85), "classContent_star");
+nonterminalStringToIntMap.put("classContent_star", new Integer(85));
+nonterminalIntToStringMap.put(new Integer(17), "continueModifierOpt");
+nonterminalStringToIntMap.put("continueModifierOpt", new Integer(17));
+nonterminalIntToStringMap.put(new Integer(0), "$START");
+nonterminalStringToIntMap.put("$START", new Integer(0));
+nonterminalIntToStringMap.put(new Integer(82), "withNameOpt");
+nonterminalStringToIntMap.put("withNameOpt", new Integer(82));
+nonterminalIntToStringMap.put(new Integer(33), "fromExprOpt");
+nonterminalStringToIntMap.put("fromExprOpt", new Integer(33));
+nonterminalIntToStringMap.put(new Integer(107), "getByPositionOption_plus");
+nonterminalStringToIntMap.put("getByPositionOption_plus", new Integer(107));
+nonterminalIntToStringMap.put(new Integer(18), "defaultClauseOpt");
+nonterminalStringToIntMap.put("defaultClauseOpt", new Integer(18));
+nonterminalIntToStringMap.put(new Integer(45), "inlineSQLStatementOpt");
+nonterminalStringToIntMap.put("inlineSQLStatementOpt", new Integer(45));
+nonterminalIntToStringMap.put(new Integer(125), "objExprEntry_plus");
+nonterminalStringToIntMap.put("objExprEntry_plus", new Integer(125));
+nonterminalIntToStringMap.put(new Integer(70), "objExprEntry");
+nonterminalStringToIntMap.put("objExprEntry", new Integer(70));
+nonterminalIntToStringMap.put(new Integer(72), "settingsBlockOpt");
+nonterminalStringToIntMap.put("settingsBlockOpt", new Integer(72));
+nonterminalIntToStringMap.put(new Integer(56), "onException");
+nonterminalStringToIntMap.put("onException", new Integer(56));
+nonterminalIntToStringMap.put(new Integer(21), "elseOpt");
+nonterminalStringToIntMap.put("elseOpt", new Integer(21));
+nonterminalIntToStringMap.put(new Integer(120), "part_plus");
+nonterminalStringToIntMap.put("part_plus", new Integer(120));
+nonterminalIntToStringMap.put(new Integer(106), "getByPositionOption_star");
+nonterminalStringToIntMap.put("getByPositionOption_star", new Integer(106));
+nonterminalIntToStringMap.put(new Integer(30), "fieldsOpt");
+nonterminalStringToIntMap.put("fieldsOpt", new Integer(30));
+nonterminalIntToStringMap.put(new Integer(62), "withClause");
+nonterminalStringToIntMap.put("withClause", new Integer(62));
+nonterminalIntToStringMap.put(new Integer(124), "setting_plus");
+nonterminalStringToIntMap.put("setting_plus", new Integer(124));
+nonterminalIntToStringMap.put(new Integer(16), "eglClassContent");
+nonterminalStringToIntMap.put("eglClassContent", new Integer(16));
+nonterminalIntToStringMap.put(new Integer(119), "part_star");
+nonterminalStringToIntMap.put("part_star", new Integer(119));
+nonterminalIntToStringMap.put(new Integer(103), "functionParameter_plus");
+nonterminalStringToIntMap.put("functionParameter_plus", new Integer(103));
+nonterminalIntToStringMap.put(new Integer(108), "ID_plus");
+nonterminalStringToIntMap.put("ID_plus", new Integer(108));
+nonterminalIntToStringMap.put(new Integer(88), "handlerContent_plus");
+nonterminalStringToIntMap.put("handlerContent_plus", new Integer(88));
+nonterminalIntToStringMap.put(new Integer(8), "callParametersOpt");
+nonterminalStringToIntMap.put("callParametersOpt", new Integer(8));
+nonterminalIntToStringMap.put(new Integer(53), "name");
+nonterminalStringToIntMap.put("name", new Integer(53));
+nonterminalIntToStringMap.put(new Integer(123), "setting_star");
+nonterminalStringToIntMap.put("setting_star", new Integer(123));
+nonterminalIntToStringMap.put(new Integer(112), "interfaceContent_plus");
+nonterminalStringToIntMap.put("interfaceContent_plus", new Integer(112));
+nonterminalIntToStringMap.put(new Integer(59), "packageDeclarationOpt");
+nonterminalStringToIntMap.put("packageDeclarationOpt", new Integer(59));
+nonterminalIntToStringMap.put(new Integer(66), "replaceOption");
+nonterminalStringToIntMap.put("replaceOption", new Integer(66));
+nonterminalIntToStringMap.put(new Integer(116), "onException_plus");
+nonterminalStringToIntMap.put("onException_plus", new Integer(116));
+nonterminalIntToStringMap.put(new Integer(102), "functionParameter_star");
+nonterminalStringToIntMap.put("functionParameter_star", new Integer(102));
+nonterminalIntToStringMap.put(new Integer(13), "callReturns");
+nonterminalStringToIntMap.put("callReturns", new Integer(13));
+nonterminalIntToStringMap.put(new Integer(55), "constOpt");
+nonterminalStringToIntMap.put("constOpt", new Integer(55));
+nonterminalIntToStringMap.put(new Integer(87), "handlerContent_star");
+nonterminalStringToIntMap.put("handlerContent_star", new Integer(87));
+nonterminalIntToStringMap.put(new Integer(7), "assignment");
+nonterminalStringToIntMap.put("assignment", new Integer(7));
+nonterminalIntToStringMap.put(new Integer(67), "returnsOpt");
+nonterminalStringToIntMap.put("returnsOpt", new Integer(67));
+nonterminalIntToStringMap.put(new Integer(5), "addOption");
+nonterminalStringToIntMap.put("addOption", new Integer(5));
+nonterminalIntToStringMap.put(new Integer(63), "primary");
+nonterminalStringToIntMap.put("primary", new Integer(63));
+nonterminalIntToStringMap.put(new Integer(111), "interfaceContent_star");
+nonterminalStringToIntMap.put("interfaceContent_star", new Integer(111));
+nonterminalIntToStringMap.put(new Integer(19), "deleteOption");
+nonterminalStringToIntMap.put("deleteOption", new Integer(19));
+nonterminalIntToStringMap.put(new Integer(49), "intoClauseOpt");
+nonterminalStringToIntMap.put("intoClauseOpt", new Integer(49));
+nonterminalIntToStringMap.put(new Integer(115), "onException_star");
+nonterminalStringToIntMap.put("onException_star", new Integer(115));
+nonterminalIntToStringMap.put(new Integer(39), "IDOpt");
+nonterminalStringToIntMap.put("IDOpt", new Integer(39));
+nonterminalIntToStringMap.put(new Integer(69), "setting");
+nonterminalStringToIntMap.put("setting", new Integer(69));
+nonterminalIntToStringMap.put(new Integer(78), "strItemDecl");
+nonterminalStringToIntMap.put("strItemDecl", new Integer(78));
+nonterminalIntToStringMap.put(new Integer(11), "callOnException");
+nonterminalStringToIntMap.put("callOnException", new Integer(11));
+nonterminalIntToStringMap.put(new Integer(129), "stmt_plus");
+nonterminalStringToIntMap.put("stmt_plus", new Integer(129));
+nonterminalIntToStringMap.put(new Integer(57), "openModifierOpt");
+nonterminalStringToIntMap.put("openModifierOpt", new Integer(57));
+nonterminalIntToStringMap.put(new Integer(60), "part");
+nonterminalStringToIntMap.put("part", new Integer(60));
+nonterminalIntToStringMap.put(new Integer(3), "ErrorNode");
+nonterminalStringToIntMap.put("ErrorNode", new Integer(3));
+nonterminalIntToStringMap.put(new Integer(20), "direction");
+nonterminalStringToIntMap.put("direction", new Integer(20));
+nonterminalIntToStringMap.put(new Integer(73), "simpleNameOpt");
+nonterminalStringToIntMap.put("simpleNameOpt", new Integer(73));
+nonterminalIntToStringMap.put(new Integer(27), "extendsOpt");
+nonterminalStringToIntMap.put("extendsOpt", new Integer(27));
+nonterminalIntToStringMap.put(new Integer(46), "inparentOpt");
+nonterminalStringToIntMap.put("inparentOpt", new Integer(46));
+nonterminalIntToStringMap.put(new Integer(110), "importDecl_plus");
+nonterminalStringToIntMap.put("importDecl_plus", new Integer(110));
+nonterminalIntToStringMap.put(new Integer(52), "moveModifierOpt");
+nonterminalStringToIntMap.put("moveModifierOpt", new Integer(52));
+nonterminalIntToStringMap.put(new Integer(65), "privateAccessModifierOpt");
+nonterminalStringToIntMap.put("privateAccessModifierOpt", new Integer(65));
+nonterminalIntToStringMap.put(new Integer(44), "inlineSQLStatement");
+nonterminalStringToIntMap.put("inlineSQLStatement", new Integer(44));
+nonterminalIntToStringMap.put(new Integer(47), "externalTypeContent");
+nonterminalStringToIntMap.put("externalTypeContent", new Integer(47));
+nonterminalIntToStringMap.put(new Integer(128), "stmt_star");
+nonterminalStringToIntMap.put("stmt_star", new Integer(128));
+nonterminalIntToStringMap.put(new Integer(40), "questionOpt");
+nonterminalStringToIntMap.put("questionOpt", new Integer(40));
+nonterminalIntToStringMap.put(new Integer(109), "importDecl_star");
+nonterminalStringToIntMap.put("importDecl_star", new Integer(109));
+nonterminalIntToStringMap.put(new Integer(68), "setTarget");
+nonterminalStringToIntMap.put("setTarget", new Integer(68));
+nonterminalIntToStringMap.put(new Integer(32), "foreachTarget");
+nonterminalStringToIntMap.put("foreachTarget", new Integer(32));
+nonterminalIntToStringMap.put(new Integer(38), "getByPositionSource");
+nonterminalStringToIntMap.put("getByPositionSource", new Integer(38));
+nonterminalIntToStringMap.put(new Integer(61), "partSubTypeOpt");
+nonterminalStringToIntMap.put("partSubTypeOpt", new Integer(61));
+nonterminalIntToStringMap.put(new Integer(64), "primaryNoNew");
+nonterminalStringToIntMap.put("primaryNoNew", new Integer(64));
+nonterminalIntToStringMap.put(new Integer(50), "literal");
+nonterminalStringToIntMap.put("literal", new Integer(50));
+nonterminalIntToStringMap.put(new Integer(118), "openTarget_plus");
+nonterminalStringToIntMap.put("openTarget_plus", new Integer(118));
+nonterminalIntToStringMap.put(new Integer(101), "externalTypeContent_plus");
+nonterminalStringToIntMap.put("externalTypeContent_plus", new Integer(101));
+nonterminalIntToStringMap.put(new Integer(12), "callUsingOpt");
+nonterminalStringToIntMap.put("callUsingOpt", new Integer(12));
+nonterminalIntToStringMap.put(new Integer(54), "namedType");
+nonterminalStringToIntMap.put("namedType", new Integer(54));
+nonterminalIntToStringMap.put(new Integer(74), "staticAccessModifierOpt");
+nonterminalStringToIntMap.put("staticAccessModifierOpt", new Integer(74));
+}
+
+private NodeNameUtility() { }
+
+public static int getNonterminalCount() {
+return nonterminalStringToIntMap.size();
+}
+
+public static String getTerminalName(int terminalType) {
+return (String)(terminalIntToStringMap.get(new Integer(terminalType)));
+}
+
+public static String getNonterminalName(int nonterminalType) {
+return (String)(nonterminalIntToStringMap.get(new Integer(nonterminalType)));
+}
+
+public static int getTerminalType(String terminalName) {
+return ((Integer)(terminalStringToIntMap.get(terminalName))).intValue();
+}
+
+public static int getNonterminalType(String nonterminalName) {
+return ((Integer)(nonterminalStringToIntMap.get(nonterminalName))).intValue();
+}
+
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeTypes.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeTypes.java
index fb9bfe3..a5bbd49 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeTypes.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NodeTypes.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminal.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminal.java
index 21b3552..6a2d683 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminal.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalInsertionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalInsertionRecovery.java
index 2342bae..b1ba941 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalInsertionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalInsertionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalSubstitutionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalSubstitutionRecovery.java
index a2c9adf..0cda76e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalSubstitutionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NonTerminalSubstitutionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullLiteral.java
index f0d5864..e110991 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullProblemRequestor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullProblemRequestor.java
index bf347d7..de9ee02 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullProblemRequestor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/NullProblemRequestor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpression.java
index f6262a2..2ecac8b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpressionEntry.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpressionEntry.java
index f2cd1d1..c063e98 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpressionEntry.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ObjectExpressionEntry.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OnExceptionBlock.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OnExceptionBlock.java
index 462912e..9a99063 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OnExceptionBlock.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OnExceptionBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OpenStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OpenStatement.java
index 5462042..e689916 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OpenStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OpenStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OtherwiseClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OtherwiseClause.java
index 385e6fb..4d920ca 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OtherwiseClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/OtherwiseClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PackageDeclaration.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PackageDeclaration.java
index 41d7e83..e589697 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PackageDeclaration.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PackageDeclaration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parameter.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parameter.java
index 682b414..f519fb7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parameter.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parameter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParenthesizedExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParenthesizedExpression.java
index 5e8cb96..4c924f4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParenthesizedExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParenthesizedExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseStack.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseStack.java
index 07398c5..18857fc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseStack.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseStack.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseTable.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseTable.java
index d6777c1..3c66fe4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseTable.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ParseTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parser.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parser.java
index c9e6f25..7f2e0ae 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parser.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Parser.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright © 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.10k
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Part.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Part.java
index 1a1fe45..1538398 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Part.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Part.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PrepareStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PrepareStatement.java
index fbfa199..8f80ca4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PrepareStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PrepareStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalInsertionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalInsertionRecovery.java
index 4cadd08..c1c55fa 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalInsertionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalInsertionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalSubstitutionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalSubstitutionRecovery.java
index 8ce6cf8..e1f1bb7 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalSubstitutionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousNonTerminalSubstitutionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalDeletionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalDeletionRecovery.java
index afbce5f..9ea8e91 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalDeletionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalDeletionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalInsertionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalInsertionRecovery.java
index 7707bd4..1c87bed 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalInsertionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalInsertionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalSubstitutionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalSubstitutionRecovery.java
index a236835..e7e1cf2 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalSubstitutionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/PreviousTerminalSubstitutionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Program.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Program.java
index 4e4831c..215d773 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Program.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Program.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/QualifiedName.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/QualifiedName.java
index 140d642..6eee79d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/QualifiedName.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/QualifiedName.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Record.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Record.java
index 86792d7..8adc1d5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Record.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Record.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReplaceStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReplaceStatement.java
index 7b25d0a..c7c4958 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReplaceStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReplaceStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnStatement.java
index 9128dd9..4ddcbcd 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToInvocationTargetClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToInvocationTargetClause.java
index 5a60f93..68876c8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToInvocationTargetClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToInvocationTargetClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToNameClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToNameClause.java
index bf09080..f2cbdd5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToNameClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturningToNameClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnsDeclaration.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnsDeclaration.java
index 22a19ac..3b4ff3f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnsDeclaration.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ReturnsDeclaration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SQLLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SQLLiteral.java
index 46017fa..fcae7e5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SQLLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SQLLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ScopeRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ScopeRecovery.java
index 6e28643..81f4ef0 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ScopeRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ScopeRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Service.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Service.java
index cdd62f2..34b3b4f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Service.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Service.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetStatement.java
index 038dda5..55407cc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesExpression.java
index fa38d4e..682fd52 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesStatement.java
index 85520c9..ce27627 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SetValuesStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SettingsBlock.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SettingsBlock.java
index 92eb4f9..f8f6c14 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SettingsBlock.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SettingsBlock.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SimpleName.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SimpleName.java
index 594a631..d6fc136 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SimpleName.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SimpleName.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SingleRowClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SingleRowClause.java
index b5e9add..bb6446b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SingleRowClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SingleRowClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SlimParseStack.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SlimParseStack.java
index 6b06579..cd7f6a2 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SlimParseStack.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SlimParseStack.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StackSymbol.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StackSymbol.java
index f030282..17a311e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StackSymbol.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StackSymbol.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Statement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Statement.java
index baaa90c..f3144d8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Statement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Statement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StringLiteral.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StringLiteral.java
index 61e47d4..dfe4dc1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StringLiteral.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StringLiteral.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StructureItem.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StructureItem.java
index 1501123..c53087b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StructureItem.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/StructureItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SubstringAccess.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SubstringAccess.java
index 76b8218..c0ddf1d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SubstringAccess.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SubstringAccess.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SuperExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SuperExpression.java
index d3a2e13..f45310f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SuperExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SuperExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SyntaxError.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SyntaxError.java
index 5f6edb9..7d33ab1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SyntaxError.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/SyntaxError.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Terminal.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Terminal.java
index 48787d0..4ef2882 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Terminal.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Terminal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalDeletionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalDeletionRecovery.java
index 1c6391f..c90bdf1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalDeletionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalDeletionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalInsertionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalInsertionRecovery.java
index 4a8ab77..e76859c 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalInsertionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalInsertionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalSubstitutionRecovery.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalSubstitutionRecovery.java
index d9cade6..9fdf5c8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalSubstitutionRecovery.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TerminalSubstitutionRecovery.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TernaryExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TernaryExpression.java
index 8564c27..bb0f8a8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TernaryExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TernaryExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThisExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThisExpression.java
index ec87f80..b5951e6 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThisExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThisExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThrowStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThrowStatement.java
index 0127757..4ac1a9f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThrowStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/ThrowStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TokenStream.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TokenStream.java
index 9768bf5..03cbc44 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TokenStream.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TokenStream.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TryStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TryStatement.java
index 74b6051..863bf4b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TryStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TryStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Type.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Type.java
index 6f45caf..f04bbfe 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Type.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/Type.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TypeLiteralExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TypeLiteralExpression.java
index 3647c6f..d8496f5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TypeLiteralExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/TypeLiteralExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UnaryExpression.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UnaryExpression.java
index 3482405..65ee519 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UnaryExpression.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UnaryExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UseStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UseStatement.java
index bcb2108..6a2cea5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UseStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UseStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingClause.java
index 26937c9..99e64ab 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingKeysClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingKeysClause.java
index 29e53de..56cb928 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingKeysClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/UsingKeysClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhenClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhenClause.java
index 0e09214..287e617 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhenClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhenClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhileStatement.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhileStatement.java
index ccbb4a2..4d58045 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhileStatement.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WhileStatement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithClause.java
index 140feae..e01b6fa 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithExpressionClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithExpressionClause.java
index 0c95ceb..69b03d8 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithExpressionClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithExpressionClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2012 IBM Corporation and others.
+ * Copyright © 2012, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithIDClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithIDClause.java
index ebe6871..d8da857 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithIDClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithIDClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineClause.java
index 1308376..67926db 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineSQLClause.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineSQLClause.java
index 24117c4..c6d85a3 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineSQLClause.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/WithInlineSQLClause.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/parser.xml b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/parser.xml
index 8f9ef3e..ae1da25 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/parser.xml
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/core/ast/parser.xml
@@ -1,3 +1,14 @@
+<!--
+  Copyright © 2013 IBM Corporation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+ 
+  Contributors:
+  IBM Corporation - initial API and implementation
+ 
+-->
 <project name="Parse egl.cup" default="run">
 	<target name="run">
 		<!-- Set this to the location of JavaCup on your machine. -->
@@ -24,4 +35,4 @@
 		
 		<eclipse.refreshLocal resource="org.eclipse.edt.compiler"/>
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/GenerationServer.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/GenerationServer.java
index ed0a561..5618b02 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/GenerationServer.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/GenerationServer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/IGenerationListener.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/IGenerationListener.java
index 9dd3a11..3a2c0b6 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/IGenerationListener.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/IGenerationListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/DefaultElementInfoVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/DefaultElementInfoVisitor.java
index bee71e6..ef030cd 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/DefaultElementInfoVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/DefaultElementInfoVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfo.java
index 16fdcbb..d12687e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfoVisitor.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfoVisitor.java
index 2b91d10..4f4348a 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfoVisitor.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IElementInfoVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IEmbeddedMemberInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IEmbeddedMemberInfo.java
index 933c6af..20e35f2 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IEmbeddedMemberInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IEmbeddedMemberInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IExternalMemberInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IExternalMemberInfo.java
index 52c2900..dff8fbe 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IExternalMemberInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IExternalMemberInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IPartInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IPartInfo.java
index 1a30e5c..27d9024 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IPartInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IPartInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IUnresolvedPartInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IUnresolvedPartInfo.java
index 6eed9d1..8b06c8d 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IUnresolvedPartInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/generationServer/parts/IUnresolvedPartInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/BuildInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/BuildInfo.java
index 87b0482..3252b75 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/BuildInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/BuildInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/DefaultBuildDescriptorResult.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/DefaultBuildDescriptorResult.java
index 0ea8828..705997b 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/DefaultBuildDescriptorResult.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/DefaultBuildDescriptorResult.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseNlsStrings.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseNlsStrings.java
index f5415a1..3f090a1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseNlsStrings.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseNlsStrings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBasePlugin.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBasePlugin.java
index d491e2c..3a01606 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBasePlugin.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBasePlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseResources.properties b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseResources.properties
index 8ac650c..269ca60 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseResources.properties
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLBaseResources.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright © 2011, 2012 IBM Corporation and others.
+# Copyright © 2011, 2013 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCaseInsensitiveComparator.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCaseInsensitiveComparator.java
index 86fe8fd..64b7aa4 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCaseInsensitiveComparator.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCaseInsensitiveComparator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCharInfo.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCharInfo.java
index b5e91b1..eaa0268 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCharInfo.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLCharInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLGenerationModeSetting.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLGenerationModeSetting.java
index fffaf06..6557339 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLGenerationModeSetting.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLGenerationModeSetting.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLIncompleteBuildPathSetting.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLIncompleteBuildPathSetting.java
index 345a24c..c175826 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLIncompleteBuildPathSetting.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLIncompleteBuildPathSetting.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLKeywordHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLKeywordHandler.java
index 2976794..c1259fc 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLKeywordHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLKeywordHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLLib.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLLib.java
index 7c7c646..228ef55 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLLib.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLLib.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLMnemonicHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLMnemonicHandler.java
index c7737e6..a888f20 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLMnemonicHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLMnemonicHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLNewPropertiesHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLNewPropertiesHandler.java
index 84d6416..2d5c69e 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLNewPropertiesHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLNewPropertiesHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertiesHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertiesHandler.java
index e534c24..cb3d44f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertiesHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertiesHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertyRule.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertyRule.java
index 80130fc..5f9f1e5 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertyRule.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLPropertyRule.java
@@ -1,464 +1,464 @@
-/*******************************************************************************

- * Copyright © 2011, 2012 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * IBM Corporation - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.edt.compiler.internal;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.edt.compiler.internal.enumerations.EGLEnumeration;

-import org.eclipse.edt.mof.EClassifier;

-import org.eclipse.edt.mof.EDataType;

-import org.eclipse.edt.mof.EEnum;

-import org.eclipse.edt.mof.EEnumLiteral;

-import org.eclipse.edt.mof.EField;

-import org.eclipse.edt.mof.EGenericType;

-import org.eclipse.edt.mof.EType;

-import org.eclipse.edt.mof.egl.AnnotationType;

-import org.eclipse.edt.mof.egl.ArrayType;

-import org.eclipse.edt.mof.egl.Classifier;

-import org.eclipse.edt.mof.egl.Enumeration;

-import org.eclipse.edt.mof.egl.ExternalType;

-import org.eclipse.edt.mof.egl.Field;

-import org.eclipse.edt.mof.egl.Type;

-import org.eclipse.edt.mof.egl.utils.TypeUtils;

-

-

-

-/**

- * @author dollar

- *

- * This class represents an EGL property.

- * It is not usually instantiated.  Instead on of it's subclasses is.

- */

-public class EGLPropertyRule implements Comparable{

-

-	protected String name;

-	protected String description="";

-	protected int [] types;

-	protected int [] elementTypes;

-	protected EGLPropertyRule[] elementAnnotationTypes;

-	private String [] specificValues;

-	

-	private String packageName;

-	

-	//Distinguish those properties that are only allowed on an array, not an array element

-	private boolean arrayOnly; 

-	

-	private boolean isComplex = false;

-	private boolean isValueless = false;

-	

-	private boolean isAnnotationField = false;

-	

-	private EGLEnumeration enumeration;

-	

-	private int specialRules = 0;

-	

-	private AnnotationType elementAnnotationType;

-	

-	public static int DONT_VALIDATE_IN_OPENUI_STATEMENT = 1 << 1;

-	public static int IS_DLI_NAME = 1 << 2;

-

-	public EGLPropertyRule(String name, String description, int [] types, String [] specificValues, boolean arrayOnly) {

-		super();

-		this.name = name;

-		this.description = description;

-		this.types = types;

-		this.specificValues = specificValues;

-		this.arrayOnly = arrayOnly;

-	}

-	

-	public EGLPropertyRule(String name, int [] types, String [] specificValues, boolean arrayOnly) {

-	    this(name, "", types, specificValues, arrayOnly);

-	}

-

-	public EGLPropertyRule(String name, String description, int [] types, String [] specificValues) {

-	    this(name, description, types, specificValues, false);

-	}

-	

-	public EGLPropertyRule(String name, int [] types, String [] specificValues) {

-	    this(name, types, specificValues, false);

-	}

-

-	public EGLPropertyRule(String name, String description, int [] types) {

-		this(name, types);

-		this.description = description;		

-	}

-	

-	public EGLPropertyRule(String name, int [] types) {

-	    this(name, types, null, false);

-	}

-	

-	public EGLPropertyRule(String name, int [] types, int [] elementTypes, EGLPropertyRule[] elementAnnotationTypes) {

-		this(name, types, null, true);

-		this.elementTypes = elementTypes;

-		this.elementAnnotationTypes = elementAnnotationTypes;

-	}

-	

-	public EGLPropertyRule(String name, EGLPropertyRule[] elementAnnotationTypes ) {

-		this.name = name;

-		this.elementAnnotationTypes = elementAnnotationTypes;

-		this.isComplex = true;

-	}

-

-	public EGLPropertyRule(AnnotationType annType) {

-//		this.name = annType.getCaseSensitiveName();

-//		this.packageName = annType.getCaseSensitivePackageName();

-//		if (annType.getEClass() == null || annType.getEFields().isEmpty()) {

-//			this.isComplex = true;

-//			return;

-//		}

-//		

-//		if ( annType.getEFields().size() == 1) {

-//			setFieldsFromEType(annType.getEFields().get(0).getEType());

-//			return;

-//		}

-//		

-//		this.types = new int[] {EGLNewPropertiesHandler.nestedValue};

-//		this.isComplex = true;

-//    	List elementRules = new ArrayList();

-//			for(EField field : annType.getEFields()) {

-//			    elementRules.add(new EGLPropertyRule(annType, field.getName()));

-//			}

-//			this.elementAnnotationTypes = (EGLPropertyRule[]) elementRules.toArray(new EGLPropertyRule[0]);			

-//	

-//		

-	}

-	

-	private EField getEField(AnnotationType annType, String name) {

-		for (EField f : annType.getEFields()) {

-			if (f.getName().equalsIgnoreCase(name))

-				return f;

-		}

-		return null;

-	}

-

-

-	public EGLPropertyRule(AnnotationType annType, String fieldName) {

-//		this.name = fieldName;

-//		this.packageName = annType.getCaseSensitivePackageName();

-//		EField field = getEField(annType, fieldName);

-//		if (field != null) {

-//			setFieldsFromEType(field.getEType());

-//		}

-	}

-

-	public EGLPropertyRule(Field field) {

-//		this.name = field.getCaseSensitiveName();

-//		

-//		if (field.getContainer() instanceof EClassifier) {

-//			this.packageName = ((EClassifier)field.getContainer()).getPackageName();

-//		}

-//		setFieldsFromType(field.getType());

-	}

-

-//	private void setFieldsFromType(Type type) {

-//		

-//		if (type == null || type.getClassifier() == null) {

-//			return;

-//		}

-//		

-//		if (type instanceof Enumeration) {

-//			List fieldNames = new ArrayList();

-//			for(EEnumLiteral entry : ((Enumeration)type).getEntries()) {

-//				fieldNames.add(entry.getCaseSensitiveName());

-//			}

-//			this.types = new int[] {EGLNewPropertiesHandler.specificValue};

-//			this.specificValues = (String[]) fieldNames.toArray(new String[0]);

-//			return;

-//		}

-//		

-//		if (type instanceof ArrayType) {

-//			this.types = new int[] {EGLNewPropertiesHandler.listValue};

-//			ArrayType arrType = (ArrayType) type;

-//			if (arrType.getElementType() instanceof Enumeration) {

-//				List fieldNames = new ArrayList();

-//				for(EEnumLiteral entry : ((Enumeration)arrType.getElementType()).getEntries()) {

-//					fieldNames.add(entry.getCaseSensitiveName());

-//				}

-//				this.types = new int[] {EGLNewPropertiesHandler.specificValue};

-//				this.specificValues = (String[]) fieldNames.toArray(new String[0]);

-//				return;

-//			}

-//			

-//			if (arrType.getElementType() instanceof ArrayType) {

-//				this.types = new int[] {EGLNewPropertiesHandler.arrayOfArrays};

-//				return;

-//			}

-//			

-//			if (arrType.getElementType() instanceof ExternalType) {

-//				this.types = new int[] {EGLNewPropertiesHandler.listValue};

-//				return;

-//			}

-//			

-//			if (arrType.getElementType() instanceof AnnotationType) {

-//				this.types = new int[] {EGLNewPropertiesHandler.arrayOf};

-//				this.elementAnnotationType = (AnnotationType) arrType.getElementType();

-//			}

-//			return;

-//		}

-//					

-//		Classifier classifier = type.getClassifier();

-//		

-//		if (classifier.equals(TypeUtils.Type_STRING)) {

-//			this.types = new int[] {EGLNewPropertiesHandler.quotedValue};

-//			return;

-//		}

-//		

-//		if (classifier.equals(TypeUtils.Type_INT)) {

-//			this.types = new int[] {EGLNewPropertiesHandler.integerValue};

-//			return;

-//		}

-//		

-//		if (classifier.equals(TypeUtils.Type_BOOLEAN)) {

-//			this.types = new int[] {EGLNewPropertiesHandler.specificValue};

-//			this.specificValues = new String[] {"yes", "no"};

-//			return;

-//		}

-//		

-//		if (classifier.equals(TypeUtils.Type_ANY)) {

-//			this.types = new int[] {EGLNewPropertiesHandler.literalValue};

-//			return;

-//		}

-//	}

-

-

-//	private void setFieldsFromEType(EType type) {

-//		

-//		if (type == null) {

-//			return;

-//		}

-//		

-//		if (type instanceof EEnum) {

-//			List fieldNames = new ArrayList();

-//			for(EEnumLiteral entry : ((EEnum)type).getLiterals()) {

-//				fieldNames.add(entry.getCaseSensitiveName());

-//			}

-//			this.types = new int[] {EGLNewPropertiesHandler.specificValue};

-//			this.specificValues = (String[]) fieldNames.toArray(new String[0]);

-//			return;

-//		}

-//		

-//    	if (type instanceof EGenericType) {

-//			this.types = new int[] {EGLNewPropertiesHandler.listValue};

-//			

-//    		EType elemType = ((EGenericType)type).getETypeArguments().get(0);

-//

-//			if (elemType instanceof EEnum) {

-//				List fieldNames = new ArrayList();

-//				for(EEnumLiteral entry : ((EEnum)elemType).getLiterals()) {

-//					fieldNames.add(entry.getCaseSensitiveName());

-//				}

-//				this.types = new int[] {EGLNewPropertiesHandler.specificValue};

-//				this.specificValues = (String[]) fieldNames.toArray(new String[0]);

-//				return;

-//			}

-//			

-//			if (elemType instanceof EGenericType) {

-//				this.types = new int[] {EGLNewPropertiesHandler.arrayOfArrays};

-//				return;

-//			}

-//			

-//			if (elemType instanceof ExternalType) {

-//				this.types = new int[] {EGLNewPropertiesHandler.listValue};

-//				return;

-//			}

-//			

-//			if (elemType instanceof AnnotationType) {

-//				this.types = new int[] {EGLNewPropertiesHandler.arrayOf};

-//				this.elementAnnotationType = (AnnotationType) elemType;

-//			}

-//			return;

-//		}

-//					

-//		if (type instanceof EDataType) {

-//			String className = ((EDataType)type).getJavaClassName();

-//			if (className.equals(EDataType.EDataType_JavaObject)) {

-//				this.types = new int[] {EGLNewPropertiesHandler.literalValue};

-//				return;

-//			}

-//

-//			if (className.equals(EDataType.EDataType_String)) {

-//				this.types = new int[] {EGLNewPropertiesHandler.quotedValue};

-//				return;

-//			}

-//

-//			if (className.equals(EDataType.EDataType_Boolean)) {

-//				this.types = new int[] {EGLNewPropertiesHandler.specificValue};

-//				this.specificValues = new String[] {"yes", "no"};

-//				return;

-//			}

-//

-//			if (className.equals(EDataType.EDataType_Int32)) {

-//				this.types = new int[] {EGLNewPropertiesHandler.integerValue};

-//				return;

-//			}

-//		}

-//

-//		//handle reflect types:

-//		this.types = new int[] {EGLNewPropertiesHandler.nameValue};

-//

-//	}

-	

-	public String getName() {

-		return name;

-	}

-

-	public String toString() {

-		return name;

-	}

-

-	public String[] getSpecificValues() {

-		return specificValues;

-	}

-

-	public int [] getTypes() {

-		return types;

-	}

-	

-	public boolean hasType(int type) {

-		if (getTypes() != null)

-			for (int i = 0; i < getTypes().length; i++)

-				if (getTypes()[i] == type)

-					return true;

-		return false; 

-	}

-	

-	public int [] getElementTypes() {

-		return elementTypes;

-	}

-	

-	public boolean hasElementType(int type) {

-		if (getElementTypes() != null)

-			for (int i = 0; i < getElementTypes().length; i++)

-				if (getElementTypes()[i] == type)

-					return true;

-		return false; 

-	}

-	

-	public EGLPropertyRule [] getElementAnnotationTypes() {

-		return elementAnnotationTypes;

-	}

-	

-	public AnnotationType getElementAnnotationType() {

-		return elementAnnotationType;

-	}

-	

-	public boolean isSQLItemPropertyRule() {

-		return false; 

-	}

-

-	public boolean isPageItemPropertyRule() {

-		return false; 

-	}

-

-	public boolean isFormattingPropertyRule() {

-		return false; 

-	}

-	

-	public boolean isValidationPropertyRule() {

-		return false; 

-	}	

-	

-	public boolean isFieldPresentationPropertyRule() {

-		return false; 

-	}

-

-	public boolean isArrayOnly() {

-		return arrayOnly;

-	}

-	

-	public boolean isComplex() {

-		return isComplex;

-	}

-	

-	public boolean isValueless() {

-		return isValueless;

-	}

-	

-	public boolean isCombo() {

-		//Jon - need to add this to property handler

-		return

-			//name.equals(IEGLConstants.PROPERTY_NUMELEMENTSITEM) ||

-			name.equals(IEGLConstants.PROPERTY_CURRENCY) ||

-			name.equals(IEGLConstants.PROPERTY_FILLCHARACTER) ||

-			name.equals(IEGLConstants.PROPERTY_KEYITEM) ||

-			name.equals(IEGLConstants.PROPERTY_LENGTHITEM);

-	}

-

-	public boolean isRecordPropertyRule() {

-		return false;

-	}

-		

-	/* (non-Javadoc)

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object arg0) {

-		return this.getName().equals(((EGLPropertyRule) arg0).getName());

-	}

-

-	/* (non-Javadoc)

-	 * @see java.lang.Comparable#compareTo(java.lang.Object)

-	 */

-	public int compareTo(Object arg0) {

-		return this.getName().toLowerCase().compareTo(((EGLPropertyRule) arg0).getName().toLowerCase());

-	}

-	

-	public void setEnumeration( EGLEnumeration enumer ) {

-		enumeration = enumer;		

-	}

-	

-	public EGLEnumeration getEnumeration() {

-		return enumeration;

-	}

-	

-	public boolean isEnumerationProperty() {

-		return enumeration != null;

-	}

-	

-	public void setSpecialRules( int newRules ) {

-		specialRules = newRules;

-	}

-	

-	public boolean shouldValidateInOpenUIStatement() {

-		return (specialRules & DONT_VALIDATE_IN_OPENUI_STATEMENT) == 0;

-	}

-	

-	public boolean isDLIName() {

-		return (specialRules & IS_DLI_NAME) != 0;

-	}

-    /**

-     * @return Returns the description.

-     */

-    public String getDescription() {

-    	if (description == null)

-    		description = "";

-        return description;

-    }

-    /**

-     * @param description The description to set.

-     */

-    public void setDescription(String description) {

-        this.description = description;

-    }

-

-	public String getPackageName() {

-		return packageName;

-	}

-

-	public boolean isAnnotationField() {

-		return isAnnotationField;

-	}

-

-	public void setAnnotationField(boolean isAnnotationField) {

-		this.isAnnotationField = isAnnotationField;

-	}

-}

+/*******************************************************************************
+ * Copyright © 2011, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.edt.compiler.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.edt.compiler.internal.enumerations.EGLEnumeration;
+import org.eclipse.edt.mof.EClassifier;
+import org.eclipse.edt.mof.EDataType;
+import org.eclipse.edt.mof.EEnum;
+import org.eclipse.edt.mof.EEnumLiteral;
+import org.eclipse.edt.mof.EField;
+import org.eclipse.edt.mof.EGenericType;
+import org.eclipse.edt.mof.EType;
+import org.eclipse.edt.mof.egl.AnnotationType;
+import org.eclipse.edt.mof.egl.ArrayType;
+import org.eclipse.edt.mof.egl.Classifier;
+import org.eclipse.edt.mof.egl.Enumeration;
+import org.eclipse.edt.mof.egl.ExternalType;
+import org.eclipse.edt.mof.egl.Field;
+import org.eclipse.edt.mof.egl.Type;
+import org.eclipse.edt.mof.egl.utils.TypeUtils;
+
+
+
+/**
+ * @author dollar
+ *
+ * This class represents an EGL property.
+ * It is not usually instantiated.  Instead on of it's subclasses is.
+ */
+public class EGLPropertyRule implements Comparable{
+
+	protected String name;
+	protected String description="";
+	protected int [] types;
+	protected int [] elementTypes;
+	protected EGLPropertyRule[] elementAnnotationTypes;
+	private String [] specificValues;
+	
+	private String packageName;
+	
+	//Distinguish those properties that are only allowed on an array, not an array element
+	private boolean arrayOnly; 
+	
+	private boolean isComplex = false;
+	private boolean isValueless = false;
+	
+	private boolean isAnnotationField = false;
+	
+	private EGLEnumeration enumeration;
+	
+	private int specialRules = 0;
+	
+	private AnnotationType elementAnnotationType;
+	
+	public static int DONT_VALIDATE_IN_OPENUI_STATEMENT = 1 << 1;
+	public static int IS_DLI_NAME = 1 << 2;
+
+	public EGLPropertyRule(String name, String description, int [] types, String [] specificValues, boolean arrayOnly) {
+		super();
+		this.name = name;
+		this.description = description;
+		this.types = types;
+		this.specificValues = specificValues;
+		this.arrayOnly = arrayOnly;
+	}
+	
+	public EGLPropertyRule(String name, int [] types, String [] specificValues, boolean arrayOnly) {
+	    this(name, "", types, specificValues, arrayOnly);
+	}
+
+	public EGLPropertyRule(String name, String description, int [] types, String [] specificValues) {
+	    this(name, description, types, specificValues, false);
+	}
+	
+	public EGLPropertyRule(String name, int [] types, String [] specificValues) {
+	    this(name, types, specificValues, false);
+	}
+
+	public EGLPropertyRule(String name, String description, int [] types) {
+		this(name, types);
+		this.description = description;		
+	}
+	
+	public EGLPropertyRule(String name, int [] types) {
+	    this(name, types, null, false);
+	}
+	
+	public EGLPropertyRule(String name, int [] types, int [] elementTypes, EGLPropertyRule[] elementAnnotationTypes) {
+		this(name, types, null, true);
+		this.elementTypes = elementTypes;
+		this.elementAnnotationTypes = elementAnnotationTypes;
+	}
+	
+	public EGLPropertyRule(String name, EGLPropertyRule[] elementAnnotationTypes ) {
+		this.name = name;
+		this.elementAnnotationTypes = elementAnnotationTypes;
+		this.isComplex = true;
+	}
+
+	public EGLPropertyRule(AnnotationType annType) {
+//		this.name = annType.getCaseSensitiveName();
+//		this.packageName = annType.getCaseSensitivePackageName();
+//		if (annType.getEClass() == null || annType.getEFields().isEmpty()) {
+//			this.isComplex = true;
+//			return;
+//		}
+//		
+//		if ( annType.getEFields().size() == 1) {
+//			setFieldsFromEType(annType.getEFields().get(0).getEType());
+//			return;
+//		}
+//		
+//		this.types = new int[] {EGLNewPropertiesHandler.nestedValue};
+//		this.isComplex = true;
+//    	List elementRules = new ArrayList();
+//			for(EField field : annType.getEFields()) {
+//			    elementRules.add(new EGLPropertyRule(annType, field.getName()));
+//			}
+//			this.elementAnnotationTypes = (EGLPropertyRule[]) elementRules.toArray(new EGLPropertyRule[0]);			
+//	
+//		
+	}
+	
+	private EField getEField(AnnotationType annType, String name) {
+		for (EField f : annType.getEFields()) {
+			if (f.getName().equalsIgnoreCase(name))
+				return f;
+		}
+		return null;
+	}
+
+
+	public EGLPropertyRule(AnnotationType annType, String fieldName) {
+//		this.name = fieldName;
+//		this.packageName = annType.getCaseSensitivePackageName();
+//		EField field = getEField(annType, fieldName);
+//		if (field != null) {
+//			setFieldsFromEType(field.getEType());
+//		}
+	}
+
+	public EGLPropertyRule(Field field) {
+//		this.name = field.getCaseSensitiveName();
+//		
+//		if (field.getContainer() instanceof EClassifier) {
+//			this.packageName = ((EClassifier)field.getContainer()).getPackageName();
+//		}
+//		setFieldsFromType(field.getType());
+	}
+
+//	private void setFieldsFromType(Type type) {
+//		
+//		if (type == null || type.getClassifier() == null) {
+//			return;
+//		}
+//		
+//		if (type instanceof Enumeration) {
+//			List fieldNames = new ArrayList();
+//			for(EEnumLiteral entry : ((Enumeration)type).getEntries()) {
+//				fieldNames.add(entry.getCaseSensitiveName());
+//			}
+//			this.types = new int[] {EGLNewPropertiesHandler.specificValue};
+//			this.specificValues = (String[]) fieldNames.toArray(new String[0]);
+//			return;
+//		}
+//		
+//		if (type instanceof ArrayType) {
+//			this.types = new int[] {EGLNewPropertiesHandler.listValue};
+//			ArrayType arrType = (ArrayType) type;
+//			if (arrType.getElementType() instanceof Enumeration) {
+//				List fieldNames = new ArrayList();
+//				for(EEnumLiteral entry : ((Enumeration)arrType.getElementType()).getEntries()) {
+//					fieldNames.add(entry.getCaseSensitiveName());
+//				}
+//				this.types = new int[] {EGLNewPropertiesHandler.specificValue};
+//				this.specificValues = (String[]) fieldNames.toArray(new String[0]);
+//				return;
+//			}
+//			
+//			if (arrType.getElementType() instanceof ArrayType) {
+//				this.types = new int[] {EGLNewPropertiesHandler.arrayOfArrays};
+//				return;
+//			}
+//			
+//			if (arrType.getElementType() instanceof ExternalType) {
+//				this.types = new int[] {EGLNewPropertiesHandler.listValue};
+//				return;
+//			}
+//			
+//			if (arrType.getElementType() instanceof AnnotationType) {
+//				this.types = new int[] {EGLNewPropertiesHandler.arrayOf};
+//				this.elementAnnotationType = (AnnotationType) arrType.getElementType();
+//			}
+//			return;
+//		}
+//					
+//		Classifier classifier = type.getClassifier();
+//		
+//		if (classifier.equals(TypeUtils.Type_STRING)) {
+//			this.types = new int[] {EGLNewPropertiesHandler.quotedValue};
+//			return;
+//		}
+//		
+//		if (classifier.equals(TypeUtils.Type_INT)) {
+//			this.types = new int[] {EGLNewPropertiesHandler.integerValue};
+//			return;
+//		}
+//		
+//		if (classifier.equals(TypeUtils.Type_BOOLEAN)) {
+//			this.types = new int[] {EGLNewPropertiesHandler.specificValue};
+//			this.specificValues = new String[] {"yes", "no"};
+//			return;
+//		}
+//		
+//		if (classifier.equals(TypeUtils.Type_ANY)) {
+//			this.types = new int[] {EGLNewPropertiesHandler.literalValue};
+//			return;
+//		}
+//	}
+
+
+//	private void setFieldsFromEType(EType type) {
+//		
+//		if (type == null) {
+//			return;
+//		}
+//		
+//		if (type instanceof EEnum) {
+//			List fieldNames = new ArrayList();
+//			for(EEnumLiteral entry : ((EEnum)type).getLiterals()) {
+//				fieldNames.add(entry.getCaseSensitiveName());
+//			}
+//			this.types = new int[] {EGLNewPropertiesHandler.specificValue};
+//			this.specificValues = (String[]) fieldNames.toArray(new String[0]);
+//			return;
+//		}
+//		
+//    	if (type instanceof EGenericType) {
+//			this.types = new int[] {EGLNewPropertiesHandler.listValue};
+//			
+//    		EType elemType = ((EGenericType)type).getETypeArguments().get(0);
+//
+//			if (elemType instanceof EEnum) {
+//				List fieldNames = new ArrayList();
+//				for(EEnumLiteral entry : ((EEnum)elemType).getLiterals()) {
+//					fieldNames.add(entry.getCaseSensitiveName());
+//				}
+//				this.types = new int[] {EGLNewPropertiesHandler.specificValue};
+//				this.specificValues = (String[]) fieldNames.toArray(new String[0]);
+//				return;
+//			}
+//			
+//			if (elemType instanceof EGenericType) {
+//				this.types = new int[] {EGLNewPropertiesHandler.arrayOfArrays};
+//				return;
+//			}
+//			
+//			if (elemType instanceof ExternalType) {
+//				this.types = new int[] {EGLNewPropertiesHandler.listValue};
+//				return;
+//			}
+//			
+//			if (elemType instanceof AnnotationType) {
+//				this.types = new int[] {EGLNewPropertiesHandler.arrayOf};
+//				this.elementAnnotationType = (AnnotationType) elemType;
+//			}
+//			return;
+//		}
+//					
+//		if (type instanceof EDataType) {
+//			String className = ((EDataType)type).getJavaClassName();
+//			if (className.equals(EDataType.EDataType_JavaObject)) {
+//				this.types = new int[] {EGLNewPropertiesHandler.literalValue};
+//				return;
+//			}
+//
+//			if (className.equals(EDataType.EDataType_String)) {
+//				this.types = new int[] {EGLNewPropertiesHandler.quotedValue};
+//				return;
+//			}
+//
+//			if (className.equals(EDataType.EDataType_Boolean)) {
+//				this.types = new int[] {EGLNewPropertiesHandler.specificValue};
+//				this.specificValues = new String[] {"yes", "no"};
+//				return;
+//			}
+//
+//			if (className.equals(EDataType.EDataType_Int32)) {
+//				this.types = new int[] {EGLNewPropertiesHandler.integerValue};
+//				return;
+//			}
+//		}
+//
+//		//handle reflect types:
+//		this.types = new int[] {EGLNewPropertiesHandler.nameValue};
+//
+//	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public String toString() {
+		return name;
+	}
+
+	public String[] getSpecificValues() {
+		return specificValues;
+	}
+
+	public int [] getTypes() {
+		return types;
+	}
+	
+	public boolean hasType(int type) {
+		if (getTypes() != null)
+			for (int i = 0; i < getTypes().length; i++)
+				if (getTypes()[i] == type)
+					return true;
+		return false; 
+	}
+	
+	public int [] getElementTypes() {
+		return elementTypes;
+	}
+	
+	public boolean hasElementType(int type) {
+		if (getElementTypes() != null)
+			for (int i = 0; i < getElementTypes().length; i++)
+				if (getElementTypes()[i] == type)
+					return true;
+		return false; 
+	}
+	
+	public EGLPropertyRule [] getElementAnnotationTypes() {
+		return elementAnnotationTypes;
+	}
+	
+	public AnnotationType getElementAnnotationType() {
+		return elementAnnotationType;
+	}
+	
+	public boolean isSQLItemPropertyRule() {
+		return false; 
+	}
+
+	public boolean isPageItemPropertyRule() {
+		return false; 
+	}
+
+	public boolean isFormattingPropertyRule() {
+		return false; 
+	}
+	
+	public boolean isValidationPropertyRule() {
+		return false; 
+	}	
+	
+	public boolean isFieldPresentationPropertyRule() {
+		return false; 
+	}
+
+	public boolean isArrayOnly() {
+		return arrayOnly;
+	}
+	
+	public boolean isComplex() {
+		return isComplex;
+	}
+	
+	public boolean isValueless() {
+		return isValueless;
+	}
+	
+	public boolean isCombo() {
+		//Jon - need to add this to property handler
+		return
+			//name.equals(IEGLConstants.PROPERTY_NUMELEMENTSITEM) ||
+			name.equals(IEGLConstants.PROPERTY_CURRENCY) ||
+			name.equals(IEGLConstants.PROPERTY_FILLCHARACTER) ||
+			name.equals(IEGLConstants.PROPERTY_KEYITEM) ||
+			name.equals(IEGLConstants.PROPERTY_LENGTHITEM);
+	}
+
+	public boolean isRecordPropertyRule() {
+		return false;
+	}
+		
+	/* (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object arg0) {
+		return this.getName().equals(((EGLPropertyRule) arg0).getName());
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Comparable#compareTo(java.lang.Object)
+	 */
+	public int compareTo(Object arg0) {
+		return this.getName().toLowerCase().compareTo(((EGLPropertyRule) arg0).getName().toLowerCase());
+	}
+	
+	public void setEnumeration( EGLEnumeration enumer ) {
+		enumeration = enumer;		
+	}
+	
+	public EGLEnumeration getEnumeration() {
+		return enumeration;
+	}
+	
+	public boolean isEnumerationProperty() {
+		return enumeration != null;
+	}
+	
+	public void setSpecialRules( int newRules ) {
+		specialRules = newRules;
+	}
+	
+	public boolean shouldValidateInOpenUIStatement() {
+		return (specialRules & DONT_VALIDATE_IN_OPENUI_STATEMENT) == 0;
+	}
+	
+	public boolean isDLIName() {
+		return (specialRules & IS_DLI_NAME) != 0;
+	}
+    /**
+     * @return Returns the description.
+     */
+    public String getDescription() {
+    	if (description == null)
+    		description = "";
+        return description;
+    }
+    /**
+     * @param description The description to set.
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+	public String getPackageName() {
+		return packageName;
+	}
+
+	public boolean isAnnotationField() {
+		return isAnnotationField;
+	}
+
+	public void setAnnotationField(boolean isAnnotationField) {
+		this.isAnnotationField = isAnnotationField;
+	}
+}
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLReportHandlerFunctionHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLReportHandlerFunctionHandler.java
index 151f1c0..1ccb4ec 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLReportHandlerFunctionHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLReportHandlerFunctionHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSQLKeywordHandler.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSQLKeywordHandler.java
index 2668a24..cf32df9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSQLKeywordHandler.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSQLKeywordHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLServiceLib.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLServiceLib.java
index 163726c..fae05f1 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLServiceLib.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLServiceLib.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLStrLib.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLStrLib.java
index 5537faf..7d50911 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLStrLib.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLStrLib.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSysLib.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSysLib.java
index 21629c0..7da3552 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSysLib.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSysLib.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemFunctionWord.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemFunctionWord.java
index 13e8f33..c234c36 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemFunctionWord.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemFunctionWord.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemVariable.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemVariable.java
index 18898c3..4c1825f 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemVariable.java
+++ b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemVariable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright © 2011, 2012 IBM Corporation and others.
+ * Copyright © 2011, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemWord.java b/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler/internal/EGLSystemWord.java
index 0f22a9b..f6a86d9 100644
--- a/core/org.eclipse.edt.compiler/src/org/eclipse/edt/compiler