diff --git a/pom.xml b/pom.xml index 4f83bee..a35d8cc 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 - 1.6 + 1.7 1.2 diff --git a/src/eclipse/ant/deploy-workspace.xml b/src/eclipse/ant/deploy-workspace.xml index 0365e89..5654704 100644 --- a/src/eclipse/ant/deploy-workspace.xml +++ b/src/eclipse/ant/deploy-workspace.xml @@ -8,8 +8,8 @@ - - + + @@ -19,35 +19,35 @@ Copy Launchers - - + + Copy java compiler settings to projects - - - - - - - + + + + + + + - + - - - - + + + + - - - + + + - - + + - - - + + + diff --git a/src/eclipse/settings/org.eclipse.jdt.core.prefs-template b/src/eclipse/settings/org.eclipse.jdt.core.prefs-template index 24c61bc..6dde5cb 100644 --- a/src/eclipse/settings/org.eclipse.jdt.core.prefs-template +++ b/src/eclipse/settings/org.eclipse.jdt.core.prefs-template @@ -1,92 +1,99 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -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.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -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.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -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.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -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.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -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.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.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -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.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -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.unusedParameter=warning -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.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +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 +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=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +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 +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +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=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +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=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 +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +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=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=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 +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +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=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 +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +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=ignore +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=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 diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackend.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackend.java index 7d8ebc3..4319b4b 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackend.java +++ b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackend.java @@ -37,6 +37,7 @@ abstract public class AbstractVascBackend impl /** * @see net.forwardfire.vasc.backend.VascBackend#getId() */ + @Override public String getId() { return id; } @@ -44,6 +45,7 @@ abstract public class AbstractVascBackend 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 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 impl /** * @see net.forwardfire.vasc.backend.VascBackend#isPageable() */ + @Override public boolean isPageable() { return false; } @@ -80,6 +86,7 @@ abstract public class AbstractVascBackend 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 impl /** * @see net.forwardfire.vasc.backend.VascBackend#isSearchable() */ + @Override public boolean isSearchable() { return false; } @@ -94,13 +102,15 @@ abstract public class AbstractVascBackend impl /** * @see net.forwardfire.vasc.backend.VascBackend#isSortable() */ + @Override public boolean isSortable() { return false; } - + /** * @see net.forwardfire.vasc.backend.VascBackend#isRecordMoveable() */ + @Override public boolean isRecordMoveable() { return false; } @@ -108,6 +118,7 @@ abstract public class AbstractVascBackend 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 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 impl /** * @see net.forwardfire.vasc.backend.VascBackend#executePageSummary() */ + @Override public Map executePageSummary() { return null; } @@ -129,6 +142,7 @@ abstract public class AbstractVascBackend impl /** * @see net.forwardfire.vasc.backend.VascBackend#executeTotalSummary() */ + @Override public Map executeTotalSummary() { return null; } @@ -136,6 +150,7 @@ abstract public class AbstractVascBackend impl /** * @see net.forwardfire.vasc.backend.VascBackend#hasPageSummary() */ + @Override public boolean hasPageSummary() { return false; } @@ -143,6 +158,7 @@ abstract public class AbstractVascBackend impl /** * @see net.forwardfire.vasc.backend.VascBackend#hasTotalSummary() */ + @Override public boolean hasTotalSummary() { return false; } diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendControllerLocal.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendControllerLocal.java index 75bab90..2ebba7f 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendControllerLocal.java +++ b/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 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 getVascBackendIds() { List result = new ArrayList(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 backend) { if (backend==null) { throw new NullPointerException("backend must not be null."); @@ -78,10 +81,11 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC VascBackend castedBackend = (VascBackend) backend; backends.put(backend.getId(), castedBackend); } - + /** * @see net.forwardfire.vasc.backend.VascBackendControllerLocal#removeVascBackendById(java.lang.String) */ + @Override public void removeVascBackendById(String backendId) { VascBackend backend = getVascBackendById(backendId); if (backend==null) { @@ -90,10 +94,11 @@ abstract public class AbstractVascBackendControllerLocal implements VascBackendC backend.stopBackend(); backends.remove(backendId); } - + /** * @see net.forwardfire.vasc.backend.VascBackendControllerLocal#clearAndStopBackends() */ + @Override public void clearAndStopBackends() { for (String backendId:getVascBackendIds()) { removeVascBackendById(backendId); diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendState.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendState.java index d978605..d26ee06 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/AbstractVascBackendState.java +++ b/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 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; } diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java index 68f15f3..f6a6461 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java +++ b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryFieldValue.java @@ -44,6 +44,7 @@ public class BeanVascEntryFieldValue 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 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 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."); diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryRecordCreator.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryRecordCreator.java index 3f64f91..b060f2a 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryRecordCreator.java +++ b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/BeanVascEntryRecordCreator.java @@ -47,6 +47,7 @@ public class BeanVascEntryRecordCreator implem } @SuppressWarnings("unchecked") + @Override public DATA_OBJECT newRecord() throws VascBackendException { try { return (DATA_OBJECT)resultClass.newInstance(); diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryFieldValue.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryFieldValue.java index f5ca5f7..bfee46f 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryFieldValue.java +++ b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryFieldValue.java @@ -41,6 +41,7 @@ public class HashMapVascEntryFieldValue implements VascEntryFieldValue 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 record) throws VascBackendException { Serializable fieldValue = getValue(field,record); if (fieldValue==null) { @@ -66,6 +68,7 @@ public class HashMapVascEntryFieldValue implements VascEntryFieldValue map,Serializable value) throws VascBackendException { map.put(backendName, value); } diff --git a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryRecordCreator.java b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryRecordCreator.java index 9a62862..b2fb32a 100644 --- a/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryRecordCreator.java +++ b/vasc-backend/vasc-backend-api/src/main/java/net/forwardfire/vasc/backend/data/HashMapVascEntryRecordCreator.java @@ -38,6 +38,7 @@ public class HashMapVascEntryRecordCreator implements VascEntryRecordCreator newRecord() throws VascBackendException { return new HashMap(10); } diff --git a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderImpl.java b/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderImpl.java index f122898..c5ff0ae 100644 --- a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderImpl.java +++ b/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 { diff --git a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderJdniImpl.java b/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderJdniImpl.java index c0c57a7..af185f4 100644 --- a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcConnectionProviderJdniImpl.java +++ b/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; diff --git a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackend.java b/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackend.java index 9645190..b805ee0 100644 --- a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackend.java +++ b/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackend.java @@ -81,6 +81,7 @@ public class JdbcVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state) */ + @Override public VascBackendResult> execute(VascBackendState state) throws VascBackendException { JdbcConnectionProvider prov = getJdbcConnectionProvider(); List> result = new ArrayList>(50); @@ -117,6 +118,7 @@ public class JdbcVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object) */ + @Override public HashMap merge(HashMap object) throws VascBackendException { return object; } @@ -124,18 +126,21 @@ public class JdbcVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object) */ + @Override public void persist(HashMap object) throws VascBackendException { } /** * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object) */ + @Override public void delete(HashMap 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> /** * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator(net.forwardfire.vasc.core.VascEntry) */ + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { return new HashMapVascEntryRecordCreator(); } diff --git a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackendXpql.java b/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackendXpql.java index b5a3f1a..78164df 100644 --- a/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackendXpql.java +++ b/vasc-backend/vasc-backend-jdbc/src/main/java/net/forwardfire/vasc/backend/jdbc/JdbcVascBackendXpql.java @@ -92,6 +92,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend> execute(VascBackendState state) throws VascBackendException { // Copy parameters for (String key:state.getDataParameterKeys()) { @@ -138,6 +139,7 @@ public class JdbcVascBackendXpql extends AbstractVascBackend merge(HashMap object) throws VascBackendException { return object; } @@ -145,18 +147,21 @@ public class JdbcVascBackendXpql extends AbstractVascBackend object) throws VascBackendException { } /** * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object) */ + @Override public void delete(HashMap 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 extends } @SuppressWarnings("unchecked") + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { // Copy parameters @@ -121,6 +122,7 @@ public class XpqlHibernateVascBackend 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 extends /** * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator() */ + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { return new BeanVascEntryRecordCreator(resultClass); } @@ -203,6 +206,7 @@ public class XpqlHibernateVascBackend extends /** * @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ + @Override public long fetchTotalExecuteSize(VascBackendState state) { Session s = getHibernateSession(); try { diff --git a/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java index 83efac3..caf8cbf 100644 --- a/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java +++ b/vasc-backend/vasc-backend-jpa/src/main/java/net/forwardfire/vasc/backends/jpa/XpqlPersistanceVascBackend.java @@ -76,9 +76,8 @@ public class XpqlPersistanceVascBackend extend return entityManagerProvider.getEntityManager(); } - - @SuppressWarnings("unchecked") + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { // Copy parameters @@ -125,6 +124,7 @@ public class XpqlPersistanceVascBackend 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 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 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 extend /** * @see net.forwardfire.vasc.backend.VascBackend#isSearchable() */ + @Override public boolean isSearchable() { if (query.getQueryParameterValue("text_search")==null) { return false; diff --git a/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapConnectionProviderImpl.java b/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapConnectionProviderImpl.java index 9755e96..0246c5f 100644 --- a/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapConnectionProviderImpl.java +++ b/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 { diff --git a/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapVascBackend.java b/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapVascBackend.java index de29d31..e6d1129 100644 --- a/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapVascBackend.java +++ b/vasc-backend/vasc-backend-ldap/src/main/java/net/forwardfire/vasc/backend/ldap/LdapVascBackend.java @@ -82,6 +82,7 @@ public class LdapVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#execute() */ + @Override public VascBackendResult> execute(VascBackendState state) throws VascBackendException { LdapConnectionProvider prov = getLdapConnectionProvider(); LDAPConnection connection = prov.getLdapConnection(); @@ -136,6 +137,7 @@ public class LdapVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object) */ + @Override public HashMap merge(HashMap map) throws VascBackendException { LdapConnectionProvider prov = getLdapConnectionProvider(); LDAPConnection connection = prov.getLdapConnection(); @@ -216,6 +218,7 @@ public class LdapVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object) */ + @Override public void persist(HashMap map) throws VascBackendException { LdapConnectionProvider prov = getLdapConnectionProvider(); LDAPConnection connection = prov.getLdapConnection(); @@ -250,6 +253,7 @@ public class LdapVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object) */ + @Override public void delete(HashMap map) throws VascBackendException { LdapConnectionProvider prov = getLdapConnectionProvider(); LDAPConnection connection = prov.getLdapConnection(); @@ -292,6 +296,7 @@ public class LdapVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator() */ + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { return new HashMapVascEntryRecordCreator(); } @@ -299,6 +304,7 @@ public class LdapVascBackend extends AbstractVascBackend> /** * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue() */ + @Override public VascEntryFieldValue provideVascEntryFieldValue() { return new HashMapVascEntryFieldValue(); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextCsv.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextCsv.java index ef3ae10..ba13d5d 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextCsv.java +++ b/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(); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJdbc.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJdbc.java index 4c341d7..6e05f0c 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJdbc.java +++ b/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; diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataContext.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataContext.java index 335785a..1f85d3a 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataContext.java +++ b/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(); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataSource.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataSource.java index fe9d801..5511ea5 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextJndiDataSource.java +++ b/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()); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextMongodb.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextMongodb.java index becdbf6..8dfb4ea 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextMongodb.java +++ b/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); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlDom.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlDom.java index 0a45e57..b500c03 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlDom.java +++ b/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."); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlSax.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlSax.java index 3d3734d..df56e4f 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelDataContextXmlSax.java +++ b/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(5); } + @Override public DataContext getDataContext() { if (file==null) { throw new NullPointerException("Can's provided data context with null file."); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelVascBackend.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelVascBackend.java index f0adf24..964beb2 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelVascBackend.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MetaModelVascBackend.java @@ -211,6 +211,7 @@ public class MetaModelVascBackend extends AbstractVascBackend { return q; } + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { Schema schema = dataContext.getDefaultSchema(); Table t = schema.getTableByName(table); @@ -262,32 +263,37 @@ public class MetaModelVascBackend extends AbstractVascBackend { return new DefaultVascBackendResult(result); } - + + @Override public void persist(Row object) throws VascBackendException { if (crudDataContext==null) { return; } crudDataContext.persist((UpdateableRow) object); } - + + @Override public Row merge(Row object) throws VascBackendException { if (crudDataContext==null) { return object; } return crudDataContext.merge((UpdateableRow) object); } - + + @Override public void delete(Row object) throws VascBackendException { if (crudDataContext==null) { return; } crudDataContext.delete((UpdateableRow) object); } - + + @Override public RowVascEntryFieldValue provideVascEntryFieldValue() { return new RowVascEntryFieldValue(); } - + + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { return new RowVascEntryRecordCreator(crudDataContext,crudDataContext.getDefaultSchema().getTableByName(table)); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MongoDbDataContextSchemaDetector.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MongoDbDataContextSchemaDetector.java index 223eead..13201ca 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/MongoDbDataContextSchemaDetector.java +++ b/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; diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryFieldValue.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryFieldValue.java index b28f6f3..613a363 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryFieldValue.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryFieldValue.java @@ -12,10 +12,11 @@ import net.forwardfire.vasc.backend.metamodel.crud.UpdateableRow; public class RowVascEntryFieldValue implements VascEntryFieldValue { private static final long serialVersionUID = -806674640688182132L; - + /** * @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 { /** * @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) { @@ -55,10 +57,11 @@ public class RowVascEntryFieldValue implements VascEntryFieldValue { } return fieldValue.toString(); } - + /** * @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; diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryRecordCreator.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryRecordCreator.java index 6e2753e..9a54644 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryRecordCreator.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/RowVascEntryRecordCreator.java @@ -17,7 +17,8 @@ public class RowVascEntryRecordCreator implements VascEntryRecordCreator { this.dataContext=dataContext; this.table=table; } - + + @Override public Row newRecord() throws VascBackendException { return dataContext.createRow(table); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataContext.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataContext.java index 779a1f6..c5e21da 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataContext.java +++ b/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 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); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataControl.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataControl.java index 32bceff..b889b66 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleDataControl.java +++ b/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(); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleUpdateExecutor.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleUpdateExecutor.java index ec56ce5..cdafba2 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/bundle/ResourceBundleUpdateExecutor.java +++ b/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(); @@ -98,18 +117,22 @@ 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()); } }; return result; } - + + @Override public RowInsertionBuilder insertInto(final Table table) throws IllegalArgumentException, IllegalStateException,UnsupportedOperationException { RowInsertionBuilder result = new AbstractRowInsertionBuilder(this, table) { + @Override public void execute() throws MetaModelException { Properties data = resourceBundleDataControl.getBundleData(table.getName()); Object[] values = getValues(); @@ -118,9 +141,11 @@ 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()); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractCrudDataContext.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractCrudDataContext.java index 944ecec..ed8c30b 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractCrudDataContext.java +++ b/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 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(); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractUpdateableRow.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractUpdateableRow.java index bc355e3..bb9df13 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractUpdateableRow.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/AbstractUpdateableRow.java @@ -16,7 +16,8 @@ import org.eobjects.metamodel.schema.Column; @SuppressWarnings("serial") abstract public class AbstractUpdateableRow extends AbstractRow implements UpdateableRow { - // TODO: rm / move getValue and indexOf to AbstractRow after UpdateableRow interface change + // 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 primaryKeys = getPrimaryKeysList(); return primaryKeys.toArray(new String[primaryKeys.size()]); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/CrudDataContextImpl.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/CrudDataContextImpl.java index c66d947..9295a56 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/CrudDataContextImpl.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/CrudDataContextImpl.java @@ -40,7 +40,8 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst public void overridePrimaryKeysForTable(String table,List keys) { tableKeys.put(table, keys); } - + + @Override public List getPrimaryKeysForTable(Table table) { List 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,15 +118,13 @@ public class CrudDataContextImpl extends AbstractCrudDataContext implements Abst // === Bean properties - - /** * @return the checkPrimaryKeysAllRows */ public boolean isCheckPrimaryKeysAllRows() { return checkPrimaryKeysAllRows; } - + /** * @param checkPrimaryKeysAllRows the checkPrimaryKeysAllRows to set */ @@ -131,86 +132,94 @@ 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); } - + /** * @see org.eobjects.metamodel.DataContext#getColumnByQualifiedLabel(java.lang.String) */ + @Override public Column getColumnByQualifiedLabel(String arg0) { return dataContextDelegate.getColumnByQualifiedLabel(arg0); } - + /** * @see org.eobjects.metamodel.DataContext#getDefaultSchema() */ + @Override public Schema getDefaultSchema() throws MetaModelException { return dataContextDelegate.getDefaultSchema(); } - + /** * @see org.eobjects.metamodel.DataContext#getSchemaByName(java.lang.String) */ + @Override public Schema getSchemaByName(String arg0) throws MetaModelException { return dataContextDelegate.getSchemaByName(arg0); } - + /** * @see org.eobjects.metamodel.DataContext#getSchemaNames() */ + @Override public String[] getSchemaNames() throws MetaModelException { return dataContextDelegate.getSchemaNames(); } - + /** * @see org.eobjects.metamodel.DataContext#getSchemas() */ + @Override public Schema[] getSchemas() throws MetaModelException { return dataContextDelegate.getSchemas(); } - + /** * @see org.eobjects.metamodel.DataContext#getTableByQualifiedLabel(java.lang.String) */ + @Override public Table getTableByQualifiedLabel(String arg0) { return dataContextDelegate.getTableByQualifiedLabel(arg0); } - + /** * @see org.eobjects.metamodel.DataContext#refreshSchemas() */ + @Override public DataContext refreshSchemas() { return dataContextDelegate.refreshSchemas(); } - + /** * @see org.eobjects.metamodel.DataContext#parseQuery(java.lang.String) */ + @Override public Query parseQuery(String queryString) throws MetaModelException { return dataContextDelegate.parseQuery(queryString); } - + /** * @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); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/UpdateableRowMapImpl.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/UpdateableRowMapImpl.java index 84920b4..947fb04 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/UpdateableRowMapImpl.java +++ b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/crud/UpdateableRowMapImpl.java @@ -39,29 +39,35 @@ public class UpdateableRowMapImpl extends AbstractUpdateableRow { // interface + @Override public Table getTable() { return table; } + @Override public List 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); } 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()); } diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextObjectFactory.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextObjectFactory.java index 33fb5fd..493a9c9 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextObjectFactory.java +++ b/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. diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextProvider.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextProvider.java index 4f292e2..34ab100 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiDataContextProvider.java +++ b/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(); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiReadOnlyDataContext.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiReadOnlyDataContext.java index afdcace..66a91ff 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/JndiReadOnlyDataContext.java +++ b/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); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiCsvDataContextLoader.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiCsvDataContextLoader.java index ee02028..6161b88 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiCsvDataContextLoader.java +++ b/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())); diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiJdbcDataContextLoader.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiJdbcDataContextLoader.java index 434a4eb..6ee1c62 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiJdbcDataContextLoader.java +++ b/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) { diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiMongodbDataContextLoader.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiMongodbDataContextLoader.java index 9532d47..29ad319 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiMongodbDataContextLoader.java +++ b/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; diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlDomDataContextLoader.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlDomDataContextLoader.java index 6386496..23ceeb1 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlDomDataContextLoader.java +++ b/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"))) { diff --git a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlSaxDataContextLoader.java b/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlSaxDataContextLoader.java index ad289ad..0e6eab9 100644 --- a/vasc-backend/vasc-backend-metamodel/src/main/java/net/forwardfire/vasc/backend/metamodel/jndi/loader/JndiXmlSaxDataContextLoader.java +++ b/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 tableSchemas = createXmlSaxConfig(config.getJndiObjectName(),config.getBackendParameters()); XmlSaxTableDef[] args = new XmlSaxTableDef[tableSchemas.size()]; if (useUrlSource) { final URL url = config.checkBackendUrl(); return new XmlSaxDataContext(new Ref() { // TODO: missing constructor in XmlSaxDataContext + @Override public InputSource get() { InputStream in = null; try { diff --git a/vasc-backend/vasc-backend-metamodel/src/test/java/SwingLoadTest.java b/vasc-backend/vasc-backend-metamodel/src/test/java/SwingLoadTest.java index 9bd826c..0ee788f 100644 --- a/vasc-backend/vasc-backend-metamodel/src/test/java/SwingLoadTest.java +++ b/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 tableRef = new MutableRef
(); table = cb.createTable(schema, "table").withColumn("column").execute(); diff --git a/vasc-backend/vasc-backend-metamodel/src/test/java/net/forwardfire/vasc/backend/metamodel/crud/CrudContextTest.java b/vasc-backend/vasc-backend-metamodel/src/test/java/net/forwardfire/vasc/backend/metamodel/crud/CrudContextTest.java index 4129c69..b94e609 100644 --- a/vasc-backend/vasc-backend-metamodel/src/test/java/net/forwardfire/vasc/backend/metamodel/crud/CrudContextTest.java +++ b/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
tableRef = new MutableRef
(); dataContext.executeUpdate(new UpdateScript() { + @Override public void run(UpdateCallback cb) { Table table = null; int idx = 0; diff --git a/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbConnectionProviderImpl.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbConnectionProviderImpl.java index 11849a5..6521906 100644 --- a/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbConnectionProviderImpl.java +++ b/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; diff --git a/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascBackend.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascBackend.java index 1d399d3..0cd6cb2 100644 --- a/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascBackend.java +++ b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascBackend.java @@ -106,6 +106,7 @@ public class MongodbVascBackend extends AbstractVascBackend { return query; } + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { DBCollection coll = getDBCollection(); DBObject query = createFilterQuery(state); @@ -122,11 +123,13 @@ public class MongodbVascBackend extends AbstractVascBackend { return new DefaultVascBackendResult(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 { 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 { coll.remove(query); // remove by _id } + @Override public MongodbVascEntryFieldValue provideVascEntryFieldValue() { return new MongodbVascEntryFieldValue(); } + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { return new MongodbVascEntryRecordCreator(); } diff --git a/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascEntryFieldValue.java b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascEntryFieldValue.java index eb5532a..2cdde42 100644 --- a/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascEntryFieldValue.java +++ b/vasc-backend/vasc-backend-mongodb/src/main/java/net/forwardfire/vasc/backend/mongodb/MongodbVascEntryFieldValue.java @@ -39,15 +39,18 @@ public class MongodbVascEntryFieldValue implements VascEntryFieldValue getVascSelectItems(net.forwardfire.vasc.core.VascEntry entry) throws VascException { List result = new ArrayList(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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java b/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java index cc715a8..6f78e1d 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/AbstractVascBackendProxy.java @@ -44,11 +44,13 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy { protected VascBackend 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 backend, VascEntry entry) { if (backend==null) { throw new NullPointerException("backend object may not be null."); @@ -59,38 +61,43 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy { this.backend=backend; this.entry=entry; } - + /** * @see net.forwardfire.vasc.backend.proxy.VascBackendProxy#isProxyNeeded() */ + @Override public boolean isProxyNeeded() { return true; } - + /** * @see net.forwardfire.vasc.backend.VascBackend#startBackend() */ + @Override public void startBackend() { backend.startBackend(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#stopBackend() */ + @Override public void stopBackend() { backend.stopBackend(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#isReadOnly() */ + @Override public boolean isReadOnly() { return backend.isReadOnly(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#fetchTotalExecuteSize(VascBackendState state) */ + @Override public long fetchTotalExecuteSize(VascBackendState state) { return backend.fetchTotalExecuteSize(state); } @@ -98,21 +105,24 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy { /** * @see net.forwardfire.vasc.backend.VascBackend#isSortable() */ + @Override public boolean isSortable() { return backend.isSortable(); } - + /** * @throws Exception * @see net.forwardfire.vasc.backend.VascBackend#execute(VascBackendState state) */ + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { return backend.execute(state); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#delete(java.lang.Object) */ + @Override public void delete(Serializable object) throws VascBackendException { backend.delete(object); } @@ -120,48 +130,55 @@ abstract public class AbstractVascBackendProxy implements VascBackendProxy { /** * @see net.forwardfire.vasc.backend.VascBackend#isPageable() */ + @Override public boolean isPageable() { return backend.isPageable(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#isSearchable() */ + @Override public boolean isSearchable() { return backend.isSearchable(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#merge(java.lang.Object) */ + @Override public Serializable merge(Serializable object) throws VascBackendException { return backend.merge(object); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#persist(java.lang.Object) */ + @Override public void persist(Serializable object) throws VascBackendException { backend.persist(object); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryFieldValue() */ + @Override public VascEntryFieldValue provideVascEntryFieldValue() { return backend.provideVascEntryFieldValue(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#provideVascEntryRecordCreator() */ + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { return backend.provideVascEntryRecordCreator(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#getId() */ + @Override public String getId() { return backend.getId(); } @@ -169,55 +186,63 @@ 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); } - + /** * @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); } - + /** * @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); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#isRecordMoveable() */ + @Override public boolean isRecordMoveable() { return backend.isRecordMoveable(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#executePageSummary() */ + @Override public Map executePageSummary() { return backend.executePageSummary(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#executeTotalSummary() */ + @Override public Map executeTotalSummary() { return backend.executeTotalSummary(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#hasPageSummary() */ + @Override public boolean hasPageSummary() { return backend.hasPageSummary(); } - + /** * @see net.forwardfire.vasc.backend.VascBackend#hasTotalSummary() */ + @Override public boolean hasTotalSummary() { return backend.hasTotalSummary(); } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyEventExecutor.java b/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyEventExecutor.java index 5c4b053..627bfe9 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyEventExecutor.java +++ b/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 backend,VascEntry entry) { super.initProxy(backend, entry); this.entry=entry; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyFilter.java b/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyFilter.java index 4a98f67..7ac36b2 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxyFilter.java +++ b/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 backend, VascEntry entry) { super.initProxy(backend,entry); filters = entry.getVascBackendFilters(); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySort.java b/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySort.java index 7b1d943..faa3ef1 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySort.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/backend/proxy/VascBackendProxySort.java @@ -83,6 +83,7 @@ public class VascBackendProxySort extends AbstractVascBackendProxy { final VascEntryFieldValue fieldValue = backend.provideVascEntryFieldValue(); Collections.sort(result.getPageData(), new Comparator() { @SuppressWarnings("rawtypes") + @Override public int compare(Serializable o1, Serializable o2) { try { Comparable c1 = null; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascControllerLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascControllerLocal.java index 2fe0151..1b2d288 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascControllerLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryControllerLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryControllerLocal.java index e8c21f4..6f08a90 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryControllerLocal.java +++ b/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 getVascEntryIds() { List result = new ArrayList(entries.keySet()); Collections.sort(result); // lets do abc for consistance behauvior. diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldLocal.java index bdede92..b658687 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldLocal.java +++ b/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 getVascEntryFieldValue() { return vascEntryFieldValue; } @@ -150,6 +154,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole /** * @param vascEntryFieldValue the vascEntryFieldValue to set */ + @Override public void setVascEntryFieldValue(VascEntryFieldValue vascEntryFieldValue) { this.vascEntryFieldValue = vascEntryFieldValue; } @@ -157,6 +162,7 @@ abstract public class AbstractVascEntryFieldLocal extends AbstractVascBaseIdRole /** * @return the vascValidators */ + @Override public List 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldSetLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldSetLocal.java index 5d4d5cb..c61a9aa 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldSetLocal.java +++ b/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 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); } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldTypeLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldTypeLocal.java index 1214794..8113e1c 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryFieldTypeLocal.java +++ b/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 getPropertyNames() { return new ArrayList(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 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLinkLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLinkLocal.java index 9a61b4c..cdc31ef 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLinkLocal.java +++ b/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 getEntryParameterFieldIdKeys() { return new ArrayList(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 getEntryCreateFieldValueKeys() { return new ArrayList(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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLocal.java index 3abea07..44ca875 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryLocal.java +++ b/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 getVascEntryFields() { return new ArrayList(vascFields); } @@ -413,6 +442,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the vascFields */ + @Override public Collection 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 getRowActions() { return new ArrayList(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 getRowActionsLocal() { return rowActions; } @@ -486,6 +524,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the columnActions */ + @Override public Collection getColumnActions() { return new ArrayList(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 getColumnActionsLocal() { return columnActions; } @@ -526,6 +569,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the globalActions */ + @Override public Collection getGlobalActions() { return new ArrayList(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 getGlobalActionsLocal() { return globalActions; } @@ -566,6 +614,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the exportActions */ + @Override public Collection getExportActions() { return new ArrayList(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 getExportActionsLocal() { return exportActions; } @@ -606,6 +659,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the vascEntryFieldSets */ + @Override public Collection getVascEntryFieldSets() { return new ArrayList(vascEntryFieldSets); } @@ -613,6 +667,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the vascEntryFieldSets */ + @Override public Collection 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 getVascEntryLinks() { return new ArrayList(vascEntryLinks); } @@ -653,6 +712,7 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL /** * @return the vascEntryLinks */ + @Override public Collection 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 getEntryParameterKeys() { return new ArrayList(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 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 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 getVascEntryFrontendActionsByType(String frontendType) { if (frontendType==null) { frontendType = "__ALL__"; @@ -850,18 +928,17 @@ abstract public class AbstractVascEntryLocal extends AbstractVascBaseIdRoleCrudL return typeList; } - - - + @Override public List getVascEntryListOptions() { return new ArrayList(vascEntryListOptions); } + @Override public Collection 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 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java index 8adf42e..883200f 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/AbstractVascEntryState.java +++ b/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 getEntryDataList() { return entryDataList; } @@ -65,6 +66,7 @@ abstract public class AbstractVascEntryState implements VascEntryState { /** * @param entryDataList the entryDataList to set */ + @Override public void setEntryDataList(List 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 multiActionSelection) { this.multiActionSelection=multiActionSelection; } + + @Override public Map getMultiActionSelection() { return multiActionSelection; } @@ -129,6 +142,7 @@ abstract public class AbstractVascEntryState implements VascEntryState { /** * @return the vascBackend */ + @Override public VascBackend getVascBackend() { return vascBackend; } @@ -136,6 +150,7 @@ abstract public class AbstractVascEntryState implements VascEntryState { /** * @param vascBackend the vascBackend to set */ + @Override public void setVascBackend(VascBackend 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java index 6de8310..8f3a95d 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryFieldTypeLocal.java +++ b/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 getVascValidators(); public void addVascValidator(VascValidator vascValidator); public void removeVascValidator(VascValidator vascValidator); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryListOptionLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryListOptionLocal.java index 3b7b179..99cb4d8 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/VascEntryListOptionLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdLocal.java index 1f368a8..12af1a5 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdLocal.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdLocal.java @@ -32,19 +32,21 @@ package net.forwardfire.vasc.core.base; abstract public class AbstractVascBaseIdLocal extends AbstractVascBaseClone implements VascBaseIdLocal { private String id = null; - + /** * @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; clone.setId(getId()); } - + /** * @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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudLocal.java index ebf3e8c..8d5d595 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderLocal.java index af6ca9e..060c03a 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderLocal.java +++ b/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,20 +57,23 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB /** * @param order the order to set */ + @Override public void setOrder(Integer order) { this.order=order; } - + /** * @return the orderCreate */ + @Override public Integer getOrderCreate() { return orderCreate; } - + /** * @param orderCreate the orderCreate to set */ + @Override public void setOrderCreate(Integer orderCreate) { this.orderCreate = orderCreate; } @@ -77,27 +81,31 @@ abstract public class AbstractVascBaseIdRoleCrudOrderLocal extends AbstractVascB /** * @return the orderEdit */ + @Override public Integer getOrderEdit() { return orderEdit; } - + /** * @param orderEdit the orderEdit to set */ + @Override public void setOrderEdit(Integer orderEdit) { this.orderEdit = orderEdit; } - + /** * @return the orderList */ + @Override public Integer getOrderList() { return orderList; } - + /** * @param orderList the orderList to set */ + @Override public void setOrderList(Integer orderList) { this.orderList = orderList; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderMetaLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderMetaLocal.java index 0bc9b74..bec9a24 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleCrudOrderMetaLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewLocal.java index f87964c..29e453b 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderLocal.java index 7e72a86..af2e2e8 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderMetaLocal.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderMetaLocal.java index 8085afa..7eb5ae2 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/base/AbstractVascBaseIdRoleViewOrderMetaLocal.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java index 3f6eb36..6ae0b01 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascColumnValueModelListener.java +++ b/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()); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java index 926a645..bf46e55 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/core/ui/VascOptionValueModelListener.java +++ b/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(); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/frontend/AbstractVascFrontend.java b/vasc-core/src/main/java/net/forwardfire/vasc/frontend/AbstractVascFrontend.java index eed90b3..95d7eeb 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/frontend/AbstractVascFrontend.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java index 0c9e8a3..0cac763 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascEntryConfigController.java +++ b/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."); @@ -153,23 +158,25 @@ 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); } } - + /** * @see net.forwardfire.vasc.core.VascEntryConfigController#configVascBackendProxied(net.forwardfire.vasc.core.VascController, net.forwardfire.vasc.core.VascEntry) */ + @Override public VascBackend configVascBackendProxied(VascController vascController,VascEntry vascEntry) throws VascException { VascBackend realBackend = vascController.getVascBackendController().getVascBackendById(vascEntry.getBackendId()); if (realBackend==null) { @@ -177,10 +184,11 @@ public class DefaultVascEntryConfigController implements VascEntryConfigControll } return configVascBackendProxied(vascController,vascEntry,realBackend); } - + /** * @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 configVascBackendProxied(VascController vascController,VascEntry vascEntry, VascBackend realBackend) throws VascException { VascBackend 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 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 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 getVascEntryExporterIds() { return new ArrayList(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 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascInterfaceLoader.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascInterfaceLoader.java index 183e90c..118a5d3 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/DefaultVascInterfaceLoader.java +++ b/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); } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java index 087610a..79b5fa5 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/AddRowAction.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java index 2af6969..50850c9 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/DeleteRowAction.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java index cd9ea64..48e7ac2 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/EditRowAction.java +++ b/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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/ExportDataGlobalAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/ExportDataGlobalAction.java index 23593ff..6c8bb92 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/ExportDataGlobalAction.java +++ b/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); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java index ca9bd54..f74c0cf 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/actions/RefreshDataGlobalAction.java +++ b/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 } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryExport.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryExport.java index 6fa0b94..8e23069 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryExport.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryExport.java @@ -49,6 +49,7 @@ public class DefaultVascEntryExport implements VascEntryExport { writerParameters = new HashMap(); } + @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 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java index 48ba264..0d25d78 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/DefaultVascEntryResourceResolver.java +++ b/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; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java index e20e7c1..388fc8c 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/HibernateValidatorService.java +++ b/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 validateObjectField(VascEntryField field, Object selectedRecord,Object objectValue) throws VascException { List error = new ArrayList(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 diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java index 9cf647c..4aa6e79 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/PersistanceValidatorService.java +++ b/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 validateObjectField(VascEntryField field, Object selectedRecord,Object objectValue) throws VascException { List error = new ArrayList(3); try { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java index e12b089..19e5365 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/SetParameterBackendListener.java +++ b/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; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java index bf0a2ef..03ddf66 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/VascValidatorsValidatorService.java +++ b/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 validateObjectField(VascEntryField field, Object selectedRecord,Object objectValue) throws VascException { List error = new ArrayList(3); try { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascActionsFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascActionsFinalizer.java index 0855681..df14ba5 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascActionsFinalizer.java +++ b/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 { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascDefaultsFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascDefaultsFinalizer.java index ba2707c..3312ae5 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascDefaultsFinalizer.java +++ b/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 diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascHelpIdFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascHelpIdFinalizer.java index 350259c..77b7cc1 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascHelpIdFinalizer.java +++ b/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(); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascI18nFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascI18nFinalizer.java index bc1e5a6..07369cf 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascI18nFinalizer.java +++ b/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 diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdAutoFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdAutoFinalizer.java index 5942e0b..83e79f2 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdAutoFinalizer.java +++ b/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 diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java index 250007a..00ba656 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/entry/config/VascIdCheckFinalizer.java +++ b/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 diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java index 60d1e18..3d79e3d 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendActions.java +++ b/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()) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendController.java index 6baedc1..c43d40b 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendController.java +++ b/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,54 +258,63 @@ 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); } - + /** * @see net.forwardfire.vasc.frontend.VascFrontendController#getFieldVascUIComponent(net.forwardfire.vasc.core.VascEntryField) */ + @Override public VascUIComponent getFieldVascUIComponent(VascEntryField field) { return fieldComps.get(field); } - + /** * @return the vascEntryResourceImageResolver */ + @Override public VascEntryResourceImageResolver getVascEntryResourceImageResolver() { return vascEntryResourceImageResolver; } - + /** * @param vascEntryResourceImageResolver the vascEntryResourceImageResolver to set */ + @Override public void setVascEntryResourceImageResolver(VascEntryResourceImageResolver vascEntryResourceImageResolver) { this.vascEntryResourceImageResolver = vascEntryResourceImageResolver; } - + /** * @see net.forwardfire.vasc.frontend.VascFrontendController#addVascValidatorService(net.forwardfire.vasc.core.entry.VascEntryFieldValidatorService) */ + @Override public void addVascValidatorService(VascEntryFieldValidatorService validatorService) { validatorServices.add(validatorService); } - + /** * @see net.forwardfire.vasc.frontend.VascFrontendController#getVascValidatorServices() */ + @Override public List 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 list = vascEntryFrontendEventListeners.get(type); @@ -355,6 +381,7 @@ public class DefaultVascFrontendController implements VascFrontendControllerLoca } } + @Override public List getVascEntryFrontendEventListener(VascEntryFrontendEventListener.VascFrontendEventType type) { List 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 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; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendDataSelector.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendDataSelector.java index cd3815e..77c45ee 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendDataSelector.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendDataSelector.java @@ -41,16 +41,18 @@ import net.forwardfire.vasc.frontend.VascFrontendDataSelector; 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 getFields(final EntryFieldSelectType type) { List result = new ArrayList(50); for (VascEntryField field:entry.getVascEntryFields()) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendHelper.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendHelper.java index 4bd8973..19e62d5 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendHelper.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendHelper.java @@ -51,6 +51,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { /** * @see net.forwardfire.vasc.frontend.VascFrontendHelper#getTotalColumnsWidth(net.forwardfire.vasc.core.VascEntry) */ + @Override public Integer getTotalColumnsWidth(VascEntry entry) { int result = 0; for(VascEntryField c:entry.getVascEntryFields()) { @@ -62,7 +63,8 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } return result; } - + + @Override public List getVascLinkEntryByType(VascEntry entry,VascEntryLinkType type) { List result = new ArrayList(10); for (VascEntryLink link:entry.getVascEntryLinks()) { @@ -77,7 +79,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { return result; } - + @Override public void headerOptionsCreatedFillData(VascEntry entry) throws VascException { // fix conv defs of options to object. ? @@ -88,6 +90,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { /** * @see net.forwardfire.vasc.frontend.VascFrontendHelper#validateObjectField(net.forwardfire.vasc.core.VascEntryField, java.lang.Object) */ + @Override public List validateObjectField(VascEntryField field) throws VascException { if (field==null) { throw new NullPointerException("Can't validate null field."); @@ -123,6 +126,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { /** * */ + @Override public boolean validateAndSetErrorText(VascEntry entry) throws VascException { boolean hadError = false; for (VascEntryField field:entry.getVascEntryFields()) { @@ -150,6 +154,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { return hadError; } + @Override public void editReadOnlyUIComponents(VascEntry entry) { // reset edit read only for (VascEntryField field:entry.getVascEntryFields()) { @@ -178,7 +183,8 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { } } } - + + @Override public List getMultiRowActions(VascEntry entry) { List result = new ArrayList(5); for (RowVascAction a:entry.getRowActions()) { @@ -189,6 +195,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { return result; } + @Override public String getSelectedDisplayName(VascEntry entry) { Serializable row = entry.getVascFrontendController().getVascEntryState().getEntryDataObject(); if (row==null) { @@ -205,6 +212,7 @@ public class DefaultVascFrontendHelper implements VascFrontendHelper { return result; } + @Override public String getParentSelectedDisplayName(VascEntry entry) { if (entry.getVascFrontendController().getVascEntryState().getParent()==null) { return ""; // no parent diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendPager.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendPager.java index 872c931..204ba0f 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendPager.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DefaultVascFrontendPager.java @@ -45,6 +45,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { private VascEntry entry = null; private List pagesAll = null; + @Override public void init(VascEntry entry) { this.entry=entry; pagesAll = new ArrayList(0); @@ -53,30 +54,38 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { class DefaultVascFrontendPagerEventListener implements VascEntryFrontendEventListener { private static final long serialVersionUID = -6667099892801941650L; + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; } + @Override public void vascEvent(VascEntry entry, Serializable data) { pagesAll = getTablePagesFromBackend(); } } - + @Override public long getPageTotalRecordCount() { long result = entry.getVascFrontendController().getVascEntryState().getTotalBackendRecords(); return result; } + + @Override public long getPageSize() { long result = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize(); return result; } + + @Override public long getPageStartCount() { int index = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex(); int pageSize = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize(); long result = index*pageSize; return result; } + + @Override public long getPageStopCount() { int index = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex(); int pageSize = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize(); @@ -88,7 +97,8 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { } return result; } - + + @Override public boolean getHasPageNextAction() { int pageIndex = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex(); pageIndex++; @@ -100,6 +110,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return true; } + @Override public boolean getHasPagePreviousAction() { int pageIndex = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex(); if (pageIndex==0) { @@ -108,6 +119,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return true; } + @Override public boolean getHasOnlySinglePage() { int pages = pagesAll.size(); if (pages==1) { @@ -116,6 +128,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return false; } + @Override public boolean getHasExtendedPageMode() { int pages = pagesAll.size(); if (pages>13) { @@ -124,6 +137,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return false; } + @Override public boolean getHasExtendedPageModeCenter() { if (getHasExtendedPageMode()==false) { return false; @@ -139,6 +153,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return true; } + @Override public List getTablePagesFromBackend() { List result = new ArrayList(30); VascBackendState state = entry.getVascFrontendController().getVascEntryState().getVascBackendState(); @@ -160,6 +175,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return result; } + @Override public List getTablePagesNormal() { if (getHasExtendedPageMode()) { return new ArrayList(0); @@ -168,6 +184,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { } } + @Override public List getTablePagesExtendedBegin() { List result = new ArrayList(6); if (pagesAll.size()>0) { @@ -201,6 +218,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return result; } + @Override public List getTablePagesExtendedEnd() { List result = new ArrayList(6); int pages = pagesAll.size(); @@ -225,6 +243,7 @@ public class DefaultVascFrontendPager implements VascFrontendPageInfo { return result; } + @Override public List getTablePagesExtendedCenter() { List result = new ArrayList(3); int page = entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex(); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DummyVascFrontendUserController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DummyVascFrontendUserController.java index b4cfd5e..0d6885a 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DummyVascFrontendUserController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/frontend/DummyVascFrontendUserController.java @@ -39,6 +39,7 @@ public class DummyVascFrontendUserController implements VascFrontendUserControll /** * @see net.forwardfire.vasc.frontend.VascFrontendUserController#isUser() */ + @Override public boolean isUser() { return false; } @@ -46,6 +47,7 @@ public class DummyVascFrontendUserController implements VascFrontendUserControll /** * @see net.forwardfire.vasc.frontend.VascFrontendUserController#getUserId() */ + @Override public Object getUserId() { return null; } @@ -53,6 +55,7 @@ public class DummyVascFrontendUserController implements VascFrontendUserControll /** * @see net.forwardfire.vasc.frontend.VascFrontendUserController#getUserName() */ + @Override public String getUserName() { return ""; } @@ -60,6 +63,7 @@ public class DummyVascFrontendUserController implements VascFrontendUserControll /** * @see net.forwardfire.vasc.frontend.VascFrontendUserController#getUserLocale() */ + @Override public Locale getUserLocale() { return Locale.ENGLISH; } @@ -67,6 +71,7 @@ public class DummyVascFrontendUserController implements VascFrontendUserControll /** * @see net.forwardfire.vasc.frontend.VascFrontendUserController#hasUserRole(java.lang.String) */ + @Override public boolean hasUserRole(String role) { return false; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerFactory.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerFactory.java index f9be7fd..a362515 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerFactory.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerFactory.java @@ -66,6 +66,7 @@ public class JndiVascControllerFactory implements ObjectFactory { /** * @see javax.naming.spi.ObjectFactory#getObjectInstance(java.lang.Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable) */ + @Override public Object getObjectInstance(Object obj, Name name2, Context nameCtx,Hashtable env) throws Exception { if (vascController!=null) { @@ -124,9 +125,11 @@ public class JndiVascControllerFactory implements ObjectFactory { if (vc.getVascBackendController() instanceof VascBackendControllerLocal) { final VascBackendController backendController = vc.getVascBackendController(); vc.setVascBackendController(new VascBackendController() { + @Override public List getVascBackendIds() { return backendController.getVascBackendIds(); } + @Override public VascBackend getVascBackendById(String id) { return backendController.getVascBackendById(id); } @@ -135,18 +138,23 @@ public class JndiVascControllerFactory implements ObjectFactory { if (vc.getVascEntryController() instanceof VascEntryControllerLocal) { final VascEntryController entryController = vc.getVascEntryController(); vc.setVascEntryController(new VascEntryController() { + @Override public List getVascEntryIds() { return entryController.getVascEntryIds(); } + @Override public VascEntry getVascEntryById(String id) { return entryController.getVascEntryById(id); } + @Override public List getVascEntryByGroupId(String groupId) { return entryController.getVascEntryByGroupId(groupId); } + @Override public VascEntryGroup getVascEntryGroupById(String id) { return entryController.getVascEntryGroupById(id); } + @Override public List getVascEntryGroupIds() { return entryController.getVascEntryGroupIds(); } @@ -157,18 +165,23 @@ public class JndiVascControllerFactory implements ObjectFactory { // Also wrap controller to non-local vascController = new VascController() { + @Override public VascEventChannelController getVascEventChannelController() { return vc.getVascEventChannelController(); } + @Override public VascEntryFieldTypeController getVascEntryFieldTypeController() { return vc.getVascEntryFieldTypeController(); } + @Override public VascEntryController getVascEntryController() { return vc.getVascEntryController(); } + @Override public VascEntryConfigController getVascEntryConfigController() { return vc.getVascEntryConfigController(); } + @Override public VascBackendController getVascBackendController() { return vc.getVascBackendController(); } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerProvider.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerProvider.java index 59fd82f..9417f0f 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerProvider.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/jndi/JndiVascControllerProvider.java @@ -56,6 +56,7 @@ public class JndiVascControllerProvider implements VascControllerProvider { * Returns a VascController from jndi context. * @see net.forwardfire.vasc.core.VascControllerProvider#getVascController() */ + @Override public VascController getVascController() { try { InitialContext context = new InitialContext(); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java index 9bb545d..438d157 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/DefaultVascEntryFieldTypeController.java @@ -58,6 +58,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo /** * */ + @Override public void addVascEntryFieldType(VascEntryFieldTypeLocal vascEntryFieldType) { if (vascEntryFieldType==null) { throw new NullPointerException("Can't add null vascEntryFieldType."); @@ -68,6 +69,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo /** * @see net.forwardfire.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeById(java.lang.String) */ + @Override public VascEntryFieldType getVascEntryFieldTypeById(String id) { VascEntryFieldTypeLocal result = vascEntryFieldTypes.get(id); if (result==null) { @@ -93,6 +95,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo /** * @see net.forwardfire.vasc.core.VascEntryFieldTypeController#getVascEntryFieldTypeIds() */ + @Override public List getVascEntryFieldTypeIds() { List result = new ArrayList(5); result.addAll(vascEntryFieldTypes.keySet()); @@ -100,7 +103,7 @@ public class DefaultVascEntryFieldTypeController implements VascEntryFieldTypeCo return result; } - + @Override public VascEntryFieldType getVascEntryFieldTypeByClass(Class clazz) { for (String typeId: vascEntryFieldTypes.keySet()) { VascEntryFieldType type = getVascEntryFieldTypeById(typeId); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java index da2f677..24e7dd9 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/type/MultiTextVascEntryFieldType.java @@ -140,6 +140,7 @@ public class MultiTextVascEntryFieldType extends DefaultVascEntryFieldType { } } class MultiVascValueModel extends VascValueModel { + @Override public Serializable getValue() throws VascException { Serializable value = super.getValue(); //System.out.println("value: "+value+" type: "+value.getClass()); @@ -165,6 +166,7 @@ class MultiVascValueModel extends VascValueModel { } @SuppressWarnings("unchecked") + @Override public void setValue(Serializable editValueObj) throws VascException { if (super.getValue()==null) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelEntry.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelEntry.java index a709c32..2d9b2f3 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelEntry.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelEntry.java @@ -62,6 +62,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel { /** * @see net.forwardfire.vasc.core.ui.VascSelectItemModel#getVascSelectItems(net.forwardfire.vasc.core.VascEntry) */ + @Override public List getVascSelectItems(VascEntry currentEntry) throws VascException { List result = new ArrayList(100); VascEntryLocal entry = (VascEntryLocal)currentEntry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryById(entryId); @@ -232,6 +233,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel { /** * @return the nullLabel */ + @Override public String getNullLabel() { return nullLabel; } @@ -239,6 +241,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel { /** * @param nullLabel the nullLabel to set */ + @Override public void setNullLabel(String nullLabel) { this.nullLabel = nullLabel; } @@ -246,6 +249,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel { /** * @return the nullKeyValue */ + @Override public String getNullKeyValue() { return nullKeyValue; } @@ -253,6 +257,7 @@ public class VascSelectItemModelEntry implements VascSelectItemModel { /** * @param nullKeyValue the nullKeyValue to set */ + @Override public void setNullKeyValue(String nullKeyValue) { this.nullKeyValue = nullKeyValue; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelStringEnum.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelStringEnum.java index 9f31ce5..c356dbd 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelStringEnum.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/ui/VascSelectItemModelStringEnum.java @@ -52,6 +52,7 @@ public class VascSelectItemModelStringEnum implements VascSelectItemModel { /** * @see net.forwardfire.vasc.core.ui.VascSelectItemModel#getVascSelectItems(net.forwardfire.vasc.core.VascEntry) */ + @Override public List getVascSelectItems(VascEntry currentEntry) throws VascException { List result = new ArrayList(100); @@ -107,6 +108,7 @@ public class VascSelectItemModelStringEnum implements VascSelectItemModel { /** * @return the nullLabel */ + @Override public String getNullLabel() { return nullLabel; } @@ -114,6 +116,7 @@ public class VascSelectItemModelStringEnum implements VascSelectItemModel { /** * @param nullLabel the nullLabel to set */ + @Override public void setNullLabel(String nullLabel) { this.nullLabel = nullLabel; } @@ -121,6 +124,7 @@ public class VascSelectItemModelStringEnum implements VascSelectItemModel { /** * @return the nullKeyValue */ + @Override public String getNullKeyValue() { return nullKeyValue; } @@ -128,6 +132,7 @@ public class VascSelectItemModelStringEnum implements VascSelectItemModel { /** * @param nullKeyValue the nullKeyValue to set */ + @Override public void setNullKeyValue(String nullKeyValue) { this.nullKeyValue = nullKeyValue; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java index 4bacc66..8b47aa3 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/SelectItemModelBindingHandler.java @@ -46,13 +46,15 @@ public class SelectItemModelBindingHandler extends AbstractElementBindingHandler /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ + @Override public Class getBindParentClass() { return VascEntryField.class; } - + /** * @see org.x4o.xml.element.ElementBindingHandler#getBindChildClasses() */ + @Override public Class[] getBindChildClasses() { return CLASSES_CHILD; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java index d7897a5..ca2583d 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascBackendElementConfigurator.java @@ -46,6 +46,7 @@ public class VascBackendElementConfigurator extends AbstractElementConfigurator /** * @see org.x4o.xml.element.AbstractElementConfigurator#doConfigEndTag(org.x4o.xml.element.Element) */ + @Override public void doConfigElement(Element element) throws ElementConfiguratorException { @SuppressWarnings("unchecked") diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java index 03b6644..bda693c 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryElementConfigurator.java @@ -43,6 +43,7 @@ public class VascEntryElementConfigurator extends AbstractElementConfigurator { /** * @see org.x4o.xml.element.AbstractElementConfigurator#doConfigEndTag(org.x4o.xml.element.Element) */ + @Override public void doConfigElement(Element element) throws ElementConfiguratorException { Object elementObject = element.getElementObject(); VascController vascController = VascDriver.getVascController(element.getLanguageSession()); diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java index d5184a8..8ad9aa9 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldBindingHandler.java @@ -47,6 +47,7 @@ public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler< /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ + @Override public Class getBindParentClass() { return VascEntryLocal.class; } @@ -54,6 +55,7 @@ public class VascEntryFieldBindingHandler extends AbstractElementBindingHandler< /** * @see org.x4o.xml.element.ElementBindingHandler#getBindChildClasses() */ + @Override public Class[] getBindChildClasses() { return CLASSES_CHILD; } diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java index 35f1dd3..6780430 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/impl/x4o/VascEntryFieldConfigurator.java @@ -41,6 +41,7 @@ public class VascEntryFieldConfigurator extends AbstractElementConfigurator { /** * @see org.x4o.xml.element.AbstractElementConfigurator#doConfigEndTag(org.x4o.xml.element.Element) */ + @Override public void doConfigElement(Element element) throws ElementConfiguratorException { String fieldID = element.getAttributes().get("vascEntryFieldType"); if (fieldID==null) { diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java index da01aec..b708473 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDateFutureValidator.java @@ -38,6 +38,7 @@ public class VascDateFutureValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Date)==false) { return false; @@ -50,6 +51,7 @@ public class VascDateFutureValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascDateFuture.class; } @@ -57,9 +59,11 @@ public class VascDateFutureValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { } + @Override public VascValidator clone() throws CloneNotSupportedException { VascDateFutureValidator result = new VascDateFutureValidator(); return result; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java index ad6cbd8..2ca14e7 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascDatePastValidator.java @@ -38,6 +38,7 @@ public class VascDatePastValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Date)==false) { return false; @@ -50,16 +51,19 @@ public class VascDatePastValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascDatePast.class; } - + /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { } + @Override public VascValidator clone() throws CloneNotSupportedException { VascDateFutureValidator result = new VascDateFutureValidator(); return result; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java index a53f495..485f175 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascIntSizeValidator.java @@ -39,6 +39,7 @@ public class VascIntSizeValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Integer)==false) { return false; // only Integer can be matched. @@ -56,19 +57,21 @@ public class VascIntSizeValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascIntSizeValidator.class; } - + /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { VascIntSize a = VascIntSize.class.cast(annotation); setMin(a.min()); setMax(a.max()); } - + /** * @return the max */ @@ -97,6 +100,7 @@ public class VascIntSizeValidator implements VascValidator { this.min = min; } + @Override public VascValidator clone() throws CloneNotSupportedException { VascIntSizeValidator result = new VascIntSizeValidator(); result.min=min; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java index 102d701..514db4b 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascLongSizeValidator.java @@ -39,6 +39,7 @@ public class VascLongSizeValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof Long)==false) { return false; // only string can be matched. @@ -56,6 +57,7 @@ public class VascLongSizeValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascLongSize.class; } @@ -63,6 +65,7 @@ public class VascLongSizeValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { VascLongSize a = VascLongSize.class.cast(annotation); setMin(a.min()); @@ -97,6 +100,7 @@ public class VascLongSizeValidator implements VascValidator { this.min = min; } + @Override public VascValidator clone() throws CloneNotSupportedException { VascLongSizeValidator result = new VascLongSizeValidator(); result.min=min; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java index 48772df..6cc1409 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNotNullValidator.java @@ -37,6 +37,7 @@ public class VascObjectNotNullValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { return object!=null; } @@ -44,6 +45,7 @@ public class VascObjectNotNullValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascObjectNotNull.class; } @@ -51,9 +53,11 @@ public class VascObjectNotNullValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { } + @Override public VascValidator clone() throws CloneNotSupportedException { VascObjectNotNullValidator result = new VascObjectNotNullValidator(); return result; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java index 7a22a1f..18c87b4 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectNullValidator.java @@ -37,6 +37,7 @@ public class VascObjectNullValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { return object==null; } @@ -44,6 +45,7 @@ public class VascObjectNullValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascObjectNull.class; } @@ -51,9 +53,11 @@ public class VascObjectNullValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { } + @Override public VascValidator clone() throws CloneNotSupportedException { VascObjectNullValidator result = new VascObjectNullValidator(); return result; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java index 5f6b231..87c4c68 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascObjectUrlValidator.java @@ -63,6 +63,7 @@ public class VascObjectUrlValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if (object==null) { @@ -94,6 +95,7 @@ public class VascObjectUrlValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascObjectNull.class; } @@ -101,11 +103,13 @@ public class VascObjectUrlValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { VascObjectUrl a = VascObjectUrl.class.cast(annotation); setForbidRegEx(a.forbidRegex()); } + @Override public VascValidator clone() throws CloneNotSupportedException { VascObjectUrlValidator result = new VascObjectUrlValidator(); result.pattern=pattern; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java index ebb332c..61757eb 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringEmailValidator.java @@ -48,16 +48,12 @@ public class VascStringEmailValidator extends VascStringRegexValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascStringEmail.class; } - - /** - * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.Class) - */ - public void initAnnotation(Class annotationType) { - } + @Override public VascValidator clone() throws CloneNotSupportedException { VascStringEmailValidator result = new VascStringEmailValidator(); return result; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java index 6489388..e33463b 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringLengthValidator.java @@ -40,6 +40,7 @@ public class VascStringLengthValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if (nullable && object==null) { return true; @@ -98,8 +99,8 @@ public class VascStringLengthValidator implements VascValidator { public void setNullable(boolean nullable) { this.nullable = nullable; } - + @Override public Class getAnnotationType() { return VascStringLength.class; } @@ -107,6 +108,7 @@ public class VascStringLengthValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { VascStringLength a = VascStringLength.class.cast(annotation); if (a.min()!=0) { @@ -118,6 +120,7 @@ public class VascStringLengthValidator implements VascValidator { setNullable(a.nullable()); } + @Override public VascValidator clone() throws CloneNotSupportedException { VascStringLengthValidator result = new VascStringLengthValidator(); result.minLenght=minLenght; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java index 7cd38a5..0f866fd 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringRegexValidator.java @@ -61,6 +61,7 @@ public class VascStringRegexValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#isObjectValid(java.lang.Object) */ + @Override public boolean isObjectValid(Object object) throws VascValidatorException { if ((object instanceof String)==false) { return false; // only string can be matched. @@ -73,6 +74,7 @@ public class VascStringRegexValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascStringRegex.class; } @@ -80,11 +82,13 @@ public class VascStringRegexValidator implements VascValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ + @Override public void initAnnotation(Annotation annotation) { VascStringRegex a = VascStringRegex.class.cast(annotation); - setRegEx(a.regex()); + setRegEx(a.regex()); } + @Override public VascValidator clone() throws CloneNotSupportedException { VascStringRegexValidator result = new VascStringRegexValidator(); result.pattern=pattern; diff --git a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java index 3ea38c9..7647bd2 100644 --- a/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java +++ b/vasc-core/src/main/java/net/forwardfire/vasc/validators/VascStringZipCodeValidator.java @@ -22,6 +22,8 @@ package net.forwardfire.vasc.validators; +import java.lang.annotation.Annotation; + /** * Validates * @@ -59,15 +61,17 @@ public class VascStringZipCodeValidator extends VascStringRegexValidator { /** * @see net.forwardfire.vasc.validators.VascValidator#getAnnotationType() */ + @Override public Class getAnnotationType() { return VascStringZipCode.class; } /** - * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.Class) + * @see net.forwardfire.vasc.validators.VascValidator#initAnnotation(java.lang.annotation.Annotation) */ - public void initAnnotation(Class annotationType) { - VascStringRegex a = VascStringRegex.class.cast(annotationType); + @Override + public void initAnnotation(Annotation annotation) { + VascStringRegex a = VascStringRegex.class.cast(annotation); if (a.regex().equals("null")) { return; } diff --git a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java index 0bbb5a5..8dd3b99 100644 --- a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java +++ b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingActionPanel.java @@ -91,6 +91,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi class DownloadListCellRenderer extends JLabel implements ListCellRenderer { private static final long serialVersionUID = -2143588238414900498L; + @Override public Component getListCellRendererComponent(JList list, Object value,int index, boolean isSelected, boolean hasFocus) { if (value==null) { setText("null"); @@ -101,7 +102,7 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi } } - + @Override public void actionPerformed(ActionEvent event) { if (init) { return; @@ -154,11 +155,13 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi /** * @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() */ + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; } + @Override public void vascEvent(VascEntry entry,Serializable dataNotUsed) { init = true; @@ -231,48 +234,58 @@ public class SwingActionPanel extends JPanel implements VascEntryFrontendEventLi } + @Override public String getName() { return "..."; } + @Override public String getImage() { // TODO Auto-generated method stub return null; } + @Override public String getId() { // TODO Auto-generated method stub return null; } + @Override public String getHelpId() { // TODO Auto-generated method stub return null; } + @Override public String getDescription() { // TODO Auto-generated method stub return null; } + @Override public void doGlobalAction(VascEntry vascEntry) throws VascException { // TODO Auto-generated method stub } + @Override public GlobalVascAction clone() { return this; } + @Override public Integer getOrder() { // TODO Auto-generated method stub return null; } + @Override public Boolean getView() { // TODO Auto-generated method stub return null; } + @Override public String getRolesView() { // TODO Auto-generated method stub return null; diff --git a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java index 0d359b8..ed1b6ba 100644 --- a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java +++ b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPagerPanel.java @@ -54,7 +54,8 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis add(result); vascEntry.getVascFrontendController().addVascEntryFrontendEventListener(this); } - + + @Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof JButton) { JButton but = (JButton)e.getSource(); @@ -68,6 +69,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis public NextAction(boolean next) { this.next=next; } + @Override public void actionPerformed(ActionEvent e) { int pageIndex = vascEntry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageIndex(); if (next) { @@ -82,6 +84,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis } } + @Override public void vascEvent(VascEntry entry, Serializable data) { for(Component c:result.getComponents()) { @@ -153,6 +156,7 @@ public class SwingPagerPanel extends JPanel implements VascEntryFrontendEventLis } } + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; diff --git a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelFrame.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelFrame.java index e8dcf5b..301071a 100644 --- a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelFrame.java +++ b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelFrame.java @@ -58,6 +58,7 @@ public class SwingPanelFrame implements SwingPanelIntegration { this.addVascMenu=addVascMenu; } + @Override public void createNewVascView(VascEntry entry) throws VascException { // define redering JPanel panel = initVascView(); @@ -70,12 +71,14 @@ public class SwingPanelFrame implements SwingPanelIntegration { entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() { private static final long serialVersionUID = -6801954395965101748L; + @Override public void vascEvent(VascEntry entry, Serializable data) { if (data instanceof Exception) { Exception e = (Exception)data; e.printStackTrace(); } } + @Override public VascFrontendEventType[] getEventTypes() { return new VascFrontendEventType[] {VascFrontendEventType.EXCEPTION}; } @@ -86,10 +89,12 @@ public class SwingPanelFrame implements SwingPanelIntegration { openVascView(panel, entry); } + @Override public JPanel initVascView() { return new JPanel(); } + @Override public void openVascView(JPanel pane,final VascEntry entry) { JFrame frame = new JFrame(); frame.setTitle("Vasc Edit - Swing - "+entry.getName()); @@ -103,6 +108,7 @@ public class SwingPanelFrame implements SwingPanelIntegration { for (final String id:entry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryIds()) { JMenuItem item = new JMenuItem(id); item.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try { VascEntry ee = entry.getVascFrontendController().getVascController().getVascEntryController().getVascEntryById(id); @@ -128,6 +134,7 @@ public class SwingPanelFrame implements SwingPanelIntegration { panels.put(pane,frame); } + @Override public void closeVascView(JPanel pane,VascEntry entry) { JFrame frame = panels.get(pane); if (frame!=null) { diff --git a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelTabbed.java b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelTabbed.java index 8c7d582..df40174 100644 --- a/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelTabbed.java +++ b/vasc-frontend/vasc-frontend-swing/src/main/java/net/forwardfire/vasc/frontend/swing/SwingPanelTabbed.java @@ -47,6 +47,7 @@ public class SwingPanelTabbed implements SwingPanelIntegration { this.tabbedPane=tabbedPane; } + @Override public void createNewVascView(VascEntry entry) throws VascException { // define redering JPanel panel = initVascView(); @@ -58,12 +59,14 @@ public class SwingPanelTabbed implements SwingPanelIntegration { entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() { private static final long serialVersionUID = -6801954395965101748L; + @Override public void vascEvent(VascEntry entry, Serializable data) { if (data instanceof Exception) { Exception e = (Exception)data; e.printStackTrace(); } } + @Override public VascFrontendEventType[] getEventTypes() { return new VascFrontendEventType[] {VascFrontendEventType.EXCEPTION}; } @@ -74,15 +77,18 @@ public class SwingPanelTabbed implements SwingPanelIntegration { openVascView(panel, entry); } + @Override public JPanel initVascView() { return new JPanel(); } - + + @Override public void openVascView(JPanel pane,final VascEntry entry) { tabbedPane.addTab(entry.getName(), pane); tabbedPane.setSelectedIndex(tabbedPane.getTabCount()-1); } - + + @Override public void closeVascView(JPanel pane,VascEntry entry) { for (int i=0;i=0) { pane.removeTabAt(pane.getSelectedIndex()); // todo release vasc frontend diff --git a/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/Test.java b/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/Test.java index b403262..0f07d5b 100644 --- a/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/Test.java +++ b/vasc-frontend/vasc-frontend-swing/src/test/java/net/forwardfire/vasc/Test.java @@ -40,6 +40,7 @@ public class Test implements ActionListener { frame.setVisible(true); } + @Override public void actionPerformed(ActionEvent e) { JLabel label = null; final JPanel panel = new JPanel(); @@ -59,8 +60,8 @@ public class Test implements ActionListener { JButton tabClose = new JButton(close); tabClose.setPreferredSize(size); tabClose.addActionListener(new ActionListener() { - public void - actionPerformed(ActionEvent e) { + @Override + public void actionPerformed(ActionEvent e) { int tNum = tabPane.indexOfComponent(panel); tabPane.removeTabAt(tNum); } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java index 2c0e87d..26e869a 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtActionPanel.java @@ -78,6 +78,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener { rowNumberField = new Text(actionRow, SWT.NONE | SWT.BORDER); rowNumberField.setText(""+entry.getVascFrontendController().getVascEntryState().getVascBackendState().getPageSize()+" "); rowNumberField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent arg0) { if (vascEvent) { return; @@ -93,6 +94,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener { l.setText("Goto: "); pageBox = new Combo(actionRow,SWT.SINGLE | SWT.BORDER); pageBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { entry.getVascFrontendController().getVascFrontendActions().pageAction(pageBox.getSelectionIndex()-1); pageBox.select(0); @@ -107,6 +109,7 @@ public class SwtActionPanel implements VascEntryFrontendEventListener { downloadBox.add(a.getName()); } downloadBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { downloadBox.select(0); @@ -121,11 +124,13 @@ public class SwtActionPanel implements VascEntryFrontendEventListener { /** * @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() */ + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; } + @Override public void vascEvent(VascEntry entry,Serializable dataNotUsed) { vascEvent = true; diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java index 0bb3576..0a02ab7 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtPagerPanel.java @@ -72,11 +72,13 @@ public class SwtPagerPanel implements VascEntryFrontendEventListener { /** * @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() */ + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; } + @Override public void vascEvent(VascEntry entry,Serializable dataNotUsed) { } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java index 819d03f..8d1d3a5 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascEditDialog.java @@ -208,6 +208,7 @@ public class SwtVascEditDialog extends Dialog { saveButton.setText(i18n("vasc.action.saveAction.name")); saveButton.setToolTipText(i18n("vasc.action.saveAction.description")); saveButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { try { boolean error = entry.getVascFrontendController().getVascFrontendHelper().validateAndSetErrorText(entry); @@ -226,6 +227,7 @@ public class SwtVascEditDialog extends Dialog { cancelButton.setText(i18n("vasc.action.cancelAction.name")); cancelButton.setToolTipText(i18n("vasc.action.cancelAction.description")); cancelButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { entry.getVascFrontendController().getVascEntryState().setEntryDataObject(null); shell.dispose(); diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java index 7f0d0c1..5970187 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/SwtVascFrontend.java @@ -111,6 +111,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * @see net.forwardfire.vasc.frontend.VascFrontend#getFrontendType() */ + @Override public String getFrontendType() { return "swt"; } @@ -118,6 +119,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * Add swt implmented ui components */ + @Override protected void addUiComponents() { VascFrontendController vfd = getVascEntry().getVascFrontendController(); @@ -165,6 +167,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** These filter extensions are used to filter which files are displayed. */ private static final String[] FILTER_EXTS = { "*.*","*.csv","*.xls" }; + @Override public void renderExport(VascEntryExport exporter) throws VascFrontendException { FileDialog dlg = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE); dlg.setFilterNames(FILTER_NAMES); @@ -197,6 +200,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { } } + @Override public void renderEdit() throws VascFrontendException { logger.fine("Rending Edit View"); SwtVascEditDialog dialog = new SwtVascEditDialog(entry); @@ -207,6 +211,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { } } + @Override public void renderDelete() throws VascFrontendException { boolean del = askDelete( Display.getCurrent().getActiveShell() ); if (del==false) { @@ -227,7 +232,8 @@ public class SwtVascFrontend extends AbstractVascFrontend { } return false; } - + + @Override public void renderView() throws VascFrontendException { if (initOnce) { return; @@ -350,6 +356,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { model.addListener(new VascOptionValueModelListener(option)); model.setValue(option.getDefaultValue()); model.addListener(new VascValueModelListener() { + @Override public void valueUpdate(VascValueModel model) throws VascException { entry.getVascFrontendController().getVascFrontendActions().refreshData();// mm } @@ -374,6 +381,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { final Text text = new Text(headerRightOptions, SWT.NONE | SWT.BORDER ); text.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String value = text.getText(); entry.getVascFrontendController().getVascFrontendActions().searchAction(value); @@ -434,12 +442,14 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetDefaultSelected(SelectionEvent e) { } /** * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ + @Override public void widgetSelected(SelectionEvent e) { Serializable data = (Serializable) e.item.getData(); logger.fine("Slecting data: "+data); @@ -455,6 +465,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { //Add sort indicator and sort data when column selected Listener sortListener = new Listener() { + @Override public void handleEvent(Event e) { // determine new sort column and direction TableColumn sortColumn = table2.getSortColumn(); @@ -474,10 +485,12 @@ public class SwtVascFrontend extends AbstractVascFrontend { entry.getVascFrontendController().addVascEntryFrontendEventListener(new VascEntryFrontendEventListener() { private static final long serialVersionUID = -5558286028449368490L; + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.POST_READ}; return result; } + @Override public void vascEvent(VascEntry entry,Serializable data) { tableViewer.refresh(); table2.deselectAll(); @@ -526,6 +539,8 @@ public class SwtVascFrontend extends AbstractVascFrontend { this.comp=comp; this.table=table; } + + @Override public void controlResized(ControlEvent e) { Rectangle area = comp.getClientArea(); Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT); @@ -551,6 +566,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { //column2.setWidth(width - column1.getWidth()); } } + @Override public void controlMoved(ControlEvent e) { } @@ -610,6 +626,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) */ + @Override public Image getColumnImage(Object arg0, int arg1) { return null; } @@ -617,6 +634,7 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int) */ + @Override public String getColumnText(Object bean, int columnNumber) { int col=0; @@ -651,18 +669,21 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener arg0) { } /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() */ + @Override public void dispose() { } /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) */ + @Override public boolean isLabelProperty(Object arg0, String arg1) { return false; } @@ -670,31 +691,33 @@ public class SwtVascFrontend extends AbstractVascFrontend { /** * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener arg0) { } - } class ListConverterContentProvider implements IStructuredContentProvider { - + /** * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object obj) { return ((VascEntry)obj).getVascFrontendController().getVascEntryState().getEntryDataList().toArray(); } - + /** * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { } - + /** * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer arg0, Object arg1, Object arg2) { } - } } \ No newline at end of file diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtBoolean.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtBoolean.java index 7c639de..58436e4 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtBoolean.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtBoolean.java @@ -50,6 +50,7 @@ public class SwtBoolean implements VascUIComponent { private Color orgBackgroundColor = null; private Color errorColor = null; + @Override public Object createComponent(final VascEntry entry,VascEntryField entryField,final VascValueModel model,Object gui) throws VascException { button = new Button((Composite)gui, SWT.CHECK); orgBackgroundColor = button.getBackground(); @@ -62,6 +63,7 @@ public class SwtBoolean implements VascUIComponent { } //button.setToolTipText(i18n("vasc.dialog.save.tooltip")); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { Boolean value = button.getSelection(); try { @@ -78,6 +80,7 @@ public class SwtBoolean implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { if (button==null) { return null; @@ -88,6 +91,7 @@ public class SwtBoolean implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String text) { if (button==null) { return; @@ -103,6 +107,7 @@ public class SwtBoolean implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return !button.isEnabled(); } @@ -110,6 +115,7 @@ public class SwtBoolean implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { button.setEnabled(!disabled); } @@ -117,6 +123,7 @@ public class SwtBoolean implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { return button.isVisible(); } @@ -124,6 +131,7 @@ public class SwtBoolean implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { button.setVisible(rendered); } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtButton.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtButton.java index 51e939a..092afac 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtButton.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtButton.java @@ -49,6 +49,7 @@ public class SwtButton implements VascUIComponent { private Color orgBackgroundColor = null; private Color errorColor = null; + @Override public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { button = new Button((Composite)gui, SWT.NONE); orgBackgroundColor = button.getBackground(); @@ -57,6 +58,7 @@ public class SwtButton implements VascUIComponent { button.setText(model.getValue()+""); //button.setToolTipText(i18n("vasc.dialog.save.tooltip")); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { } }); @@ -66,6 +68,7 @@ public class SwtButton implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { if (button==null) { return null; @@ -76,6 +79,7 @@ public class SwtButton implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String text) { if (button==null) { return; @@ -91,6 +95,7 @@ public class SwtButton implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return !button.isEnabled(); } @@ -98,6 +103,7 @@ public class SwtButton implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { button.setEnabled(!disabled); } @@ -105,6 +111,7 @@ public class SwtButton implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { return button.isVisible(); } @@ -112,6 +119,7 @@ public class SwtButton implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { button.setVisible(rendered); } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtLabel.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtLabel.java index 5e8185d..fc2c8f3 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtLabel.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtLabel.java @@ -46,6 +46,7 @@ public class SwtLabel implements VascUIComponent { private Color orgBackgroundColor = null; private Color errorColor = null; + @Override public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { label = new Label((Composite)gui, SWT.NONE); orgBackgroundColor = label.getBackground(); @@ -57,6 +58,7 @@ public class SwtLabel implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { if (label==null) { return null; @@ -67,6 +69,7 @@ public class SwtLabel implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String text) { if (label==null) { return; @@ -82,6 +85,7 @@ public class SwtLabel implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return !label.isEnabled(); } @@ -89,6 +93,7 @@ public class SwtLabel implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { label.setEnabled(!disabled); } @@ -96,6 +101,7 @@ public class SwtLabel implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { return label.isVisible(); } @@ -103,6 +109,7 @@ public class SwtLabel implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { label.setVisible(rendered); } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtList.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtList.java index 1487a40..d2a7e42 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtList.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtList.java @@ -56,6 +56,7 @@ public class SwtList implements VascUIComponent { private Color errorColor = null; private List data = null; + @Override public Object createComponent(final VascEntry entry,VascEntryField entryField,final VascValueModel model,Object gui) throws VascException { combo = new Combo((Composite)gui,SWT.SINGLE | SWT.BORDER); combo.setVisibleItemCount(8); @@ -67,6 +68,7 @@ public class SwtList implements VascUIComponent { orgBackgroundColor = combo.getBackground(); errorColor = new Color(((Composite)gui).getDisplay(),255,0,0); combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { VascSelectItem item = findItem(combo.getText()); if (item!=null) { @@ -125,6 +127,7 @@ public class SwtList implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { if (combo==null) { return null; @@ -135,6 +138,7 @@ public class SwtList implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String text) { if (combo==null) { return; @@ -150,6 +154,7 @@ public class SwtList implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return !combo.isEnabled(); } @@ -157,6 +162,7 @@ public class SwtList implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { combo.setEnabled(!disabled); } @@ -164,6 +170,7 @@ public class SwtList implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { return combo.isVisible(); } @@ -171,6 +178,7 @@ public class SwtList implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { combo.setVisible(rendered); } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtText.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtText.java index 8c4ff2f..6b4e9ed 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtText.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtText.java @@ -51,6 +51,7 @@ public class SwtText implements VascUIComponent { private Color orgBackgroundColor = null; private Color errorColor = null; + @Override public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { text = new Text((Composite)gui, SWT.NONE | SWT.BORDER); orgBackgroundColor = text.getBackground(); @@ -72,7 +73,8 @@ public class SwtText implements VascUIComponent { this.model=model; this.entry=entry; } - + + @Override public void modifyText(ModifyEvent e) { Serializable value = text.getText(); try { @@ -86,6 +88,7 @@ public class SwtText implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { if (text==null) { return null; @@ -96,6 +99,7 @@ public class SwtText implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String textString) { if (text==null) { return; @@ -111,6 +115,7 @@ public class SwtText implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return !text.isEnabled(); } @@ -118,6 +123,7 @@ public class SwtText implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { text.setEnabled(!disabled); } @@ -125,6 +131,7 @@ public class SwtText implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { return text.isVisible(); } @@ -132,6 +139,7 @@ public class SwtText implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { text.setVisible(rendered); } diff --git a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtTextArea.java b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtTextArea.java index f4b41cf..1ac45ee 100644 --- a/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtTextArea.java +++ b/vasc-frontend/vasc-frontend-swt/src/main/java/net/forwardfire/vasc/frontend/swt/ui/SwtTextArea.java @@ -54,6 +54,7 @@ public class SwtTextArea implements VascUIComponent { private Color orgBackgroundColor = null; private Color errorColor = null; + @Override public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { text = new Text((Composite)gui, SWT.MULTI | SWT.BORDER); orgBackgroundColor = text.getBackground(); @@ -96,7 +97,8 @@ public class SwtTextArea implements VascUIComponent { this.model=model; this.entry=entry; } - + + @Override public void modifyText(ModifyEvent e) { Serializable value = text.getText(); try { @@ -110,6 +112,7 @@ public class SwtTextArea implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { if (text==null) { return null; @@ -120,6 +123,7 @@ public class SwtTextArea implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String textString) { if (text==null) { return; @@ -135,6 +139,7 @@ public class SwtTextArea implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return !text.isEnabled(); } @@ -142,6 +147,7 @@ public class SwtTextArea implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { text.setEnabled(!disabled); } @@ -149,6 +155,7 @@ public class SwtTextArea implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { return text.isVisible(); } @@ -156,6 +163,7 @@ public class SwtTextArea implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { text.setVisible(rendered); } diff --git a/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java index 1612623..603c807 100644 --- a/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java +++ b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTableViewerTest.java @@ -64,6 +64,7 @@ import junit.framework.TestCase; */ public class SWTTableViewerTest extends TestCase { + @Override public void setUp() throws Exception { // enable all logs //InputStream loggingProperties = this.getClass().getResourceAsStream("/META-INF/logging.properties"); @@ -77,6 +78,7 @@ public class SWTTableViewerTest extends TestCase { new PersonEditor().run(); } + @Override public void tearDown() throws Exception { } @@ -129,6 +131,7 @@ class PersonEditor extends ApplicationWindow { * @param shell * the shell */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText("Person Editor"); @@ -142,6 +145,7 @@ class PersonEditor extends ApplicationWindow { * the main window * @return Control */ + @Override protected Control createContents(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout(1, false)); @@ -174,6 +178,7 @@ class PersonEditor extends ApplicationWindow { // Add a new person when the user clicks button newPerson.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { Person p = new Person(); p.setName("Name"); @@ -220,6 +225,7 @@ class PersonEditor extends ApplicationWindow { /** * Returns the Person objects */ + @Override public Object[] getElements(Object inputElement) { return ((List) inputElement).toArray(); } @@ -227,6 +233,7 @@ class PersonEditor extends ApplicationWindow { /** * Disposes any created resources */ + @Override public void dispose() { // Do nothing } @@ -234,6 +241,7 @@ class PersonEditor extends ApplicationWindow { /** * Called when the input changes */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // Ignore } @@ -251,6 +259,7 @@ class PersonEditor extends ApplicationWindow { * the data model * @return Object[] */ + @Override public Object[] getElements(Object arg0) { return ((GroceryList) arg0).getFoods().toArray(); } @@ -258,6 +267,7 @@ class PersonEditor extends ApplicationWindow { /** * Disposes any created resources */ + @Override public void dispose() { // Do nothing } @@ -272,6 +282,7 @@ class PersonEditor extends ApplicationWindow { * @param arg2 * the new input */ + @Override public void inputChanged(Viewer arg0, Object arg1, Object arg2) { // Do nothing } @@ -297,6 +308,7 @@ class PersonEditor extends ApplicationWindow { * the property * @return boolean */ + @Override public boolean canModify(Object element, String property) { // Allow editing of all values return true; @@ -311,6 +323,7 @@ class PersonEditor extends ApplicationWindow { * the property * @return Object */ + @Override public Object getValue(Object element, String property) { Person p = (Person) element; if (PersonEditor.NAME.equals(property)) @@ -335,6 +348,7 @@ class PersonEditor extends ApplicationWindow { * @param value * the value */ + @Override public void modify(Object element, String property, Object value) { if (element instanceof Item) element = ((Item) element).getData(); @@ -522,6 +536,7 @@ class PersonEditor extends ApplicationWindow { * the column index * @return Image */ + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } @@ -535,6 +550,7 @@ class PersonEditor extends ApplicationWindow { * the column index * @return String */ + @Override public String getColumnText(Object element, int columnIndex) { Person person = (Person) element; switch (columnIndex) { @@ -556,6 +572,7 @@ class PersonEditor extends ApplicationWindow { * @param listener * the listener */ + @Override public void addListener(ILabelProviderListener listener) { // Ignore it } @@ -563,6 +580,7 @@ class PersonEditor extends ApplicationWindow { /** * Disposes any created resources */ + @Override public void dispose() { // Nothing to dispose } @@ -577,6 +595,7 @@ class PersonEditor extends ApplicationWindow { * the property * @return boolean */ + @Override public boolean isLabelProperty(Object element, String property) { return false; } @@ -587,6 +606,7 @@ class PersonEditor extends ApplicationWindow { * @param listener * the listener */ + @Override public void removeListener(ILabelProviderListener listener) { // Ignore } diff --git a/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java index efcb523..2ddbd4f 100644 --- a/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java +++ b/vasc-frontend/vasc-frontend-swt/src/test/java/net/forwardfire/vasc/SWTTest.java @@ -36,6 +36,8 @@ import org.eclipse.swt.widgets.Shell; + + import junit.framework.TestCase; /** @@ -48,9 +50,11 @@ public class SWTTest extends TestCase { private TestModelData testData = null; + @Override public void setUp() throws Exception { } + @Override public void tearDown() throws Exception { } public void testNull() throws Exception { diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerEJB.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerEJB.java index 613a12b..60e61b1 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerEJB.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerEJB.java @@ -100,11 +100,14 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF String value = bundle.getString(key); data.put(key, value); } - } + } + + @Override public Object handleGetObject(String key) { return data.get(key); } + @Override public Enumeration getKeys() { return Collections.enumeration(data.keySet()); } @@ -157,6 +160,7 @@ abstract public class AbstractJSFVascFacesControllerEJB extends AbstractJSFVascF /** * @return the vascController */ + @Override public VascController getVascController() { if (vascController!=null) { return vascController; diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java index d5d962a..590fd5c 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/AbstractJSFVascFacesControllerLocal.java @@ -84,11 +84,14 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas String value = bundle.getString(key); data.put(key, value); } - } + } + + @Override public Object handleGetObject(String key) { return data.get(key); } + @Override public Enumeration getKeys() { return Collections.enumeration(data.keySet()); } @@ -131,6 +134,7 @@ abstract public class AbstractJSFVascFacesControllerLocal extends AbstractJSFVas /** * @return the vascController */ + @Override public VascController getVascController() { if (vascController!=null) { return vascController; diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java index cb9051f..75db98f 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntryEventListener.java @@ -47,10 +47,11 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener public JSFVascEntryEventListener(String entrySupportVar) { this.entrySupportVar=entrySupportVar; } - + /** * @see net.forwardfire.vasc.core.entry.VascEntryFrontendEventListener#getEventTypes() */ + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = { VascEntryFrontendEventListener.VascFrontendEventType.POST_READ, @@ -59,9 +60,8 @@ public class JSFVascEntryEventListener implements VascEntryFrontendEventListener }; return result; } - - - + + @Override public void vascEvent(VascEntry entry,Serializable dataNotUsed) { /* moved to fillVascEntryFrontend try { diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java index 37922cc..ccb499d 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascEntrySupportBean.java @@ -384,9 +384,12 @@ public class JSFVascEntrySupportBean implements Serializable { this.vascEntry=vascEntry; this.actionId=actionId; } + + @Override public void beforePhase(PhaseEvent PhaseEvent) { } - + + @Override public void afterPhase(PhaseEvent PhaseEvent) { if (vascEntry==null) { return; @@ -416,7 +419,8 @@ public class JSFVascEntrySupportBean implements Serializable { vascEntry=null; } } - + + @Override public PhaseId getPhaseId(){ return PhaseId.UPDATE_MODEL_VALUES; } @@ -933,52 +937,52 @@ class JSFVascSupportI18nMapController implements Map { this.entry=entry; } - public void clear() { + @Override + public void clear() { } - + @Override public boolean containsKey(Object key) { return true; } - + @Override public boolean containsValue(Object value) { return true; } - + @Override public Set> entrySet() { return null; } - + @Override public String get(Object key) { String result = entry.getVascFrontendController().getVascEntryResourceResolver().getTextValue((String)key); return result; } - + @Override public boolean isEmpty() { return false; } - + @Override public Set keySet() { return null; } - + @Override public String put(String key, String value) { return null; } - @SuppressWarnings("rawtypes") + @Override public void putAll(Map m) { } - + @Override public String remove(Object key) { return null; } - + @Override public int size() { return 0; } - + @Override public Collection values() { return null; } - } \ No newline at end of file diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascFrontendRenderer.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascFrontendRenderer.java index 87cdb44..f0e134d 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascFrontendRenderer.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascFrontendRenderer.java @@ -57,10 +57,12 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser /** * @see net.forwardfire.vasc.frontend.VascFrontend#getFrontendType() */ + @Override public String getFrontendType() { return "jsf"; } + @Override protected void addUiComponents() { VascFrontendController vfd = getVascEntry().getVascFrontendController(); @@ -81,6 +83,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser /** * @see net.forwardfire.vasc.frontend.VascFrontend#renderDelete(java.lang.Object) */ + @Override public void renderDelete() throws VascFrontendException { logger.finer("renderDelete"); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -91,6 +94,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser /** * @see net.forwardfire.vasc.frontend.VascFrontend#renderEdit(java.lang.Object) */ + @Override public void renderEdit() throws VascFrontendException { logger.finer("renderEdit"); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -113,6 +117,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser /** * @see net.forwardfire.vasc.frontend.VascFrontend#renderExport(net.forwardfire.vasc.core.entry.VascEntryExport) */ + @Override public void renderExport(VascEntryExport exporter) throws VascFrontendException { logger.finer("renderExport"); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -124,6 +129,7 @@ public class JSFVascFrontendRenderer extends AbstractVascFrontend implements Ser /** * @see net.forwardfire.vasc.frontend.VascFrontend#renderView() */ + @Override public void renderView() throws VascFrontendException { logger.finer("renderView"); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java index 0c0d123..40f49b7 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponent.java @@ -82,6 +82,7 @@ public class JSFVascUIComponent extends UIComponentBase { logger = Logger.getLogger(JSFVascUIComponent.class.getName()); } + @Override public String getFamily() { return FAMILY; } @@ -393,10 +394,14 @@ public class JSFVascUIComponent extends UIComponentBase { this.fieldId=fieldId; this.value=value; } + + @Override public VascFrontendEventType[] getEventTypes() { VascFrontendEventType[] result = {VascEntryFrontendEventListener.VascFrontendEventType.PRE_CREATE}; return result; } + + @Override public void vascEvent(VascEntry entry,Serializable data) { VascEntryField field = entry.getVascEntryFieldById(fieldId); try { diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentRenderer.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentRenderer.java index 1ae5ddd..d23e65b 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentRenderer.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentRenderer.java @@ -230,9 +230,12 @@ public class JSFVascUIComponentRenderer extends Renderer { this.fieldId=fieldId; logger = Logger.getLogger(VascJSFInputValidator2.class.getName()); } + + @Override public void validate(FacesContext context, UIComponent component,Object object) throws ValidatorException { // always oke, we are runned by phase listener } + public void validatePhase(FacesContext context, UIComponent component,Object object) throws ValidatorException { JSFVascUIComponent comp = JSFVascUIComponent.findVascParent(component); VascEntry entry = comp.getVascEntry(); @@ -340,10 +343,13 @@ public class JSFVascUIComponentRenderer extends Renderer { public class ModelChangeListener implements ValueChangeListener,Serializable { private static final long serialVersionUID = 1L; - VascValueModel model; + private final VascValueModel model; + public ModelChangeListener(VascValueModel model) { this.model=model; } + + @Override public void processValueChange(ValueChangeEvent event) throws AbortProcessingException { try { model.setValue((Serializable)event.getNewValue()); diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentTag.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentTag.java index f602b4b..c65f37a 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentTag.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascUIComponentTag.java @@ -70,6 +70,7 @@ public class JSFVascUIComponentTag extends UIComponentELTag { processProperty(component, disableLinkColumns ,JSFVascUIComponent.DISABLE_LINK_COLUMNS); } + @Override public void release() { super.release(); entrySupportVar = null; diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascValidatePhaseListener.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascValidatePhaseListener.java index 22ddb92..373100e 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascValidatePhaseListener.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/JSFVascValidatePhaseListener.java @@ -57,6 +57,7 @@ public class JSFVascValidatePhaseListener implements PhaseListener { private static final String SAVE_ACTION_ID_HACK = "VASC_SAVE"; + @Override public void afterPhase(PhaseEvent event) { FacesContext context = event.getFacesContext(); @@ -70,8 +71,12 @@ public class JSFVascValidatePhaseListener implements PhaseListener { } } } + + @Override public void beforePhase(PhaseEvent event) { } + + @Override public PhaseId getPhaseId() { return PhaseId.PROCESS_VALIDATIONS; } diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascRequestFacesFilter.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascRequestFacesFilter.java index 6154477..0afa805 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascRequestFacesFilter.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/VascRequestFacesFilter.java @@ -67,6 +67,7 @@ public class VascRequestFacesFilter implements Filter { /** * @see javax.servlet.Filter#destroy() */ + @Override public void destroy() { servletContext = null; templateFile = null; @@ -76,6 +77,7 @@ public class VascRequestFacesFilter implements Filter { /** * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) */ + @Override public void init(FilterConfig config) throws ServletException { logger = Logger.getLogger(VascRequestFacesFilter.class.getName()); servletContext = config.getServletContext(); @@ -112,6 +114,7 @@ public class VascRequestFacesFilter implements Filter { /** * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) */ + @Override public void doFilter(ServletRequest servletRequest,ServletResponse servletResponse,FilterChain chain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest)servletRequest; diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/AbstractJSFBaseComponent.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/AbstractJSFBaseComponent.java index d6c7b97..3076e91 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/AbstractJSFBaseComponent.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/AbstractJSFBaseComponent.java @@ -44,27 +44,31 @@ abstract public class AbstractJSFBaseComponent implements VascUIComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#getErrorText() */ + @Override public String getErrorText() { return ""; } - + /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setErrorText(java.lang.String) */ + @Override public void setErrorText(String text) { } /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isRendered() */ + @Override public boolean isRendered() { UIComponent component = (UIComponent)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); return component.isRendered(); } - + /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setRendered(boolean) */ + @Override public void setRendered(boolean rendered) { // todo: disabled until templates fixes //UIComponent component = (UIComponent)net.forwardfire.vasc.frontends.web.jsf.VascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFBoolean.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFBoolean.java index d336679..4fa22ee 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFBoolean.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFBoolean.java @@ -44,7 +44,8 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent; * @version 1.0 Mar 28, 2009 */ public class JSFBoolean extends AbstractJSFBaseComponent { - + + @Override public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { Application application = FacesContext.getCurrentInstance().getApplication(); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -60,6 +61,7 @@ public class JSFBoolean extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { HtmlSelectBooleanCheckbox component = (HtmlSelectBooleanCheckbox)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); return component.isDisabled(); @@ -68,6 +70,7 @@ public class JSFBoolean extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { HtmlSelectBooleanCheckbox component = (HtmlSelectBooleanCheckbox)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); component.setDisabled(disabled); diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFLabel.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFLabel.java index 072a202..88abccb 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFLabel.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFLabel.java @@ -41,6 +41,7 @@ import net.forwardfire.vasc.core.VascException; */ public class JSFLabel extends AbstractJSFBaseComponent { + @Override public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { Application application = FacesContext.getCurrentInstance().getApplication(); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -56,13 +57,15 @@ public class JSFLabel extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { return false; } - + /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { } } \ No newline at end of file diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFList.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFList.java index 6d020ba..b85f1e3 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFList.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFList.java @@ -53,7 +53,7 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent; */ public class JSFList extends AbstractJSFBaseComponent { - + @Override public Object createComponent(VascEntry entry,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { Application application = FacesContext.getCurrentInstance().getApplication(); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -79,6 +79,7 @@ public class JSFList extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { HtmlSelectOneMenu component = (HtmlSelectOneMenu)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); return component.isDisabled(); @@ -87,6 +88,7 @@ public class JSFList extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { HtmlSelectOneMenu component = (HtmlSelectOneMenu)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); component.setDisabled(disabled); @@ -121,6 +123,7 @@ class VascConverter implements Converter,Serializable { /** * Convert an ID to an Object */ + @Override public Object getAsObject(FacesContext context,UIComponent component,String value) throws ConverterException { if (context == null) { throw new NullPointerException("context may not be null"); } if (component == null) { throw new NullPointerException("component may not be null"); } @@ -138,6 +141,7 @@ class VascConverter implements Converter,Serializable { /** * Converts an Object to an ID. */ + @Override public String getAsString(FacesContext context,UIComponent component,Object value) throws ConverterException { if (context == null) { throw new NullPointerException("context may not be null"); } if (component == null) { throw new NullPointerException("component may not be null"); } diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFListModel.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFListModel.java index a9574f4..31e6c4a 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFListModel.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFListModel.java @@ -106,72 +106,95 @@ public class JSFListModel implements Serializable,List { // === LIST interface + @Override public void add(int arg0, SelectItem arg1) { getSelectItems().add(arg0,arg1); } + @Override public boolean add(SelectItem arg0) { return getSelectItems().add(arg0); } + @Override public boolean addAll(Collection arg0) { return getSelectItems().addAll(arg0); } + @Override public boolean addAll(int arg0, Collection arg1) { return getSelectItems().addAll(arg0,arg1); } + @Override public void clear() { getSelectItems().clear(); } + @Override public boolean contains(Object arg0) { return getSelectItems().contains(arg0); } + @Override public boolean containsAll(Collection arg0) { return getSelectItems().containsAll(arg0); } + @Override public SelectItem get(int index) { return getSelectItems().get(index); } + @Override public int indexOf(Object arg0) { return getSelectItems().indexOf(arg0); } + @Override public boolean isEmpty() { return getSelectItems().isEmpty(); } + @Override public Iterator iterator() { return getSelectItems().iterator(); } + @Override public int lastIndexOf(Object arg0) { return getSelectItems().lastIndexOf(arg0); } + @Override public ListIterator listIterator() { return getSelectItems().listIterator(); } + @Override public ListIterator listIterator(int arg0) { return getSelectItems().listIterator(arg0); } + @Override public SelectItem remove(int arg0) { return getSelectItems().remove(arg0); } + @Override public boolean remove(Object arg0) { return getSelectItems().remove(arg0); } + @Override public boolean removeAll(Collection arg0) { return getSelectItems().removeAll(arg0); } + @Override public boolean retainAll(Collection arg0) { return getSelectItems().retainAll(arg0); } + @Override public SelectItem set(int arg0, SelectItem arg1) { return getSelectItems().set(arg0, arg1); } + @Override public int size() { return getSelectItems().size(); } + @Override public List subList(int arg0, int arg1) { return getSelectItems().subList(arg0, arg1); } + @Override public Object[] toArray() { return getSelectItems().toArray(); } + @Override public T[] toArray(T[] a) { return getSelectItems().toArray(a); } diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFText.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFText.java index 5dbe001..b3a1a03 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFText.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFText.java @@ -48,7 +48,8 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent; * @version 1.0 Mar 25, 2009 */ public class JSFText extends AbstractJSFBaseComponent { - + + @Override public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { Application application = FacesContext.getCurrentInstance().getApplication(); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -69,14 +70,16 @@ public class JSFText extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { HtmlInputText component = (HtmlInputText)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); return component.isDisabled(); } - + /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { HtmlInputText component = (HtmlInputText)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); component.setDisabled(disabled); @@ -89,6 +92,7 @@ class VascNullConverter implements Converter,Serializable { /** * Convert an ID to an Object */ + @Override public Object getAsObject(FacesContext context,UIComponent component,String value) throws ConverterException { //System.out.println("getAsObject: "+component+" value: "+value); if (context == null) { throw new NullPointerException("context may not be null"); } @@ -101,6 +105,7 @@ class VascNullConverter implements Converter,Serializable { /** * Converts an Object to an ID. */ + @Override public String getAsString(FacesContext context,UIComponent component,Object value) throws ConverterException { //System.out.println("getAsString: "+component+" value: "+value); if (context == null) { throw new NullPointerException("context may not be null"); } diff --git a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFTextArea.java b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFTextArea.java index 9dbaa80..e7e1c34 100644 --- a/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFTextArea.java +++ b/vasc-frontend/vasc-frontend-web-jsf/src/main/java/net/forwardfire/vasc/frontend/web/jsf/ui/JSFTextArea.java @@ -45,6 +45,7 @@ import net.forwardfire.vasc.frontend.web.jsf.JSFVascUIComponent; */ public class JSFTextArea extends AbstractJSFBaseComponent { + @Override public Object createComponent(VascEntry table,VascEntryField entryField,VascValueModel model,Object gui) throws VascException { Application application = FacesContext.getCurrentInstance().getApplication(); UIViewRoot viewRoot = FacesContext.getCurrentInstance().getViewRoot(); @@ -68,14 +69,16 @@ public class JSFTextArea extends AbstractJSFBaseComponent { /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#isDisabled() */ + @Override public boolean isDisabled() { HtmlInputTextarea component = (HtmlInputTextarea)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); return component.isDisabled(); } - + /** * @see net.forwardfire.vasc.core.ui.VascUIComponent#setDisabled(boolean) */ + @Override public void setDisabled(boolean disabled) { HtmlInputTextarea component = (HtmlInputTextarea)JSFVascUIComponent.findComponentById(FacesContext.getCurrentInstance().getViewRoot(),componentId); component.setDisabled(disabled); diff --git a/vasc-lib/vasc-lib-i18n/src/main/java/net/forwardfire/vasc/lib/i18n/config/BundleCharSetControl.java b/vasc-lib/vasc-lib-i18n/src/main/java/net/forwardfire/vasc/lib/i18n/config/BundleCharSetControl.java index 19dd021..d36adcc 100644 --- a/vasc-lib/vasc-lib-i18n/src/main/java/net/forwardfire/vasc/lib/i18n/config/BundleCharSetControl.java +++ b/vasc-lib/vasc-lib-i18n/src/main/java/net/forwardfire/vasc/lib/i18n/config/BundleCharSetControl.java @@ -35,6 +35,7 @@ public class BundleCharSetControl extends Control { /** * Does the loading of the ResourceBundle */ + @Override public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException, IOException { String bundleName = toBundleName(baseName, locale); String resourceName = toResourceName(bundleName, BUNDLE_EXTENSION); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java index 6ebb8a6..306342d 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlQueryManagerImpl.java @@ -170,13 +170,15 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa logger.finer("FOUND Query: "+out); } } - + + @Override public Query getQuery(String name) { Query q = queries.get(name); return q; } @SuppressWarnings("unchecked") + @Override public List execute(EntityManager entityManager,Query query) { String sql = query.toPreparedSQL(query); logger.finer("Executing: "+query.getName()+" sql: "+sql); @@ -212,6 +214,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa return q2.getResultList(); } + @Override public Object executeObject(EntityManager entityManager,Query query) { String sql = query.toPreparedSQL(query); logger.finer("Executing: "+query.getName()+" sql: "+sql); @@ -261,6 +264,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa } } + @Override public List execute(EntityManager entityManager,String name,Map parameters) { Query query = getQuery(name); if (parameters!=null) { @@ -272,6 +276,7 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa return execute(entityManager,query); } + @Override public Object executeObject(EntityManager entityManager,String name,Map parameters) { Query query = getQuery(name); if (parameters!=null) { @@ -282,7 +287,8 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa } return executeObject(entityManager,query); } - + + @Override public Integer executeUpdate(EntityManager entityManager,Query query) { String sql = query.toPreparedSQL(query); logger.fine("Executing: "+query.getName()+" sql: "+sql); @@ -330,7 +336,8 @@ public class XpqlQueryManagerImpl implements XpqlQueryManager.ILocal,XpqlQueryMa } throw new IllegalStateException("unknow query type"); } - + + @Override public Integer executeUpdate(EntityManager entityManager,String name,Map parameters) { Query query = getQuery(name); for (String key:parameters.keySet()) { diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java index 57fc443..a698ae1 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/execute/jpa/XpqlVascJndiQueriesElement.java @@ -53,52 +53,63 @@ public class XpqlVascJndiQueriesElement extends AbstractElement { this.xpqlManager=xpqlManager; } - public void clear() { + @Override + public void clear() { } - + + @Override public boolean containsKey(Object key) { return true; } - + + @Override public boolean containsValue(Object value) { return true; } - + + @Override public Set> entrySet() { return null; } - + + @Override public Query get(Object key) { return xpqlManager.getQuery((String)key); } - + + @Override public boolean isEmpty() { return false; } - + + @Override public Set keySet() { return null; } - + + @Override public Query put(String key, Query value) { return null; } - + @SuppressWarnings("unchecked") + @Override public void putAll(Map m) { } - + + @Override public Query remove(Object key) { return null; } - + + @Override public int size() { return 0; } - + + @Override public Collection values() { return null; } - } } diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java index 54448fd..1ccb82e 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQuery.java @@ -123,6 +123,7 @@ public class DefaultQuery extends AbstractQuery { return queryBuffer.toString(); } + @Override public Query clone() throws CloneNotSupportedException { Query query = new DefaultQuery(); //query.setTemplateStore(getTemplateStore()); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java index 16c296f..cbd413a 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/DefaultQueryParameterValue.java @@ -32,6 +32,7 @@ import net.forwardfire.vasc.xpql.query.QueryParameterValue; */ public class DefaultQueryParameterValue extends AbstractQueryParameterValue { + @Override public QueryParameterValue clone() throws CloneNotSupportedException { QueryParameterValue p = new DefaultQueryParameterValue(); p.setDefaultValue(getDefaultValue()); @@ -41,5 +42,4 @@ public class DefaultQueryParameterValue extends AbstractQueryParameterValue { p.setValueType(getValueType()); return p; } - } \ No newline at end of file diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java index 943b686..8a0bca8 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryInclude.java @@ -88,6 +88,7 @@ public class QueryInclude extends AbstractQueryPart { return query.getQueryStore().getQuery(getName()).toSQL(query); } + @Override public String toPreparedSQL(Query query) { if (query.getQueryStore().getQuery(getName())==null) { if (resource!=null) { @@ -104,6 +105,7 @@ public class QueryInclude extends AbstractQueryPart { return query.getQueryStore().getQuery(getName()).toPreparedSQL(query); } + @Override public String toXML(Query query) { if (resource==null) { return ""; @@ -111,6 +113,7 @@ public class QueryInclude extends AbstractQueryPart { return ""; } + @Override public String toEdit(Query query) { if (resource==null) { return "@inc:"+name; @@ -118,6 +121,7 @@ public class QueryInclude extends AbstractQueryPart { return "@inc:"+name+"@"+resource; } + @Override public QueryPart clone() throws CloneNotSupportedException { QueryInclude include = new QueryInclude(); include.setName(getName()); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java index 8c2a171..0d8709f 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryParameter.java @@ -56,8 +56,9 @@ public class QueryParameter extends AbstractQueryPart { public void setName(String name) { this.name = name; } - + @SuppressWarnings("unchecked") + @Override public String toSQL(Query query) { QueryParameterValue value = query.getQueryParameterValue(getName()); if ( value == null ) { @@ -105,6 +106,7 @@ public class QueryParameter extends AbstractQueryPart { } @SuppressWarnings("unchecked") + @Override public String toPreparedSQL(Query query) { QueryParameterValue value = query.getQueryParameterValue(getName()); @@ -197,14 +199,17 @@ public class QueryParameter extends AbstractQueryPart { return result; } + @Override public String toXML(Query query) { return ""; } + @Override public String toEdit(Query query) { return "@"+getName(); } + @Override public QueryPart clone() throws CloneNotSupportedException { QueryParameter p = new QueryParameter(); p.setName(getName()); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java index 0f872ca..477161b 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/QueryText.java @@ -41,19 +41,20 @@ public class QueryText extends AbstractQueryPart { public String getText() { return text; } - + /** * @param text the text to set */ public void setText(String text) { this.text = text; } - + @Override public String toSQL(Query query) { return text; } + @Override public QueryPart clone() throws CloneNotSupportedException { QueryText text = new QueryText(); text.setText(getText()); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java index 3b4f34a..b9d0157 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/ParameterTypeObjectConverter.java @@ -40,15 +40,18 @@ import org.x4o.xml.conv.ObjectConverterException; public class ParameterTypeObjectConverter extends AbstractStringObjectConverter { private static final long serialVersionUID = 40849496158706355L; - + + @Override public Class getObjectClassTo() { return QueryParameterType.class; } + @Override public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { return ((QueryParameterType)obj).name(); } + @Override public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { try { return QueryParameterType.valueOf(""+str); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java index adb2deb..ba85575 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryBindingHandler.java @@ -49,6 +49,7 @@ public class QueryBindingHandler extends AbstractElementBindingHandler { /** * @see org.x4o.xml.element.ElementBindingHandler#getBindParentClass() */ + @Override public Class getBindParentClass() { return Query.class; } @@ -56,6 +57,7 @@ public class QueryBindingHandler extends AbstractElementBindingHandler { /** * @see org.x4o.xml.element.ElementBindingHandler#getBindChildClasses() */ + @Override public Class[] getBindChildClasses() { return CLASSES_CHILD; } diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java index cb84c41..5299cd8 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/impl/x4o/QueryTypeObjectConverter.java @@ -42,14 +42,17 @@ public class QueryTypeObjectConverter extends AbstractStringObjectConverter { private static final long serialVersionUID = 2383122486722789617L; + @Override public Class getObjectClassTo() { return QueryType.class; } + @Override public String convertStringBack(Object obj,Locale locale) throws ObjectConverterException { return ((QueryType)obj).name(); } + @Override public Object convertStringTo(String str, Locale locale) throws ObjectConverterException { try { return QueryType.valueOf(""+str); diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java index f9fc522..4831a2c 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQuery.java @@ -66,6 +66,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getName() */ + @Override public String getName() { return name; } @@ -73,6 +74,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#setName(java.lang.String) */ + @Override public void setName(String name) { this.name=name; } @@ -80,6 +82,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#addQueryComment(java.lang.String) */ + @Override public void addQueryComment(String comment) { queryComments.add(comment); } @@ -87,6 +90,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#addQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue) */ + @Override public void addQueryParameterValue(QueryParameterValue value) { queryParameterValues.put(value.getName(), value); } @@ -94,6 +98,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#addLocalQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue) */ + @Override public void addLocalQueryParameterValue(QueryParameterValue value) { localQueryParameterValues.put(value.getName(), value); } @@ -101,6 +106,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#addOrderQueryParameterValue(net.forwardfire.vasc.xpql.query.QueryParameterValue) */ + @Override public void addOrderQueryParameterValue(QueryParameterValue value) { orderQueryParameterValues.add(value); } @@ -108,6 +114,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#addQueryPart(net.forwardfire.vasc.xpql.query.QueryPart) */ + @Override public void addQueryPart(QueryPart queryPart) { queryParts.add(queryPart); } @@ -115,6 +122,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getProperty(java.lang.String) */ + @Override public Object getProperty(String name) { return properties.get(name); } @@ -122,6 +130,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getPropertyString(java.lang.String) */ + @Override public String getPropertyString(String name) { return getProperty(name).toString(); } @@ -129,6 +138,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getQueryComments() */ + @Override public List getQueryComments() { return queryComments; } @@ -136,6 +146,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValue(java.lang.String) */ + @Override public QueryParameterValue getQueryParameterValue(String name) { return queryParameterValues.get(name); } @@ -143,6 +154,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getQueryParts() */ + @Override public List getQueryParts() { return queryParts; } @@ -150,6 +162,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#setProperty(java.lang.String, java.lang.Object) */ + @Override public void setProperty(String name, Object value) { properties.put(name,value); } @@ -157,6 +170,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getPropertyKeys() */ + @Override public Collection getPropertyKeys() { return properties.keySet(); } @@ -164,6 +178,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getQueryParameters() */ + @Override public List getQueryParameters() { return null; } @@ -171,6 +186,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getQueryParameterValues() */ + @Override public Collection getQueryParameterValues() { return queryParameterValues.values(); } @@ -178,6 +194,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getLocalQueryParameterValues() */ + @Override public Collection getLocalQueryParameterValues() { return localQueryParameterValues.values(); } @@ -185,6 +202,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getOrderQueryParameterValues() */ + @Override public List getOrderQueryParameterValues() { return orderQueryParameterValues; } @@ -192,6 +210,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#setQueryParameter(java.lang.String, java.lang.Object) */ + @Override public void setQueryParameter(String name, Object value) { if (name==null) { throw new NullPointerException("name can't be null."); @@ -219,6 +238,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { parameter.setValue(value); } + @Override public void setQueryParameters(Map parameters) { for (String key:parameters.keySet()) { setQueryParameter(key,parameters.get(key)); @@ -228,6 +248,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getType() */ + @Override public QueryType getType() { return type; } @@ -235,6 +256,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#setType(net.forwardfire.vasc.xpql.query.Query.QueryType) */ + @Override public void setType(QueryType type) { this.type=type; } @@ -242,6 +264,7 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#getQueryStore() */ + @Override public QueryStore getQueryStore() { return queryStore; } @@ -249,9 +272,11 @@ abstract public class AbstractQuery extends AbstractQueryPart implements Query { /** * @see net.forwardfire.vasc.xpql.query.Query#setQueryStore(net.forwardfire.vasc.xpql.query.QueryStore) */ + @Override public void setQueryStore(QueryStore store) { this.queryStore=store; } + @Override abstract public Query clone() throws CloneNotSupportedException; } \ No newline at end of file diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java index f1a5d8f..36938ee 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryParameterValue.java @@ -38,6 +38,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getName() */ + @Override public String getName() { return name; } @@ -45,6 +46,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setName(java.lang.String) */ + @Override public void setName(String name) { this.name=name; } @@ -52,6 +54,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getDefaultValue() */ + @Override public Object getDefaultValue() { return defaultValue; } @@ -59,6 +62,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setDefaultValue(java.lang.Object) */ + @Override public void setDefaultValue(Object defaultValue) { this.defaultValue=defaultValue; } @@ -66,6 +70,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getValue() */ + @Override public Object getValue() { return value; } @@ -73,6 +78,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setType(net.forwardfire.vasc.xpql.query.QueryParameterValue.QueryParameterType) */ + @Override public void setType(QueryParameterType type) { this.type=type; } @@ -80,6 +86,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#getType() */ + @Override public QueryParameterType getType() { return type; } @@ -87,6 +94,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @see net.forwardfire.vasc.xpql.query.QueryParameterValue#setValue(java.lang.Object) */ + @Override public void setValue(Object value) { this.value=value; } @@ -94,6 +102,7 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @return the valueType */ + @Override public Class getValueType() { return valueType; } @@ -101,9 +110,11 @@ abstract public class AbstractQueryParameterValue implements QueryParameterValue /** * @param valueType the valueType to set */ + @Override public void setValueType(Class valueType) { this.valueType = valueType; } + @Override abstract public QueryParameterValue clone() throws CloneNotSupportedException; } diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java index 1ce7ceb..376e47d 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/AbstractQueryPart.java @@ -32,12 +32,14 @@ abstract public class AbstractQueryPart implements QueryPart { /** * @see net.forwardfire.vasc.xpql.query.QueryPart#toSQL() */ + @Override abstract public String toSQL(Query query); /** * Returns the toSQL() retult. * @see net.forwardfire.vasc.xpql.query.QueryPart#toPreparedSQL() */ + @Override public String toPreparedSQL(Query query) { return toSQL(query); } @@ -46,6 +48,7 @@ abstract public class AbstractQueryPart implements QueryPart { * XML escapes the toSQL() return String. * @see net.forwardfire.vasc.xpql.query.QueryPart#toXML() */ + @Override public String toXML(Query query) { return escapeXML(toSQL(query)); } @@ -54,6 +57,7 @@ abstract public class AbstractQueryPart implements QueryPart { * Returns the toSQL() retult. * @see net.forwardfire.vasc.xpql.query.QueryPart#toEdit() */ + @Override public String toEdit(Query query) { return toSQL(query); } @@ -83,5 +87,6 @@ abstract public class AbstractQueryPart implements QueryPart { return filtered.toString(); } + @Override abstract public QueryPart clone() throws CloneNotSupportedException; } \ No newline at end of file diff --git a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java index f50b583..0d5dda3 100644 --- a/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java +++ b/vasc-lib/vasc-lib-xpql/src/main/java/net/forwardfire/vasc/xpql/query/Query.java @@ -79,5 +79,6 @@ public interface Query extends QueryPart { * @return * @throws CloneNotSupportedException */ + @Override public Query clone() throws CloneNotSupportedException; } diff --git a/vasc-opt/vasc-opt-editor/src/main/java/net/forwardfire/vasc/opt/editor/VirtualVascBackend.java b/vasc-opt/vasc-opt-editor/src/main/java/net/forwardfire/vasc/opt/editor/VirtualVascBackend.java index 267cb4e..e97a9e6 100644 --- a/vasc-opt/vasc-opt-editor/src/main/java/net/forwardfire/vasc/opt/editor/VirtualVascBackend.java +++ b/vasc-opt/vasc-opt-editor/src/main/java/net/forwardfire/vasc/opt/editor/VirtualVascBackend.java @@ -36,6 +36,7 @@ public class VirtualVascBackend extends AbstractVascBackend { private String vascType = "entry"; private String entryId = null; + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { List result = new ArrayList(100); entryId = (String)state.getDataParameter("entry_id"); @@ -67,19 +68,22 @@ public class VirtualVascBackend extends AbstractVascBackend { return new DefaultVascBackendResult(result); } - + + @Override public void persist(Serializable object) throws VascBackendException { edit(object,false,true); } - + + @Override public Serializable merge(Serializable object) throws VascBackendException { return edit(object,true,true); } - + + @Override public void delete(Serializable object) throws VascBackendException { edit(object,true,false); } - + public Serializable edit(Serializable object,boolean removeReal,boolean addEdit) throws VascBackendException { if (object instanceof VascEntry) { @@ -129,11 +133,12 @@ public class VirtualVascBackend extends AbstractVascBackend { return object; } - + @Override public VascEntryFieldValue provideVascEntryFieldValue() { return new BeanVascEntryFieldValue(); } - + + @Override public VascEntryRecordCreator provideVascEntryRecordCreator() { if ("entry".equals(vascType)) { return new BeanVascEntryRecordCreator(DefaultVascEntry.class); diff --git a/vasc-opt/vasc-opt-metamodel/src/main/java/net/forwardfire/vasc/opt/metamodel/x4o/SchemaAutoEntryElementConfigurator.java b/vasc-opt/vasc-opt-metamodel/src/main/java/net/forwardfire/vasc/opt/metamodel/x4o/SchemaAutoEntryElementConfigurator.java index c03916d..772f60e 100644 --- a/vasc-opt/vasc-opt-metamodel/src/main/java/net/forwardfire/vasc/opt/metamodel/x4o/SchemaAutoEntryElementConfigurator.java +++ b/vasc-opt/vasc-opt-metamodel/src/main/java/net/forwardfire/vasc/opt/metamodel/x4o/SchemaAutoEntryElementConfigurator.java @@ -41,6 +41,7 @@ public class SchemaAutoEntryElementConfigurator extends AbstractElementConfigura /** * @see org.x4o.xml.element.AbstractElementConfigurator#doConfigEndTag(org.x4o.xml.element.Element) */ + @Override public void doConfigElement(Element element) throws ElementConfiguratorException { if (element.getElementObject()==null) { diff --git a/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java index 41586fe..0ba7856 100644 --- a/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java +++ b/vasc-test/vasc-test-frontend/src/main/java/net/forwardfire/vasc/test/frontend/data/TestModelVascDataSource.java @@ -104,6 +104,7 @@ public class TestModelVascDataSource { return modelList; } + @Override public VascBackendResult execute(VascBackendState state) throws VascBackendException { if (state.getDataParameterKeys().isEmpty()==false) { List result = new ArrayList(modelList.size()/2); @@ -140,10 +141,12 @@ public class TestModelVascDataSource { } } + @Override public void persist(DATA_OBJECT object) throws VascBackendException { modelList.add(object); } + @Override public DATA_OBJECT merge(DATA_OBJECT object) throws VascBackendException { if(modelList.contains(object)==false) { modelList.add(object); @@ -151,6 +154,7 @@ public class TestModelVascDataSource { return object; } + @Override public void delete(DATA_OBJECT object) throws VascBackendException { modelList.remove(object); }