浏览代码

prepare jfinal 1.8

James 11 年之前
父节点
当前提交
02d5067604

+ 6 - 7
pom.xml

@@ -51,7 +51,12 @@
 			<version>4.8.2</version>
 			<scope>test</scope>
 		</dependency>
-		
+		<dependency>
+			<groupId>com.jfinal</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>8.1.8</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -109,12 +114,6 @@
 		</dependency>
 		<dependency>
 			<groupId>com.jfinal</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>8.1.8</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.jfinal</groupId>
 			<artifactId>cos</artifactId>
 			<version>26Dec2008</version>
 			<scope>provided</scope>

+ 0 - 1
src/com/jfinal/core/ActionReporter.java

@@ -48,7 +48,6 @@ final class ActionReporter {
 		doReport(controller, action);
 	}
 	
-	@SuppressWarnings("unchecked")
 	private static final void doReport(Controller controller, Action action) {
 		StringBuilder sb = new StringBuilder("\nJFinal action report -------- ").append(sdf.format(new Date())).append(" ------------------------------\n");
 		Class<? extends Controller> cc = action.getControllerClass();

+ 1 - 1
src/com/jfinal/core/ModelInjector.java

@@ -78,7 +78,7 @@ final class ModelInjector {
 		}
 	}
 	
-	@SuppressWarnings({"rawtypes", "unchecked"})
+	@SuppressWarnings("rawtypes")
 	private static final void injectActiveRecordModel(Model<?> model, String modelName, HttpServletRequest request, boolean skipConvertError) {
 		Table table = TableMapping.me().getTable(model.getClass());
 		

+ 1 - 0
src/com/jfinal/ext/interceptor/SessionInViewInterceptor.java

@@ -69,6 +69,7 @@ class JFinalSession extends HashMap implements HttpSession {
 		return session.getAttribute(key);
 	}
 	
+	@SuppressWarnings("unchecked")
 	public Enumeration getAttributeNames() {
 		return session.getAttributeNames();
 	}

+ 0 - 1
src/com/jfinal/plugin/ehcache/CacheInterceptor.java

@@ -94,7 +94,6 @@ public class CacheInterceptor implements Interceptor {
 		return sb.toString();
 	}
 	
-	@SuppressWarnings("unchecked")
 	private void cacheAction(String cacheName, String cacheKey, Controller controller) {
 		HttpServletRequest request = controller.getRequest();
 		Map<String, Object> cacheData = new HashMap<String, Object>();

+ 0 - 1
src/com/jfinal/render/VelocityRender.java

@@ -74,7 +74,6 @@ public class VelocityRender extends Render {
 		}
 	}
 	
-	@SuppressWarnings("unchecked")
 	public void render() {
 		 if (notInit) {
 			 Velocity.init(properties);	// Velocity.init("velocity.properties");	// setup