修复编译错误

Author: Peng Hu

src/main/java/info/xiaomo/gengine/ai/btree/branch/Selector.java

@@ -1,19 +1,3 @@
-/*******************************************************************************
- * Copyright 2014 See AUTHORS file.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package info.xiaomo.gengine.ai.btree.branch;
 
 import java.util.Arrays;
@@ -45,6 +29,7 @@ public Selector() {
 	 *
 	 * @param tasks the children of this task
 	 */
+	@SafeVarargs
 	public Selector(Task<E>... tasks) {
 		super(Arrays.asList(tasks));
 	}

src/main/java/info/xiaomo/gengine/common/bean/Config.java

@@ -35,7 +35,7 @@ public class Config {
 	public static long getId() {
 		synchronized (obj) {
 			id += 1;
-			return (((long) SERVER_ID) & 0xFFFF) << 48 | (System.currentTimeMillis() / 1000L & 0xFFFFFFFF) << 16
+			return (((long) SERVER_ID) & 0xFFFF) << 48 | (System.currentTimeMillis() / 1000L) << 16
 					| id & 0xFFFF;
 		}
 	}

src/main/java/info/xiaomo/gengine/common/bean/NetPort.java

@@ -2,37 +2,53 @@
 
 /**
  * 网络端口常量
- * 
- *
- *  2017年6月30日 下午2:57:34
+ * <p>
+ * <p>
+ * 2017年6月30日 下午2:57:34
  */
 public final class NetPort {
 
-	/** 集群Tcp端口 */
-	public static int CLUSTER_PORT = 8000;
-	/** 集群http端口 */
-	public static int CLUSTER_HTTP_PORT = 8001;
+    /**
+     * 集群Tcp端口
+     */
+    public static int CLUSTER_PORT = 8000;
+    /**
+     * 集群http端口
+     */
+    public static int CLUSTER_HTTP_PORT = 8001;
 
-	/** 网关用户Tcp端口 */
-	public static int GATE_USER_PORT = 8002;
-	/** 网关游戏 tcp端口 (固定死) */
-	public static final int GATE_GAME_PORT = 8003;
-	/** 网关用户UPD端口 */
-	public static int GATE_USER_UDP_PORT = 8004;
-	/** 网关用户HTTP端口 */
-	public static int GATE_HTTP_PORT = 8006;
-	/** 网关用户WebSocket端口 */
-	public static int GATE_USER_WEBSOCKET_PORT = 8007;
-	
-	
-	
-	
-	// ======游戏服端口9000开始=======
+    /**
+     * 网关用户Tcp端口
+     */
+    public static int GATE_USER_PORT = 8002;
+    /**
+     * 网关游戏 tcp端口 (固定死)
+     */
+    public static final int GATE_GAME_PORT = 8003;
+    /**
+     * 网关用户UPD端口
+     */
+    public static int GATE_USER_UDP_PORT = 8004;
+    /**
+     * 网关用户HTTP端口
+     */
+    public static int GATE_HTTP_PORT = 8006;
+    /**
+     * 网关用户WebSocket端口
+     */
+    public static int GATE_USER_WEBSOCKET_PORT = 8007;
 
-	/** 捕鱼达人 */
-	public static int GAME_BYDR_PORT = 9001;
-	/**捕鱼达人世界服*/
-	public static int GAME_BYDR_WORLD_HTTP_PORT = 9992;
+
+    // ======游戏服端口9000开始=======
+
+    /**
+     * 捕鱼达人
+     */
+    public static int GAME_BYDR_PORT = 9001;
+    /**
+     * 捕鱼达人世界服
+     */
+    public static int GAME_BYDR_WORLD_HTTP_PORT = 9992;
 
     private NetPort() {
     }

src/main/java/info/xiaomo/gengine/common/bean/Reason.java

@@ -3,37 +3,37 @@
 /**
  * 全局原因、类型区别
  *
- * 
- *     <p>2017年7月26日 下午4:43:39
+ *
+ * <p>2017年7月26日 下午4:43:39
  */
 public enum Reason {
-  SessionIdle("会话空闲"),
-  SessionClosed("会话关闭"),
+    SessionIdle("会话空闲"),
+    SessionClosed("会话关闭"),
 
-  UserQuit("用户退出"),
-  UserLogin("用户登录"),
-  UserReconnect("用户登录"),
+    UserQuit("用户退出"),
+    UserLogin("用户登录"),
+    UserReconnect("用户登录"),
 
-  CrossServer("跨服"),
+    CrossServer("跨服"),
 
-  RoleUseItem("使用物品"),
-  RoleFire("开炮"),
-  RoleSync("角色同步"),
+    RoleUseItem("使用物品"),
+    RoleFire("开炮"),
+    RoleSync("角色同步"),
 
-  GmTickRole("gm踢角色下线"),
+    GmTickRole("gm踢角色下线"),
 
-  HallGoldChange("大厅金币改变"),
+    HallGoldChange("大厅金币改变"),
 
-  ServerClose("服务器关闭"),
-  ;
+    ServerClose("服务器关闭"),
+    ;
 
-  private final String reason;
+    private final String reason;
 
-  Reason(String reason) {
-    this.reason = reason;
-  }
+    Reason(String reason) {
+        this.reason = reason;
+    }
 
-  public String getReason() {
-    return reason;
-  }
+    public String getReason() {
+        return reason;
+    }
 }

src/main/java/info/xiaomo/gengine/common/bean/Result.java

@@ -5,62 +5,62 @@
 @Data
 public class Result<T> {
 
-	private int resultCode = 200;
+    private int resultCode = 200;
 
-	private String message = "SUCCESS";
+    private String message = "SUCCESS";
 
-	private T data;
+    private T data;
 
-	/**
-	 * 只返回错误码
-	 *
-	 * @param resultCode resultCode
-	 */
-	public Result(int resultCode) {
-		this.resultCode = resultCode;
-	}
+    /**
+     * 只返回错误码
+     *
+     * @param resultCode resultCode
+     */
+    public Result(int resultCode) {
+        this.resultCode = resultCode;
+    }
 
-	/**
-	 * 只有返回数据的(验证成功)
-	 *
-	 * @param data data
-	 */
-	public Result(T data) {
-		this.data = data;
-	}
+    /**
+     * 只有返回数据的(验证成功)
+     *
+     * @param data data
+     */
+    public Result(T data) {
+        this.data = data;
+    }
 
-	/**
-	 * 只有错误码和错误信息的
-	 *
-	 * @param resultCode resultCode
-	 * @param message    message
-	 */
-	public Result(int resultCode, String message) {
-		this.resultCode = resultCode;
-		this.message = message;
-	}
+    /**
+     * 只有错误码和错误信息的
+     *
+     * @param resultCode resultCode
+     * @param message    message
+     */
+    public Result(int resultCode, String message) {
+        this.resultCode = resultCode;
+        this.message = message;
+    }
 
-	/**
-	 * 只有错误码和错误信息的
-	 *
-	 * @param resultCode resultCode
-	 */
-	public Result(int resultCode, T data) {
-		this.resultCode = resultCode;
-		this.data = data;
-	}
+    /**
+     * 只有错误码和错误信息的
+     *
+     * @param resultCode resultCode
+     */
+    public Result(int resultCode, T data) {
+        this.resultCode = resultCode;
+        this.data = data;
+    }
 
 
-	/**
-	 * 全部参数
-	 *
-	 * @param resultCode resultCode
-	 * @param message    message
-	 * @param data       data
-	 */
-	public Result(int resultCode, String message, T data) {
-		this.resultCode = resultCode;
-		this.message = message;
-		this.data = data;
-	}
+    /**
+     * 全部参数
+     *
+     * @param resultCode resultCode
+     * @param message    message
+     * @param data       data
+     */
+    public Result(int resultCode, String message, T data) {
+        this.resultCode = resultCode;
+        this.message = message;
+        this.data = data;
+    }
 }