Browse Source

添加大括号

James 3 years ago
parent
commit
537fe8a9c6

+ 11 - 6
src/main/java/com/jfinal/plugin/activerecord/Model.java

@@ -66,8 +66,9 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	
 	private Map<String, Object> createAttrsMap() {
 		Config config = _getConfig();
-		if (config == null)
+		if (config == null) {
 			return DbKit.brokenConfig.containerFactory.getAttrsMap();
+		}
 		return config.containerFactory.getAttrsMap();
 	}
 	
@@ -157,8 +158,9 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	 * @return this Model
 	 */
 	public M _setAttrs(Map<String, Object> attrs) {
-		for (Entry<String, Object> e : attrs.entrySet())
+		for (Entry<String, Object> e : attrs.entrySet()) {
 			set(e.getKey(), e.getValue());
+		}
 		return (M)this;
 	}
 	
@@ -172,10 +174,11 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	protected Set<String> _getModifyFlag() {
 		if (modifyFlag == null) {
 			Config config = _getConfig();
-			if (config == null)
+			if (config == null) {
 				modifyFlag = DbKit.brokenConfig.containerFactory.getModifyFlagSet();
-			else
+			} else {
 				modifyFlag = config.containerFactory.getModifyFlagSet();
+			}
 		}
 		return modifyFlag;
 	}
@@ -187,8 +190,9 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	}
 	
 	protected Config _getConfig() {
-		if (configName != null)
+		if (configName != null) {
 			return DbKit.getConfig(configName);
+		}
 		return DbKit.getConfig(_getUsefulClass());
 	}
 	
@@ -867,11 +871,12 @@ public abstract class Model<M extends Model> implements IRow<M>, Serializable {
 	 * @return this model
 	 */
 	public M remove(String... attrs) {
-		if (attrs != null)
+		if (attrs != null) {
 			for (String a : attrs) {
 				this.attrs.remove(a);
 				this._getModifyFlag().remove(a);
 			}
+		}
 		return (M)this;
 	}
 	

+ 10 - 6
src/main/java/com/jfinal/plugin/activerecord/Record.java

@@ -45,10 +45,11 @@ public class Record implements IRow<Record>, Serializable {
 	Set<String> _getModifyFlag() {
 		if (modifyFlag == null) {
 			Config config = DbKit.getConfig();
-			if (config == null)
+			if (config == null) {
 				modifyFlag = DbKit.brokenConfig.containerFactory.getModifyFlagSet();
-			else
+			} else {
 				modifyFlag = config.containerFactory.getModifyFlagSet();
+			}
 		}
 		return modifyFlag;
 	}
@@ -66,8 +67,9 @@ public class Record implements IRow<Record>, Serializable {
 	 */
 	public Record setContainerFactoryByConfigName(String configName) {
 		Config config = DbKit.getConfig(configName);
-		if (config == null)
+		if (config == null) {
 			throw new IllegalArgumentException("Config not found: " + configName);
+		}
 		
 		processColumnsMap(config);
 		return this;
@@ -95,10 +97,11 @@ public class Record implements IRow<Record>, Serializable {
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> getColumns() {
 		if (columns == null) {
-			if (DbKit.config == null)
+			if (DbKit.config == null) {
 				columns = DbKit.brokenConfig.containerFactory.getColumnsMap();
-			else
+			} else {
 				columns = DbKit.config.containerFactory.getColumnsMap();
+			}
 		}
 		return columns;
 	}
@@ -145,11 +148,12 @@ public class Record implements IRow<Record>, Serializable {
 	 * @param columns the column names of the record
 	 */
 	public Record remove(String... columns) {
-		if (columns != null)
+		if (columns != null) {
 			for (String c : columns) {
 				this.getColumns().remove(c);
 				this._getModifyFlag().remove(c);
 			}
+		}
 		return this;
 	}