浏览代码

Improve IMapFactory and TableInfo

JamesZhan 13 年之前
父节点
当前提交
59efdb466c

+ 3 - 2
src/com/jfinal/plugin/activerecord/IMapFactory.java

@@ -2,7 +2,8 @@ package com.jfinal.plugin.activerecord;
 
 import java.util.Map;
 
+@SuppressWarnings("rawtypes")
 public interface IMapFactory {
-	Map<String, Object> getAttrsMap();
-	Map<String, Object> getColumnsMap();
+	Map getAttrsMap();
+	Map getColumnsMap();
 }

+ 1 - 0
src/com/jfinal/plugin/activerecord/Record.java

@@ -28,6 +28,7 @@ import java.util.Map.Entry;
 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>();
 	
 	/**

+ 2 - 2
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;