prepare jfinal 1.8

jfinal · jfinal · commit 02d50676049e · 2014-04-16T17:15:31.000+08:00
diff --git a/pom.xml b/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>
@@ -107,12 +112,6 @@
 			<version>3.2.4.RELEASE</version>
 			<scope>provided</scope>
 		</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>
diff --git a/src/com/jfinal/core/ActionReporter.java b/src/com/jfinal/core/ActionReporter.java
@@ -48,7 +48,6 @@ static final void reportMultipartRequest(Controller controller, Action action) {
 		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();
diff --git a/src/com/jfinal/core/ModelInjector.java b/src/com/jfinal/core/ModelInjector.java
@@ -78,7 +78,7 @@ private static final void injectCommonModel(Object model, String modelName, Http
 		}
 	}
 	
-	@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());
 		
diff --git a/src/com/jfinal/ext/interceptor/SessionInViewInterceptor.java b/src/com/jfinal/ext/interceptor/SessionInViewInterceptor.java
@@ -69,6 +69,7 @@ public Object getAttribute(String key) {
 		return session.getAttribute(key);
 	}
 	
+	@SuppressWarnings("unchecked")
 	public Enumeration getAttributeNames() {
 		return session.getAttributeNames();
 	}
diff --git a/src/com/jfinal/plugin/ehcache/CacheInterceptor.java b/src/com/jfinal/plugin/ehcache/CacheInterceptor.java
@@ -94,7 +94,6 @@ private String buildCacheKey(ActionInvocation ai, Controller controller) {
 		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>();
diff --git a/src/com/jfinal/render/VelocityRender.java b/src/com/jfinal/render/VelocityRender.java
@@ -74,7 +74,6 @@ public static void setProperties(Properties properties) {
 		}
 	}
 	
-	@SuppressWarnings("unchecked")
 	public void render() {
 		 if (notInit) {
 			 Velocity.init(properties);	// Velocity.init("velocity.properties");	// setup

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ static final void reportMultipartRequest(Controller controller, Action action) {`
`48`	`48`	`doReport(controller, action);`
`49`	`49`	`}`
`50`	`50`
`51`		`- @SuppressWarnings("unchecked")`
`52`	`51`	`private static final void doReport(Controller controller, Action action) {`
`53`	`52`	`StringBuilder sb = new StringBuilder("\nJFinal action report -------- ").append(sdf.format(new Date())).append(" ------------------------------\n");`
`54`	`53`	`Class<? extends Controller> cc = action.getControllerClass();`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private static final void injectCommonModel(Object model, String modelName, Http`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- @SuppressWarnings({"rawtypes", "unchecked"})`
	`81`	`+ @SuppressWarnings("rawtypes")`
`82`	`82`	`private static final void injectActiveRecordModel(Model<?> model, String modelName, HttpServletRequest request, boolean skipConvertError) {`
`83`	`83`	`Table table = TableMapping.me().getTable(model.getClass());`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public Object getAttribute(String key) {`
`69`	`69`	`return session.getAttribute(key);`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ @SuppressWarnings("unchecked")`
`72`	`73`	`public Enumeration getAttributeNames() {`
`73`	`74`	`return session.getAttributeNames();`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ private String buildCacheKey(ActionInvocation ai, Controller controller) {`
`94`	`94`	`return sb.toString();`
`95`	`95`	`}`
`96`	`96`
`97`		`- @SuppressWarnings("unchecked")`
`98`	`97`	`private void cacheAction(String cacheName, String cacheKey, Controller controller) {`
`99`	`98`	`HttpServletRequest request = controller.getRequest();`
`100`	`99`	`Map<String, Object> cacheData = new HashMap<String, Object>();`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ public static void setProperties(Properties properties) {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- @SuppressWarnings("unchecked")`
`78`	`77`	`public void render() {`
`79`	`78`	`if (notInit) {`
`80`	`79`	`Velocity.init(properties); // Velocity.init("velocity.properties"); // setup`