Improve IMapFactory and TableInfo

jfinal · jfinal · commit 59efdb466ce9 · 2012-10-25T00:44:36.000+08:00
diff --git a/src/com/jfinal/plugin/activerecord/IMapFactory.java b/src/com/jfinal/plugin/activerecord/IMapFactory.java
@@ -2,7 +2,8 @@
 
 import java.util.Map;
 
+@SuppressWarnings("rawtypes")
 public interface IMapFactory {
-	Map<String, Object> getAttrsMap();
-	Map<String, Object> getColumnsMap();
+	Map getAttrsMap();
+	Map getColumnsMap();
 }
diff --git a/src/com/jfinal/plugin/activerecord/Record.java b/src/com/jfinal/plugin/activerecord/Record.java
@@ -28,6 +28,7 @@
 public class Record implements Serializable {
 	
 	private static final long serialVersionUID = -3254070837297655225L;
+	@SuppressWarnings("unchecked")
 	private Map<String, Object> columns = DbKit.mapFactory.getColumnsMap();	// new HashMap<String, Object>();
 	
 	/**
diff --git a/src/com/jfinal/plugin/activerecord/TableInfo.java b/src/com/jfinal/plugin/activerecord/TableInfo.java
@@ -16,7 +16,6 @@
 
 package com.jfinal.plugin.activerecord;
 
-import java.util.HashMap;
 import java.util.Map;
 import com.jfinal.util.StringKit;
 
@@ -27,7 +26,8 @@ public class TableInfo {
 	
 	private String tableName;
 	private String primaryKey;
-	private Map<String, Class<?>> columnTypeMap = new HashMap<String, Class<?>>();
+	@SuppressWarnings("unchecked")
+	private Map<String, Class<?>> columnTypeMap = DbKit.mapFactory.getAttrsMap();	//	new HashMap<String, Class<?>>();
 	
 	public String getTableName() {
 		return tableName;

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`
`3`	`3`	`import java.util.Map;`
`4`	`4`
	`5`	`+@SuppressWarnings("rawtypes")`
`5`	`6`	`public interface IMapFactory {`
`6`		`- Map<String, Object> getAttrsMap();`
`7`		`- Map<String, Object> getColumnsMap();`
	`7`	`+ Map getAttrsMap();`
	`8`	`+ Map getColumnsMap();`
`8`	`9`	`}`