Add missing @Override to o.e.dltk.ruby.core/src.

Change-Id: Ie965faa34beac841da81fdf9bdf6cbb4a5ce1549
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAliasExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAliasExpression.java
index 85c74f6..b402c2c 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAliasExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAliasExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -31,6 +30,7 @@
 		this.newValue = newValue;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {			
 			visitor.endvisit(this);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayAccessExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayAccessExpression.java
index 1d46767..ed54714 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayAccessExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayAccessExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -48,6 +47,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (array != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayExpression.java
index 0ae4b9a..99588b6 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyArrayExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -42,6 +41,7 @@
 		this.arrayKind = arrayKind;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (this.getChilds() != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAssignment.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAssignment.java
index f8c2d88..114310a 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAssignment.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyAssignment.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -47,6 +46,7 @@
 	/**
 	 * Convert to string in pattern: "left = right"
 	 */
+	@Override
 	public String toString( ) {
 		return String.valueOf(getLeft()) + '=' + String.valueOf(getRight());
 	}
@@ -54,6 +54,7 @@
 	/**
 	 * Testing purposes only. Used to print expression.
 	 */
+	@Override
 	public void printNode( CorePrinter output ) {
 
 		if( getLeft() != null ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBeginExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBeginExpression.java
index a8d9b47..b12225e 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBeginExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBeginExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (body != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBinaryExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBinaryExpression.java
index 8ed47a6..175d2e8 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBinaryExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBinaryExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -44,6 +43,7 @@
 		return right;
 	}
 
+	@Override
 	public void traverse(ASTVisitor pVisitor) throws Exception {
 		if (pVisitor.visit(this)) {
 			if (left != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBlock.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBlock.java
index 97d324a..bc8aaac 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBlock.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBlock.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -65,6 +64,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			for (Iterator iterator = vars.keySet().iterator(); iterator
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBreakExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBreakExpression.java
index 354f867..7b0519d 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBreakExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyBreakExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (value != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCallArgument.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCallArgument.java
index 0b9b4d7..c23ebaf 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCallArgument.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCallArgument.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -60,6 +59,7 @@
 		}
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (getValue() != null)
@@ -68,6 +68,7 @@
 		}
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		if (!(obj instanceof RubyCallArgument))
 			return false;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCaseStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCaseStatement.java
index 5c546bf..08b04fc 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCaseStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyCaseStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -49,6 +48,7 @@
 		this.elseWhen = elseWhen;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if( visitor.visit( this ) ) {
 			if( this.target != null ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyClassDeclaration.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyClassDeclaration.java
index 96c19af..413f089 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyClassDeclaration.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyClassDeclaration.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		this.addSuperClass(superClass);
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 
 		if (visitor.visit(this)) {
@@ -51,6 +51,7 @@
 		}
 	}
 
+	@Override
 	public List/* <String> */getSuperClassNames() {
 		List names = super.getSuperClassNames();
 		if (names == null || names.isEmpty()) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyColonExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyColonExpression.java
index d461811..d6c3876 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyColonExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyColonExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -37,6 +36,7 @@
 	}
 
 	
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if( visitor.visit( this ) ) {
 			if( left != null ) {
@@ -50,6 +50,7 @@
 		return left == null;
 	}
 	
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrintLn("ColonExpression" + this.getSourceRange().toString() + ":"); //$NON-NLS-1$ //$NON-NLS-2$
 		output.indent();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyConstantDeclaration.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyConstantDeclaration.java
index e521959..2532502 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyConstantDeclaration.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyConstantDeclaration.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -45,10 +44,12 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrint("ConstantDeclaration" + this.getSourceRange().toString() + ":(" + this.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 	}
 
+	@Override
 	public void traverse(ASTVisitor pVisitor) throws Exception {
 		if (pVisitor.visit(this)) {
 			if (path != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDAssgnExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDAssgnExpression.java
index 5fdab8c..c8e2004 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDAssgnExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDAssgnExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -32,6 +31,7 @@
 		left.setName(name);
 	}
 
+	@Override
 	public int getKind() {
 		return 0;
 	}
@@ -43,6 +43,7 @@
 //		}
 //	}
 
+	@Override
 	public ASTNode getLeft() {
 		return left;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDVarExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDVarExpression.java
index 78f7109..46c8cc4 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDVarExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDVarExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			visitor.endvisit(this);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDefinedExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDefinedExpression.java
index 95d259f..35b86a2 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDefinedExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDefinedExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (value != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDotExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDotExpression.java
index 52a36e0..c06a011 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDotExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyDotExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -57,6 +56,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (begin != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEnsureExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEnsureExpression.java
index 187ae22..243c88d 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEnsureExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEnsureExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -38,6 +37,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (ensure != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEvaluatableStringExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEvaluatableStringExpression.java
index 3d2a7d2..fec08fa 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEvaluatableStringExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyEvaluatableStringExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (body != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyExceptionList.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyExceptionList.java
index f38f69f..fa66a6f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyExceptionList.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyExceptionList.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -48,6 +47,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (var != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement.java
index 3dee75a..9cefbfd 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -54,11 +53,13 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		// TODO Auto-generated method stub
 
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (expression != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement2.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement2.java
index 63f669e..c8c70e9 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement2.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyForStatement2.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -61,6 +60,7 @@
 
 
 
+	@Override
 	public void traverse(ASTVisitor pVisitor) throws Exception {
 
 		if (pVisitor.visit(this)) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyHashPairExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyHashPairExpression.java
index 55f1074..a306301 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyHashPairExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyHashPairExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -35,6 +34,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (key != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyIfStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyIfStatement.java
index f8b06c8..a6a7e71 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyIfStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyIfStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -40,6 +39,7 @@
 		this.fElseStatement = elseStatement;
 	}
 
+	@Override
 	public void traverse(ASTVisitor pVisitor) throws Exception {
 
 		if (pVisitor.visit(this)) {
@@ -87,6 +87,7 @@
 		return this.fCondition;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrintLn("if: "); //$NON-NLS-1$
 		if (this.fCondition != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch2Expression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch2Expression.java
index c9648b1..4069d3f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch2Expression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch2Expression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -35,6 +34,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if( visitor.visit( this ) ) {
 			if( this.receiver != null ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch3Expression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch3Expression.java
index f0b9069..72c4547 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch3Expression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatch3Expression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -35,6 +34,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if( visitor.visit( this ) ) {
 			if( this.receiver != null ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatchExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatchExpression.java
index b7e4432..6091956 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatchExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMatchExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 
 		if( visitor.visit( this ) ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyModuleDeclaration.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyModuleDeclaration.java
index 546a9e9..bfd6a75 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyModuleDeclaration.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyModuleDeclaration.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -31,6 +30,7 @@
 		return name;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (name != null) {
@@ -47,6 +47,7 @@
 		}
 	}
 
+	@Override
 	public String resolveSuperClassReference(ASTNode node) {
 		return RubyASTUtil.resolveClassName(node);
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMultipleAssignmentStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMultipleAssignmentStatement.java
index e2937dc..f8009d6 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMultipleAssignmentStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyMultipleAssignmentStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -78,11 +77,13 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		// TODO Auto-generated method stub
 
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (this.leftAsterix != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyNotExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyNotExpression.java
index b3caa12..c9521ca 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyNotExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyNotExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -25,6 +24,7 @@
 		return value;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (value != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyParenthesisExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyParenthesisExpression.java
index e8d1fbe..f6a776b 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyParenthesisExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyParenthesisExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -36,6 +35,7 @@
 		return 0;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (internals != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueBodyStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueBodyStatement.java
index 262b071..7e1b4e9 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueBodyStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueBodyStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -71,9 +70,11 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if( visitor.visit( this ) ) {
 			if( this.bodyNode != null ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueStatement.java
index 2f14fa6..15f74fd 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyRescueStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -77,9 +76,11 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (bodyNode != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyReturnStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyReturnStatement.java
index 09bd40a..23fb743 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyReturnStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyReturnStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -31,9 +30,11 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (value != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySelfReference.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySelfReference.java
index e6d8142..6a11c43 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySelfReference.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySelfReference.java
@@ -1,16 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
-/*
- * (c) 2002, 2005 xored software and others all rights reserved. http://www.xored.com
- */
-
 package org.eclipse.dltk.ruby.ast;
 
 import org.eclipse.dltk.ast.references.Reference;
@@ -22,18 +17,22 @@
 		super(start, end);
 	}
 
+	@Override
 	public String getStringRepresentation() {
 		return "self"; //$NON-NLS-1$
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrintLn("SelfReference" + this.getSourceRange().toString()); //$NON-NLS-1$
 	}
 
+	@Override
 	public String toString() {
 		return "self"; //$NON-NLS-1$
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		if (!(obj instanceof RubySelfReference)) {
 			return false;
@@ -42,6 +41,7 @@
 		return sourceStart() == d.sourceStart() && sourceEnd() == d.sourceEnd();
 	}
 
+	@Override
 	public int hashCode() {
 		return sourceStart() ^ sourceEnd();
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonClassDeclaration.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonClassDeclaration.java
index 4cdfecd..95214ff 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonClassDeclaration.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonClassDeclaration.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -33,6 +32,7 @@
 		this.receiver = receiver;
 	}
 	
+	@Override
 	public void traverse( ASTVisitor visitor ) throws Exception {
 
 		if( visitor.visit( this ) ) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonMethodDeclaration.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonMethodDeclaration.java
index 6b45dcd..e825666 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonMethodDeclaration.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySingletonMethodDeclaration.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -30,6 +29,7 @@
 		return receiver;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		Block body = this.getBody();
 		if (visitor.visit(this)) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyStringConcatenation.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyStringConcatenation.java
index f6c3c70..c48b6ca 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyStringConcatenation.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyStringConcatenation.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -18,6 +17,7 @@
 		super(start, end);
 	}
 
+	@Override
 	public void addNode(ASTNode s) {
 		super.addNode(s);
 		if (this.sourceStart() == -1)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySuperExpression.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySuperExpression.java
index 83fda7f..edd8d33 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySuperExpression.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySuperExpression.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -40,6 +39,7 @@
 		this.args = args;
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (getArgs() != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySymbolReference.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySymbolReference.java
index 4249bf6..cd54fa3 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySymbolReference.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubySymbolReference.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -26,10 +25,12 @@
 		return name;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrintLn("RubySymbolReference" + this.getSourceRange().toString()); //$NON-NLS-1$
 	}
 	
+	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof RubySymbolReference) {
 			RubySymbolReference sr = (RubySymbolReference)obj;			
@@ -39,14 +40,17 @@
 		return false;
 	}
 
+	@Override
 	public int hashCode() {
 		return super.hashCode() ^ name.hashCode();
 	}
 
+	@Override
 	public String getStringRepresentation() {
 		return toString();
 	}
 	
+	@Override
 	public String toString() {
 		return name;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUndefStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUndefStatement.java
index 2e9978d..781bf73 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUndefStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUndefStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -37,11 +36,13 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		// TODO Auto-generated method stub
 
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {			
 			visitor.endvisit(this);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUntilStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUntilStatement.java
index 6bc0a62..20a9f40 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUntilStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyUntilStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -25,6 +24,7 @@
 		this.fAction = action;
 	}
 
+	@Override
 	public void traverse(ASTVisitor pVisitor) throws Exception {
 		if (pVisitor.visit(this)) {
 			if (fCondition != null) {
@@ -45,6 +45,7 @@
 		return fAction;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrintLn("while"); //$NON-NLS-1$
 		if (this.fCondition != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhenStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhenStatement.java
index ea9d1c8..ca246cb 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhenStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhenStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -45,9 +44,11 @@
 		return 0;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {		
 	}
 
+	@Override
 	public void traverse(ASTVisitor visitor) throws Exception {
 		if (visitor.visit(this)) {
 			if (expressions != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhileStatement.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhileStatement.java
index 348e5bf..3355a9b 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhileStatement.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/ast/RubyWhileStatement.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.ast;
 
@@ -26,6 +25,7 @@
 		this.fAction = action;
 	}
 
+	@Override
 	public void traverse(ASTVisitor pVisitor) throws Exception {
 		if (pVisitor.visit(this)) {
 			if (fCondition != null) {
@@ -47,6 +47,7 @@
 		return fAction;
 	}
 
+	@Override
 	public void printNode(CorePrinter output) {
 		output.formatPrintLn("while"); //$NON-NLS-1$
 		if (this.fCondition != null) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/ParentshipBuildingVisitor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/ParentshipBuildingVisitor.java
index 5e2f562..0acaa62 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/ParentshipBuildingVisitor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/ParentshipBuildingVisitor.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.core;
 
@@ -35,6 +34,7 @@
 		stack.remove(stack.size() - 1);
 	}
 
+	@Override
 	public boolean visitGeneral(ASTNode node) throws Exception {
 		if (!stack.isEmpty())
 			parents.put(node, peek());
@@ -42,6 +42,7 @@
 		return true;
 	}
 	
+	@Override
 	public void endvisitGeneral(ASTNode node) throws Exception {
 		Assert.isTrue(node == peek());
 		pop();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyContentDescriber.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyContentDescriber.java
index 97dae46..29b2585 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyContentDescriber.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyContentDescriber.java
@@ -8,6 +8,7 @@
 	protected static Pattern[] header_patterns = { Pattern.compile(
 			"^#!.*ruby.*", Pattern.MULTILINE) }; //$NON-NLS-1$
 
+	@Override
 	protected Pattern[] getHeaderPatterns() {
 		return header_patterns;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyLanguageToolkit.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyLanguageToolkit.java
index f7a4747..5a1dbd8 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyLanguageToolkit.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyLanguageToolkit.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.core;
 
@@ -17,6 +16,7 @@
 	public RubyLanguageToolkit() {
 	}
 
+	@Override
 	public boolean languageSupportZIPBuildpath() {
 		return false;
 	}
@@ -37,6 +37,7 @@
 		return "org.eclipse.dltk.rubyContentType"; //$NON-NLS-1$
 	}
 	
+	@Override
 	public String getPreferenceQualifier() {
 		return RubyPlugin.PLUGIN_ID;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyPlugin.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyPlugin.java
index 7a77179..7b49da4 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyPlugin.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/RubyPlugin.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.core;
 
@@ -51,9 +50,7 @@
 		plugin = this;
 	}
 
-	/*
-	 * @see Plugins#start(BundleContext)
-	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 	}
@@ -64,9 +61,7 @@
 		shutdownListeners.add(listener);
 	}
 
-	/*
-	 * @see Plugin#stop(BundleContext)
-	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		Object[] listeners = shutdownListeners.getListeners();
 		for (int i = 0; i < listeners.length; ++i) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/model/FakeField.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/model/FakeField.java
index 9f0bd0e..704b93b 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/model/FakeField.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/core/model/FakeField.java
@@ -1,15 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
-/**
- * 
- */
 package org.eclipse.dltk.ruby.core.model;
 
 import org.eclipse.dltk.core.ISourceModule;
@@ -41,18 +37,22 @@
 		this.hasFlags = true;
 	}
 
+	@Override
 	public ISourceRange getNameRange() throws ModelException {
 		return this;
 	}
 
+	@Override
 	public ISourceRange getSourceRange() throws ModelException {
 		return this;
 	}
 
+	@Override
 	public boolean exists() {
 		return true;
 	}
 
+	@Override
 	public int getFlags() throws ModelException {
 		return hasFlags ? flags : super.getFlags();
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/callhierarchy/RubyCallProcessor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/callhierarchy/RubyCallProcessor.java
index be188fd..b6cd248 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/callhierarchy/RubyCallProcessor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/callhierarchy/RubyCallProcessor.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.callhierarchy;
 
@@ -37,6 +36,7 @@
 		final Map elements = new HashMap();
 		SearchRequestor requestor = new SearchRequestor() {
 
+			@Override
 			public void acceptSearchMatch(SearchMatch match) {
 				if ((match.getAccuracy() != SearchMatch.A_ACCURATE)) {
 					return;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/RubyCorePreferenceInitializer.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/RubyCorePreferenceInitializer.java
index 307fa32..bf5ea6d 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/RubyCorePreferenceInitializer.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/RubyCorePreferenceInitializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.  
+ * Copyright (c) 2008, 2016 xored software, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -22,6 +22,7 @@
 public class RubyCorePreferenceInitializer extends
 		AbstractPreferenceInitializer {
 
+	@Override
 	public void initializeDefaultPreferences() {
 		List<TodoTask> taskTags = TaskTagUtils.getDefaultTags();
 		taskTags.add(new TodoTask("OPTIMIZE", TodoTask.PRIORITY_NORMAL));
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubyCompletionEngine.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubyCompletionEngine.java
index c92cfea..2ef556f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubyCompletionEngine.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubyCompletionEngine.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.core.codeassist;
 
@@ -118,14 +117,17 @@
 		this.parser = DLTKLanguageManager.getSourceParser(RubyNature.NATURE_ID);
 	}
 
+	@Override
 	protected int getEndOfEmptyToken() {
 		return 0;
 	}
 
+	@Override
 	protected String processMethodName(IMethod method, String token) {
 		return null;
 	}
 
+	@Override
 	protected String processTypeName(IType method, String token) {
 		return null;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubySelectionEngine.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubySelectionEngine.java
index d17dca1..f46d9cb 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubySelectionEngine.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/codeassist/RubySelectionEngine.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -336,6 +336,7 @@
 
 		if (selectionElements.isEmpty()) {
 			TypeNameMatchRequestor requestor = new TypeNameMatchRequestor() {
+				@Override
 				public void acceptTypeNameMatch(TypeNameMatch match) {
 					selectionElements.add(match.getType());
 				}
@@ -507,6 +508,7 @@
 			String methodName, final List availableMethods) {
 		final SearchRequestor requestor = new SearchRequestor() {
 
+			@Override
 			public void acceptSearchMatch(SearchMatch match)
 					throws CoreException {
 				IModelElement modelElement = (IModelElement) match.getElement();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubyMatchLocatorParser.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubyMatchLocatorParser.java
index 7d14109..e38ba2f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubyMatchLocatorParser.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubyMatchLocatorParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -55,10 +55,12 @@
 			super(start, end, name);
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			return locationEquals(this, obj);
 		}
 
+		@Override
 		public int hashCode() {
 			return this.sourceEnd() * 1001 + this.sourceEnd();
 		}
@@ -71,10 +73,12 @@
 			super(name, nameStart, nameEnd, declStart, declEnd);
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			return locationEquals(this, obj);
 		}
 
+		@Override
 		public int hashCode() {
 			return this.sourceEnd() * 1001 + this.sourceEnd();
 		}
@@ -87,10 +91,12 @@
 			super(name, nameStart, nameEnd, declStart, declEnd);
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			return locationEquals(this, obj);
 		}
 
+		@Override
 		public int hashCode() {
 			return this.sourceEnd() * 1001 + this.sourceEnd();
 		}
@@ -101,10 +107,12 @@
 			super(start, end, name);
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			return locationEquals(this, obj);
 		}
 
+		@Override
 		public int hashCode() {
 			return this.sourceEnd() * 1001 + this.sourceEnd();
 		}
@@ -119,6 +127,7 @@
 
 	}
 
+	@Override
 	protected MatchVisitor getMatchVisitor() {
 		return new RubyMatchVisitor();
 	}
@@ -155,6 +164,7 @@
 				this.getNodeSet());
 	}
 
+	@Override
 	protected void processStatement(ASTNode node, PatternLocator locator) {
 		if (node == null) {
 			return;
@@ -252,6 +262,7 @@
 		}
 	}
 
+	@Override
 	protected TypeReference createSuperTypeReference(TypeDeclaration t,
 			ASTNode superClass) {
 		String name = t.resolveSuperClassReference(superClass);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchFactory.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchFactory.java
index d5495b3..a283812 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchFactory.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchFactory.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.core.search;
 
@@ -16,10 +15,12 @@
 
 public class RubySearchFactory extends AbstractSearchFactory {
 
+	@Override
 	public IMatchLocatorParser createMatchParser(MatchLocator locator) {
 		return new RubyMatchLocatorParser(locator);
 	}
 
+	@Override
 	public ISearchPatternProcessor createSearchPatternProcessor() {
 		return new RubySearchPatternProcessor();
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchPatternProcessor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchPatternProcessor.java
index c56a993..0faa5f6 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchPatternProcessor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/core/search/RubySearchPatternProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -19,6 +19,7 @@
 
 	private static final String METHOD_DELIMITER = "::"; //$NON-NLS-1$
 
+	@Override
 	public char[] extractDeclaringTypeQualification(String pattern) {
 		final int pos = pattern.lastIndexOf(METHOD_DELIMITER);
 		if (pos != -1) {
@@ -28,6 +29,7 @@
 		return null;
 	}
 
+	@Override
 	public char[] extractDeclaringTypeSimpleName(String pattern) {
 		final int pos = pattern.lastIndexOf(METHOD_DELIMITER);
 		if (pos != -1) {
@@ -37,6 +39,7 @@
 		return null;
 	}
 
+	@Override
 	public char[] extractSelector(String pattern) {
 		final int pos = pattern.lastIndexOf(METHOD_DELIMITER);
 		if (pos != -1) {
@@ -62,6 +65,7 @@
 		}
 	}
 
+	@Override
 	public String getDelimiterReplacementString() {
 		return TYPE_DELIMITER;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceElementParser.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceElementParser.java
index af893ba..7ce63cf 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceElementParser.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceElementParser.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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,16 +18,12 @@
 
 public class RubySourceElementParser extends AbstractSourceElementParser {
 
-	/*
-	 * @see org.eclipse.dltk.core.AbstractSourceElementParser#createVisitor()
-	 */
+	@Override
 	protected SourceElementRequestVisitor createVisitor() {
 		return new RubySourceElementRequestor(getRequestor());
 	}
 
-	/*
-	 * @see org.eclipse.dltk.core.AbstractSourceElementParser#getNatureId()
-	 */
+	@Override
 	protected String getNatureId() {
 		return RubyNature.NATURE_ID;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceFixer.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceFixer.java
index 1536dc9..9868587 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceFixer.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubySourceFixer.java
@@ -112,6 +112,7 @@
 	// missingName.len should == missingName2.len, etc
 
 	private final class ASTPositionsCorrector extends ASTVisitor {
+		@Override
 		public boolean visitGeneral(ASTNode node) throws Exception {
 			if (node.sourceStart() < 0 || node.sourceEnd() < 0)
 				return true;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubyTodoParserType.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubyTodoParserType.java
index 8cb13ba..76e53ba 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubyTodoParserType.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/RubyTodoParserType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 xored software, Inc.
+ * Copyright (c) 2008, 2016 xored software, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -20,6 +20,7 @@
 
 public class RubyTodoParserType extends AbstractTodoTaskBuildParticipantType {
 
+	@Override
 	protected ITodoTaskPreferences getPreferences(IScriptProject project) {
 		return new TodoTaskPreferencesOnPreferenceLookupDelegate(
 				RubyPlugin.PLUGIN_ID, project);
@@ -31,6 +32,7 @@
 			super(preferences);
 		}
 
+		@Override
 		protected void reset() {
 			super.reset();
 			blockMode = false;
@@ -38,6 +40,7 @@
 
 		private boolean blockMode;
 
+		@Override
 		protected int findCommentStart(char[] content, int begin, int end) {
 			if (blockMode) {
 				if (checkChars(content, begin, end, "=end")) { //$NON-NLS-1$
@@ -83,6 +86,7 @@
 
 	}
 
+	@Override
 	protected IBuildParticipant getBuildParticipant(
 			ITodoTaskPreferences preferences) {
 		return new RubyTodoTaskParser(preferences);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/AliasedRubyMixinMethod.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/AliasedRubyMixinMethod.java
index f3d0c6c..c75356a 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/AliasedRubyMixinMethod.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/AliasedRubyMixinMethod.java
@@ -51,10 +51,12 @@
 		}
 	}
 
+	@Override
 	public String getName() {
 		return alias.getNewName();
 	}
 
+	@Override
 	public RubyMixinVariable[] getVariables() {
 		List result = new ArrayList();
 		IMixinElement mixinElement = model.getRawModel().get(alias.getOldKey());
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinBuildVisitor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinBuildVisitor.java
index 8fbaa4f..1125639 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinBuildVisitor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinBuildVisitor.java
@@ -98,12 +98,14 @@
 			super(node);
 		}
 
+		@Override
 		public String getClassKey() {
 			return "Object"; //$NON-NLS-1$
 		}
 
 		private boolean isObjectReported = false;
 
+		@Override
 		public String reportMethod(String name, IMethod object) {
 			if (!isObjectReported) {
 				report(getClassKey() + INSTANCE_SUFFIX, null);
@@ -113,6 +115,7 @@
 					RubyMixinElementInfo.createMethod(object));
 		}
 
+		@Override
 		public String reportType(String name, IType object, boolean module) {
 			RubyMixinElementInfo obj = null;
 			if (module)
@@ -123,6 +126,7 @@
 			return report(name, obj);
 		}
 
+		@Override
 		public String reportVariable(String name, IField object) {
 			RubyMixinElementInfo info = (name.endsWith(VIRTUAL_SUFFIX)) ? RubyMixinElementInfo
 					.createVirtualClass()
@@ -138,16 +142,19 @@
 			}
 		}
 
+		@Override
 		public String getKey() {
 			return "Object"; //$NON-NLS-1$
 		}
 
+		@Override
 		public String reportInclude(String object) {
 			return report(getClassKey() + INSTANCE_SUFFIX,
 					new RubyMixinElementInfo(RubyMixinElementInfo.K_INCLUDE,
 							object));
 		}
 
+		@Override
 		public String reportExtend(String object) {
 			return null;
 		}
@@ -163,11 +170,13 @@
 			this.classKey = classKey;
 		}
 
+		@Override
 		public String reportMethod(String name, IMethod object) {
 			String key = classKey + INSTANCE_SUFFIX + SEPARATOR + name;
 			return report(key, RubyMixinElementInfo.createMethod(object));
 		}
 
+		@Override
 		public String reportType(String name, IType obj, boolean module) {
 			RubyMixinElementInfo object = null;
 			if (module)
@@ -179,6 +188,7 @@
 			return report(key, object);
 		}
 
+		@Override
 		public String reportVariable(String name, IField object) {
 			RubyMixinElementInfo info = (name.endsWith(VIRTUAL_SUFFIX)) ? RubyMixinElementInfo
 					.createVirtualClass()
@@ -200,19 +210,23 @@
 			}
 		}
 
+		@Override
 		public String getClassKey() {
 			return classKey;
 		}
 
+		@Override
 		public String getKey() {
 			return classKey;
 		}
 
+		@Override
 		public String reportInclude(String object) {
 			return report(classKey + INSTANCE_SUFFIX, new RubyMixinElementInfo(
 					RubyMixinElementInfo.K_INCLUDE, object));
 		}
 
+		@Override
 		public String reportExtend(String object) {
 			return report(classKey + INSTANCE_SUFFIX, new RubyMixinElementInfo(
 					RubyMixinElementInfo.K_EXTEND, object));
@@ -229,11 +243,13 @@
 			this.classKey = classKey;
 		}
 
+		@Override
 		public String reportMethod(String name, IMethod object) {
 			return report(classKey + SEPARATOR + name, RubyMixinElementInfo
 					.createMethod(object));
 		}
 
+		@Override
 		public String reportType(String name, IType object, boolean module) {
 			RubyMixinElementInfo obj = null;
 			if (module)
@@ -244,6 +260,7 @@
 			return report(classKey + SEPARATOR + name, obj);
 		}
 
+		@Override
 		public String reportVariable(String name, IField object) {
 			RubyMixinElementInfo info = (name.endsWith(VIRTUAL_SUFFIX)) ? RubyMixinElementInfo
 					.createVirtualClass()
@@ -259,19 +276,23 @@
 			}
 		}
 
+		@Override
 		public String getClassKey() {
 			return classKey;
 		}
 
+		@Override
 		public String getKey() {
 			return classKey;
 		}
 
+		@Override
 		public String reportInclude(String object) {
 			return report(classKey, new RubyMixinElementInfo(
 					RubyMixinElementInfo.K_INCLUDE, object));
 		}
 
+		@Override
 		public String reportExtend(String object) {
 			return report(classKey, new RubyMixinElementInfo(
 					RubyMixinElementInfo.K_EXTEND, object));
@@ -290,15 +311,18 @@
 			this.methodKey = methodKey;
 		}
 
+		@Override
 		public String reportMethod(String name, IMethod object) {
 			return classScope.reportMethod(name, object);
 		}
 
+		@Override
 		public String reportType(String name, IType obj, boolean module) {
 			// throw new RuntimeException();
 			return null;
 		}
 
+		@Override
 		public String reportVariable(String name, IField obj) {
 			RubyMixinElementInfo info = (name.endsWith(VIRTUAL_SUFFIX)) ? RubyMixinElementInfo
 					.createVirtualClass()
@@ -327,18 +351,22 @@
 			}
 		}
 
+		@Override
 		public String getClassKey() {
 			return classScope.getClassKey();
 		}
 
+		@Override
 		public String getKey() {
 			return methodKey;
 		}
 
+		@Override
 		public String reportInclude(String object) {
 			return classScope.reportInclude(object);
 		}
 
+		@Override
 		public String reportExtend(String object) {
 			return classScope.reportExtend(object);
 		}
@@ -362,11 +390,13 @@
 		return (Scope) scopes.peek();
 	}
 
+	@Override
 	public boolean visit(ModuleDeclaration s) throws Exception {
 		this.scopes.add(new SourceModuleScope(s));
 		return true;
 	}
 
+	@Override
 	public boolean visit(MethodDeclaration decl) throws Exception {
 		IMethod obj = null;
 		String name = decl.getName();
@@ -413,6 +443,7 @@
 		return sourceModule.getElementAt(decl.sourceStart() + 1);
 	}
 
+	@Override
 	public boolean visitGeneral(ASTNode s) throws Exception {
 		if (s instanceof RubyMethodArgument) {
 			RubyMethodArgument argument = (RubyMethodArgument) s;
@@ -592,6 +623,7 @@
 		return true;
 	}
 
+	@Override
 	public boolean visit(TypeDeclaration decl) throws Exception {
 		IType obj = null;
 		if (moduleAvailable) {
@@ -722,6 +754,7 @@
 		return null;
 	}
 
+	@Override
 	public void endvisitGeneral(ASTNode node) throws Exception {
 		Scope scope = (Scope) scopes.peek();
 		if (scope.getNode() == node) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinElementInfo.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinElementInfo.java
index e33e0fb..0163d50 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinElementInfo.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinElementInfo.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.parser.mixin;
 
@@ -36,11 +35,7 @@
 	private int kind = 0;
 	private Object object = null;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
@@ -49,11 +44,7 @@
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinMethod.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinMethod.java
index 9ced43c..b39389f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinMethod.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyMixinMethod.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -108,9 +108,7 @@
 				.toArray(new RubyMixinVariable[result.size()]);
 	}
 	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return "RubyMixinMethod[" + key + "]"; //$NON-NLS-1$ //$NON-NLS-2$
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyObjectMixinClass.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyObjectMixinClass.java
index 41e0e04..141b6fd 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyObjectMixinClass.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/mixin/RubyObjectMixinClass.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.parser.mixin;
 
@@ -24,6 +23,7 @@
 				: RubyMixinUtils.OBJECT_INSTANCE, false);
 	}
 
+	@Override
 	public RubyMixinVariable[] getFields() {
 		return new RubyMixinVariable[0];
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/visitors/RubySourceElementRequestor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/visitors/RubySourceElementRequestor.java
index ed26a0c..86fc109 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/visitors/RubySourceElementRequestor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parser/visitors/RubySourceElementRequestor.java
@@ -97,6 +97,7 @@
 			return fToNode;
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			if (obj instanceof TypeField) {
 				TypeField typeFileld = (TypeField) obj;
@@ -107,6 +108,7 @@
 			return false;
 		}
 
+		@Override
 		public String toString() {
 			return fName;
 		}
@@ -172,6 +174,7 @@
 		}
 	}
 
+	@Override
 	protected String makeLanguageDependentValue(ASTNode value) {
 		String outValue = ""; //$NON-NLS-1$
 		/*
@@ -188,6 +191,7 @@
 	}
 
 	// Visiting methods
+	@Override
 	protected void onEndVisitMethod(MethodDeclaration method) {
 		if (DLTKCore.DEBUG) {
 			System.out.println("==> Method: " + method.getName()); //$NON-NLS-1$
@@ -238,6 +242,7 @@
 	}
 
 	// Visiting expressions
+	@Override
 	public boolean visit(ASTNode expression) throws Exception {
 		if (DLTKCore.DEBUG) {
 			System.out.println("==> Expression: " + expression.toString()); //$NON-NLS-1$
@@ -461,20 +466,24 @@
 		return true;
 	}
 
+	@Override
 	public boolean endvisit(ASTNode expression) throws Exception {
 		return true;
 	}
 
+	@Override
 	public boolean visit(Expression expression) throws Exception {
 		super.visit(expression);
 		return visit((ASTNode) expression);
 	}
 
+	@Override
 	public boolean visit(Statement statement) throws Exception {
 		super.visit(statement);
 		return visit((ASTNode) statement);
 	}
 
+	@Override
 	protected void modifyMethodInfo(MethodDeclaration methodDeclaration,
 			MethodInfo mi) {
 		if (fInClass) {
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/ASTUtils.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/ASTUtils.java
index 5844ce0..ff2c49d 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/ASTUtils.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/ASTUtils.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.parsers.jruby;
 
@@ -163,6 +162,7 @@
 				return realEnd - realStart;
 			}
 
+			@Override
 			public boolean visitGeneral(ASTNode s) throws Exception {
 				int realStart = s.sourceStart();
 				int realEnd = s.sourceEnd();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/RubyASTBuildVisitor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/RubyASTBuildVisitor.java
index be9baf9..f4c477f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/RubyASTBuildVisitor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/parsers/jruby/RubyASTBuildVisitor.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.parsers.jruby;
 
@@ -248,6 +247,7 @@
 			list.clear();
 		}
 
+		@Override
 		public String toString() {
 			return getShortClassName(this) + '[' + list + ']';
 		}
@@ -265,6 +265,7 @@
 			list.addArgument(s, 0);
 		}
 
+		@Override
 		public String toString() {
 			return getShortClassName(this) + '[' + list + ']';
 		}
@@ -281,6 +282,7 @@
 			module.getStatements().add(statement);
 		}
 
+		@Override
 		public String toString() {
 			return getShortClassName(this);
 		}
@@ -302,6 +304,7 @@
 			type.getStatements().add(statement);
 		}
 
+		@Override
 		public String toString() {
 			return getShortClassName(this) + '[' + fullName + ']';
 		}
@@ -335,6 +338,7 @@
 			method.getStatements().add(statement);
 		}
 
+		@Override
 		public String toString() {
 			return getShortClassName(this) + '[' + method.getName() + ']';
 		}
@@ -352,6 +356,7 @@
 			block.getStatements().add(statement);
 		}
 
+		@Override
 		public String toString() {
 			return getShortClassName(this);
 		}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/typehierarchy/RubyTypeHierarchyEngine.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/typehierarchy/RubyTypeHierarchyEngine.java
index 42c69b8..0d1712a 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/typehierarchy/RubyTypeHierarchyEngine.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/internal/typehierarchy/RubyTypeHierarchyEngine.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.internal.typehierarchy;
 
@@ -98,6 +97,7 @@
 			fStop= true;
 		}
 
+		@Override
 		public void acceptTypeNameMatch(TypeNameMatch match) {
 			if (fStop)
 				return;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/ConstantTypeGoal.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/ConstantTypeGoal.java
index a948548..94b5cb9 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/ConstantTypeGoal.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/ConstantTypeGoal.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -31,9 +30,7 @@
 		return offset;
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
@@ -42,9 +39,7 @@
 		return result;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/MethodContext.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/MethodContext.java
index b3c19fe..44ffe57 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/MethodContext.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/MethodContext.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -55,9 +54,7 @@
 		return instanceType;
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
@@ -68,9 +65,7 @@
 		return result;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/OffsetTargetedASTVisitor.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/OffsetTargetedASTVisitor.java
index f6fa7af..10893d5 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/OffsetTargetedASTVisitor.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/OffsetTargetedASTVisitor.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -39,6 +38,7 @@
 		return true;
 	}
 
+	@Override
 	public final boolean visit(MethodDeclaration s) {
 		if (!interesting(s))
 			return false;
@@ -49,6 +49,7 @@
 		return visitGeneralInteresting(s);
 	}
 
+	@Override
 	public final boolean visit(ModuleDeclaration s) {
 		if (!interesting(s))
 			return false;
@@ -59,6 +60,7 @@
 		return visitGeneralInteresting(s);
 	}
 
+	@Override
 	public final boolean visit(TypeDeclaration s) throws Exception {
 		if (!interesting(s))
 			return false;
@@ -69,6 +71,7 @@
 		return visitGeneralInteresting(s);
 	}
 
+	@Override
 	public final boolean visit(Expression s) throws Exception {
 		if (!interesting(s))
 			return false;
@@ -79,6 +82,7 @@
 		return visitGeneralInteresting(s);
 	}
 
+	@Override
 	public final boolean visit(Statement s) throws Exception {
 		if (!interesting(s))
 			return false;
@@ -93,6 +97,7 @@
 		return true;
 	}
 
+	@Override
 	public final boolean visitGeneral(ASTNode s) throws Exception {
 		if (!interesting(s))
 			return false;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyClassType.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyClassType.java
index 492d68f..d5cc70a 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyClassType.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyClassType.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -25,10 +24,12 @@
 		return false; //TODO
 	}
 
+	@Override
 	public String getModelKey() {
 		return modelKey;
 	}
 
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
@@ -37,6 +38,7 @@
 		return result;
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyModelUtils.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyModelUtils.java
index 459a55c..de6bd3f 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyModelUtils.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyModelUtils.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -117,12 +116,14 @@
 				return true;
 			}
 
+			@Override
 			public boolean visit(Expression s) throws Exception {
 				if (!interesting(s))
 					return false;
 				return true;
 			}
 
+			@Override
 			public boolean visit(MethodDeclaration s) throws Exception {
 				if (!interesting(s))
 					return false;
@@ -141,24 +142,28 @@
 				return true;
 			}
 
+			@Override
 			public boolean visit(ModuleDeclaration s) throws Exception {
 				if (!interesting(s))
 					return false;
 				return true;
 			}
 
+			@Override
 			public boolean visit(TypeDeclaration s) throws Exception {
 				if (!interesting(s))
 					return false;
 				return true;
 			}
 
+			@Override
 			public boolean endvisit(TypeDeclaration s) throws Exception {
 				if (!interesting(s))
 					return false;
 				return false /* dummy */;
 			}
 
+			@Override
 			public boolean visitGeneral(ASTNode s) throws Exception {
 				if (s instanceof Block)
 					return true;
@@ -613,6 +618,7 @@
 		final List result = new ArrayList();
 		SearchRequestor requestor = new SearchRequestor() {
 
+			@Override
 			public void acceptSearchMatch(SearchMatch match)
 					throws CoreException {
 				Object element = match.getElement();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencer.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencer.java
index 8c07ed1..1e548b3 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencer.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencer.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -50,6 +49,7 @@
 		super(new RubyEvaluatorFactory());
 	}
 
+	@Override
 	public synchronized IEvaluatedType evaluateType(AbstractTypeGoal goal,
 			int timeLimit) {
 		IEvaluatedType type = super.evaluateType(goal, new SimplestRubyPruner(
@@ -61,6 +61,7 @@
 		return type;
 	}
 
+	@Override
 	public synchronized Object evaluateGoal(IGoal goal, IPruner pruner) {
 		return super.evaluateGoal(goal, pruner);
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencingUtils.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencingUtils.java
index 2489f98..289de62 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencingUtils.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/RubyTypeInferencingUtils.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -68,6 +67,7 @@
 
 		TypeNameMatchRequestor requestor = new TypeNameMatchRequestor() {
 
+			@Override
 			public void acceptTypeNameMatch(TypeNameMatch match) {
 				IType type = match.getType();
 				if (type.getParent() instanceof ISourceModule) {
@@ -87,26 +87,31 @@
 			final int requestedOffset) {
 		final Collection scopes = new ArrayList();
 		ASTVisitor visitor = new OffsetTargetedASTVisitor(requestedOffset) {
+			@Override
 			public boolean visitInteresting(MethodDeclaration s) {
 				scopes.add(s);
 				return true;
 			}
 
+			@Override
 			public boolean visitInteresting(ModuleDeclaration s) {
 				scopes.add(s);
 				return true;
 			}
 
+			@Override
 			public boolean visitInteresting(TypeDeclaration s) {
 				scopes.add(s);
 				return true;
 			}
 
+			@Override
 			protected boolean visitInteresting(RubyBlock b) {
 				scopes.add(b);
 				return true;
 			}
 
+			@Override
 			protected boolean visitGeneralInteresting(ASTNode s) {
 				if (ASTUtils.isNodeScoping(s)) {
 					scopes.add(s);
@@ -207,18 +212,21 @@
 		final Collection assignments = new ArrayList();
 		ASTVisitor visitor = new ASTVisitor() {
 
+			@Override
 			public boolean visit(MethodDeclaration s) throws Exception {
 				if (s == scope)
 					return true;
 				return false;
 			}
 
+			@Override
 			public boolean visit(TypeDeclaration s) throws Exception {
 				if (s == scope)
 					return true;
 				return false;
 			}
 
+			@Override
 			public boolean visit(ASTNode node) throws Exception {
 				if (node instanceof RubyAssignment) {
 					RubyAssignment assignment = (RubyAssignment) node;
@@ -348,6 +356,7 @@
 			this.level.clear();
 		}
 
+		@Override
 		public boolean visitGeneral(ASTNode node) throws Exception {
 			if (node == root)
 				return true;
@@ -381,6 +390,7 @@
 			return true;
 		}
 
+		@Override
 		public void endvisitGeneral(ASTNode node) throws Exception {
 			if (level.size() > 0 && level.peek().equals(node)) {
 				level.pop();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/UniqueNamesList.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/UniqueNamesList.java
index 3abe2dd..42b3c2b 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/UniqueNamesList.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/UniqueNamesList.java
@@ -1,15 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
-/**
- * 
- */
 package org.eclipse.dltk.ruby.typeinference;
 
 import java.util.ArrayList;
@@ -23,6 +19,7 @@
 	
 	HashSet names = new HashSet ();
 	
+	@Override
 	public boolean add(Object elem) {
 		if (elem instanceof IModelElement) {
 			IModelElement modelElement = (IModelElement) elem;
@@ -33,11 +30,13 @@
 		return super.add(elem);
 	}
 
+	@Override
 	public void clear() {			
 		super.clear();
 		names.clear();
 	}
 
+	@Override
 	public boolean contains(Object elem) {
 		if (elem instanceof IModelElement) {
 			IModelElement modelElement = (IModelElement) elem;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/VariableTypeGoal.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/VariableTypeGoal.java
index 7c969ba..6f84feb 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/VariableTypeGoal.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/VariableTypeGoal.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference;
 
@@ -43,9 +42,7 @@
 		return parentKey;
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
@@ -55,9 +52,7 @@
 		return result;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
@@ -81,6 +76,7 @@
 		return true;
 	}
 
+	@Override
 	public String toString() {
 		return getClassName() + "[" + name + "," + parentKey + "," + kind + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/AssignmentEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/AssignmentEvaluator.java
index f84eddd..5f914fe 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/AssignmentEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/AssignmentEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -25,6 +24,7 @@
 		super(goal);
 	}
 
+	@Override
 	public IGoal[] init() {
 		ExpressionTypeGoal typedGoal = (ExpressionTypeGoal) goal;
 		ASTNode expression = (typedGoal).getExpression();
@@ -36,11 +36,13 @@
 				expr.getRight()) };
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		this.result = (IEvaluatedType) result;
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public Object produceResult() {
 		return result;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BlockEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BlockEvaluator.java
index bd650f9..2326d94 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BlockEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BlockEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -32,10 +31,12 @@
 		return (ExpressionTypeGoal) this.getGoal();
 	}
 
+	@Override
 	public Object produceResult() {
 		return this.result;
 	}
 
+	@Override
 	public IGoal[] init() {
 		ExpressionTypeGoal typedGoal = getTypedGoal();
 		Block block = (Block) typedGoal.getExpression();
@@ -50,6 +51,7 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		this.result = (IEvaluatedType) result;
 		return IGoal.NO_GOALS;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BooleanLiteralEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BooleanLiteralEvaluator.java
index 5b212b7..e1c62bc 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BooleanLiteralEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/BooleanLiteralEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -26,6 +25,7 @@
 		return null;
 	}
 
+	@Override
 	public Object produceResult() {
 		ExpressionTypeGoal tg = (ExpressionTypeGoal) goal;
 		BooleanLiteral l = (BooleanLiteral) tg.getExpression();
@@ -35,10 +35,12 @@
 			return new RubyClassType("FalseClass%");// TrueClass || FalseClass //$NON-NLS-1$
 	}
 
+	@Override
 	public IGoal[] init() {
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		return IGoal.NO_GOALS;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/CaseStatementTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/CaseStatementTypeEvaluator.java
index 9d07c94..be12afa 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/CaseStatementTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/CaseStatementTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -34,6 +33,7 @@
 		return (ExpressionTypeGoal) getGoal();
 	}
 
+	@Override
 	public IGoal[] init() {
 		ExpressionTypeGoal typedGoal = this.getTypedGoal();
 		ASTNode expression = typedGoal.getExpression();
@@ -50,10 +50,12 @@
 		return (IGoal[]) subgoals.toArray(new IGoal[subgoals.size()]);
 	}
 
+	@Override
 	public Object produceResult() {
 		return RubyTypeInferencingUtils.combineTypes(types);
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		if (result != null)
 			this.types.add(result);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ColonExpressionEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ColonExpressionEvaluator.java
index ef6a624..68746ed 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ColonExpressionEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ColonExpressionEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -42,11 +41,13 @@
 				.translateGoal(this.goal);
 	}
 
+	@Override
 	public Object produceResult() {
 
 		return answer;
 	}
 
+	@Override
 	public IGoal[] init() {
 		RubyColonExpression expr = getTypedGoal().getColonExpression();
 
@@ -65,6 +66,7 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		this.helperResult = (IEvaluatedType) result;
 
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ConstantReferenceEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ConstantReferenceEvaluator.java
index 8728e30..c9a7412 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ConstantReferenceEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/ConstantReferenceEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -40,10 +39,12 @@
 		return (ISourceModuleContext) goal.getContext();
 	}
 
+	@Override
 	public Object produceResult() {
 		return result;
 	}
 
+	@Override
 	public IGoal[] init() {
 		helperGoal = null;
 		ISourceModuleContext typedContext = getTypedContext();
@@ -89,6 +90,7 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		this.result = (IEvaluatedType) result;
 		return IGoal.NO_GOALS;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/FieldParentKeyVerificator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/FieldParentKeyVerificator.java
index c066491..fceffdb 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/FieldParentKeyVerificator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/FieldParentKeyVerificator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -42,6 +41,7 @@
 		return node;
 	}
 
+	@Override
 	public IGoal[] init() {
 		FieldPositionVerificationGoal goal = (FieldPositionVerificationGoal) this.goal;
 		PossiblePosition position = goal.getPosition();
@@ -91,10 +91,12 @@
 		return null;
 	}
 
+	@Override
 	public Object produceResult() {
 		return result;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		return null;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/IfStatementTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/IfStatementTypeEvaluator.java
index 12a2b1d..7ed5aba 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/IfStatementTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/IfStatementTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -76,10 +75,12 @@
 		return null;
 	}
 
+	@Override
 	public Object produceResult() {
 		return RubyTypeInferencingUtils.combineTypes(evaluatedTypes);
 	}
 
+	@Override
 	public IGoal[] init() {
 		IGoal goal = produceNextSubgoal(null, null);
 		if (goal != null)
@@ -87,6 +88,7 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		IGoal goal = produceNextSubgoal(subgoal, result);
 		if (goal != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallTypeEvaluator.java
index 911b985..85ebac1 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -158,6 +157,7 @@
 		return null;
 	}
 
+	@Override
 	public Object produceResult() {
 		if (state == STATE_UNKNOWN)
 			return null;
@@ -165,6 +165,7 @@
 			return result;
 	}
 
+	@Override
 	public IGoal[] init() {
 		IGoal goal = produceNextSubgoal(null, null);
 		if (goal != null)
@@ -172,6 +173,7 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		IGoal goal = produceNextSubgoal(subgoal, result);
 		if (goal != null)
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallVerificator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallVerificator.java
index 6a4ef74..8008741 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallVerificator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodCallVerificator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -50,6 +49,7 @@
 		return (MethodCallVerificationGoal) this.getGoal();
 	}
 
+	@Override
 	public IGoal[] init() {
 		topLevelMethod = false;
 		MethodCallVerificationGoal goal2 = getTypedGoal();
@@ -89,6 +89,7 @@
 		return null;
 	}
 
+	@Override
 	public Object produceResult() { // TODO: add partial results support
 		if (!(receiverType instanceof RubyClassType))
 			return null;
@@ -121,6 +122,7 @@
 		return result;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		if (this.state == RECEIVER_WAIT) {
 			receiverType = (IEvaluatedType) result;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodReturnTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodReturnTypeEvaluator.java
index 6a27f66..f26c811 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodReturnTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/MethodReturnTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -63,6 +62,7 @@
 		return (InstanceContext) this.getGoal().getContext();
 	}
 
+	@Override
 	public Object produceResult() {
 		if (rdocResult != null)
 			return rdocResult;
@@ -72,6 +72,7 @@
 		return null;
 	}
 
+	@Override
 	public IGoal[] init() {
 		MethodReturnTypeGoal typedGoal = getTypedGoal();
 		InstanceContext typedContext = getTypedContext();
@@ -157,6 +158,7 @@
 
 		ASTVisitor visitor = new ASTVisitor() {
 
+			@Override
 			public boolean visitGeneral(ASTNode node) throws Exception {
 				if (node instanceof RubyReturnStatement) {
 					RubyReturnStatement statement = (RubyReturnStatement) node;
@@ -212,6 +214,7 @@
 		return null;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		if (result != null)
 			evaluated.add(result);
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/NonTypeConstantTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/NonTypeConstantTypeEvaluator.java
index cda13fc..39523f9 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/NonTypeConstantTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/NonTypeConstantTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -50,6 +49,7 @@
 		return (NonTypeConstantTypeGoal) this.goal;
 	}
 
+	@Override
 	public IGoal[] init() {
 		NonTypeConstantTypeGoal g = getTypedGoal();
 		IMixinElement element = g.getElement();
@@ -75,10 +75,12 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public Object produceResult() {
 		return result;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		return IGoal.NO_GOALS;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyArgumentTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyArgumentTypeEvaluator.java
index 57f8671..0eaf1fe 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyArgumentTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyArgumentTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -23,6 +22,7 @@
 		super(goal);
 	}
 
+	@Override
 	public IGoal[] init() {
 		ExpressionTypeGoal goal = (ExpressionTypeGoal) this.getGoal();
 		RubyCallArgument arg = (RubyCallArgument) goal.getExpression();
@@ -32,10 +32,12 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public Object produceResult() {
 		return result;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		this.result = result;
 		return IGoal.NO_GOALS;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyVariableTypeEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyVariableTypeEvaluator.java
index 130d9cf..f6ed73c 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyVariableTypeEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/RubyVariableTypeEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -41,6 +40,7 @@
 		super(goal);
 	}
 
+	@Override
 	public IGoal[] init() {
 		init = true;
 		VariableTypeGoal goal = (VariableTypeGoal) this.goal;
@@ -51,6 +51,7 @@
 				parent) };
 	}
 
+	@Override
 	public Object produceResult() {
 		IEvaluatedType type = RubyTypeInferencingUtils.combineTypes(results);
 		return type;
@@ -68,6 +69,7 @@
 		return (BasicContext) this.goal.getContext();
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		if (init) {
 			init = false;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/SelfReferenceEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/SelfReferenceEvaluator.java
index c90fb0f..1a5e939 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/SelfReferenceEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/SelfReferenceEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -33,10 +32,12 @@
 		return (ISourceModuleContext) goal.getContext();
 	}
 
+	@Override
 	public Object produceResult() {
 		return result;
 	}
 
+	@Override
 	public IGoal[] init() {
 		ISourceModuleContext typedContext = getTypedContext();
 		if (typedContext instanceof IInstanceContext) {
@@ -53,6 +54,7 @@
 		return IGoal.NO_GOALS;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		return IGoal.NO_GOALS;
 	}
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/VariableReferenceEvaluator.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/VariableReferenceEvaluator.java
index 47491ef..5b51ea2 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/VariableReferenceEvaluator.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/evaluators/VariableReferenceEvaluator.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.evaluators;
 
@@ -59,6 +58,7 @@
 		super(goal);
 	}
 
+	@Override
 	public Object produceResult() {
 		return RubyTypeInferencingUtils.combineTypes(results);
 	}
@@ -86,6 +86,7 @@
 		return null;
 	}
 
+	@Override
 	public IGoal[] init() {
 		VariableReference ref = getGoalVariableReference();
 		if (ref.getVariableKind() == RubyVariableKind.LOCAL) {
@@ -236,6 +237,7 @@
 		return null;
 	}
 
+	@Override
 	public IGoal[] subGoalDone(IGoal subgoal, Object result, GoalState state) {
 		if (subgoal == callsGoal) {
 			List possibles = new ArrayList();
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/ColonExpressionGoal.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/ColonExpressionGoal.java
index a15042c..9283e6a 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/ColonExpressionGoal.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/ColonExpressionGoal.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.goals;
 
@@ -26,9 +25,7 @@
 		return expr;
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
@@ -36,9 +33,7 @@
 		return result;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
diff --git a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/NonTypeConstantTypeGoal.java b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/NonTypeConstantTypeGoal.java
index df7641d..253cf88 100644
--- a/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/NonTypeConstantTypeGoal.java
+++ b/plugins/org.eclipse.dltk.ruby.core/src/org/eclipse/dltk/ruby/typeinference/goals/NonTypeConstantTypeGoal.java
@@ -1,11 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation and others.
  * All rights reserved. This program and 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
  *
- 
  *******************************************************************************/
 package org.eclipse.dltk.ruby.typeinference.goals;
 
@@ -31,9 +30,7 @@
 		return element;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
@@ -41,9 +38,7 @@
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;