added interface override annotations.

pom.xml

@@ -38,7 +38,7 @@
 </modules>
 <properties>
 	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	<project.build.sourceVersion>1.6</project.build.sourceVersion>
+	<project.build.sourceVersion>1.7</project.build.sourceVersion>
 	
 	<!-- Maven plugin versions -->
     <exec-maven-plugin.version>1.2</exec-maven-plugin.version>

src/eclipse/ant/deploy-workspace.xml

@@ -8,8 +8,8 @@
 	
 	<property name="launch.postfix"           value=".launch" />
 	<property name="launch.postfix.template"  value=".launch-template" />
-	<property name="launch.dir.from"          value="${project.basedir}/src/eclipse/launch" />
+	<property name="launch.dir.from"          value="${project.basedir}/src/eclipse/launch-template" />
-	<property name="launch.dir.to"            value="${project.basedir}/.settings/vasc/launch" />
+	<property name="launch.dir.to"            value="${project.basedir}/.settings/vasc" />
 	
 	<property name="config.dir.from"          value="${project.basedir}/src/eclipse/settings" />
 	<property name="config.file.jdt"          value="org.eclipse.jdt.core.prefs" />
@@ -19,35 +19,35 @@
 		
 		<echo>Copy Launchers</echo>
 		<mkdir dir="${launch.dir.to}" />
-		<copy overwrite="true" file="${launch.dir.from}/vasc-demo-server${launch.postfix.template}"       tofile="${launch.dir.to}/vasc-demo-server${launch.postfix.template}"/>
+		<copy overwrite="true" file="${launch.dir.from}/vasc-demo-server${launch.postfix.template}"       tofile="${launch.dir.to}/vasc-demo-server${launch.postfix}"/>
-		<copy overwrite="true" file="${launch.dir.from}/vasc-demo-client-swing${launch.postfix.template}" tofile="${launch.dir.to}/vasc-demo-client-swing${launch.postfix.template}"/>
+		<copy overwrite="true" file="${launch.dir.from}/vasc-demo-client-swing${launch.postfix.template}" tofile="${launch.dir.to}/vasc-demo-client-swing${launch.postfix}"/>
 
 		<echo>Copy java compiler settings to projects</echo>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-api/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-api/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-jdbc/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-jdbc/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-jpa/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-jpa/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-ldap/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-ldap/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-metamodel/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-metamodel/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-mongodb/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-mongodb/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-backend/vasc-backend-test/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-backend/vasc-backend-test/.settings/${config.file.jdt}"/>
 		
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-core/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-core/.settings/${config.file.jdt}"/>
 		
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-frontend/vasc-frontend-swing/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-frontend/vasc-frontend-swing/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-frontend/vasc-frontend-swt/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-frontend/vasc-frontend-swt/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-frontend/vasc-frontend-web-export/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-frontend/vasc-frontend-web-export/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-frontend/vasc-frontend-web-jsf/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-frontend/vasc-frontend-web-jsf/.settings/${config.file.jdt}"/>
 		
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-lib/vasc-lib-i18n/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-lib/vasc-lib-i18n/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-lib/vasc-lib-jr40/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-lib/vasc-lib-jr40/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-lib/vasc-lib-xpql/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-lib/vasc-lib-xpql/.settings/${config.file.jdt}"/>
 		
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-opt/vasc-opt-editor/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-opt/vasc-opt-editor/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-opt/vasc-opt-metamodel/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-opt/vasc-opt-metamodel/.settings/${config.file.jdt}"/>
 		
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-test/vasc-test-backend/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-test/vasc-test-backend/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-test/vasc-test-frontend/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-test/vasc-test-frontend/.settings/${config.file.jdt}"/>
-		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt-template}" tofile="vasc-test/vasc-test-i18n/.settings/${config.file.jdt}"/>
+		<copy overwrite="true" file="${config.dir.from}/${config.file.jdt.template}" tofile="vasc-test/vasc-test-i18n/.settings/${config.file.jdt}"/>
 
 	</target>
 	

src/eclipse/settings/org.eclipse.jdt.core.prefs-template

@@ -5,9 +5,15 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -15,11 +21,12 @@ org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
@@ -28,15 +35,15 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
@@ -48,12 +55,12 @@ org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
@@ -71,7 +78,7 @@ org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
@@ -80,13 +87,13 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.7

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackend.java

@@ -37,6 +37,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#getId()
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -44,6 +45,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setId(java.lang.String)
 	 */
+	@Override
 	public void setId(String id) {
 		if (id==null) {
 			throw new IllegalArgumentException("id may not be null");
@@ -54,18 +56,21 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#startBackend()
 	 */
+	@Override
 	public void startBackend() {
 	}
 
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#stopBackend()
 	 */
+	@Override
 	public void stopBackend() {
 	}
 
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isReadOnly()
 	 */
+	@Override
 	public boolean isReadOnly() {
 		return false;
 	}
@@ -73,6 +78,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isPageable()
 	 */
+	@Override
 	public boolean isPageable() {
 		return false;
 	}
@@ -80,6 +86,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
 	 */
+	@Override
 	public long fetchTotalExecuteSize(VascBackendState state) {
 		return 0;
 	}
@@ -87,6 +94,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isSearchable()
 	 */
+	@Override
 	public boolean isSearchable() {
 		return false;
 	}
@@ -94,6 +102,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isSortable()
 	 */
+	@Override
 	public boolean isSortable() {
 		return false;
 	}
@@ -101,6 +110,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isRecordMoveable()
 	 */
+	@Override
 	public boolean isRecordMoveable() {
 		return false;
 	}
@@ -108,6 +118,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#doRecordMoveDownById(java.lang.Object)
 	 */
+	@Override
 	public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascBackendException {
 		return 0l;
 	}
@@ -115,6 +126,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#doRecordMoveUpById(java.lang.Object)
 	 */
+	@Override
 	public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascBackendException {
 		return 0l;
 	}
@@ -122,6 +134,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#executePageSummary()
 	 */
+	@Override
 	public Map<String, Object> executePageSummary() {
 		return null;
 	}
@@ -129,6 +142,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#executeTotalSummary()
 	 */
+	@Override
 	public Map<String, Object> executeTotalSummary() {
 		return null;
 	}
@@ -136,6 +150,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#hasPageSummary()
 	 */
+	@Override
 	public boolean hasPageSummary() {
 		return false;
 	}
@@ -143,6 +158,7 @@ abstract public class AbstractVascBackend<DATA_OBJECT extends Serializable> impl
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#hasTotalSummary()
 	 */
+	@Override
 	public boolean hasTotalSummary() {
 		return false;
 	}

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendControllerLocal.java

@@ -47,6 +47,7 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendController#getVascBackendById(java.lang.String)
 	 */
+	@Override
 	public VascBackend<Serializable> getVascBackendById(String id) {
 		return backends.get(id);
 	}
@@ -54,6 +55,7 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendController#getVascBackendIds()
 	 */
+	@Override
 	public List<String> getVascBackendIds() {
 		List<String> result = new ArrayList<String>(50);
 		for (String id:backends.keySet()) {
@@ -67,6 +69,7 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC
 	 * @see net.forwardfire.vasc.backend.VascBackendControllerLocal#addVascBackend(net.forwardfire.vasc.backend.VascBackend)
 	 */
 	@SuppressWarnings("unchecked")
+	@Override
 	public void addVascBackend(VascBackend<? extends Serializable> backend) {
 		if (backend==null) {
 			throw new NullPointerException("backend must not be null.");
@@ -82,6 +85,7 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendControllerLocal#removeVascBackendById(java.lang.String)
 	 */
+	@Override
 	public void removeVascBackendById(String backendId) {
 		VascBackend<? extends Serializable> backend = getVascBackendById(backendId);
 		if (backend==null) {
@@ -94,6 +98,7 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendControllerLocal#clearAndStopBackends()
 	 */
+	@Override
 	public void clearAndStopBackends() {
 		for (String backendId:getVascBackendIds()) {
 			removeVascBackendById(backendId);

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendState.java

@@ -50,6 +50,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendState#setDataParameter(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public void setDataParameter(String key, Object data) {
 		parameters.put(key,data);
 	}
@@ -57,6 +58,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendState#removeDataParameter(java.lang.String)
 	 */
+	@Override
 	public void removeDataParameter(String key) {
 		parameters.remove(key);
 	}
@@ -64,6 +66,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendState#removeDataParameterAll()
 	 */
+	@Override
 	public void removeDataParameterAll() {
 		parameters.clear();
 	}
@@ -71,6 +74,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendState#getDataParameter(java.lang.String)
 	 */
+	@Override
 	public Object getDataParameter(String key) {
 		return parameters.get(key);
 	}
@@ -78,6 +82,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackendState#getDataParameterKeys()
 	 */
+	@Override
 	public Set<String> getDataParameterKeys() {
 		return parameters.keySet();
 	}
@@ -85,6 +90,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#getPageIndex()
 	 */
+	@Override
 	public int getPageIndex() {
 		return pageIndex;
 	}
@@ -92,6 +98,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setPageIndex(int)
 	 */
+	@Override
 	public void setPageIndex(int pageIndex) {
 		this.pageIndex=pageIndex;
 	}
@@ -99,6 +106,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#getPageSize()
 	 */
+	@Override
 	public int getPageSize() {
 		return pageSize;
 	}
@@ -106,6 +114,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setPageSize(int)
 	 */
+	@Override
 	public void setPageSize(int pageSize) {
 		this.pageSize=pageSize;
 	}
@@ -113,6 +122,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#getSearchString()
 	 */
+	@Override
 	public String getSearchString() { 
 		return searchString;
 	}
@@ -120,6 +130,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setSearchString(java.lang.String)
 	 */
+	@Override
 	public void setSearchString(String searchString) {
 		this.searchString=searchString;
 	}
@@ -127,6 +138,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isSortAscending()
 	 */
+	@Override
 	public boolean isSortAscending() {
 		return ascending;
 	}
@@ -134,6 +146,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setSortAscending(boolean)
 	 */
+	@Override
 	public void setSortAscending(boolean ascending) {
 		this.ascending=ascending;
 	}
@@ -141,6 +154,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#getSortField()
 	 */
+	@Override
 	public String getSortField() {
 		return sortField;
 	}
@@ -148,6 +162,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setSortField(java.lang.String)
 	 */
+	@Override
 	public void setSortField(String sortField) {
 		this.sortField=sortField;
 	}
@@ -155,6 +170,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @return the pageSizeMax
 	 */
+	@Override
 	public int getPageSizeMax() {
 		return pageSizeMax;
 	}
@@ -162,6 +178,7 @@ abstract public class AbstractVascBackendState implements VascBackendState {
 	/**
 	 * @param pageSizeMax the pageSizeMax to set
 	 */
+	@Override
 	public void setPageSizeMax(int pageSizeMax) {
 		this.pageSizeMax = pageSizeMax;
 	}

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java

@@ -44,6 +44,7 @@ public class BeanVascEntryFieldValue<DATA_OBJECT extends Serializable> implement
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getValue(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public Serializable getValue(String backendName, DATA_OBJECT record) throws VascBackendException {
 		if (backendName==null) {
 			throw new NullPointerException("Can't get value of null backendName.");
@@ -62,6 +63,7 @@ public class BeanVascEntryFieldValue<DATA_OBJECT extends Serializable> implement
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getDisplayValue(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public String getDisplayValue(String backendName, DATA_OBJECT record) throws VascBackendException {
 		Serializable value = getValue(backendName,record);
 		if (value==null) {
@@ -91,6 +93,7 @@ public class BeanVascEntryFieldValue<DATA_OBJECT extends Serializable> implement
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#setValue(java.lang.String, java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public void setValue(String backendName, DATA_OBJECT record,Serializable value) throws VascBackendException {
 		if (backendName==null) {
 			throw new NullPointerException("Can't set value of null backendName.");

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryRecordCreator.java

@@ -47,6 +47,7 @@ public class BeanVascEntryRecordCreator<DATA_OBJECT extends Serializable> implem
 	}
 
 	@SuppressWarnings("unchecked")
+	@Override
 	public DATA_OBJECT newRecord() throws VascBackendException {
 		try {
 			return (DATA_OBJECT)resultClass.newInstance();

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryFieldValue.java

@@ -41,6 +41,7 @@ public class HashMapVascEntryFieldValue implements VascEntryFieldValue<HashMap<S
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getValue(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public Serializable getValue(String backendName,HashMap<String,Serializable> map) throws VascBackendException {
 		if (backendName==null) {
 			throw new NullPointerException("Can't get value of null backendName field.");
@@ -55,6 +56,7 @@ public class HashMapVascEntryFieldValue implements VascEntryFieldValue<HashMap<S
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#getDisplayValue(net.forwardfire.vasc.core.VascEntryField, java.lang.Object)
 	 */
+	@Override
 	public String getDisplayValue(String field, HashMap<String,Serializable> record) throws VascBackendException {
 		Serializable fieldValue = getValue(field,record);
 		if (fieldValue==null) {
@@ -66,6 +68,7 @@ public class HashMapVascEntryFieldValue implements VascEntryFieldValue<HashMap<S
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryFieldValue#setValue(java.lang.String, java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public void setValue(String backendName, HashMap<String,Serializable> map,Serializable value) throws VascBackendException {
 		map.put(backendName, value);
 	}

vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryRecordCreator.java

@@ -38,6 +38,7 @@ public class HashMapVascEntryRecordCreator implements VascEntryRecordCreator<Has
 	
 	private static final long serialVersionUID = 1L;
 
+	@Override
 	public HashMap<String,Serializable> newRecord() throws VascBackendException {
 		return new HashMap<String,Serializable>(10);
 	}

vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderImpl.java

@@ -44,6 +44,7 @@ public class JdbcConnectionProviderImpl implements JdbcConnectionProvider {
 	/**
 	 * @see net.forwardfire.vasc.backend.jdbc.JdbcConnectionProvider#getJdbcConnection()
 	 */
+	@Override
 	public Connection getJdbcConnection() throws SQLException {
 		if (loadedDriver==false) { 
 			try {

vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderJdniImpl.java

@@ -46,6 +46,7 @@ public class JdbcConnectionProviderJdniImpl implements JdbcConnectionProvider {
 	/**
 	 * @see net.forwardfire.vasc.backend.jdbc.JdbcConnectionProvider#getJdbcConnection()
 	 */
+	@Override
 	public Connection getJdbcConnection() throws SQLException {
 		Connection connection = getDataSource(dataSourceName).getConnection();
 		return connection;

vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackend.java

@@ -81,6 +81,7 @@ public class JdbcVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state)
 	 */
+	@Override
 	public VascBackendResult<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
 		JdbcConnectionProvider prov = getJdbcConnectionProvider();
 		List<HashMap<String,Object>> result = new ArrayList<HashMap<String,Object>>(50);
@@ -117,6 +118,7 @@ public class JdbcVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object)
 	 */
+	@Override
 	public HashMap<String,Object> merge(HashMap<String,Object> object) throws VascBackendException {
 		return object;
 	}
@@ -124,18 +126,21 @@ public class JdbcVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object)
 	 */
+	@Override
 	public void persist(HashMap<String,Object> object) throws VascBackendException {	
 	}
 	
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object)
 	 */
+	@Override
 	public void delete(HashMap<String,Object> object) throws VascBackendException {
 	}
 
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue(net.forwardfire.vasc.core.VascEntryField)
 	 */
+	@Override
 	public VascEntryFieldValue provideVascEntryFieldValue() {
 		return new HashMapVascEntryFieldValue();
 	}
@@ -143,6 +148,7 @@ public class JdbcVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public VascEntryRecordCreator provideVascEntryRecordCreator() {
 		return new HashMapVascEntryRecordCreator();
 	}

vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackendXpql.java

@@ -92,6 +92,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend<HashMap<String,Obje
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state)
 	 */
+	@Override
 	public VascBackendResult<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
 		// Copy parameters
 		for (String key:state.getDataParameterKeys()) {
@@ -138,6 +139,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend<HashMap<String,Obje
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object)
 	 */
+	@Override
 	public HashMap<String,Object> merge(HashMap<String,Object> object) throws VascBackendException {
 		return object;
 	}
@@ -145,18 +147,21 @@ public class JdbcVascBackendXpql extends AbstractVascBackend<HashMap<String,Obje
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object)
 	 */
+	@Override
 	public void persist(HashMap<String,Object> object) throws VascBackendException {
 	}
 	
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object)
 	 */
+	@Override
 	public void delete(HashMap<String,Object> object) throws VascBackendException {
 	}
 	
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue()
 	 */
+	@Override
 	public VascEntryFieldValue provideVascEntryFieldValue() {
 		return new HashMapVascEntryFieldValue();
 	}
@@ -164,6 +169,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend<HashMap<String,Obje
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator()
 	 */
+	@Override
 	public VascEntryRecordCreator provideVascEntryRecordCreator() {
 		return new HashMapVascEntryRecordCreator();
 	}

vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractHibernateVascBackend.java

@@ -43,6 +43,7 @@ abstract public class AbstractHibernateVascBackend<DATA_OBJECT extends Serializa
 	 */
 	abstract Session getHibernateSession();
 	
+	@Override
 	public void persist(DATA_OBJECT object) throws VascBackendException {
 		Session s  = getHibernateSession();
 		try {
@@ -59,6 +60,7 @@ abstract public class AbstractHibernateVascBackend<DATA_OBJECT extends Serializa
 		}
 	}
 	
+	@Override
 	public DATA_OBJECT merge(DATA_OBJECT object) throws VascBackendException {
 		Session s  = getHibernateSession();
 		try {
@@ -76,6 +78,7 @@ abstract public class AbstractHibernateVascBackend<DATA_OBJECT extends Serializa
 		}
 	}
 	
+	@Override
 	public void delete(DATA_OBJECT object) throws VascBackendException {
 		Session s  = getHibernateSession();
 		try {

vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/AbstractPersistenceVascBackend.java

@@ -40,6 +40,7 @@ abstract public class AbstractPersistenceVascBackend<DATA_OBJECT extends Seriali
 	
 	abstract EntityManager getEntityManager();
 	
+	@Override
 	public void persist(DATA_OBJECT object) throws VascBackendException {
 		EntityManager s  = getEntityManager();
 		try {
@@ -57,6 +58,7 @@ abstract public class AbstractPersistenceVascBackend<DATA_OBJECT extends Seriali
 		}
 	}
 	
+	@Override
 	public DATA_OBJECT merge(DATA_OBJECT object) throws VascBackendException {
 		EntityManager s  = getEntityManager();
 		try {
@@ -75,6 +77,7 @@ abstract public class AbstractPersistenceVascBackend<DATA_OBJECT extends Seriali
 		}
 	}
 	
+	@Override
 	public void delete(DATA_OBJECT object) throws VascBackendException {
 		EntityManager s  = getEntityManager();
 		try {

vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlHibernateVascBackend.java

@@ -77,6 +77,7 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
 	}
 		
 	@SuppressWarnings("unchecked")
+	@Override
 	public VascBackendResult<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
 		
         // Copy parameters
@@ -121,6 +122,7 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue()
 	 */
+	@Override
 	public VascEntryFieldValue provideVascEntryFieldValue() {
 		BeanVascEntryFieldValue result = new BeanVascEntryFieldValue();
 		return result;
@@ -129,6 +131,7 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator()
 	 */
+	@Override
 	public VascEntryRecordCreator provideVascEntryRecordCreator() {
 		return new BeanVascEntryRecordCreator(resultClass);
 	}
@@ -203,6 +206,7 @@ public class XpqlHibernateVascBackend<DATA_OBJECT extends Serializable> extends
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
 	 */
+	@Override
 	public long fetchTotalExecuteSize(VascBackendState state) {
 		Session s = getHibernateSession();
 		try {

vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java

@@ -76,9 +76,8 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
 		return entityManagerProvider.getEntityManager();
 	}
 	
-
-	
 	@SuppressWarnings("unchecked")
+	@Override
 	public VascBackendResult<DATA_OBJECT> execute(VascBackendState state) throws VascBackendException {
 		
         // Copy parameters
@@ -125,6 +124,7 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue()
 	 */
+	@Override
 	public VascEntryFieldValue provideVascEntryFieldValue() {
 		VascEntryFieldValue result = new BeanVascEntryFieldValue();
 		return result;
@@ -133,6 +133,7 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator()
 	 */
+	@Override
 	public VascEntryRecordCreator provideVascEntryRecordCreator() {
 		VascEntryRecordCreator result = new BeanVascEntryRecordCreator(resultClass);
 		return result;
@@ -208,6 +209,7 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
 	 */
+	@Override
 	public long fetchTotalExecuteSize(VascBackendState state) {
 		EntityManager em = getEntityManager();
 		try {
@@ -427,6 +429,7 @@ public class XpqlPersistanceVascBackend<DATA_OBJECT extends Serializable> extend
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isSearchable()
 	 */
+	@Override
 	public boolean isSearchable() {
 		if (query.getQueryParameterValue("text_search")==null) {
 			return false;

vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapConnectionProviderImpl.java

@@ -40,6 +40,7 @@ public class LdapConnectionProviderImpl implements LdapConnectionProvider {
 	/**
 	 * @see net.forwardfire.vasc.backend.ldap.LdapConnectionProvider#getLdapConnection()
 	 */
+	@Override
 	public LDAPConnection getLdapConnection() {
 		try {
 			

vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapVascBackend.java

@@ -82,6 +82,7 @@ public class LdapVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#execute()
 	 */
+	@Override
 	public VascBackendResult<HashMap<String,Object>> execute(VascBackendState state) throws VascBackendException {
 		LdapConnectionProvider prov = getLdapConnectionProvider();
 		LDAPConnection connection = prov.getLdapConnection();
@@ -136,6 +137,7 @@ public class LdapVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object)
 	 */
+	@Override
 	public HashMap<String,Object> merge(HashMap<String,Object> map) throws VascBackendException {
 		LdapConnectionProvider prov = getLdapConnectionProvider();
 		LDAPConnection connection = prov.getLdapConnection();
@@ -216,6 +218,7 @@ public class LdapVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object)
 	 */
+	@Override
 	public void persist(HashMap<String,Object> map) throws VascBackendException {
 		LdapConnectionProvider prov = getLdapConnectionProvider();
 		LDAPConnection connection = prov.getLdapConnection();
@@ -250,6 +253,7 @@ public class LdapVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object)
 	 */
+	@Override
 	public void delete(HashMap<String,Object> map) throws VascBackendException {
 		LdapConnectionProvider prov = getLdapConnectionProvider();
 		LDAPConnection connection = prov.getLdapConnection();
@@ -292,6 +296,7 @@ public class LdapVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator()
 	 */
+	@Override
 	public VascEntryRecordCreator provideVascEntryRecordCreator() {
 		return new HashMapVascEntryRecordCreator();
 	}
@@ -299,6 +304,7 @@ public class LdapVascBackend extends AbstractVascBackend<HashMap<String,Object>>
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue()
 	 */
+	@Override
 	public VascEntryFieldValue provideVascEntryFieldValue() {
 		return new HashMapVascEntryFieldValue();
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextCsv.java

@@ -42,6 +42,7 @@ public class MetaModelDataContextCsv implements MetaModelDataContextProvider {
 	private String url = null;
 	private CsvConfiguration csvConfiguration = null;
 	
+	@Override
 	public DataContext getDataContext() {
 		if (csvConfiguration==null) {
 			csvConfiguration = new CsvConfiguration();

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJdbc.java

@@ -41,6 +41,7 @@ public class MetaModelDataContextJdbc implements MetaModelDataContextProvider {
 	private String username = null;
 	private String password = null;	
 	
+	@Override
 	public DataContext getDataContext() {
 		JdbcDataContext dataContext = new JdbcDataContext(getConnection());
 		return dataContext;

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataContext.java

@@ -37,6 +37,7 @@ public class MetaModelDataContextJndiDataContext implements MetaModelDataContext
 
 	private String jndiName = null;	
 	
+	@Override
 	public DataContext getDataContext() {
 		return getDataContextJndi();
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataSource.java

@@ -40,6 +40,7 @@ public class MetaModelDataContextJndiDataSource implements MetaModelDataContextP
 	private String jndiName = null;
 	private JdbcDataContext dataContext = null;
 	
+	@Override
 	public DataContext getDataContext() {
 		if (dataContext==null) {
 			dataContext = new JdbcDataContext(getDataSource());

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextMongodb.java

@@ -49,6 +49,7 @@ public class MetaModelDataContextMongodb implements MetaModelDataContextProvider
 	
 	protected Mongo mongo = null;
 	
+	@Override
 	public DataContext getDataContext() {
 		//MongoDbDataContextBean dataContext = new MongoDbDataContextBean(getMongodbConnection());
 		///dataContext.setRegisterMBean(true);

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlDom.java

@@ -38,7 +38,7 @@ public class MetaModelDataContextXmlDom implements MetaModelDataContextProvider
 	private String file = null;
 	private boolean autoFlattenTables = true;
 	
-	
+	@Override
 	public DataContext getDataContext() {
 		if (file==null) {
 			throw new NullPointerException("Can's provided data context with null file.");

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlSax.java

@@ -45,6 +45,7 @@ public class MetaModelDataContextXmlSax implements MetaModelDataContextProvider
 		tableSchemas = new ArrayList<XmlSaxTableDef>(5);
 	}
 	
+	@Override
 	public DataContext getDataContext() {
 		if (file==null) {
 			throw new NullPointerException("Can's provided data context with null file.");

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelVascBackend.java

@@ -211,6 +211,7 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
 		return q;
 	}
 	
+	@Override
 	public VascBackendResult<Row> execute(VascBackendState state) throws VascBackendException {
 		Schema schema = dataContext.getDefaultSchema();
 		Table t = schema.getTableByName(table);
@@ -263,6 +264,7 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
 		return new DefaultVascBackendResult<Row>(result);
 	}
 	
+	@Override
 	public void persist(Row object) throws VascBackendException {
 		if (crudDataContext==null) {
 			return;
@@ -270,6 +272,7 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
 		crudDataContext.persist((UpdateableRow) object);
 	}
 	
+	@Override
 	public Row merge(Row object) throws VascBackendException {
 		if (crudDataContext==null) {
 			return object;
@@ -277,6 +280,7 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
 		return crudDataContext.merge((UpdateableRow) object);
 	}
 	
+	@Override
 	public void delete(Row object) throws VascBackendException {
 		if (crudDataContext==null) {
 			return;
@@ -284,10 +288,12 @@ public class MetaModelVascBackend extends AbstractVascBackend<Row> {
 		crudDataContext.delete((UpdateableRow) object);
 	}
 	
+	@Override
 	public RowVascEntryFieldValue provideVascEntryFieldValue() {
 		return new RowVascEntryFieldValue();
 	}
 	
+	@Override
 	public VascEntryRecordCreator<Row> provideVascEntryRecordCreator() {
 		return new RowVascEntryRecordCreator(crudDataContext,crudDataContext.getDefaultSchema().getTableByName(table));
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MongoDbDataContextSchemaDetector.java

@@ -65,14 +65,19 @@ public class MongoDbDataContextSchemaDetector /* implements MetaModelSchemaDetec
 	    	schema = walker.detectSchema(mongoDb, getMainSchemaName());
 	        return schema;
 	    }
+	    
+	    @Override
 	    protected String getMainSchemaName() throws MetaModelException {
 	        return mongoDb.getName();
 	    }
+	    
+	    @Override
 	    protected DataSet materializeMainSchemaTable(Table table, Column[] columns, int maxRows) {
 	        return materializeMainSchemaTableInternal(table, columns, null, maxRows, true);
 	    }
 
 		// Overidded these method because they do not use the getMainSchema() method
+	    @Override
 	    public DataSet executeQuery(Query query) {
 	        // Check for queries containing only simple selects and where clauses,
 	        // or if it is a COUNT(*) query.
@@ -170,6 +175,7 @@ public class MongoDbDataContextSchemaDetector /* implements MetaModelSchemaDetec
 	    		return _queryPostProcessed;
 	    	}
 
+	    	@Override
 	    	public SelectItem[] getSelectItems() {
 	    		return _selectItems;
 	    	}
@@ -192,6 +198,7 @@ public class MongoDbDataContextSchemaDetector /* implements MetaModelSchemaDetec
 	    		}
 	    	}
 
+	    	@Override
 	    	public boolean next() {
 	    		if (_cursor.hasNext()) {
 	    			_dbObject = _cursor.next();
@@ -202,6 +209,7 @@ public class MongoDbDataContextSchemaDetector /* implements MetaModelSchemaDetec
 	    		}
 	    	}
 
+	    	@Override
 	    	public Row getRow() {
 	    		if (_dbObject == null) {
 	    			return null;

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryFieldValue.java

@@ -16,6 +16,7 @@ public class RowVascEntryFieldValue implements VascEntryFieldValue<Row> {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascEntryFieldValue#getValue(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public Serializable getValue(String backendName, Row record) throws VascBackendException {
 		if (backendName==null) {
 			throw new NullPointerException("Can't get value of null backendName.");
@@ -48,6 +49,7 @@ public class RowVascEntryFieldValue implements VascEntryFieldValue<Row> {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascEntryFieldValue#getDisplayValue(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public String getDisplayValue(String backendName, Row record) throws VascBackendException {
 		Object fieldValue = getValue(backendName,record);
 		if (fieldValue==null) {
@@ -59,6 +61,7 @@ public class RowVascEntryFieldValue implements VascEntryFieldValue<Row> {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascEntryFieldValue#setValue(java.lang.String, java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public void setValue(String backendName, Row record,Serializable value) throws VascBackendException {
 		if (record instanceof UpdateableRow) {
 			UpdateableRow row = (UpdateableRow)record;

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryRecordCreator.java

@@ -18,6 +18,7 @@ public class RowVascEntryRecordCreator implements VascEntryRecordCreator<Row> {
 		this.table=table;
 	}
 	
+	@Override
 	public Row newRecord() throws VascBackendException {
 		return dataContext.createRow(table);
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataContext.java

@@ -218,8 +218,11 @@ public class ResourceBundleDataContext extends QueryPostprocessDataContext imple
 		final Iterator<Row> resultData = result.iterator();
 		return new AbstractDataSet() {
 			int resultCount = 0;
+			@Override
 			public SelectItem[] getSelectItems() {	return selectItems;				}
+			@Override
 			public Row getRow() {					return resultData.next();		}
+			@Override
 			public boolean next() {
 				if (maxRows > 0 && resultCount++ > maxRows) {
 					return false;
@@ -229,6 +232,7 @@ public class ResourceBundleDataContext extends QueryPostprocessDataContext imple
 		};
 	}
 	
+	@Override
 	public void executeUpdate(UpdateScript update) {
 		update.run(resourceBundleUpdateExecutor);
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataControl.java

@@ -135,6 +135,7 @@ public class ResourceBundleDataControl extends Control {
 	/**
 	 * Does the loading of the ResourceBundle
 	 */
+	@Override
     public ResourceBundle newBundle(String baseName, Locale localeRequested, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException, IOException {
     	long startTime = System.currentTimeMillis();
     	

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleUpdateExecutor.java

@@ -52,37 +52,56 @@ public class ResourceBundleUpdateExecutor extends AbstractUpdateCallback {
 		return isDataContextWritable();
 	}
 	
+	@Override
 	public boolean isDeleteSupported() {
 		return isDataContextWritable();
 	}
 
+	@Override
 	public boolean isDropTableSupported() {
 		return isDataContextWritable();
 	}
 	
+	@Override
 	public TableCreationBuilder createTable(final Schema schema, final String name)	throws IllegalArgumentException, IllegalStateException {
 		TableCreationBuilder result = new TableCreationBuilder() {
+			@Override
 			public Table toTable() {												return execute();	}
+			@Override
 			public String toSql() {													return "nosql";		}
+			@Override
 			public TableCreationBuilder like(Table table) {							return this;		}
+			@Override
 			public ColumnCreationBuilder withColumn(String name) {
 				//return new ColumnCreationBuilderImpl(this,new MutableColumn(name));
 				final TableCreationBuilder parent = this;
 				return new ColumnCreationBuilder() {
+					@Override
 					public ColumnCreationBuilder withColumn(String name) {			return this;		}
+					@Override
 					public ColumnCreationBuilder ofType(ColumnType type) {			return this;		}
+					@Override
 					public ColumnCreationBuilder ofSize(int size) {					return this;		}
+					@Override
 					public ColumnCreationBuilder ofNativeType(String nativeType) {	return this;		}
+					@Override
 					public ColumnCreationBuilder nullable(boolean nullable) {		return this;		}
+					@Override
 					public ColumnCreationBuilder asPrimaryKey() {					return this;		}
+					@Override
 					public ColumnCreationBuilder like(Column column) {				return this;		}
+					@Override
 					public TableCreationBuilder  like(Table table) {					return this;		}
+					@Override
 					public String toSql() {											return "nosql";		}
+					@Override
 					public Table toTable() {										return execute();	}
+					@Override
 					public Table execute() throws MetaModelException {				return parent.execute();}
-					
 				};
 			}
+			
+			@Override
 			public Table execute() throws MetaModelException {
 				File file = new File(name);
 				Properties p = new Properties();
@@ -99,8 +118,10 @@ public class ResourceBundleUpdateExecutor extends AbstractUpdateCallback {
 		return result;
 	}
 	
+	@Override
 	public TableDropBuilder dropTable(Table table) throws IllegalArgumentException, IllegalStateException,UnsupportedOperationException {
 		TableDropBuilder result = new AbstractTableDropBuilder(table) {
+			@Override
 			public void execute() throws MetaModelException {
 				resourceBundleDataControl.removeBundle(getTable().getName()); 
 			}
@@ -108,8 +129,10 @@ public class ResourceBundleUpdateExecutor extends AbstractUpdateCallback {
 		return result;
 	}
 	
+	@Override
 	public RowInsertionBuilder insertInto(final Table table) throws IllegalArgumentException, IllegalStateException,UnsupportedOperationException {
 		RowInsertionBuilder result = new AbstractRowInsertionBuilder<UpdateCallback>(this, table) {
+			@Override
 			public void execute() throws MetaModelException {
 				Properties data = resourceBundleDataControl.getBundleData(table.getName());
 				Object[] values = getValues();
@@ -119,8 +142,10 @@ public class ResourceBundleUpdateExecutor extends AbstractUpdateCallback {
 		return result;
 	}
 	
+	@Override
 	public RowDeletionBuilder deleteFrom(final Table table) throws IllegalArgumentException, IllegalStateException,UnsupportedOperationException {
 		RowDeletionBuilder result = new AbstractRowDeletionBuilder(table) {
+			@Override
 			public void execute() throws MetaModelException {
 				DataSet ds = resourceBundleDataContext.materializeMainSchemaTable(getTable(),getTable().getColumns(),0);
 				Properties data = resourceBundleDataControl.getBundleData(table.getName());

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractCrudDataContext.java

@@ -37,13 +37,16 @@ abstract public class AbstractCrudDataContext  implements CrudDataContext {
 		return this;
 	}
 	
+	@Override
 	public UpdateableRow createRow(Table table) {
 		return wrapOrCreateToUpdateableRow(null,table);
 	}
 	
+	@Override
 	public void persist(final UpdateableRow row) {
 		UpdateableDataContext dataContext = abstractProviderUpdateableDataContext();
 		dataContext.executeUpdate(new UpdateScript() {
+			@Override
 			public void run(UpdateCallback backendImpl) {
 				RowInsertionBuilder query = backendImpl.insertInto(row.getTable());
 				for (int i=0;i<row.size();i++) {
@@ -59,6 +62,7 @@ abstract public class AbstractCrudDataContext  implements CrudDataContext {
 		});
 	}
 	
+	@Override
 	public UpdateableRow merge(final UpdateableRow row) {
 		for (String column:row.getPrimaryKeys()) {
 			if (row.getValue(column)==null) {
@@ -67,6 +71,7 @@ abstract public class AbstractCrudDataContext  implements CrudDataContext {
 		}
 		UpdateableDataContext dataContext = abstractProviderUpdateableDataContext();
 		dataContext.executeUpdate(new UpdateScript() {
+			@Override
 			public void run(UpdateCallback backendImpl) {
 				Object qWhere = backendImpl.update(row.getTable());
 				boolean first = true;
@@ -110,9 +115,11 @@ abstract public class AbstractCrudDataContext  implements CrudDataContext {
 		return rowResult;
 	}
 	
+	@Override
 	public void delete(final UpdateableRow row) {
 		UpdateableDataContext dataContext = abstractProviderUpdateableDataContext();
 		dataContext.executeUpdate(new UpdateScript() {
+			@Override
 			public void run(UpdateCallback backendImpl) {
 				Object qWhere = backendImpl.deleteFrom(row.getTable());
 				boolean first = true;

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractRow.java

@@ -77,6 +77,7 @@ abstract public class AbstractRow implements Row,RowLocal {
 		return result;
     }
     
+    @Override
     public void setStyle(int index,Style style) {
     	MetaRowData metaRow = metaData.get(index);
     	metaRow.style=style;
@@ -95,6 +96,8 @@ abstract public class AbstractRow implements Row,RowLocal {
     
     // ==== Start interface
     
+    
+    @Override
 	public Object[] getValues() {
 		Object[] result = new Object[size()];
 		for (int i=0;i<size();i++) {
@@ -103,14 +106,17 @@ abstract public class AbstractRow implements Row,RowLocal {
 		return result;
 	}
     
+    @Override
     public Object getValue(SelectItem item) {
     	return getValue(indexOf(item));
     }
     
+    @Override
 	public Object getValue(Column column) {
 		return getValue(indexOf(column));
 	}	
 	
+    @Override
 	public int indexOf(SelectItem item) {
         if (item == null) {
             return UpdateableRow.INDEX_NOT_FOUND;
@@ -125,6 +131,7 @@ abstract public class AbstractRow implements Row,RowLocal {
         return UpdateableRow.INDEX_NOT_FOUND;
     }
 	
+    @Override
     public int indexOf(Column column) {
         if (column == null) {
             return UpdateableRow.INDEX_NOT_FOUND;
@@ -133,20 +140,24 @@ abstract public class AbstractRow implements Row,RowLocal {
         return indexOf(selectItem);
     }
 	
+    @Override
 	public SelectItem[] getSelectItems() {
 		List<SelectItem> list = getIndexedSelectItemList();
 		SelectItem[] result = new SelectItem[list.size()];
 		return list.toArray(result);
 	}
 
+    @Override
     public Style getStyle(SelectItem item) {
     	return getStyle(indexOf(item));
     }
 
+    @Override
     public Style getStyle(Column column) {
     	return getStyle(indexOf(column));
     }
 
+    @Override
     public Style getStyle(int index) throws IndexOutOfBoundsException {
     	MetaRowData metaRow = getMetaRowData(index);
     	if (metaRow==null) {
@@ -158,6 +169,7 @@ abstract public class AbstractRow implements Row,RowLocal {
         return metaRow.style;
     }
     
+    @Override
     public int size() {
     	return metaData.size();
     }

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractUpdateableRow.java

@@ -17,6 +17,7 @@ import org.eobjects.metamodel.schema.Column;
 abstract public class AbstractUpdateableRow extends AbstractRow implements UpdateableRow {
 	
 	// TODO: rm / move getValue and indexOf to AbstractRow after UpdateableRow interface change
+	@Override
 	public Object getValue(String columnName) {
 		return getValue(indexOf(columnName));
 	}
@@ -43,18 +44,22 @@ abstract public class AbstractUpdateableRow extends AbstractRow implements Updat
 		}
 	}
 	
+	@Override
 	public void setValue(String columnName,Object object) {
 		setValue(indexOf(columnName), object);
 	}
 	
+	@Override
 	public void setValue(SelectItem selectItem,Object object) {
 		setValue(indexOf(selectItem),object);
 	}
 	
+	@Override
 	public void setValue(Column column,Object object) {
 		setValue(indexOf(column),object);
 	}
 	
+	@Override
 	public String[] getPrimaryKeys() {
 		List<String> primaryKeys = getPrimaryKeysList();
 		return primaryKeys.toArray(new String[primaryKeys.size()]);

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/CrudDataContextImpl.java

@@ -41,6 +41,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 		tableKeys.put(table, keys);
 	}
 	
+	@Override
 	public List<String> getPrimaryKeysForTable(Table table) {
 		List<String> keys = tableKeys.get(table.getName());
 		if (keys!=null) {
@@ -92,6 +93,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	 * Checks if backend dataContextDelegate has native support for UpdateableRowDataContext.
 	 * If not then automatic wrap full DataSet data to UpdateableRow
 	 */
+	@Override
 	public DataSet executeQuery(Query query) throws MetaModelException {
 		if (dataContextDelegate instanceof UpdateableRowDataContext) {
 			return ((UpdateableRowDataContext) dataContextDelegate).crudExecuteQuery(this,query);
@@ -105,6 +107,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	 * If so then use api to start query builder with this datacontext.
 	 * Else use default InitFromBuilderImpl query builder.
 	 */
+	@Override
 	public InitFromBuilder query() {
 		if (dataContextDelegate instanceof UpdateableRowDataContext) {
 			return ((UpdateableRowDataContext) dataContextDelegate).crudCreateQuery(this);
@@ -115,8 +118,6 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	
 	// === Bean properties
 	
-	
-	
 	/**
 	 * @return the checkPrimaryKeysAllRows
 	 */
@@ -131,15 +132,12 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 		this.checkPrimaryKeysAllRows = checkPrimaryKeysAllRows;
 	}
 	
-	
-	
 	// === Start wrapper to dataContextDelegate
 	
-	
-	
 	/**
 	 * @see org.eobjects.metamodel.UpdateableDataContext#executeUpdate(org.eobjects.metamodel.UpdateScript)
 	 */
+	@Override
 	public void executeUpdate(UpdateScript arg0) {
 		dataContextDelegate.executeUpdate(arg0);
 	}
@@ -147,6 +145,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#getColumnByQualifiedLabel(java.lang.String)
 	 */
+	@Override
 	public Column getColumnByQualifiedLabel(String arg0) {
 		return dataContextDelegate.getColumnByQualifiedLabel(arg0);
 	}
@@ -154,6 +153,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#getDefaultSchema()
 	 */
+	@Override
 	public Schema getDefaultSchema() throws MetaModelException {
 		return dataContextDelegate.getDefaultSchema();
 	}
@@ -161,6 +161,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#getSchemaByName(java.lang.String)
 	 */
+	@Override
 	public Schema getSchemaByName(String arg0) throws MetaModelException {
 		return dataContextDelegate.getSchemaByName(arg0);
 	}
@@ -168,6 +169,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#getSchemaNames()
 	 */
+	@Override
 	public String[] getSchemaNames() throws MetaModelException {
 		return dataContextDelegate.getSchemaNames();
 	}
@@ -175,6 +177,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#getSchemas()
 	 */
+	@Override
 	public Schema[] getSchemas() throws MetaModelException {
 		return dataContextDelegate.getSchemas();
 	}
@@ -182,6 +185,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#getTableByQualifiedLabel(java.lang.String)
 	 */
+	@Override
 	public Table getTableByQualifiedLabel(String arg0) {
 		return dataContextDelegate.getTableByQualifiedLabel(arg0);
 	}
@@ -189,6 +193,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#refreshSchemas()
 	 */
+	@Override
 	public DataContext refreshSchemas() {
 		return dataContextDelegate.refreshSchemas();
 	}
@@ -196,6 +201,7 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#parseQuery(java.lang.String)
 	 */
+	@Override
 	public Query parseQuery(String queryString) throws MetaModelException {
 		return dataContextDelegate.parseQuery(queryString);
 	}
@@ -203,14 +209,17 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst
 	/**
 	 * @see org.eobjects.metamodel.DataContext#executeQuery(java.lang.String)
 	 */
+	@Override
 	public DataSet executeQuery(String queryString) throws MetaModelException {
 		return dataContextDelegate.executeQuery(queryString);
 	}
 	
+	@Override
 	public CompiledQuery compileQuery(Query q) throws MetaModelException {
 		return dataContextDelegate.compileQuery(q);
 	}
 	
+	@Override
 	public DataSet executeQuery(CompiledQuery cq, Object... args) {
 		return dataContextDelegate.executeQuery(cq, args);
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/UpdateableRowMapImpl.java

@@ -39,14 +39,17 @@ public class UpdateableRowMapImpl extends AbstractUpdateableRow {
 		
 	// interface
 	
+	@Override
 	public Table getTable() {
 		return table;
 	}
 	
+	@Override
 	public List<String> getPrimaryKeysList() {
 		return primaryKeys;
 	}
 	
+	@Override
 	public void setValue(int index, Object value) throws IndexOutOfBoundsException {
 		if (index == UpdateableRow.INDEX_NOT_FOUND) {
 			throw new IndexOutOfBoundsException("Can't save value without key index: "+UpdateableRow.INDEX_NOT_FOUND+" value:"+value);
@@ -54,14 +57,17 @@ public class UpdateableRowMapImpl extends AbstractUpdateableRow {
 		dataMap.put(index, value);
 	}
 	
+	@Override
 	public Object getValue(int index) throws IndexOutOfBoundsException {
 		return dataMap.get(index);
 	}
 	
+	@Override
 	public Row getSubSelection(SelectItem[] selectItems) {
 		return getSubSelectionFromImpl(new UpdateableRowMapImpl(table,primaryKeys,selectItems),selectItems);
 	}
 	
+	@Override
 	public Row getSubSelection(DataSetHeader header) {
 		return getSubSelection(header.getSelectItems());
 	}

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextObjectFactory.java

@@ -42,6 +42,7 @@ public class JndiDataContextObjectFactory implements ObjectFactory  {
 	/**
 	 * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)
 	 */
+	@Override
 	synchronized public Object getObjectInstance(Object obj, Name namePath, Context nameCtx,Hashtable<?, ?> env) throws Exception {
 
 		// Create only once.

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextProvider.java

@@ -19,6 +19,7 @@ public class JndiDataContextProvider implements DataContextProvider {
 	/**
 	 * Returns an DataContext object from the jndi tree.
 	 */
+	@Override
 	public DataContext getDataContext() {
 		try {			
 			InitialContext context = new InitialContext();

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiReadOnlyDataContext.java

@@ -17,47 +17,73 @@ import org.eobjects.metamodel.schema.Table;
  * @version 1.0 May 22, 2012
  */
 public class JndiReadOnlyDataContext /* extends DataContextProxy */ implements DataContext {
+	
 	private DataContext proxyDataContext = null;
+	
 	public JndiReadOnlyDataContext(DataContext proxyDataContext) {
 		this.proxyDataContext=proxyDataContext;
 	}
+	
+	@Override
 	public DataSet executeQuery(Query arg0) throws MetaModelException {
 		return proxyDataContext.executeQuery(arg0);
 	}
+	
+	@Override
 	public Column getColumnByQualifiedLabel(String arg0) {
 		return proxyDataContext.getColumnByQualifiedLabel(arg0);
 	}
+	
+	@Override
 	public Schema getDefaultSchema() throws MetaModelException {
 		return proxyDataContext.getDefaultSchema();
 	}
+	
+	@Override
 	public Schema getSchemaByName(String arg0) throws MetaModelException {
 		return proxyDataContext.getSchemaByName(arg0);
 	}
+	
+	@Override
 	public String[] getSchemaNames() throws MetaModelException {
 		return proxyDataContext.getSchemaNames();
 	}
+	
+	@Override
 	public Schema[] getSchemas() throws MetaModelException {
 		return proxyDataContext.getSchemas();
 	}
+	
+	@Override
 	public Table getTableByQualifiedLabel(String arg0) {
 		return proxyDataContext.getTableByQualifiedLabel(arg0);
 	}
+	
+	@Override
 	public InitFromBuilder query() {
 		return proxyDataContext.query();
 	}
+	
+	@Override
 	public DataContext refreshSchemas() {
 		return proxyDataContext.refreshSchemas();
 	}
+	
+	@Override
 	public Query parseQuery(String queryString) throws MetaModelException {
 		return proxyDataContext.parseQuery(queryString);
 	}
+	
+	@Override
 	public DataSet executeQuery(String queryString) throws MetaModelException {
 		return proxyDataContext.executeQuery(queryString);
 	}
+	
 	@Override
 	public CompiledQuery compileQuery(Query q) throws MetaModelException {
 		return proxyDataContext.compileQuery(q);
 	}
+	
 	@Override
 	public DataSet executeQuery(CompiledQuery cq, Object... args) {
 		return proxyDataContext.executeQuery(cq, args);

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiCsvDataContextLoader.java

@@ -22,6 +22,7 @@ public class JndiCsvDataContextLoader implements JndiDataContextLoader {
 		setUseUrlSource(useUrlSource);
 	}
 	
+	@Override
 	public DataContext loadDataContext(JndiDataContextLoaderConfig config) {
 		if (useUrlSource) {
 			return new CsvDataContext(config.checkBackendUrl(),createCsvConfig(config.getBackendParameters()));	

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiJdbcDataContextLoader.java

@@ -26,6 +26,7 @@ public class JndiJdbcDataContextLoader implements JndiDataContextLoader {
 		setUseDataSource(useDataSource);
 	}
 	
+	@Override
 	public DataContext loadDataContext(JndiDataContextLoaderConfig config) {
 		if (useDataSource) {
 			if (config.getBackendUrl()==null) {

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiMongodbDataContextLoader.java

@@ -29,6 +29,7 @@ public class JndiMongodbDataContextLoader implements JndiDataContextLoader {
 		setUseJndiResource(useJndiResource);
 	}
 	
+	@Override
 	public DataContext loadDataContext(JndiDataContextLoaderConfig config) {
 		//MongoDbDataContextBean result = null;
 		DB mongoDb = null;

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlDomDataContextLoader.java

@@ -19,6 +19,7 @@ public class JndiXmlDomDataContextLoader implements JndiDataContextLoader {
 		setUseUrlSource(useUrlSource);
 	}
 	
+	@Override
 	public DataContext loadDataContext(JndiDataContextLoaderConfig config) {
 		boolean autoFlattenTables = true;
 		if ("false".equalsIgnoreCase(config.getBackendParameters().get("autoFlattenTables"))) {

vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlSaxDataContextLoader.java

@@ -29,12 +29,14 @@ public class JndiXmlSaxDataContextLoader implements JndiDataContextLoader {
 		setUseUrlSource(useUrlSource);
 	}
 	
+	@Override
 	public DataContext loadDataContext(JndiDataContextLoaderConfig config) {
 		List<XmlSaxTableDef> tableSchemas = createXmlSaxConfig(config.getJndiObjectName(),config.getBackendParameters());
 		XmlSaxTableDef[] args = new XmlSaxTableDef[tableSchemas.size()];
 		if (useUrlSource) {
 			final URL url = config.checkBackendUrl();
 			return new XmlSaxDataContext(new Ref<InputSource>() {  // TODO: missing constructor in XmlSaxDataContext
+				@Override
 				public InputSource get() {
 					InputStream in = null;
 					try {

vasc-backend/vasc-backend-metamodel/src/test/java/SwingLoadTest.java

@@ -21,6 +21,7 @@ public class SwingLoadTest {
 		CsvDataContext dataContext = new CsvDataContext(tmpFile);
 		final Schema schema = dataContext.getDefaultSchema();
 		dataContext.executeUpdate(new UpdateScript() {
+			@Override
             public void run(UpdateCallback cb) {
             	MutableRef<Table> tableRef = new MutableRef<Table>();
             	table = cb.createTable(schema, "table").withColumn("column").execute();

vasc-backend/vasc-backend-metamodel/src/test/java/net/forwardfire/vasc/backend/metamodel/crud/CrudContextTest.java

@@ -1,6 +1,7 @@
 package net.forwardfire.vasc.backend.metamodel.crud;
 
 import java.io.File;
+
 import org.eobjects.metamodel.DataContext;
 import org.eobjects.metamodel.UpdateCallback;
 import org.eobjects.metamodel.UpdateScript;
@@ -11,6 +12,7 @@ import org.eobjects.metamodel.data.Row;
 import org.eobjects.metamodel.schema.Schema;
 import org.eobjects.metamodel.schema.Table;
 import org.eobjects.metamodel.util.MutableRef;
+
 import junit.framework.TestCase;
 
 public class CrudContextTest extends TestCase {
@@ -24,6 +26,7 @@ public class CrudContextTest extends TestCase {
 		final Schema schema = dataContext.getDefaultSchema();
 		final MutableRef<Table> tableRef = new MutableRef<Table>();
 		dataContext.executeUpdate(new UpdateScript() {
+			@Override
             public void run(UpdateCallback cb) {
             	Table table = null;
             	int idx = 0;

vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbConnectionProviderImpl.java

@@ -49,6 +49,7 @@ public class MongodbConnectionProviderImpl implements MongodbConnectionProvider
 	protected static Mongo mongo = null;
 	protected static DB db = null;
 	
+	@Override
 	public DB getMongodbConnection() {
 		if (db!=null) {
 			return db;

vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascBackend.java

@@ -106,6 +106,7 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
 		return query;
 	}
 
+	@Override
 	public VascBackendResult<BasicDBObject> execute(VascBackendState state) throws VascBackendException {
 		DBCollection coll = getDBCollection();
 		DBObject query = createFilterQuery(state);
@@ -122,11 +123,13 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
 		return new DefaultVascBackendResult<BasicDBObject>(result);
 	}
 
+	@Override
 	public void persist(BasicDBObject object) throws VascBackendException {
 		DBCollection coll = getDBCollection();
 		coll.insert(object);
 	}
 
+	@Override
 	public BasicDBObject merge(BasicDBObject row) throws VascBackendException {
 		DBCollection coll = getDBCollection();
 		DBObject query = new BasicDBObject();
@@ -136,6 +139,7 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
 		return row;
 	}
 
+	@Override
 	public void delete(BasicDBObject object) throws VascBackendException {
 		DBCollection coll = getDBCollection();
 		DBObject query = new BasicDBObject();
@@ -143,10 +147,12 @@ public class MongodbVascBackend extends AbstractVascBackend<BasicDBObject> {
 		coll.remove(query); // remove by _id
 	}
 
+	@Override
 	public MongodbVascEntryFieldValue provideVascEntryFieldValue() {
 		return new MongodbVascEntryFieldValue();
 	}
 
+	@Override
 	public VascEntryRecordCreator<BasicDBObject> provideVascEntryRecordCreator() {
 		return new MongodbVascEntryRecordCreator();
 	}

vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascEntryFieldValue.java

@@ -39,15 +39,18 @@ public class MongodbVascEntryFieldValue implements VascEntryFieldValue<BasicDBOb
 
 	private static final long serialVersionUID = -7371273796529818557L;
 
+	@Override
 	public Serializable getValue(String backendName, BasicDBObject row)	throws VascBackendException {
 		Serializable data = (Serializable) row.get(backendName);
 		return data;
 	}
 
+	@Override
 	public String getDisplayValue(String field, BasicDBObject row) throws VascBackendException {
 		return ""+getValue(field,row);
 	}
 
+	@Override
 	public void setValue(String backendName, BasicDBObject row, Serializable value) throws VascBackendException {
 		row.put(backendName, value);
 	}

vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascEntryRecordCreator.java

@@ -38,6 +38,7 @@ public class MongodbVascEntryRecordCreator implements VascEntryRecordCreator<Bas
 
 	private static final long serialVersionUID = -9213830731796787384L;
 	
+	@Override
 	public BasicDBObject newRecord() throws VascBackendException {
 		return new BasicDBObject();
 	}

vasc-core/src/main/java/net/forwardfire/vasc/annotations/VascChoicesSelectItemModel.java

@@ -53,6 +53,7 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa
 	/**
 	 * @see net.forwardfire.vasc.core.ui.VascSelectItemModel#getVascSelectItems(net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public List<VascSelectItem> getVascSelectItems(net.forwardfire.vasc.core.VascEntry entry) throws VascException {
 		List<VascSelectItem> result = new ArrayList<VascSelectItem>(10);
 		if ("null".equals(vascChoices.nullLabel())==false) {
@@ -104,6 +105,7 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa
 	/**
 	 * @return the nullLabel
 	 */
+	@Override
 	public String getNullLabel() {
 		return nullLabel;
 	}
@@ -111,6 +113,7 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa
 	/**
 	 * @param nullLabel the nullLabel to set
 	 */
+	@Override
 	public void setNullLabel(String nullLabel) {
 		this.nullLabel = nullLabel;
 	}
@@ -118,6 +121,7 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa
 	/**
 	 * @return the nullKeyValue
 	 */
+	@Override
 	public String getNullKeyValue() {
 		return nullKeyValue;
 	}
@@ -125,6 +129,7 @@ public class VascChoicesSelectItemModel implements VascSelectItemModel,Serializa
 	/**
 	 * @param nullKeyValue the nullKeyValue to set
 	 */
+	@Override
 	public void setNullKeyValue(String nullKeyValue) {
 		this.nullKeyValue = nullKeyValue;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java

@@ -44,11 +44,13 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	protected VascBackend<Serializable> backend = null;
 	protected VascEntry entry = null;
 	
+	@Override
 	abstract public VascBackendProxy clone() throws CloneNotSupportedException;
 	
 	/**
 	 * @see net.forwardfire.vasc.backend.proxy.VascBackendProxy#initProxy(net.forwardfire.vasc.backend.VascBackend, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void initProxy(VascBackend<Serializable> backend, VascEntry entry) {
 		if (backend==null) {
 			throw new NullPointerException("backend object may not be null.");
@@ -63,6 +65,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.proxy.VascBackendProxy#isProxyNeeded()
 	 */
+	@Override
 	public boolean isProxyNeeded() {
 		return true;
 	}
@@ -70,6 +73,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#startBackend()
 	 */
+	@Override
 	public void startBackend() {
 		backend.startBackend();
 	}
@@ -77,6 +81,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#stopBackend()
 	 */
+	@Override
 	public void stopBackend() {
 		backend.stopBackend();
 	}
@@ -84,6 +89,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isReadOnly()
 	 */
+	@Override
 	public boolean isReadOnly() {
 		return backend.isReadOnly();
 	}
@@ -91,6 +97,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state)
 	 */
+	@Override
 	public long fetchTotalExecuteSize(VascBackendState state) {
 		return backend.fetchTotalExecuteSize(state);
 	}
@@ -98,6 +105,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isSortable()
 	 */
+	@Override
 	public boolean isSortable() {
 		return backend.isSortable();
 	}
@@ -106,6 +114,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	 * @throws Exception 
 	 * @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state)
 	 */
+	@Override
 	public VascBackendResult<Serializable> execute(VascBackendState state) throws VascBackendException {
 		return backend.execute(state);
 	}
@@ -113,6 +122,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object)
 	 */
+	@Override
 	public void delete(Serializable object) throws VascBackendException {
 		backend.delete(object);
 	}
@@ -120,6 +130,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isPageable()
 	 */
+	@Override
 	public boolean isPageable() {
 		return backend.isPageable();
 	}
@@ -127,6 +138,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isSearchable()
 	 */
+	@Override
 	public boolean isSearchable() {
 		return backend.isSearchable();
 	}
@@ -134,6 +146,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object)
 	 */
+	@Override
 	public Serializable merge(Serializable object) throws VascBackendException {
 		return backend.merge(object);
 	}
@@ -141,6 +154,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object)
 	 */
+	@Override
 	public void persist(Serializable object) throws VascBackendException {
 		backend.persist(object);
 	}
@@ -148,6 +162,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue()
 	 */
+	@Override
 	public VascEntryFieldValue<Serializable> provideVascEntryFieldValue() {
 		return backend.provideVascEntryFieldValue();
 	}
@@ -155,6 +170,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator()
 	 */
+	@Override
 	public VascEntryRecordCreator<Serializable> provideVascEntryRecordCreator() {
 		return backend.provideVascEntryRecordCreator();
 	}
@@ -162,6 +178,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#getId()
 	 */
+	@Override
 	public String getId() {
 		return backend.getId();
 	}
@@ -169,6 +186,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#setId(java.lang.String)
 	 */
+	@Override
 	public void setId(String id) {
 		backend.setId(id);
 	}
@@ -176,6 +194,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.core.VascBackend#doRecordMoveDownById(VascBackendState state,java.lang.Object)
 	 */
+	@Override
 	public long doRecordMoveDownById(VascBackendState state,Object primaryId) throws VascBackendException {
 		return backend.doRecordMoveDownById(state,primaryId);
 	}
@@ -183,6 +202,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.core.VascBackend#doRecordMoveUpById(VascBackendState state,java.lang.Object)
 	 */
+	@Override
 	public long doRecordMoveUpById(VascBackendState state,Object primaryId) throws VascBackendException {
 		return backend.doRecordMoveUpById(state,primaryId);
 	}
@@ -190,6 +210,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#isRecordMoveable()
 	 */
+	@Override
 	public boolean isRecordMoveable() {
 		return backend.isRecordMoveable();
 	}
@@ -197,6 +218,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#executePageSummary()
 	 */
+	@Override
 	public Map<String, Object> executePageSummary() {
 		return backend.executePageSummary();
 	}
@@ -204,6 +226,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#executeTotalSummary()
 	 */
+	@Override
 	public Map<String, Object> executeTotalSummary() {
 		return backend.executeTotalSummary();
 	}
@@ -211,6 +234,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#hasPageSummary()
 	 */
+	@Override
 	public boolean hasPageSummary() {
 		return backend.hasPageSummary();
 	}
@@ -218,6 +242,7 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.VascBackend#hasTotalSummary()
 	 */
+	@Override
 	public boolean hasTotalSummary() {
 		return backend.hasTotalSummary();
 	}

vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyEventExecutor.java

@@ -53,6 +53,7 @@ public class VascBackendProxyEventExecutor extends AbstractVascBackendProxy {
 		return result;
 	}
 	
+	@Override
 	public void initProxy(VascBackend<Serializable> backend,VascEntry entry) {
 		super.initProxy(backend, entry);
 		this.entry=entry;

vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyFilter.java

@@ -56,6 +56,7 @@ public class VascBackendProxyFilter extends AbstractVascBackendProxy {
 	/**
 	 * @see net.forwardfire.vasc.backend.proxy.VascBackendProxy#initProxy(net.forwardfire.vasc.backend.VascBackend, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void initProxy(VascBackend<Serializable> backend, VascEntry entry) {
 		super.initProxy(backend,entry);
 		filters = entry.getVascBackendFilters();

vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySort.java

@@ -83,6 +83,7 @@ public class VascBackendProxySort extends AbstractVascBackendProxy {
 		final VascEntryFieldValue<Serializable> fieldValue = backend.provideVascEntryFieldValue();
 		Collections.sort(result.getPageData(), new Comparator<Serializable>() {
 			@SuppressWarnings("rawtypes")
+			@Override
 			public int compare(Serializable o1, Serializable o2) {
 				try {
 					Comparable c1 = null;

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascControllerLocal.java

@@ -41,6 +41,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @return the vascEntryConfigController
 	 */
+	@Override
 	public VascEntryConfigController getVascEntryConfigController() {
 		return vascEntryConfigController;
 	}
@@ -48,6 +49,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @param vascEntryConfigController the vascEntryConfigController to set
 	 */
+	@Override
 	public void setVascEntryConfigController(VascEntryConfigController vascEntryConfigController) {
 		this.vascEntryConfigController = vascEntryConfigController;
 	}
@@ -55,6 +57,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @return the vascEventChannelController
 	 */
+	@Override
 	public VascEventChannelController getVascEventChannelController() {
 		return vascEventChannelController;
 	}
@@ -62,6 +65,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @param vascEventChannelController the vascEventChannelController to set
 	 */
+	@Override
 	public void setVascEventChannelController(VascEventChannelController vascEventChannelController) {
 		this.vascEventChannelController = vascEventChannelController;
 	}
@@ -69,6 +73,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @return the vascBackendController
 	 */
+	@Override
 	public VascBackendController getVascBackendController() {
 		return vascBackendController;
 	}
@@ -76,6 +81,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @param vascBackendController the vascBackendController to set
 	 */
+	@Override
 	public void setVascBackendController(VascBackendController vascBackendController) {
 		this.vascBackendController = vascBackendController;
 	}
@@ -83,6 +89,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @return the vascEntryController
 	 */
+	@Override
 	public VascEntryController getVascEntryController() {
 		return vascEntryController;
 	}
@@ -90,6 +97,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @param vascEntryController the vascEntryController to set
 	 */
+	@Override
 	public void setVascEntryController(VascEntryController vascEntryController) {
 		this.vascEntryController = vascEntryController;
 	}
@@ -97,6 +105,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @return the vascEntryFieldController
 	 */
+	@Override
 	public VascEntryFieldTypeController getVascEntryFieldTypeController() {
 		return vascEntryFieldTypeController;
 	}
@@ -104,6 +113,7 @@ abstract public class AbstractVascControllerLocal implements VascControllerLocal
 	/**
 	 * @param vascEntryFieldController the vascEntryFieldController to set
 	 */
+	@Override
 	public void setVascEntryFieldTypeController(VascEntryFieldTypeController vascEntryFieldTypeController) {
 		this.vascEntryFieldTypeController = vascEntryFieldTypeController;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryControllerLocal.java

@@ -47,6 +47,7 @@ abstract public class AbstractVascEntryControllerLocal implements VascEntryContr
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryControllerLocal#addVascEntry(net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void addVascEntry(VascEntryLocal entry) {
 		if (entry==null) {
 			throw new NullPointerException("Can't add null VascEntry.");
@@ -60,6 +61,7 @@ abstract public class AbstractVascEntryControllerLocal implements VascEntryContr
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryControllerLocal#removeVascEntry(java.lang.String)
 	 */
+	@Override
 	public void removeVascEntry(String entryId) {
 		entries.remove(entryId);
 	}
@@ -67,6 +69,7 @@ abstract public class AbstractVascEntryControllerLocal implements VascEntryContr
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryController#getVascEntryById(java.lang.String)
 	 */
+	@Override
 	public VascEntry getVascEntryById(String id) {
 		VascEntryLocal entry = entries.get(id);
 		if (entry==null) {
@@ -82,6 +85,7 @@ abstract public class AbstractVascEntryControllerLocal implements VascEntryContr
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryControllerLocal#getMasterVascEntryById(java.lang.String)
 	 */
+	@Override
 	public VascEntryLocal getMasterVascEntryById(String entryId) {
 		VascEntryLocal entry = entries.get(entryId);
 		return entry;
@@ -90,6 +94,7 @@ abstract public class AbstractVascEntryControllerLocal implements VascEntryContr
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryController#getVascEntryIds()
 	 */
+	@Override
 	public List<String> getVascEntryIds() {
 		List<String> result = new ArrayList<String>(entries.keySet());
 		Collections.sort(result); // lets do abc for consistance behauvior.

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldLocal.java

@@ -101,20 +101,20 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 		clone.setGraphable(getGraphable());
 	}
 	
-	
+	@Override
 	public VascEntry getVascEntry() {
 		return vascEntry;
 	}
 	
+	@Override
 	public void setVascEntry(VascEntry vascEntry) {
 		this.vascEntry=vascEntry;
 	}
 	
-
-	
 	/**
 	 * @return the vascEntryFieldType
 	 */
+	@Override
 	public VascEntryFieldType getVascEntryFieldType() {
 		return vascEntryFieldType;
 	}
@@ -122,6 +122,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param vascEntryFieldType the vascEntryFieldType to set
 	 */
+	@Override
 	public void setVascEntryFieldType(VascEntryFieldType vascEntryFieldType) {
 		this.vascEntryFieldType = vascEntryFieldType;
 	}
@@ -129,6 +130,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the backendName
 	 */
+	@Override
 	public String getBackendName() {
 		return backendName;
 	}
@@ -136,6 +138,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param backendName the backendName to set
 	 */
+	@Override
 	public void setBackendName(String backendName) {
 		this.backendName = backendName;
 	}
@@ -143,6 +146,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the vascEntryFieldValue
 	 */
+	@Override
 	public VascEntryFieldValue<Serializable> getVascEntryFieldValue() {
 		return vascEntryFieldValue;
 	}
@@ -150,6 +154,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param vascEntryFieldValue the vascEntryFieldValue to set
 	 */
+	@Override
 	public void setVascEntryFieldValue(VascEntryFieldValue<Serializable> vascEntryFieldValue) {
 		this.vascEntryFieldValue = vascEntryFieldValue;
 	}
@@ -157,6 +162,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the vascValidators
 	 */
+	@Override
 	public List<VascValidator> getVascValidators() {
 		return vascValidators;
 	}
@@ -164,6 +170,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param vascValidators the vascValidators to add
 	 */
+	@Override
 	public void addVascValidator(VascValidator vascValidator) {
 		this.vascValidators.add(vascValidator);
 	}
@@ -171,6 +178,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param vascValidators the vascValidators to remove
 	 */
+	@Override
 	public void removeVascValidator(VascValidator vascValidator) {
 		this.vascValidators.remove(vascValidator);
 	}
@@ -179,6 +187,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the defaultValue
 	 */
+	@Override
 	public Serializable getDefaultValue() {
 		return defaultValue;
 	}
@@ -186,6 +195,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param defaultValue the defaultValue to set
 	 */
+	@Override
 	public void setDefaultValue(Serializable defaultValue) {
 		this.defaultValue = defaultValue;
 	}
@@ -193,6 +203,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the sizeList
 	 */
+	@Override
 	public Integer getSizeList() {
 		return sizeList;
 	}
@@ -200,6 +211,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param sizeList the sizeList to set
 	 */
+	@Override
 	public void setSizeList(Integer sizeList) {
 		this.sizeList = sizeList;
 	}
@@ -207,6 +219,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the sizeEdit
 	 */
+	@Override
 	public Integer getSizeEdit() {
 		return sizeEdit;
 	}
@@ -214,6 +227,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param sizeEdit the sizeEdit to set
 	 */
+	@Override
 	public void setSizeEdit(Integer sizeEdit) {
 		this.sizeEdit = sizeEdit;
 	}
@@ -221,6 +235,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the styleList
 	 */
+	@Override
 	public String getStyleList() {
 		return styleList;
 	}
@@ -228,6 +243,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param styleList the styleList to set
 	 */
+	@Override
 	public void setStyleList(String styleList) {
 		this.styleList = styleList;
 	}
@@ -235,6 +251,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the styleEdit
 	 */
+	@Override
 	public String getStyleEdit() {
 		return styleEdit;
 	}
@@ -242,6 +259,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param styleEdit the styleEdit to set
 	 */
+	@Override
 	public void setStyleEdit(String styleEdit) {
 		this.styleEdit = styleEdit;
 	}
@@ -249,6 +267,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the choices
 	 */
+	@Override
 	public String getChoices() {
 		return choices;
 	}
@@ -256,6 +275,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param choices the choices to set
 	 */
+	@Override
 	public void setChoices(String choices) {
 		this.choices = choices;
 	}
@@ -264,6 +284,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the optional
 	 */
+	@Override
 	public Boolean getOptional() {
 		return optional;
 	}
@@ -271,15 +292,15 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param optional the optional to set
 	 */
+	@Override
 	public void setOptional(Boolean optional) {
 		this.optional = optional;
 	}
 	
-
-
 	/**
 	 * @return the choicesAsRadio
 	 */
+	@Override
 	public Boolean getChoicesAsRadio() {
 		return choicesAsRadio;
 	}
@@ -287,6 +308,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param choicesAsRadio the choicesAsRadio to set
 	 */
+	@Override
 	public void setChoicesAsRadio(Boolean choicesAsRadio) {
 		this.choicesAsRadio = choicesAsRadio;
 	}
@@ -294,6 +316,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the editBlank
 	 */
+	@Override
 	public Boolean getEditBlank() {
 		return editBlank;
 	}
@@ -301,6 +324,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param editBlank the editBlank to set
 	 */
+	@Override
 	public void setEditBlank(Boolean editBlank) {
 		this.editBlank = editBlank;
 	}
@@ -308,6 +332,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the displayName
 	 */
+	@Override
 	public String getDisplayName() {
 		return displayName;
 	}
@@ -315,6 +340,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param displayName the displayName to set
 	 */
+	@Override
 	public void setDisplayName(String displayName) {
 		this.displayName = displayName;
 	}
@@ -322,6 +348,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the sortable
 	 */
+	@Override
 	public Boolean getSortable() {
 		return sortable;
 	}
@@ -329,6 +356,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param sortable the sortable to set
 	 */
+	@Override
 	public void setSortable(Boolean sortable) {
 		this.sortable = sortable;
 	}
@@ -336,6 +364,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the sumable
 	 */
+	@Override
 	public Boolean getSumable() {
 		return sumable;
 	}
@@ -343,6 +372,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param sumable the sumable to set
 	 */
+	@Override
 	public void setSumable(Boolean sumable) {
 		this.sumable = sumable;
 	}
@@ -350,6 +380,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @return the graphable
 	 */
+	@Override
 	public Boolean getGraphable() {
 		return graphable;
 	}
@@ -357,6 +388,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole
 	/**
 	 * @param graphable the graphable to set
 	 */
+	@Override
 	public void setGraphable(Boolean graphable) {
 		this.graphable = graphable;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldSetLocal.java

@@ -67,6 +67,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @return the styleList
 	 */
+	@Override
 	public String getStyleList() {
 		return styleList;
 	}
@@ -74,6 +75,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @param styleList the styleList to set
 	 */
+	@Override
 	public void setStyleList(String styleList) {
 		this.styleList = styleList;
 	}
@@ -81,6 +83,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @return the styleEdit
 	 */
+	@Override
 	public String getStyleEdit() {
 		return styleEdit;
 	}
@@ -88,6 +91,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @param styleEdit the styleEdit to set
 	 */
+	@Override
 	public void setStyleEdit(String styleEdit) {
 		this.styleEdit = styleEdit;
 	}
@@ -95,6 +99,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @return the collapsed
 	 */
+	@Override
 	public Boolean getCollapsed() {
 		return collapsed;
 	}
@@ -102,6 +107,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @param collapsed the collapsed to set
 	 */
+	@Override
 	public void setCollapsed(Boolean collapsed) {
 		this.collapsed = collapsed;
 	}
@@ -109,6 +115,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @return the vascEntryFieldIds
 	 */
+	@Override
 	public List<String> getVascEntryFieldIds() {
 		return vascEntryFieldIds;
 	}
@@ -116,6 +123,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @param vascEntryFieldIds the vascEntryFieldIds to set
 	 */
+	@Override
 	public void addVascEntryFieldId(String vascEntryFieldId) {
 		vascEntryFieldIds.add(vascEntryFieldId);
 	}
@@ -123,6 +131,7 @@ abstract public class AbstractVascEntryFieldSetLocal extends AbstractVascBaseIdR
 	/**
 	 * @param vascEntryFieldIds the vascEntryFieldIds to set
 	 */
+	@Override
 	public void removeVascEntryFieldId(String vascEntryFieldId) {
 		vascEntryFieldIds.remove(vascEntryFieldId);
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldTypeLocal.java

@@ -87,6 +87,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getProperty(java.lang.String)
 	 */
+	@Override
 	public String getProperty(String name) {
 		return properties.get(name);
 	}
@@ -94,6 +95,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#setProperty(java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void setProperty(String name, String value) {
 		properties.put(name, value);
 	}
@@ -101,6 +103,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getPropertyNames()
 	 */
+	@Override
 	public List<String> getPropertyNames() {
 		return new ArrayList<String>(properties.keySet());
 	}
@@ -108,6 +111,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @return the dataObject
 	 */
+	@Override
 	public Object getDataObject() {
 		return dataObject;
 	}
@@ -115,6 +119,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @param dataObject the dataObject to set
 	 */
+	@Override
 	public void setDataObject(Object dataObject) {
 		this.dataObject = dataObject;
 	}
@@ -122,6 +127,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getVascValidators()
 	 */
+	@Override
 	public List<VascValidator> getVascValidators() {
 		return vascValidators;
 	}
@@ -129,6 +135,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#addVascValidator(net.forwardfire.vasc.validators.VascValidator)
 	 */
+	@Override
 	public void addVascValidator(VascValidator vascValidator) {
 		vascValidators.add(vascValidator);
 	}
@@ -136,6 +143,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#removeVascValidator(net.forwardfire.vasc.validators.VascValidator)
 	 */
+	@Override
 	public void removeVascValidator(VascValidator vascValidator) {
 		vascValidators.remove(vascValidator);
 	}
@@ -143,6 +151,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getAutoDetectClass()
 	 */
+	@Override
 	public Class<?> getAutoDetectClass() {
 		return autoDetectClass;
 	}
@@ -150,6 +159,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#setAutoDetectClass(java.lang.Class)
 	 */
+	@Override
 	public void setAutoDetectClass(Class<?> classObject) {
 		autoDetectClass=classObject;
 	}
@@ -157,6 +167,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getInputMask()
 	 */
+	@Override
 	public String getInputMask() {
 		return inputMask;
 	}
@@ -164,6 +175,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#setInputMask(java.lang.String)
 	 */
+	@Override
 	public void setInputMask(String inputMask) {
 		this.inputMask=inputMask;
 	}
@@ -171,6 +183,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getUIComponentId()
 	 */
+	@Override
 	public String getUIComponentId() {
 		return uiComponentId;
 	}
@@ -178,6 +191,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#setUIComponentId(java.lang.String)
 	 */
+	@Override
 	public void setUIComponentId(String uiComponentId) {
 		this.uiComponentId=uiComponentId;
 	}
@@ -185,6 +199,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#getUIComponentCount()
 	 */
+	@Override
 	public int getUIComponentCount(VascEntryField entryField) throws VascException {
 		return 1;
 	}
@@ -192,6 +207,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#provideEditorUIComponent(int)
 	 */
+	@Override
 	public VascUIComponent provideEditorUIComponent(int index,VascEntryField entryField) throws VascException {
     	ClassLoader cl = Thread.currentThread().getContextClassLoader();
     	if (cl == null) {
@@ -207,6 +223,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#provideLabelUIComponent(int)
 	 */
+	@Override
 	public VascUIComponent provideLabelUIComponent(int index,VascEntryField entryField) throws VascException {
     	return entryField.getVascEntry().getVascFrontendController().getVascUIComponent(VascUIComponent.VASC_LABEL);
 	}
@@ -214,6 +231,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryFieldType#provideEditorVascValueModel()
 	 */
+	@Override
 	public VascValueModel provideEditorVascValueModel(int index,VascEntryField entryField) throws VascException {
 		if (index>0) {
 			throw new IllegalArgumentException("You have to override provideEditorVascValueModel if multi editor support is needed");
@@ -225,6 +243,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @return the objectConverter
 	 */
+	@Override
 	public ObjectConverter getObjectConverter() {
 		return objectConverter;
 	}
@@ -232,6 +251,7 @@ abstract public class AbstractVascEntryFieldTypeLocal extends AbstractVascBaseId
 	/**
 	 * @param objectConverter the objectConverter to set
 	 */
+	@Override
 	public void setObjectConverter(ObjectConverter objectConverter) {
 		this.objectConverter = objectConverter;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLinkLocal.java

@@ -67,22 +67,32 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 		}
 	}
 	
+	@Override
 	public String getEntryParameterFieldId(String parameterName) {
 		return entryParameterFieldIds.get(parameterName);
 	}
+	
+	@Override
 	public void addEntryParameterFieldId(String parameterName,String valueFieldId) {
 		entryParameterFieldIds.put(parameterName, valueFieldId);
 	}
+	
+	@Override
 	public List<String> getEntryParameterFieldIdKeys() {
 		return new ArrayList<String>(entryParameterFieldIds.keySet());
 	}
 	
+	@Override
 	public String getEntryCreateFieldValue(String valueFieldId) {
 		return entryCreateFieldValues.get(valueFieldId);
 	}
+	
+	@Override
 	public void addEntryCreateFieldValue(String valueFieldId,String selectedFieldId) {
 		entryCreateFieldValues.put(valueFieldId, selectedFieldId);
 	}
+	
+	@Override
 	public List<String> getEntryCreateFieldValueKeys() {
 		return new ArrayList<String>(entryCreateFieldValues.keySet());
 	}
@@ -90,6 +100,7 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 	/**
 	 * @return the vascEntryId
 	 */
+	@Override
 	public String getVascEntryId() {
 		return vascEntryId;
 	}
@@ -97,6 +108,7 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 	/**
 	 * @param vascEntryId the vascEntryId to set
 	 */
+	@Override
 	public void setVascEntryId(String vascEntryId) {
 		this.vascEntryId = vascEntryId;
 	}
@@ -104,6 +116,7 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 	/**
 	 * @return the vascLinkEntryType
 	 */
+	@Override
 	public VascEntryLinkType getVascEntryLinkType() {
 		return vascEntryLinkType;
 	}
@@ -111,6 +124,7 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 	/**
 	 * @param vascLinkEntryType the vascLinkEntryType to set
 	 */
+	@Override
 	public void setVascEntryLinkType(VascEntryLinkType vascEntryLinkType) {
 		this.vascEntryLinkType = vascEntryLinkType;
 	}
@@ -118,6 +132,7 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 	/**
 	 * @return the doActionId
 	 */
+	@Override
 	public String getDoActionId() {
 		return doActionId;
 	}
@@ -125,6 +140,7 @@ abstract public class AbstractVascEntryLinkLocal extends AbstractVascBaseIdRoleV
 	/**
 	 * @param doActionId the doActionId to set
 	 */
+	@Override
 	public void setDoActionId(String doActionId) {
 		this.doActionId = doActionId;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLocal.java

@@ -191,11 +191,10 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 		clone.setVascGroupId(getVascGroupId());
 	}
 	
-
-	
 	/**
 	 * @return the name
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -203,6 +202,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param name the name to set
 	 */
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -210,6 +210,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the helpId
 	 */
+	@Override
 	public String getHelpId() {
 		return helpId;
 	}
@@ -217,6 +218,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param helpId the helpId to set
 	 */
+	@Override
 	public void setHelpId(String helpId) {
 		this.helpId = helpId;
 	}
@@ -224,6 +226,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the image
 	 */
+	@Override
 	public String getImage() {
 		return image;
 	}
@@ -231,6 +234,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param image the image to set
 	 */
+	@Override
 	public void setImage(String image) {
 		this.image = image;
 	}
@@ -238,6 +242,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the listDescription
 	 */
+	@Override
 	public String getListDescription() {
 		return listDescription;
 	}
@@ -245,6 +250,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param listDescription the listDescription to set
 	 */
+	@Override
 	public void setListDescription(String listDescription) {
 		this.listDescription = listDescription;
 	}
@@ -252,6 +258,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the listImage
 	 */
+	@Override
 	public String getListImage() {
 		return listImage;
 	}
@@ -259,6 +266,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param listImage the listImage to set
 	 */
+	@Override
 	public void setListImage(String listImage) {
 		this.listImage = listImage;
 	}
@@ -266,6 +274,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the editDescription
 	 */
+	@Override
 	public String getEditDescription() {
 		return editDescription;
 	}
@@ -273,6 +282,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param editDescription the editDescription to set
 	 */
+	@Override
 	public void setEditDescription(String editDescription) {
 		this.editDescription = editDescription;
 	}
@@ -280,6 +290,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the editImage
 	 */
+	@Override
 	public String getEditImage() {
 		return editImage;
 	}
@@ -287,6 +298,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param editImage the editImage to set
 	 */
+	@Override
 	public void setEditImage(String editImage) {
 		this.editImage = editImage;
 	}
@@ -294,6 +306,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the deleteDescription
 	 */
+	@Override
 	public String getDeleteDescription() {
 		return deleteDescription;
 	}
@@ -301,6 +314,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param deleteDescription the deleteDescription to set
 	 */
+	@Override
 	public void setDeleteDescription(String deleteDescription) {
 		this.deleteDescription = deleteDescription;
 	}
@@ -308,6 +322,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the deleteImage
 	 */
+	@Override
 	public String getDeleteImage() {
 		return deleteImage;
 	}
@@ -315,6 +330,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param deleteImage the deleteImage to set
 	 */
+	@Override
 	public void setDeleteImage(String deleteImage) {
 		this.deleteImage = deleteImage;
 	}
@@ -322,6 +338,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the createDescription
 	 */
+	@Override
 	public String getCreateDescription() {
 		return createDescription;
 	}
@@ -329,6 +346,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param createDescription the createDescription to set
 	 */
+	@Override
 	public void setCreateDescription(String createDescription) {
 		this.createDescription = createDescription;
 	}
@@ -336,6 +354,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the createImage
 	 */
+	@Override
 	public String getCreateImage() {
 		return createImage;
 	}
@@ -343,6 +362,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param createImage the createImage to set
 	 */
+	@Override
 	public void setCreateImage(String createImage) {
 		this.createImage = createImage;
 	}
@@ -350,6 +370,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the primaryKeyFieldId
 	 */
+	@Override
 	public String getPrimaryKeyFieldId() {
 		return primaryKeyFieldId;
 	}
@@ -357,6 +378,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param primaryKeyFieldId the primaryKeyFieldId to set
 	 */
+	@Override
 	public void setPrimaryKeyFieldId(String primaryKeyFieldId) {
 		this.primaryKeyFieldId = primaryKeyFieldId;
 	}
@@ -364,6 +386,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the displayNameFieldId
 	 */
+	@Override
 	public String getDisplayNameFieldId() {
 		return displayNameFieldId;
 	}
@@ -371,6 +394,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param displayNameFieldId the displayNameFieldId to set
 	 */
+	@Override
 	public void setDisplayNameFieldId(String displayNameFieldId) {
 		this.displayNameFieldId = displayNameFieldId;
 	}
@@ -378,6 +402,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the delete
 	 */
+	@Override
 	public Boolean getDelete() {
 		return delete;
 	}
@@ -385,6 +410,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param delete the delete to set
 	 */
+	@Override
 	public void setDelete(Boolean delete) {
 		this.delete = delete;
 	}
@@ -392,6 +418,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the rolesDelete
 	 */
+	@Override
 	public String getRolesDelete() {
 		return rolesDelete;
 	}
@@ -399,6 +426,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param rolesDelete the rolesDelete to set
 	 */
+	@Override
 	public void setRolesDelete(String rolesDelete) {
 		this.rolesDelete = rolesDelete;
 	}
@@ -406,6 +434,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascFields
 	 */
+	@Override
 	public Collection<VascEntryField> getVascEntryFields() {
 		return new ArrayList<VascEntryField>(vascFields);
 	}
@@ -413,6 +442,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascFields
 	 */
+	@Override
 	public Collection<VascEntryFieldLocal> getVascEntryFieldsLocal() {
 		return vascFields;
 	}
@@ -420,6 +450,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascField the vascFields to add
 	 */
+	@Override
 	public void addVascEntryField(VascEntryFieldLocal vascField) {
 		vascFields.add(vascField);
 	}
@@ -427,6 +458,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascField the vascFields to remove
 	 */
+	@Override
 	public void removeVascEntryField(VascEntryFieldLocal vascField) {
 		vascFields.remove(vascField);
 	}
@@ -434,6 +466,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntry#getVascEntryFieldById(java.lang.String)
 	 */
+	@Override
 	public VascEntryField getVascEntryFieldById(String id) {
 		for (VascEntryField field:vascFields) {
 			if (id.equals(field.getId())) {
@@ -446,6 +479,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the rowActions
 	 */
+	@Override
 	public Collection<RowVascAction> getRowActions() {
 		return new ArrayList<RowVascAction>(rowActions);
 	}
@@ -453,6 +487,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the RowVascAction
 	 */
+	@Override
 	public RowVascAction getRowActionById(String actionId) {
 		for (RowVascAction a:rowActions) {
 			if (a.getId().equals(actionId)) {
@@ -465,6 +500,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param rowAction the rowAction to add
 	 */
+	@Override
 	public void addRowAction(RowVascActionLocal rowAction) {
 		rowActions.add(rowAction);
 	}
@@ -472,6 +508,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param rowAction the rowAction to remove
 	 */
+	@Override
 	public void removeRowAction(RowVascActionLocal rowAction) {
 		rowActions.remove(rowAction);
 	}
@@ -479,6 +516,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the rowActions
 	 */
+	@Override
 	public Collection<RowVascActionLocal> getRowActionsLocal() {
 		return rowActions;
 	}
@@ -486,6 +524,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the columnActions
 	 */
+	@Override
 	public Collection<ColumnVascAction> getColumnActions() {
 		return new ArrayList<ColumnVascAction>(columnActions);
 	}
@@ -493,6 +532,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the ColumnVascAction
 	 */
+	@Override
 	public ColumnVascAction getColumnActionById(String actionId) {
 		for (ColumnVascAction a:columnActions) {
 			if (a.getId().equals(actionId)) {
@@ -505,6 +545,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param columnAction the columnActions to add
 	 */
+	@Override
 	public void addColumnAction(ColumnVascActionLocal columnAction) {
 		columnActions.add(columnAction);
 	}
@@ -512,6 +553,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param columnAction the columnActions to remove
 	 */
+	@Override
 	public void removeColumnAction(ColumnVascActionLocal columnAction) {
 		columnActions.remove(columnAction);
 	}
@@ -519,6 +561,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the columnActions
 	 */
+	@Override
 	public Collection<ColumnVascActionLocal> getColumnActionsLocal() {
 		return columnActions;
 	}
@@ -526,6 +569,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the globalActions
 	 */
+	@Override
 	public Collection<GlobalVascAction> getGlobalActions() {
 		return new ArrayList<GlobalVascAction>(globalActions);
 	}
@@ -533,6 +577,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the GlobalVascAction
 	 */
+	@Override
 	public GlobalVascAction getGlobalActionById(String actionId) {
 		for (GlobalVascAction a:globalActions) {
 			if (a.getId().equals(actionId)) {
@@ -545,6 +590,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param globalAction the globalAction to add
 	 */
+	@Override
 	public void addGlobalAction(GlobalVascActionLocal globalAction) {
 		globalActions.add(globalAction);
 	}
@@ -552,6 +598,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param globalAction the globalAction to remove
 	 */
+	@Override
 	public void removeGlobalAction(GlobalVascActionLocal globalAction) {
 		globalActions.remove(globalAction);
 	}
@@ -559,6 +606,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the globalActions
 	 */
+	@Override
 	public Collection<GlobalVascActionLocal> getGlobalActionsLocal() {
 		return globalActions;
 	}
@@ -566,6 +614,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the exportActions
 	 */
+	@Override
 	public Collection<GlobalVascAction> getExportActions() {
 		return new ArrayList<GlobalVascAction>(exportActions);
 	}
@@ -573,6 +622,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the GlobalVascAction exportAction
 	 */
+	@Override
 	public GlobalVascAction getExportActionById(String actionId) {
 		for (GlobalVascAction a:exportActions) {
 			if (a.getId().equals(actionId)) {
@@ -585,6 +635,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param exportAction the exportAction to add
 	 */
+	@Override
 	public void addExportAction(GlobalVascActionLocal exportAction) {
 		exportActions.add(exportAction);
 	}
@@ -592,6 +643,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param exportAction the exportAction to remove
 	 */
+	@Override
 	public void removeExportAction(GlobalVascActionLocal exportAction) {
 		exportActions.remove(exportAction);
 	}
@@ -599,6 +651,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the exportActions
 	 */
+	@Override
 	public Collection<GlobalVascActionLocal> getExportActionsLocal() {
 		return exportActions;
 	}
@@ -606,6 +659,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascEntryFieldSets
 	 */
+	@Override
 	public Collection<VascEntryFieldSet> getVascEntryFieldSets() {
 		return new ArrayList<VascEntryFieldSet>(vascEntryFieldSets);
 	}
@@ -613,6 +667,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascEntryFieldSets
 	 */
+	@Override
 	public Collection<VascEntryFieldSetLocal> getVascEntryFieldSetsLocal() {
 		return vascEntryFieldSets;
 	}
@@ -620,6 +675,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the VascEntryFieldSet
 	 */
+	@Override
 	public VascEntryFieldSet getVascEntryFieldSetById(String fieldSetId) {
 		for (VascEntryFieldSet a:vascEntryFieldSets) {
 			if (a.getId().equals(fieldSetId)) {
@@ -632,6 +688,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascEntryFieldSet the vascEntryFieldSet to add
 	 */
+	@Override
 	public void addVascEntryFieldSet(VascEntryFieldSetLocal vascEntryFieldSet) {
 		vascEntryFieldSets.add(vascEntryFieldSet);
 	}
@@ -639,6 +696,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascEntryFieldSet the vascEntryFieldSet to add
 	 */
+	@Override
 	public void removeVascEntryFieldSet(VascEntryFieldSetLocal vascEntryFieldSet) {
 		vascEntryFieldSets.remove(vascEntryFieldSet);
 	}
@@ -646,6 +704,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascEntryLinks
 	 */
+	@Override
 	public Collection<VascEntryLink> getVascEntryLinks() {
 		return new ArrayList<VascEntryLink>(vascEntryLinks);
 	}
@@ -653,6 +712,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascEntryLinks
 	 */
+	@Override
 	public Collection<VascEntryLinkLocal> getVascEntryLinksLocal() {
 		return vascEntryLinks;
 	}
@@ -660,6 +720,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascEntryLinks
 	 */
+	@Override
 	public VascEntryLink getVascEntryLinkById(String linkId) {
 		for (VascEntryLink a:vascEntryLinks) {
 			if (a.getId().equals(linkId)) {
@@ -672,6 +733,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascEntryLink the vascEntryLink to set
 	 */
+	@Override
 	public void addVascEntryLink(VascEntryLinkLocal vascEntryLink) {
 		vascEntryLinks.add(vascEntryLink);
 	}
@@ -679,6 +741,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascEntryLink the vascEntryLink to remove
 	 */
+	@Override
 	public void removeVascEntryLink(VascEntryLinkLocal vascEntryLink) {
 		vascEntryLinks.remove(vascEntryLink);
 	}
@@ -686,6 +749,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntry#getEntryParameter(java.lang.String)
 	 */
+	@Override
 	public Object getEntryParameter(String key) {
 		return entryParameters.get(key);
 	}
@@ -693,6 +757,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntry#getEntryParameterKeys()
 	 */
+	@Override
 	public List<String> getEntryParameterKeys() {
 		return new ArrayList<String>(entryParameters.keySet());
 	}
@@ -700,6 +765,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntry#setEntryParameter(java.lang.String, java.lang.Object)
 	 */
+	@Override
 	public void setEntryParameter(String key, Object value) {
 		entryParameters.put(key, value);
 	}
@@ -707,6 +773,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntry#removeEntryParameter(java.lang.String)
 	 */
+	@Override
 	public void removeEntryParameter(String key) {
 		entryParameters.remove(key);
 	}
@@ -714,6 +781,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascFrontendData
 	 */
+	@Override
 	public VascFrontendController getVascFrontendController() {
 		return vascFrontendData;
 	}
@@ -721,6 +789,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascFrontendData the vascFrontendData to set
 	 */
+	@Override
 	public void setVascFrontendController(VascFrontendController vascFrontendData) {
 		this.vascFrontendData = vascFrontendData;
 	}
@@ -728,6 +797,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the backendId
 	 */
+	@Override
 	public String getBackendId() {
 		return backendId;
 	}
@@ -735,6 +805,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param backendId the backendId to set
 	 */
+	@Override
 	public void setBackendId(String backendId) {
 		this.backendId = backendId;
 	}
@@ -742,6 +813,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascEntryFieldEventChannel
 	 */
+	@Override
 	public VascEntryFieldEventChannel getVascEntryFieldEventChannel() {
 		return vascEntryFieldEventChannel;
 	}
@@ -749,6 +821,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascEntryFieldEventChannel the vascEntryFieldEventChannel to set
 	 */
+	@Override
 	public void setVascEntryFieldEventChannel(VascEntryFieldEventChannel vascEntryFieldEventChannel) {
 		this.vascEntryFieldEventChannel = vascEntryFieldEventChannel;
 	}
@@ -757,6 +830,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	 * Added an VascEntryBackendEventListener
 	 * @param listener The class of the event listener.
 	 */
+	@Override
 	public void addVascEntryBackendEventListener(String listener) {
 		eventEntryBackendEventListeners.add(listener);
 	}
@@ -765,6 +839,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	 * Returns the list of VascEntryBackendEventListener
 	 * @return
 	 */
+	@Override
 	public List<String> getVascEntryBackendEventListeners() {
 		return eventEntryBackendEventListeners;
 	}
@@ -773,6 +848,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	 * Added an VascEntryFrontendEventListener
 	 * @param listener The class of the event listener.
 	 */
+	@Override
 	public void addVascEntryFrontendEventListener(String listener,String frontendType) {
 		if (frontendType==null) {
 			frontendType = "__ALL__";
@@ -792,6 +868,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	 * Returns the list of VascEntryFrontendEventListener
 	 * @return
 	 */
+	@Override
 	public List<String> getVascEntryFrontendEventListenersByType(String frontendType) {
 		if (frontendType==null) {
 			frontendType = "__ALL__";
@@ -813,6 +890,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 		return typeList;
 	}
 	
+	@Override
 	public void addVascEntryFrontendAction(String actionClass,String frontendType) {
 		if (frontendType==null) {
 			frontendType = "__ALL__";
@@ -828,7 +906,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 		typeList.add(actionClass);
 	}
 	
-
+	@Override
 	public List<String> getVascEntryFrontendActionsByType(String frontendType) {
 		if (frontendType==null) {
 			frontendType = "__ALL__";
@@ -850,18 +928,17 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 		return typeList;
 	}
 	
-	
+	@Override
-
-	
 	public List<VascEntryListOption> getVascEntryListOptions() {
 		return new ArrayList<VascEntryListOption>(vascEntryListOptions);
 	}
 	
+	@Override
 	public Collection<VascEntryListOptionLocal> getVascEntryListOptionsLocal() {
 		return vascEntryListOptions;
 	}
 	
-	
+	@Override
 	public VascEntryListOption getVascEntryListOptionById(String listOptionId) {
 		for (VascEntryListOption vef:vascEntryListOptions) {
 			if (vef.getId().equals(listOptionId)) {
@@ -871,6 +948,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 		return null;
 	}
 	
+	@Override
 	public void addVascEntryListOption(VascEntryListOptionLocal listOption) {
 		if (listOption==null) {
 			throw new NullPointerException("can not add null listOption.");
@@ -878,15 +956,17 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 		vascEntryListOptions.add(listOption);
 	}
 	
+	@Override
 	public void removeVascEntryListOption(VascEntryListOptionLocal listOption) {
 		vascEntryListOptions.remove(listOption);
 	}
 	
-	
+	@Override
 	public void addVascBackendFilter(VascProxyFilter filter) {
 		backendFilters.add(filter);
 	}
 	
+	@Override
 	public List<VascProxyFilter> getVascBackendFilters() {
 		return backendFilters;
 	}
@@ -894,6 +974,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascDisplayOnly
 	 */
+	@Override
 	public Boolean getVascDisplayOnly() {
 		return vascDisplayOnly;
 	}
@@ -901,6 +982,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascDisplayOnly the vascDisplayOnly to set
 	 */
+	@Override
 	public void setVascDisplayOnly(Boolean vascDisplayOnly) {
 		this.vascDisplayOnly = vascDisplayOnly;
 	}
@@ -908,6 +990,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the vascGroupId
 	 */
+	@Override
 	public String getVascGroupId() {
 		return vascGroupId;
 	}
@@ -915,6 +998,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param vascGroupId the vascGroupId to set
 	 */
+	@Override
 	public void setVascGroupId(String vascGroupId) {
 		this.vascGroupId = vascGroupId;
 	}
@@ -922,6 +1006,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @return the accessType
 	 */
+	@Override
 	public VascEntryAccessType getAccessType() {
 		return accessType;
 	}
@@ -929,6 +1014,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL
 	/**
 	 * @param accessType the accessType to set
 	 */
+	@Override
 	public void setAccessType(VascEntryAccessType accessType) {
 		this.accessType = accessType;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java

@@ -58,6 +58,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @return the entryDataList
 	 */
+	@Override
 	public List<Serializable> getEntryDataList() {
 		return entryDataList;
 	}
@@ -65,6 +66,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @param entryDataList the entryDataList to set
 	 */
+	@Override
 	public void setEntryDataList(List<Serializable> entryDataList) {
 		this.entryDataList = entryDataList;
 	}
@@ -72,6 +74,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @return the entryDataObject
 	 */
+	@Override
 	public Serializable getEntryDataObject() {
 		return entryDataObject;
 	}
@@ -79,6 +82,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @param entryDataObject the entryDataObject to set
 	 */
+	@Override
 	public void setEntryDataObject(Serializable entryDataObject) {
 		this.entryDataObject = entryDataObject;
 	}
@@ -86,6 +90,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @return the vascBackendState
 	 */
+	@Override
 	public VascBackendState getVascBackendState() {
 		return vascBackendState;
 	}
@@ -93,6 +98,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @param vascBackendState the vascBackendState to set
 	 */
+	@Override
 	public void setVascBackendState(VascBackendState vascBackendState) {
 		this.vascBackendState = vascBackendState;
 	}
@@ -100,6 +106,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @return the totalBackendRecords
 	 */
+	@Override
 	public Long getTotalBackendRecords() {
 		return totalBackendRecords;
 	}
@@ -107,21 +114,27 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @param totalBackendRecords the totalBackendRecords to set
 	 */
+	@Override
 	public void setTotalBackendRecords(Long totalBackendRecords) {
 		this.totalBackendRecords = totalBackendRecords;
 	}
 	
+	@Override
 	public void setParent(VascEntryState state) {
 		this.state=state;
 	}
 	
+	@Override
 	public VascEntryState getParent() {
 		return state;
 	}
 	
+	@Override
 	public void setMultiActionSelection(Map<Integer,Boolean> multiActionSelection) {
 		this.multiActionSelection=multiActionSelection;
 	}
+	
+	@Override
 	public Map<Integer,Boolean> getMultiActionSelection() {
 		return multiActionSelection;
 	}
@@ -129,6 +142,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @return the vascBackend
 	 */
+	@Override
 	public VascBackend<Serializable> getVascBackend() {
 		return vascBackend;
 	}
@@ -136,6 +150,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @param vascBackend the vascBackend to set
 	 */
+	@Override
 	public void setVascBackend(VascBackend<Serializable> vascBackend) {
 		this.vascBackend = vascBackend;
 	}
@@ -144,6 +159,7 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @return the isEditCreate
 	 */
+	@Override
 	public boolean isEditCreate() {
 		return isEditCreate;
 	}
@@ -151,13 +167,17 @@ abstract public class AbstractVascEntryState implements VascEntryState {
 	/**
 	 * @param isEditCreate the isEditCreate to set
 	 */
+	@Override
 	public void setEditCreate(boolean isEditCreate) {
 		this.isEditCreate = isEditCreate;
 	}
 	
+	@Override
 	public void setVascEntry(VascEntry vascEntry) {
 		this.vascEntry=vascEntry;
 	}
+	
+	@Override
 	public VascEntry getVascEntry() {
 		return vascEntry;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java

@@ -43,6 +43,7 @@ public interface VascEntryFieldTypeLocal extends VascEntryFieldType,VascBaseIdLo
 	
 	public void setAutoDetectClass(Class<?> classObject);
 	
+	@Override
 	public List<VascValidator> getVascValidators();
 	public void addVascValidator(VascValidator vascValidator);
 	public void removeVascValidator(VascValidator vascValidator);

vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryListOptionLocal.java

@@ -37,5 +37,6 @@ public interface VascEntryListOptionLocal extends VascEntryListOption,VascEntryF
 	 * @return
 	 * @throws CloneNotSupportedException
 	 */
+	@Override
 	public VascEntryListOptionLocal clone() throws CloneNotSupportedException;
 }

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdLocal.java

@@ -36,6 +36,7 @@ abstract public class AbstractVascBaseIdLocal extends AbstractVascBaseClone impl
 	/**
 	 * @see net.forwardfire.vasc.core.base.VascBaseClone#cloneFields(java.lang.Object)
 	 */
+	@Override
 	public void cloneFields(Object cloneObject)	throws CloneNotSupportedException {
 		super.cloneFields(cloneObject);
 		VascBaseIdLocal clone = (VascBaseIdLocal)cloneObject;
@@ -45,6 +46,7 @@ abstract public class AbstractVascBaseIdLocal extends AbstractVascBaseClone impl
 	/**
 	 * @return the id
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -52,6 +54,7 @@ abstract public class AbstractVascBaseIdLocal extends AbstractVascBaseClone impl
 	/**
 	 * @param id the id to set
 	 */
+	@Override
 	public void setId(String id) {
 		this.id = id;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudLocal.java

@@ -58,6 +58,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the create
 	 */
+	@Override
 	public Boolean getCreate() {
 		return create;
 	}
@@ -65,6 +66,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param create the create to set
 	 */
+	@Override
 	public void setCreate(Boolean create) {
 		this.create = create;
 	}
@@ -72,6 +74,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the edit
 	 */
+	@Override
 	public Boolean getEdit() {
 		return edit;
 	}
@@ -79,6 +82,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param edit the edit to set
 	 */
+	@Override
 	public void setEdit(Boolean edit) {
 		this.edit = edit;
 	}
@@ -86,6 +90,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the editReadOnly
 	 */
+	@Override
 	public Boolean getEditReadOnly() {
 		return editReadOnly;
 	}
@@ -93,6 +98,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param editReadOnly the editReadOnly to set
 	 */
+	@Override
 	public void setEditReadOnly(Boolean editReadOnly) {
 		this.editReadOnly = editReadOnly;
 	}
@@ -100,6 +106,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the list
 	 */
+	@Override
 	public Boolean getList() {
 		return list;
 	}
@@ -107,6 +114,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param list the list to set
 	 */
+	@Override
 	public void setList(Boolean list) {
 		this.list = list;
 	}
@@ -114,6 +122,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the rolesCreate
 	 */
+	@Override
 	public String getRolesCreate() {
 		return rolesCreate;
 	}
@@ -121,6 +130,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param rolesCreate the rolesCreate to set
 	 */
+	@Override
 	public void setRolesCreate(String rolesCreate) {
 		this.rolesCreate = rolesCreate;
 	}
@@ -128,6 +138,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the rolesEdit
 	 */
+	@Override
 	public String getRolesEdit() {
 		return rolesEdit;
 	}
@@ -135,6 +146,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param rolesEdit the rolesEdit to set
 	 */
+	@Override
 	public void setRolesEdit(String rolesEdit) {
 		this.rolesEdit = rolesEdit;
 	}
@@ -142,6 +154,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the rolesEditReadOnly
 	 */
+	@Override
 	public String getRolesEditReadOnly() {
 		return rolesEditReadOnly;
 	}
@@ -149,6 +162,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param rolesEditReadOnly the rolesEditReadOnly to set
 	 */
+	@Override
 	public void setRolesEditReadOnly(String rolesEditReadOnly) {
 		this.rolesEditReadOnly = rolesEditReadOnly;
 	}
@@ -156,6 +170,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @return the rolesList
 	 */
+	@Override
 	public String getRolesList() {
 		return rolesList;
 	}
@@ -163,6 +178,7 @@ abstract public class AbstractVascBaseIdRoleCrudLocal extends AbstractVascBaseId
 	/**
 	 * @param rolesList the rolesList to set
 	 */
+	@Override
 	public void setRolesList(String rolesList) {
 		this.rolesList = rolesList;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderLocal.java

@@ -49,6 +49,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @return the order
 	 */
+	@Override
 	public Integer getOrder() {
 		return order;
 	}
@@ -56,6 +57,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @param order the order to set
 	 */
+	@Override
 	public void setOrder(Integer order) {
 		this.order=order;
 	}
@@ -63,6 +65,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @return the orderCreate
 	 */
+	@Override
 	public Integer getOrderCreate() {
 		return orderCreate;
 	}
@@ -70,6 +73,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @param orderCreate the orderCreate to set
 	 */
+	@Override
 	public void setOrderCreate(Integer orderCreate) {
 		this.orderCreate = orderCreate;
 	}
@@ -77,6 +81,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @return the orderEdit
 	 */
+	@Override
 	public Integer getOrderEdit() {
 		return orderEdit;
 	}
@@ -84,6 +89,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @param orderEdit the orderEdit to set
 	 */
+	@Override
 	public void setOrderEdit(Integer orderEdit) {
 		this.orderEdit = orderEdit;
 	}
@@ -91,6 +97,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @return the orderList
 	 */
+	@Override
 	public Integer getOrderList() {
 		return orderList;
 	}
@@ -98,6 +105,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB
 	/**
 	 * @param orderList the orderList to set
 	 */
+	@Override
 	public void setOrderList(Integer orderList) {
 		this.orderList = orderList;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderMetaLocal.java

@@ -49,6 +49,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @return the name
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -56,6 +57,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @param name the name to set
 	 */
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -63,6 +65,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @return the description
 	 */
+	@Override
 	public String getDescription() {
 		return description;
 	}
@@ -70,6 +73,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @param description the description to set
 	 */
+	@Override
 	public void setDescription(String description) {
 		this.description = description;
 	}
@@ -77,6 +81,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @return the helpId
 	 */
+	@Override
 	public String getHelpId() {
 		return helpId;
 	}
@@ -84,6 +89,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @param helpId the helpId to set
 	 */
+	@Override
 	public void setHelpId(String helpId) {
 		this.helpId = helpId;
 	}
@@ -91,6 +97,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @return the image
 	 */
+	@Override
 	public String getImage() {
 		return image;
 	}
@@ -98,6 +105,7 @@ abstract public class AbstractVascBaseIdRoleCrudOrderMetaLocal extends AbstractV
 	/**
 	 * @param image the image to set
 	 */
+	@Override
 	public void setImage(String image) {
 		this.image = image;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewLocal.java

@@ -45,6 +45,7 @@ abstract public class AbstractVascBaseIdRoleViewLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.base.VascBaseIdRoleView#getView()
 	 */
+	@Override
 	public Boolean getView() {
 		return view;
 	}
@@ -52,6 +53,7 @@ abstract public class AbstractVascBaseIdRoleViewLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.base.VascBaseIdRoleViewLocal#setView(java.lang.Boolean)
 	 */
+	@Override
 	public void setView(Boolean view) {
 		this.view=view;
 	}
@@ -59,6 +61,7 @@ abstract public class AbstractVascBaseIdRoleViewLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.base.VascBaseIdRoleView#getRolesView()
 	 */
+	@Override
 	public String getRolesView() {
 		return rolesView;
 	}
@@ -66,6 +69,7 @@ abstract public class AbstractVascBaseIdRoleViewLocal extends AbstractVascBaseId
 	/**
 	 * @see net.forwardfire.vasc.core.base.VascBaseIdRoleViewLocal#setRolesView(java.lang.String)
 	 */
+	@Override
 	public void setRolesView(String rolesView) {
 		this.rolesView=rolesView;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderLocal.java

@@ -43,6 +43,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderLocal extends AbstractVascB
 	/**
 	 * @return the order
 	 */
+	@Override
 	public Integer getOrder() {
 		return order;
 	}
@@ -50,6 +51,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderLocal extends AbstractVascB
 	/**
 	 * @param order the order to set
 	 */
+	@Override
 	public void setOrder(Integer order) {
 		this.order=order;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderMetaLocal.java

@@ -49,6 +49,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @return the name
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -56,6 +57,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @param name the name to set
 	 */
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -63,6 +65,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @return the description
 	 */
+	@Override
 	public String getDescription() {
 		return description;
 	}
@@ -70,6 +73,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @param description the description to set
 	 */
+	@Override
 	public void setDescription(String description) {
 		this.description = description;
 	}
@@ -77,6 +81,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @return the helpId
 	 */
+	@Override
 	public String getHelpId() {
 		return helpId;
 	}
@@ -84,6 +89,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @param helpId the helpId to set
 	 */
+	@Override
 	public void setHelpId(String helpId) {
 		this.helpId = helpId;
 	}
@@ -91,6 +97,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @return the image
 	 */
+	@Override
 	public String getImage() {
 		return image;
 	}
@@ -98,6 +105,7 @@ abstract public class AbstractVascBaseIdRoleViewOrderMetaLocal extends AbstractV
 	/**
 	 * @param image the image to set
 	 */
+	@Override
 	public void setImage(String image) {
 		this.image = image;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java

@@ -47,6 +47,7 @@ public class VascColumnValueModelListener implements VascValueModelListener {
 		setBean(bean);
 	}
 	
+	@Override
 	public void valueUpdate(VascValueModel model) throws VascException {
 		try {
 			vascEntryField.getVascEntryFieldValue().setValue(vascEntryField.getBackendName(), bean, model.getValue());

vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java

@@ -42,6 +42,7 @@ public class VascOptionValueModelListener implements VascValueModelListener {
 		setVascEntryListOption(vascEntryListOption);
 	}
 	
+	@Override
 	public void valueUpdate(VascValueModel model) throws VascException {
 		String key = vascEntryListOption.getBackendName();
 		Object value = model.getValue();

vasc-core/src/main/java/net/forwardfire/vasc/frontend/AbstractVascFrontend.java

@@ -55,6 +55,7 @@ abstract public class AbstractVascFrontend implements VascFrontend {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontend#initEntry(net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void initEntry(VascEntry entry) {
 		if (entry.getVascFrontendController().getVascFrontend()==null) {
 			Logger.getLogger(AbstractVascFrontend.class.getName()).fine("Bind frontend: "+this+" to: "+entry.getVascFrontendController()+" entry: "+entry.getId());
@@ -71,6 +72,7 @@ abstract public class AbstractVascFrontend implements VascFrontend {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontend#getId()
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -78,6 +80,7 @@ abstract public class AbstractVascFrontend implements VascFrontend {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontend#setId(java.lang.String)
 	 */
+	@Override
 	public void setId(String id) {
 		this.id=id;	
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java

@@ -89,6 +89,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getVascInterfaceLoader()
 	 */
+	@Override
 	public VascInterfaceLoader getVascInterfaceLoader() {
 		return vascInterfaceLoader;
 	}
@@ -96,6 +97,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#createVascInterfaceImplemention(net.forwardfire.vasc.core.VascInterfaceKey)
 	 */
+	@Override
 	public Object createVascInterfaceImplemention(VascInterfaceKey key) {
 		Class<?> classImpl = vascInterfaceImpls.get(key);
 		if (classImpl==null) {
@@ -112,6 +114,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigControllerLocal#putVascInterfaceImplemention(net.forwardfire.vasc.core.VascInterfaceKey, java.lang.Class)
 	 */
+	@Override
 	public void putVascInterfaceImplemention(VascInterfaceKey key,Class<?> interfaceImpl) {
 		if (key==null) {
 			throw new NullPointerException("Can't add null interface key.");
@@ -125,6 +128,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#createVascInterfaceImplementionFrontend(net.forwardfire.vasc.core.VascInterfaceKeyFrontend, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public Object createVascInterfaceImplementionFrontend(VascInterfaceKeyFrontend key, VascEntry entry) {
 		Class<?> classImpl = vascInterfaceImplFrontends.get(key);
 		if (classImpl==null) {
@@ -144,6 +148,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigControllerLocal#putVascInterfaceImplementionFrontend(net.forwardfire.vasc.core.VascInterfaceKeyFrontend, java.lang.Class)
 	 */
+	@Override
 	public void putVascInterfaceImplementionFrontend(VascInterfaceKeyFrontend key, Class<?> interfaceImpl) {
 		if (key==null) {
 			throw new NullPointerException("Can't add null interface key.");
@@ -154,13 +159,14 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 		vascInterfaceImplFrontends.put(key,interfaceImpl);
 	}
 	
-
+	@Override
 	public VascEntry configVascEntry(VascController vascController,String entryId) throws VascException {
 		VascEntryLocal vascEntry = (VascEntryLocal)vascController.getVascEntryController().getVascEntryById(entryId);
 		configVascEntry(vascController,vascEntry);
 		return vascEntry;
 	}
 	
+	@Override
 	public void configVascEntry(VascController vascController,VascEntryLocal vascEntry) throws VascException {
 		for (VascEntryConfigFinalizer finalizer:configFinalizers) {
 			finalizer.configVascEntry(vascController,vascEntry);
@@ -170,6 +176,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#configVascBackendProxied(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public VascBackend<Serializable> configVascBackendProxied(VascController vascController,VascEntry vascEntry) throws VascException {
 		VascBackend<Serializable> realBackend = vascController.getVascBackendController().getVascBackendById(vascEntry.getBackendId());
 		if (realBackend==null) {
@@ -181,6 +188,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#configVascBackendProxied(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry, net.forwardfire.vasc.backend.VascBackend)
 	 */
+	@Override
 	public VascBackend<Serializable> configVascBackendProxied(VascController vascController,VascEntry vascEntry, VascBackend<Serializable> realBackend) throws VascException {
 		VascBackend<Serializable> backend = realBackend;
 		for (VascBackendProxy proxy:backendProxies) {
@@ -203,6 +211,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	 * @throws VascException 
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#configVascFrontendController(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry, java.util.Locale)
 	 */
+	@Override
 	public void configVascFrontendController(VascController vascController,VascEntryLocal entry) throws VascException {
 
 		// get the interface loader and create some impl objects
@@ -292,6 +301,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#addVascEntryConfigFinalizer(net.forwardfire.vasc.core.VascEntryConfigFinalizer)
 	 */
+	@Override
 	public void addVascEntryConfigFinalizer(VascEntryConfigFinalizer vascEntryConfigFinalizer) {
 		configFinalizers.add(vascEntryConfigFinalizer);
 	}
@@ -299,6 +309,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#removeVascEntryConfigFinalizer(net.forwardfire.vasc.core.VascEntryConfigFinalizer)
 	 */
+	@Override
 	public void removeVascEntryConfigFinalizer(VascEntryConfigFinalizer vascEntryConfigFinalizer) {
 		configFinalizers.remove(vascEntryConfigFinalizer);
 	}
@@ -306,6 +317,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getVascEntryConfigFinalizers()
 	 */
+	@Override
 	public List<VascEntryConfigFinalizer> getVascEntryConfigFinalizers() {
 		return configFinalizers;
 	}
@@ -313,6 +325,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#addVascBackendProxy(net.forwardfire.vasc.backend.proxy.VascBackendProxy)
 	 */
+	@Override
 	public void addVascBackendProxy(VascBackendProxy proxy) {
 		backendProxies.add(proxy);
 	}
@@ -320,6 +333,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#removeVascBackendProxy(net.forwardfire.vasc.backend.proxy.VascBackendProxy)
 	 */
+	@Override
 	public void removeVascBackendProxy(VascBackendProxy proxy) {
 		backendProxies.remove(proxy);
 	}
@@ -327,6 +341,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getVascBackendProxies()
 	 */
+	@Override
 	public List<VascBackendProxy> getVascBackendProxies() {
 		return backendProxies;
 	}
@@ -334,6 +349,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getVascEntryExporterById(java.lang.String)
 	 */
+	@Override
 	public VascEntryExport getVascEntryExporterById(String exporterId) {
 		return dataExporters.get(exporterId);
 	}
@@ -341,6 +357,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#addVascEntryExporter(net.forwardfire.vasc.core.entry.VascEntryExport)
 	 */
+	@Override
 	public void addVascEntryExporter(VascEntryExport exporter) {
 		dataExporters.put(exporter.getId(),exporter);
 	}
@@ -348,6 +365,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#removeVascEntryExporter(net.forwardfire.vasc.core.entry.VascEntryExport)
 	 */
+	@Override
 	public void removeVascEntryExporter(VascEntryExport exporter) {
 		dataExporters.remove(exporter.getId());
 	}
@@ -355,6 +373,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getVascEntryExporterIds()
 	 */
+	@Override
 	public List<String> getVascEntryExporterIds() {
 		return new ArrayList<String>(dataExporters.keySet());
 	}
@@ -362,6 +381,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getResourceBundle()
 	 */
+	@Override
 	public String getResourceBundle() {
 		return resourceBundle;
 	}
@@ -369,6 +389,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#setResourceBundle(java.lang.String)
 	 */
+	@Override
 	public void setResourceBundle(String resourceBundle) {
 		this.resourceBundle=resourceBundle;
 	}
@@ -376,6 +397,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#addVascEntryFieldValidatorService(net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService)
 	 */
+	@Override
 	public void addVascEntryFieldValidatorService(VascEntryFieldValidatorService validator) {
 		fieldValidators.add(validator);
 	}
@@ -383,6 +405,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#removeVascEntryFieldValidatorService(net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService)
 	 */
+	@Override
 	public void removeVascEntryFieldValidatorService(VascEntryFieldValidatorService validator) {
 		fieldValidators.remove(validator);
 	}
@@ -390,6 +413,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigController#getVascEntryFieldValidatorServices()
 	 */
+	@Override
 	public List<VascEntryFieldValidatorService> getVascEntryFieldValidatorServices() {
 		return fieldValidators;
 	}
@@ -397,6 +421,7 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigControllerLocal#getMasterVascBackendState()
 	 */
+	@Override
 	public VascBackendState getMasterVascBackendState() {
 		return masterVascBackendState;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascInterfaceLoader.java

@@ -65,6 +65,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascEntryImpl()
 	 */
+	@Override
 	public VascEntry createVascEntryImpl() {
 		return (VascEntry)createImpl(VascInterfaceKey.VASC_ENTRY);
 	}
@@ -72,6 +73,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascEntryFieldImpl()
 	 */
+	@Override
 	public VascEntryField createVascEntryFieldImpl() {
 		return (VascEntryField)createImpl(VascInterfaceKey.VASC_ENTRY_FIELD);
 	}
@@ -79,6 +81,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascEntryStateImpl()
 	 */
+	@Override
 	public VascEntryState createVascEntryStateImpl() {
 		return (VascEntryState)createImpl(VascInterfaceKey.VASC_ENTRY_STATE);
 	}
@@ -86,6 +89,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascEntryFieldSetImpl()
 	 */
+	@Override
 	public VascEntryFieldSet createVascEntryFieldSetImpl() {
 		return (VascEntryFieldSet)createImpl(VascInterfaceKey.VASC_ENTRY_FIELD_SET);
 	}
@@ -93,6 +97,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascEntryLinkImpl()
 	 */
+	@Override
 	public VascEntryLink createVascEntryLinkImpl() {
 		return (VascEntryLink)createImpl(VascInterfaceKey.VASC_ENTRY_LINK);
 	}
@@ -100,6 +105,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascEntryListOptionImpl()
 	 */
+	@Override
 	public VascEntryListOption createVascEntryListOptionImpl() {
 		return (VascEntryListOption)createImpl(VascInterfaceKey.VASC_ENTRY_LIST_OPTION);
 	}
@@ -107,6 +113,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascBackendStateImpl()
 	 */
+	@Override
 	public VascBackendState createVascBackendStateImpl() {
 		return (VascBackendState)createImpl(VascInterfaceKey.VASC_BACKEND_STATE);
 	}
@@ -114,6 +121,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascFrontendControllerLocalImpl()
 	 */
+	@Override
 	public VascFrontendControllerLocal createVascFrontendControllerLocalImpl() {
 		return (VascFrontendControllerLocal)createImpl(VascInterfaceKey.VASC_FRONTEND_CONTROLLER_LOCAL);
 	}
@@ -121,6 +129,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascFrontendPagerImpl()
 	 */
+	@Override
 	public VascFrontendPageInfo createVascFrontendPagerImpl(VascEntry entry) {
 		return (VascFrontendPageInfo)createImpl(VascInterfaceKeyFrontend.VASC_FRONTEND_PAGER,entry);
 	}
@@ -128,6 +137,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascFrontendActionsImpl()
 	 */
+	@Override
 	public VascFrontendActions createVascFrontendActionsImpl(VascEntry entry) {
 		return (VascFrontendActions)createImpl(VascInterfaceKeyFrontend.VASC_FRONTEND_ACTIONS,entry);
 	}
@@ -135,6 +145,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascFrontendDataSelectorImpl()
 	 */
+	@Override
 	public VascFrontendDataSelector createVascFrontendDataSelectorImpl(VascEntry entry) {
 		return (VascFrontendDataSelector)createImpl(VascInterfaceKeyFrontend.VASC_FRONTEND_DATA_SELECTOR,entry);
 	}
@@ -142,6 +153,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascFrontendUserControllerImpl()
 	 */
+	@Override
 	public VascFrontendUserController createVascFrontendUserControllerImpl(VascEntry entry) {
 		return (VascFrontendUserController)createImpl(VascInterfaceKeyFrontend.VASC_FRONTEND_USER_CONTROLLER,entry);
 	}
@@ -149,6 +161,7 @@ public class DefaultVascInterfaceLoader implements VascInterfaceLoader {
 	/**
 	 * @see net.forwardfire.vasc.core.VascInterfaceLoader#createVascFrontendUserSettingControllerImpl()
 	 */
+	@Override
 	public VascFrontendUserSettingController createVascFrontendUserSettingControllerImpl(VascEntry entry) {
 		return (VascFrontendUserSettingController)createImpl(VascInterfaceKeyFrontend.VASC_FRONTEND_USER_SETTING_CONTROLLER,entry);
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java

@@ -39,11 +39,12 @@ public class AddRowAction extends AbstractVascRowActionLocal {
 	private static final long serialVersionUID = 3400966729022979875L;
 	static public final String ACTION_ID = "addRowAction";
 	
+	@Override
 	protected String getActionId() {
 		return ACTION_ID;
 	}
 	
-	
+	@Override
 	public void doRowAction(VascEntry entry,Serializable rowObject) throws VascException {
 		entry.getVascFrontendController().getVascEntryState().setEditCreate(true);
 		Serializable object = entry.getVascFrontendController().getVascFrontendActions().createObject();
@@ -54,6 +55,7 @@ public class AddRowAction extends AbstractVascRowActionLocal {
 	/**
 	 * @see net.forwardfire.vasc.core.actions.RowVascAction#isMultiRowAction()
 	 */
+	@Override
 	public boolean isMultiRowAction() {
 		return false;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java

@@ -39,10 +39,12 @@ public class DeleteRowAction extends AbstractVascRowActionLocal {
 	private static final long serialVersionUID = 1162940569489964980L;
 	static public final String ACTION_ID = "deleteRowAction";
 	
+	@Override
 	protected String getActionId() {
 		return ACTION_ID;
 	}
 	
+	@Override
 	public void doRowAction(VascEntry entry,Serializable rowObject) throws VascException {
 		if (rowObject==null) {
 			return; // nothing selected
@@ -54,6 +56,7 @@ public class DeleteRowAction extends AbstractVascRowActionLocal {
 	/**
 	 * @see net.forwardfire.vasc.core.actions.RowVascAction#isMultiRowAction()
 	 */
+	@Override
 	public boolean isMultiRowAction() {
 		return true;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java

@@ -40,11 +40,12 @@ public class EditRowAction extends AbstractVascRowActionLocal {
 	private static final long serialVersionUID = 8159548546452740185L;
 	static public final String ACTION_ID = "editRowAction";
 	
+	@Override
 	protected String getActionId() {
 		return ACTION_ID;
 	}
 	
-	
+	@Override
 	public void doRowAction(VascEntry entry,Serializable rowObject) throws VascException {
 		if (rowObject==null) {
 			return; // nothing selected
@@ -59,6 +60,7 @@ public class EditRowAction extends AbstractVascRowActionLocal {
 	/**
 	 * @see net.forwardfire.vasc.core.actions.RowVascAction#isMultiRowAction()
 	 */
+	@Override
 	public boolean isMultiRowAction() {
 		return false;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/ExportDataGlobalAction.java

@@ -48,10 +48,12 @@ public class ExportDataGlobalAction extends AbstractVascGlobalActionLocal {
 		setId(exporterId+ACTION_POSTFIX);
 	}
 	
+	@Override
 	protected String getActionId() {
 		return exporterId;
 	}
 	
+	@Override
 	public void doGlobalAction(VascEntry entry) throws VascException {
 		VascEntryExport exporter = entry.getVascFrontendController().getVascController().getVascEntryConfigController().getVascEntryExporterById(exporterId);
 		entry.getVascFrontendController().getVascFrontend().renderExport(exporter);

vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java

@@ -37,10 +37,12 @@ public class RefreshDataGlobalAction extends AbstractVascGlobalActionLocal {
 	private static final long serialVersionUID = -5988959004156823956L;
 	static public final String ACTION_ID = "refreshDataAction";
 	
+	@Override
 	protected String getActionId() {
 		return ACTION_ID;
 	}
 	
+	@Override
 	public void doGlobalAction(VascEntry entry) throws VascException {
 		entry.getVascFrontendController().getVascFrontendActions().refreshData(); // this wil also fire the event
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryExport.java

@@ -49,6 +49,7 @@ public class DefaultVascEntryExport implements VascEntryExport {
 		writerParameters = new HashMap<String,String>();
 	}
 	
+	@Override
 	public VascEntryExportWriter createExportWriter() throws VascException {
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
 		if (cl == null) {
@@ -64,12 +65,17 @@ public class DefaultVascEntryExport implements VascEntryExport {
 		}
 	}
 	
+	@Override
 	public void addWriterParameter(String key,String value) {
 		writerParameters.put(key,value);
 	}
+	
+	@Override
 	public String getWriterParameter(String key) {
 		return writerParameters.get(key);
 	}
+	
+	@Override
 	public Set<String> getWriterParameterKeys() {
 		return writerParameters.keySet();
 	}
@@ -77,6 +83,7 @@ public class DefaultVascEntryExport implements VascEntryExport {
 	/**
 	 * @return the id
 	 */
+	@Override
 	public String getId() {
 		return id;
 	}
@@ -91,6 +98,7 @@ public class DefaultVascEntryExport implements VascEntryExport {
 	/**
 	 * @return the rolesExport
 	 */
+	@Override
 	public String getRolesExport() {
 		return rolesExport;
 	}
@@ -105,6 +113,7 @@ public class DefaultVascEntryExport implements VascEntryExport {
 	/**
 	 * @return the exportWriterClass
 	 */
+	@Override
 	public String getExportWriterClass() {
 		return exportWriterClass;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java

@@ -51,6 +51,7 @@ public class DefaultVascEntryResourceResolver implements VascEntryResourceResolv
 		this(ResourceBundle.getBundle(baseName, locale));
 	}
 	
+	@Override
 	public String getTextValue(String text,Object...params) {
 		if (resourceBundle==null) {
 			return text;

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java

@@ -56,6 +56,7 @@ public class HibernateValidatorService implements VascEntryFieldValidatorService
 	private Logger logger = Logger.getLogger(HibernateValidatorService.class.getName());
 	
 	@SuppressWarnings("unchecked")
+	@Override
 	public List<String> validateObjectField(VascEntryField field, Object selectedRecord,Object objectValue) throws VascException {
 		List<String> error = new ArrayList<String>(3);
 		try {
@@ -123,6 +124,7 @@ public class HibernateValidatorService implements VascEntryFieldValidatorService
 		}
 		
 		@SuppressWarnings("rawtypes")
+		@Override
 		public String interpolate(String message, Validator validator, MessageInterpolator defaultInterpolator) {
 			if ( annotationMessage!=null && annotationMessage.equals( message ) ) {
 				//short cut

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java

@@ -51,6 +51,7 @@ public class PersistanceValidatorService implements VascEntryFieldValidatorServi
 
 	private Logger logger = Logger.getLogger(PersistanceValidatorService.class.getName());
 	
+	@Override
 	public List<String> validateObjectField(VascEntryField field, Object selectedRecord,Object objectValue) throws VascException {
 		List<String> error = new ArrayList<String>(3);
     	try {

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java

@@ -57,6 +57,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryBackendEventListener#getEventType()
 	 */
+	@Override
 	public VascBackendEventType[] getEventTypes() {
 		return new VascBackendEventType[] {
 				VascBackendEventType.PRE_DELETE,
@@ -72,6 +73,7 @@ public class SetParameterBackendListener implements VascEntryBackendEventListene
 	/**
 	 * @see net.forwardfire.vasc.core.entry.VascEntryBackendEventListener#vascEvent(net.forwardfire.vasc.core.VascEntry, java.lang.Object)
 	 */
+	@Override
 	public void vascEvent(VascEntry entry, Object data) {
 		if (data instanceof VascBackendState) {
 			VascBackendState state = (VascBackendState)data;

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java

@@ -43,6 +43,7 @@ public class VascValidatorsValidatorService implements VascEntryFieldValidatorSe
 
 	private Logger logger = Logger.getLogger(VascValidatorsValidatorService.class.getName());
 	
+	@Override
 	public List<String> validateObjectField(VascEntryField field, Object selectedRecord,Object objectValue) throws VascException {
 		List<String> error = new ArrayList<String>(3);
     	try {

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascActionsFinalizer.java

@@ -43,6 +43,7 @@ public class VascActionsFinalizer implements VascEntryConfigFinalizer  {
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigFinalizer#configVascEntry(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void configVascEntry(VascController vascController, VascEntryLocal entry)	throws VascException {
 
 

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascDefaultsFinalizer.java

@@ -49,6 +49,7 @@ public class VascDefaultsFinalizer implements VascEntryConfigFinalizer  {
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigFinalizer#configVascEntry(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void configVascEntry(VascController vascController, VascEntryLocal entry)	throws VascException {
 
 		// First Check if we all have ids

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascHelpIdFinalizer.java

@@ -45,6 +45,7 @@ public class VascHelpIdFinalizer implements VascEntryConfigFinalizer  {
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigFinalizer#configVascEntry(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void configVascEntry(VascController vascController, VascEntryLocal entry)	throws VascException {
 
 		String id = entry.getId();

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascI18nFinalizer.java

@@ -42,6 +42,7 @@ public class VascI18nFinalizer implements VascEntryConfigFinalizer  {
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigFinalizer#configVascEntry(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void configVascEntry(VascController vascController, VascEntryLocal entry)	throws VascException {
 
 		// Fill up all not field i18n keys

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdAutoFinalizer.java

@@ -44,6 +44,7 @@ public class VascIdAutoFinalizer implements VascEntryConfigFinalizer  {
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigFinalizer#configVascEntry(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void configVascEntry(VascController vascController, VascEntryLocal entry)	throws VascException {
 
 		// count all auto objects as one index 

vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java

@@ -45,6 +45,7 @@ public class VascIdCheckFinalizer implements VascEntryConfigFinalizer  {
 	/**
 	 * @see net.forwardfire.vasc.core.VascEntryConfigFinalizer#configVascEntry(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void configVascEntry(VascController vascController, VascEntryLocal entry)	throws VascException {
 
 		// First Check if we all have ids

vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java

@@ -47,6 +47,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 	private Logger logger = Logger.getLogger(DefaultVascFrontendActions.class.getName());
 	private VascEntry entry = null;
 
+	@Override
 	public void init(VascEntry entry) {
 		this.entry=entry;
 	}
@@ -54,6 +55,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendHelper#initEditObject(net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public Serializable createObject() throws VascFrontendException {
 		entry.getVascFrontendController().fireVascFrontendEvent(entry,VascEntryFrontendEventListener.VascFrontendEventType.PRE_CREATE, null);
 		Serializable object;
@@ -124,6 +126,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendActions#persistObject()
 	 */
+	@Override
 	public void persistObject() throws VascFrontendException {
 		try {
 			saveObject(true);
@@ -135,6 +138,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendActions#mergeObject()
 	 */
+	@Override
 	public Serializable mergeObject() throws VascFrontendException {
 		try {
 			return saveObject(false);
@@ -180,6 +184,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 	 * @param entry
 	 * @param object
 	 */
+	@Override
 	public void deleteObject() throws VascFrontendException {
 		try {
 			Serializable object = entry.getVascFrontendController().getVascEntryState().getEntryDataObject();
@@ -198,6 +203,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendHelper#refreshData(net.forwardfire.vasc.core.VascEntry)
 	 */
+	@Override
 	public void refreshData() throws VascFrontendException {
 		
 		// Fire pre read event
@@ -240,7 +246,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 		}
 	}
 
-	
+	@Override
 	public void sortAction(VascEntryField field) throws VascFrontendException {
 		String curSort = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getSortField();
 		if (field.getBackendName().equals(curSort)) {
@@ -255,6 +261,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 		entry.getVascFrontendController().getVascFrontend().renderView();
 	}
 	
+	@Override
 	public void searchAction(String searchString) throws VascFrontendException {
 		entry.getVascFrontendController().getVascEntryState().getVascBackendState().setSearchString(searchString);
 		entry.getVascFrontendController().getVascEntryState().getVascBackendState().setPageIndex(0);
@@ -264,6 +271,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 		entry.getVascFrontendController().getVascFrontend().renderView();
 	}
 	
+	@Override
 	public void pageAction(Integer pageIndex) throws VascFrontendException {
 		if (pageIndex<1) {
 			pageIndex = 0;
@@ -282,6 +290,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 		entry.getVascFrontendController().getVascFrontend().renderView();
 	}
 	
+	@Override
 	public void moveUpAction(Serializable record) throws VascFrontendException {
 		if (entry.getVascFrontendController().getVascEntryState().getVascBackend().isRecordMoveable()) {
 			try {
@@ -299,6 +308,7 @@ public class DefaultVascFrontendActions implements VascFrontendActions  {
 		entry.getVascFrontendController().getVascFrontend().renderView();
 	}
 	
+	@Override
 	public void moveDownAction(Serializable record) throws VascFrontendException {
 		if (entry.getVascFrontendController().getVascEntryState().getVascBackend().isRecordMoveable()) {
 			

vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendController.java

@@ -94,6 +94,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontend
 	 */
+	@Override
 	public VascFrontend getVascFrontend() {
 		return vascFrontend;
 	}
@@ -101,6 +102,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontend the vascFrontend to set
 	 */
+	@Override
 	public void setVascFrontend(VascFrontend vascFrontend) {
 		this.vascFrontend = vascFrontend;
 	}
@@ -108,6 +110,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontendActions
 	 */
+	@Override
 	public VascFrontendActions getVascFrontendActions() {
 		return vascFrontendActions;
 	}
@@ -115,6 +118,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontendActions the vascFrontendActions to set
 	 */
+	@Override
 	public void setVascFrontendActions(VascFrontendActions vascFrontendActions) {
 		this.vascFrontendActions = vascFrontendActions;
 	}
@@ -122,6 +126,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontendPager
 	 */
+	@Override
 	public VascFrontendPageInfo getVascFrontendPageInfo() {
 		return vascFrontendPageInfo;
 	}
@@ -129,6 +134,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontendPager the vascFrontendPager to set
 	 */
+	@Override
 	public void setVascFrontendPageInfo(VascFrontendPageInfo vascFrontendPageInfo) {
 		this.vascFrontendPageInfo = vascFrontendPageInfo;
 	}
@@ -150,6 +156,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontendHelper
 	 */
+	@Override
 	public VascFrontendHelper getVascFrontendHelper() {
 		return vascFrontendHelper;
 	}
@@ -157,6 +164,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontendHelper the vascFrontendHelper to set
 	 */
+	@Override
 	public void setVascFrontendHelper(VascFrontendHelper vascFrontendHelper) {
 		this.vascFrontendHelper = vascFrontendHelper;
 	}
@@ -164,6 +172,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascEntryResourceResolver
 	 */
+	@Override
 	public VascEntryResourceResolver getVascEntryResourceResolver() {
 		return vascEntryResourceResolver;
 	}
@@ -171,11 +180,12 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascEntryResourceResolver the vascEntryResourceResolver to set
 	 */
+	@Override
 	public void setVascEntryResourceResolver(VascEntryResourceResolver vascEntryResourceResolver) {
 		this.vascEntryResourceResolver = vascEntryResourceResolver;
 	}
 
-	
+	@Override
 	public VascUIComponent getVascUIComponent(String rendererId) throws VascException {
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
     	if (cl == null) {
@@ -201,6 +211,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#getVascUIComponent(java.lang.String)
 	 */
+	@Override
 	public String getVascUIComponentClass(String rendererId) {
 		return uiComponents.get(rendererId);
 	}
@@ -208,6 +219,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#putVascUIComponent(java.lang.String, java.lang.String)
 	 */
+	@Override
 	public void putVascUIComponent(String rendererId, String uiComponentClass) {
 		uiComponents.put(rendererId, uiComponentClass);
 	}
@@ -215,6 +227,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascController
 	 */
+	@Override
 	public VascController getVascController() {
 		return vascController;
 	}
@@ -222,6 +235,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascController the vascController to set
 	 */
+	@Override
 	public void setVascController(VascController vascController) {
 		this.vascController = vascController;
 	}
@@ -229,11 +243,13 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#addFieldVascUIComponents(net.forwardfire.vasc.core.VascEntryField, net.forwardfire.vasc.core.ui.VascUIComponent, java.lang.Object)
 	 */
+	@Override
 	public void addFieldVascUIComponents(VascEntryField field,VascUIComponent uiComponent, Object editor) {
 		fieldComps.put(field, uiComponent);
 		fieldEditors.put(field, editor);
 	}
 	
+	@Override
 	public void clearFieldRenderObjects() {
 		fieldComps.clear();
 		fieldEditors.clear();
@@ -242,6 +258,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#getFieldRealRenderer(net.forwardfire.vasc.core.VascEntryField)
 	 */
+	@Override
 	public Object getFieldRealRenderer(VascEntryField field) {
 		return fieldEditors.get(field);
 	}
@@ -249,6 +266,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#getFieldVascUIComponent(net.forwardfire.vasc.core.VascEntryField)
 	 */
+	@Override
 	public VascUIComponent getFieldVascUIComponent(VascEntryField field) {
 		return fieldComps.get(field);
 	}
@@ -256,6 +274,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascEntryResourceImageResolver
 	 */
+	@Override
 	public VascEntryResourceImageResolver getVascEntryResourceImageResolver() {
 		return vascEntryResourceImageResolver;
 	}
@@ -263,6 +282,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascEntryResourceImageResolver the vascEntryResourceImageResolver to set
 	 */
+	@Override
 	public void setVascEntryResourceImageResolver(VascEntryResourceImageResolver vascEntryResourceImageResolver) {
 		this.vascEntryResourceImageResolver = vascEntryResourceImageResolver;
 	}
@@ -270,6 +290,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#addVascValidatorService(net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService)
 	 */
+	@Override
 	public void addVascValidatorService(VascEntryFieldValidatorService validatorService) {
 		validatorServices.add(validatorService);
 	}
@@ -277,19 +298,23 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @see net.forwardfire.vasc.frontend.VascFrontendController#getVascValidatorServices()
 	 */
+	@Override
 	public List<VascEntryFieldValidatorService> getVascValidatorServices() {
 		return validatorServices;
 	}
 	
+	@Override
 	public VascEntryState getVascEntryState() {
 		return state;
 	}
 	
+	@Override
 	public void setVascEntryState(VascEntryState state) {
 		this.state=state;
 	}
 	
 	// TODO move to config
+	@Override
 	public void initFrontendListeners(VascEntryLocal entry,String frontendType) throws InstantiationException, IllegalAccessException {
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
 		if (cl==null) {
@@ -344,6 +369,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 		}
 	}
 	
+	@Override
 	public void addVascEntryFrontendEventListener(VascEntryFrontendEventListener listener) {
 		for (VascEntryFrontendEventListener.VascFrontendEventType type:listener.getEventTypes()) {
 			List<VascEntryFrontendEventListener> list = vascEntryFrontendEventListeners.get(type);
@@ -355,6 +381,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 		}
 	}
 	
+	@Override
 	public List<VascEntryFrontendEventListener> getVascEntryFrontendEventListener(VascEntryFrontendEventListener.VascFrontendEventType type) {
 		List<VascEntryFrontendEventListener> list = vascEntryFrontendEventListeners.get(type);
 		if (list==null) {
@@ -363,6 +390,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 		return list;
 	}
 	
+	@Override
 	public void fireVascFrontendEvent(VascEntry entry,VascFrontendEventType type, Serializable data) {
 		List<VascEntryFrontendEventListener> list = getVascEntryFrontendEventListener(type);
 		for (VascEntryFrontendEventListener l:list) {
@@ -373,6 +401,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontendDataSelector
 	 */
+	@Override
 	public VascFrontendDataSelector getVascFrontendDataSelector() {
 		return vascFrontendDataSelector;
 	}
@@ -380,6 +409,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontendDataSelector the vascFrontendDataSelector to set
 	 */
+	@Override
 	public void setVascFrontendDataSelector(VascFrontendDataSelector vascFrontendDataSelector) {
 		this.vascFrontendDataSelector = vascFrontendDataSelector;
 	}
@@ -387,6 +417,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontendUserController
 	 */
+	@Override
 	public VascFrontendUserController getVascFrontendUserController() {
 		return vascFrontendUserController;
 	}
@@ -394,6 +425,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontendUserController the vascFrontendUserController to set
 	 */
+	@Override
 	public void setVascFrontendUserController(VascFrontendUserController vascFrontendUserController) {
 		this.vascFrontendUserController = vascFrontendUserController;
 	}
@@ -401,6 +433,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @return the vascFrontendUserSettingController
 	 */
+	@Override
 	public VascFrontendUserSettingController getVascFrontendUserSettingController() {
 		return vascFrontendUserSettingController;
 	}
@@ -408,6 +441,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca
 	/**
 	 * @param vascFrontendUserSettingController the vascFrontendUserSettingController to set
 	 */
+	@Override
 	public void setVascFrontendUserSettingController(VascFrontendUserSettingController vascFrontendUserSettingController) {
 		this.vascFrontendUserSettingController = vascFrontendUserSettingController;
 	}

vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendDataSelector.java

@@ -42,15 +42,17 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
 
 	private VascEntry entry = null;
 	
+	@Override
 	public void init(VascEntry entry) {
 		this.entry=entry;
 	}
 	
+	@Override
 	public boolean isActionAllowed(VascAction action) {
 		return true;
 	}
 	
-	
+	@Override
 	public boolean isFieldView(VascEntryField field) {
 		if (field.getView()==false) {
 			return false;
@@ -58,6 +60,7 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
 		return true;
 	}
 	
+	@Override
 	public boolean isFieldCreate(VascEntryField field) {
 		if (isFieldView(field)==false) {
 			return false;
@@ -71,6 +74,8 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
 		}
 		return false;
 	}
+	
+	@Override
 	public boolean isFieldEdit(VascEntryField field) {
 		if (isFieldView(field)==false) {
 			return false;
@@ -80,6 +85,8 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
 		}
 		return false;
 	}
+	
+	@Override
 	public boolean isFieldEditReadOnly(VascEntryField field) {
 		if (isFieldView(field)==false) {
 			return false;
@@ -89,6 +96,8 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
 		}
 		return false;
 	}
+	
+	@Override
 	public boolean isFieldList(VascEntryField field) { 
 		if (isFieldView(field)==false) {
 			return false;
@@ -126,7 +135,7 @@ public class DefaultVascFrontendDataSelector implements VascFrontendDataSelector
 	
 	*/
 	
-	
+	@Override
 	public List<VascEntryField> getFields(final EntryFieldSelectType type) {
 		List<VascEntryField> result = new ArrayList<VascEntryField>(50);
 		for (VascEntryField field:entry.getVascEntryFields()) {