格式化代码

格式化

Author: huguangju

src/main/java/com/thinkgem/jeesite/common/beanvalidator/BeanValidators.java

@@ -20,12 +20,12 @@
  * JSR303 Validator(Hibernate Validator)工具类.
  * 
  * ConstraintViolation中包含propertyPath, message 和invalidValue等信息.
- * 提供了各种convert方法，适合不同的i18n需求:
- * 1. List<String>, String内容为message
- * 2. List<String>, String内容为propertyPath + separator + message
- * 3. Map<propertyPath, message>
+ * 提供了各种convert方法，适合不同的i18n需求: 1. List<String>, String内容为message 2.
+ * List<String>, String内容为propertyPath + separator + message 3.
+ * Map<propertyPath, message>
  * 
  * 详情见wiki: https://github.com/springside/springside4/wiki/HibernateValidator
+ * 
  * @author calvin
  * @version 2013-01-15
  */
@@ -35,8 +35,9 @@ public class BeanValidators {
 	 * 调用JSR303的validate方法, 验证失败时抛出ConstraintViolationException.
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public static void validateWithException(Validator validator, Object object, Class<?>... groups)
+	public static void validateWithException(Validator validator, Object object, Class<?>... groups) 
 			throws ConstraintViolationException {
+		
 		Set constraintViolations = validator.validate(object, groups);
 		if (!constraintViolations.isEmpty()) {
 			throw new ConstraintViolationException(constraintViolations);
@@ -107,8 +108,9 @@ public static List<String> extractPropertyAndMessageAsList(ConstraintViolationEx
 	 * 辅助方法, 转换Set<ConstraintViolation>为List<propertyPath +separator+ message>.
 	 */
 	@SuppressWarnings("rawtypes")
-	public static List<String> extractPropertyAndMessageAsList(Set<? extends ConstraintViolation> constraintViolations,
-			String separator) {
+	public static List<String> extractPropertyAndMessageAsList(
+			Set<? extends ConstraintViolation> constraintViolations,String separator) {
+		
 		List<String> errorMessages = Lists.newArrayList();
 		for (ConstraintViolation violation : constraintViolations) {
 			errorMessages.add(violation.getPropertyPath() + separator + violation.getMessage());

src/main/java/com/thinkgem/jeesite/common/config/Global.java

@@ -14,56 +14,57 @@
 
 /**
  * 全局配置类
+ * 
  * @author ThinkGem
  * @version 2013-03-23
  */
 public class Global {
-	
+
 	/**
 	 * 保存全局属性值
 	 */
 	private static Map<String, String> map = Maps.newHashMap();
-	
+
 	/**
 	 * 属性文件加载对象
 	 */
 	private static PropertiesLoader propertiesLoader = new PropertiesLoader("jeesite.properties");
-	
+
 	/**
 	 * 获取配置
 	 */
 	public static String getConfig(String key) {
 		String value = map.get(key);
-		if (value == null){
+		if (value == null) {
 			value = propertiesLoader.getProperty(key);
 			map.put(key, value);
 		}
 		return value;
 	}
 
 	/////////////////////////////////////////////////////////
-	
+
 	/**
 	 * 获取管理端根路径
 	 */
 	public static String getAdminPath() {
 		return getConfig("adminPath");
 	}
-	
+
 	/**
 	 * 获取前端根路径
 	 */
 	public static String getFrontPath() {
 		return getConfig("frontPath");
 	}
-	
+
 	/**
 	 * 获取URL后缀
 	 */
 	public static String getUrlSuffix() {
 		return getConfig("urlSuffix");
 	}
-	
+
 	/**
 	 * 是否是演示模式，演示模式下不能修改用户、角色、密码、菜单、授权
 	 */
@@ -74,15 +75,16 @@ public static Boolean isDemoMode() {
 
 	/**
 	 * 获取CKFinder上传文件的根目录
+	 * 
 	 * @return
 	 */
 	public static String getCkBaseDir() {
 		String dir = getConfig("userfiles.basedir");
 		Assert.hasText(dir, "配置文件里没有配置userfiles.basedir属性");
-		if(!dir.endsWith("/")) {
+		if (!dir.endsWith("/")) {
 			dir += "/";
 		}
 		return dir;
 	}
-	
+
 }

src/main/java/com/thinkgem/jeesite/common/filter/PageCachingFilter.java

@@ -7,6 +7,7 @@
 
 /**
  * 页面高速缓存过滤器
+ * 
  * @author ThinkGem
  * @version 2013-8-5
  */
@@ -16,5 +17,5 @@ public class PageCachingFilter extends SimplePageCachingFilter {
 	protected CacheManager getCacheManager() {
 		return CacheUtils.getCacheManager();
 	}
-	
+
 }

src/main/java/com/thinkgem/jeesite/common/log/Log4jManager.java

@@ -47,8 +47,7 @@ public void setRootLoggerLevel(String newLevel) {
 	}
 
 	/**
-	 * 获得项目默认logger的级别.
-	 * 项目默认logger名称通过#setProjectLoggerName(String)配置.
+	 * 获得项目默认logger的级别. 项目默认logger名称通过#setProjectLoggerName(String)配置.
 	 */
 	@ManagedAttribute(description = "Level of the project default package logger")
 	public String getProjectLoggerLevel() {
@@ -60,8 +59,7 @@ public String getProjectLoggerLevel() {
 	}
 
 	/**
-	 * 设置项目默认logger的级别.
-	 * 项目默认logger名称通过#setProjectLoggerName(String)配置.
+	 * 设置项目默认logger的级别. 项目默认logger名称通过#setProjectLoggerName(String)配置.
 	 */
 	@ManagedAttribute
 	public void setProjectLoggerLevel(String newLevel) {
@@ -81,11 +79,11 @@ public String getLoggerLevel(String loggerName) {
 	}
 
 	/**
-	 * 设置Logger的日志级别.
-	 * 如果日志级别名称错误, 设为DEBUG.
+	 * 设置Logger的日志级别. 如果日志级别名称错误, 设为DEBUG.
 	 */
 	@ManagedOperation(description = "Set new logging level to the logger")
-	@ManagedOperationParameters({ @ManagedOperationParameter(name = "loggerName", description = "Logger name"),
+	@ManagedOperationParameters({
+			@ManagedOperationParameter(name = "loggerName", description = "Logger name"),
 			@ManagedOperationParameter(name = "newlevel", description = "New level") })
 	public void setLoggerLevel(String loggerName, String newLevel) {
 		Logger logger = Logger.getLogger(loggerName);

src/main/java/com/thinkgem/jeesite/common/mapper/BeanMapper.java

@@ -14,11 +14,11 @@
 
 /**
  * 简单封装Dozer, 实现深度转换Bean<->Bean的Mapper.实现:
- *  
- * 1. 持有Mapper的单例. 
- * 2. 返回值类型转换.
- * 3. 批量转换Collection中的所有对象.
- * 4. 区分创建新的B对象与将对象A值复制到已存在的B对象两种函数.
+ * 
+ * <p>1. 持有Mapper的单例. <p/>
+ * <p>2. 返回值类型转换. <p/>
+ * <p>3. 批量转换Collection中的所有对象.  <p/>
+ * <p>4.区分创建新的B对象与将对象A值复制到已存在的B对象两种函数. <p/>
  * 
  * @author calvin
  * @version 2013-01-15

src/main/java/com/thinkgem/jeesite/common/mapper/JaxbMapper.java

@@ -29,8 +29,7 @@
 /**
  * 使用Jaxb2.0实现XML<->Java Object的Mapper.
  * 
- * 在创建时需要设定所有需要序列化的Root对象的Class.
- * 特别支持Root对象是Collection的情形.
+ * 在创建时需要设定所有需要序列化的Root对象的Class. 特别支持Root对象是Collection的情形.
  * 
  * @author calvin
  * @version 2013-01-15
@@ -84,8 +83,8 @@ public static String toXml(Collection<?> root, String rootName, Class clazz, Str
 			CollectionWrapper wrapper = new CollectionWrapper();
 			wrapper.collection = root;
 
-			JAXBElement<CollectionWrapper> wrapperElement = new JAXBElement<CollectionWrapper>(new QName(rootName),
-					CollectionWrapper.class, wrapper);
+			JAXBElement<CollectionWrapper> wrapperElement = new JAXBElement<CollectionWrapper>(
+					new QName(rootName), CollectionWrapper.class, wrapper);
 
 			StringWriter writer = new StringWriter();
 			createMarshaller(clazz, encoding).marshal(wrapperElement, writer);
@@ -110,16 +109,16 @@ public static <T> T fromXml(String xml, Class<T> clazz) {
 	}
 
 	/**
-	 * 创建Marshaller并设定encoding(可为null).
-	 * 线程不安全，需要每次创建或pooling。
+	 * 创建Marshaller并设定encoding(可为null). 线程不安全，需要每次创建或pooling。
 	 */
 	public static Marshaller createMarshaller(Class clazz, String encoding) {
 		try {
 			JAXBContext jaxbContext = getJaxbContext(clazz);
 
 			Marshaller marshaller = jaxbContext.createMarshaller();
 
-			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
+					Boolean.TRUE);
 
 			if (StringUtils.isNotBlank(encoding)) {
 				marshaller.setProperty(Marshaller.JAXB_ENCODING, encoding);
@@ -132,8 +131,7 @@ public static Marshaller createMarshaller(Class clazz, String encoding) {
 	}
 
 	/**
-	 * 创建UnMarshaller.
-	 * 线程不安全，需要每次创建或pooling。
+	 * 创建UnMarshaller. 线程不安全，需要每次创建或pooling。
 	 */
 	public static Unmarshaller createUnmarshaller(Class clazz) {
 		try {
@@ -152,8 +150,8 @@ protected static JAXBContext getJaxbContext(Class clazz) {
 				jaxbContext = JAXBContext.newInstance(clazz, CollectionWrapper.class);
 				jaxbContexts.putIfAbsent(clazz, jaxbContext);
 			} catch (JAXBException ex) {
-				throw new HttpMessageConversionException("Could not instantiate JAXBContext for class [" + clazz
-						+ "]: " + ex.getMessage(), ex);
+				throw new HttpMessageConversionException(
+						"Could not instantiate JAXBContext for class [" + clazz + "]: " + ex.getMessage(), ex);
 			}
 		}
 		return jaxbContext;
@@ -167,5 +165,5 @@ public static class CollectionWrapper {
 		@XmlAnyElement
 		protected Collection<?> collection;
 	}
-	
+
 }