From 5e3c36ac584acd80e5b5026474015a6b38c508d1 Mon Sep 17 00:00:00 2001 From: Erwin Vervaet Date: Wed, 7 Mar 2007 20:35:47 +0000 Subject: [PATCH] Setup Eclipse project for sandbox. Also did some cleanup of the source code to avoid compiler warnings. --- spring-webflow-sandbox/.classpath | 42 +++++++++++ spring-webflow-sandbox/.project | 17 +++++ .../.settings/org.eclipse.jdt.core.prefs | 74 +++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 3 + spring-webflow-sandbox/build.xml | 2 +- .../util/AbstractResourceHolder.java | 1 + ...endedFlowExecutionListenerInterceptor.java | 2 +- .../jpa/EntityManagerLifecycleController.java | 2 +- ...ityManagerPerConversationFlowListener.java | 20 +++-- .../webflow/jpa/hibernate/HibernateUtils.java | 1 + 10 files changed, 150 insertions(+), 14 deletions(-) create mode 100644 spring-webflow-sandbox/.classpath create mode 100644 spring-webflow-sandbox/.project create mode 100644 spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs create mode 100644 spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs diff --git a/spring-webflow-sandbox/.classpath b/spring-webflow-sandbox/.classpath new file mode 100644 index 00000000..7a1ebe48 --- /dev/null +++ b/spring-webflow-sandbox/.classpath @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-webflow-sandbox/.project b/spring-webflow-sandbox/.project new file mode 100644 index 00000000..c5d48186 --- /dev/null +++ b/spring-webflow-sandbox/.project @@ -0,0 +1,17 @@ + + + spring-webflow-sandbox + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..066111a1 --- /dev/null +++ b/spring-webflow-sandbox/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,74 @@ +#Wed Mar 07 21:33:41 CET 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +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.doc.comment.support=enabled +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.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.fallthroughCase=ignore +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=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=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.nullReference=ignore +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.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=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.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.unusedParameter=ignore +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.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..43086fa6 --- /dev/null +++ b/spring-webflow-sandbox/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +#Wed Mar 07 21:34:27 CET 2007 +eclipse.preferences.version=1 +internal.default.compliance=default diff --git a/spring-webflow-sandbox/build.xml b/spring-webflow-sandbox/build.xml index f8d80e0b..00ee4cbd 100644 --- a/spring-webflow-sandbox/build.xml +++ b/spring-webflow-sandbox/build.xml @@ -8,7 +8,7 @@ - + diff --git a/spring-webflow-sandbox/src/main/java/org/springframework/util/AbstractResourceHolder.java b/spring-webflow-sandbox/src/main/java/org/springframework/util/AbstractResourceHolder.java index 5fce9a33..f63da202 100644 --- a/spring-webflow-sandbox/src/main/java/org/springframework/util/AbstractResourceHolder.java +++ b/spring-webflow-sandbox/src/main/java/org/springframework/util/AbstractResourceHolder.java @@ -11,6 +11,7 @@ import java.lang.reflect.Method; */ public abstract class AbstractResourceHolder implements ResourceHolder , MethodReplacer {//todo replace on injector in config + @SuppressWarnings("unchecked") public Object reimplement(Object aObj, Method aMethod, Object[] aArgs) throws Throwable { Object retVal = null; if( aArgs.length == 0 ){ diff --git a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/execution/ExtendedFlowExecutionListenerInterceptor.java b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/execution/ExtendedFlowExecutionListenerInterceptor.java index 01f022f6..28c2b2ff 100644 --- a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/execution/ExtendedFlowExecutionListenerInterceptor.java +++ b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/execution/ExtendedFlowExecutionListenerInterceptor.java @@ -84,10 +84,10 @@ public class ExtendedFlowExecutionListenerInterceptor extends FlowExecutionListe * invoked. * * @param aContext The request aContext + * @param aFlowDefinition * @param aInput * @throws EnterStateVetoException * The start state transition was not allowed - * @param aFlowDefinition */ public final void sessionStarting(RequestContext aContext, FlowDefinition aFlowDefinition, MutableAttributeMap aInput) { aContext.getRequestScope().put(FIRST_EVENT_SIGNALED, Boolean.TRUE); diff --git a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/EntityManagerLifecycleController.java b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/EntityManagerLifecycleController.java index a5ac5be4..2ec54785 100644 --- a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/EntityManagerLifecycleController.java +++ b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/EntityManagerLifecycleController.java @@ -6,7 +6,7 @@ import javax.persistence.EntityManager; * Lifycycle controller that hide vendor specific routines for entity manager like: *
    *
  • Application transaction commit implementation. See, for example, - * {@link org.hibernate.annotations.FlushModeType.MANUAL}
    • + * org.hibernate.annotations.FlushModeType.MANUAL *
  • Binding/Unbinding persistence context resources for current thread
    • *
* diff --git a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/OpenEntityManagerPerConversationFlowListener.java b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/OpenEntityManagerPerConversationFlowListener.java index c9ff306b..dd6dd603 100644 --- a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/OpenEntityManagerPerConversationFlowListener.java +++ b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/OpenEntityManagerPerConversationFlowListener.java @@ -1,19 +1,17 @@ package org.springframework.webflow.jpa; -import org.springframework.webflow.execution.ExtendedFlowExecutionListenerInterceptor; -import org.springframework.webflow.execution.RequestContext; -import org.springframework.webflow.execution.FlowSession; -import org.springframework.webflow.execution.FlowExecutionContext; -import org.springframework.webflow.execution.ConversationLifecycleListener; -import org.springframework.webflow.execution.ConversationLifecycleListenerAdapter; +import javax.persistence.EntityManager; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.web.context.request.WebRequestInterceptor; import org.springframework.webflow.definition.FlowDefinition; import org.springframework.webflow.definition.StateDefinition; import org.springframework.webflow.engine.EndState; -import org.springframework.web.context.request.WebRequestInterceptor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.persistence.EntityManager; +import org.springframework.webflow.execution.ConversationLifecycleListenerAdapter; +import org.springframework.webflow.execution.FlowExecutionContext; +import org.springframework.webflow.execution.FlowSession; +import org.springframework.webflow.execution.RequestContext; /** * Intended for those wating a long session model within webflows. A entity * manager is created when the flow begins, and is disconnected and reconnected diff --git a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/hibernate/HibernateUtils.java b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/hibernate/HibernateUtils.java index 029ce1f6..4aaad430 100644 --- a/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/hibernate/HibernateUtils.java +++ b/spring-webflow-sandbox/src/main/java/org/springframework/webflow/jpa/hibernate/HibernateUtils.java @@ -29,6 +29,7 @@ public abstract class HibernateUtils { } @Deprecated public static List getEntityClasses( EntityManager aEntityManager ) { SessionFactory sessionFactory = getSession(aEntityManager).getSessionFactory(); + @SuppressWarnings("unchecked") Map metadataMap = sessionFactory.getAllClassMetadata(); List retVal = new LinkedList(); for (ClassMetadata classMetadata : metadataMap.values()) {