Merge branch 'master' of github.com:medcl/elasticsearch-analysis-ik

src/main/java/org/wltea/analyzer/dic/Dictionary.java

@@ -79,7 +79,7 @@ public class Dictionary {
 	 * 配置对象
 	 */
 	private Configuration configuration;
-    public static ESLogger logger=Loggers.getLogger("ik-analyzer");
+    public static final ESLogger logger=Loggers.getLogger("ik-analyzer");
     
     private static ScheduledExecutorService pool = Executors.newScheduledThreadPool(1);
     

src/main/java/org/wltea/analyzer/help/Sleep.java

@@ -5,7 +5,7 @@ import org.elasticsearch.common.logging.Loggers;
 
 public class Sleep {
 
-    public static ESLogger logger= Loggers.getLogger("ik-analyzer");
+    public static final ESLogger logger= Loggers.getLogger("ik-analyzer");
     
 	public enum Type{MSEC,SEC,MIN,HOUR};
 	public static void sleep(Type type,int num){
@@ -15,13 +15,13 @@ public class Sleep {
 					Thread.sleep(num);
 					return;
 				case SEC:
-					Thread.sleep(num*1000);
+					Thread.sleep(num*1000L);
 					return;
 				case MIN:
-					Thread.sleep(num*60*1000);
+					Thread.sleep(num*60*1000L);
 					return;
 				case HOUR:
-					Thread.sleep(num*60*60*1000);
+					Thread.sleep(num*60*60*1000L);
 					return;
 				default:
                     logger.error("输入类型错误，应为MSEC,SEC,MIN,HOUR之一");

src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java

@@ -47,7 +47,7 @@ import java.util.Stack;
  */
 public class IKQueryExpressionParser {
 
-    public static ESLogger logger= Loggers.getLogger("ik-analyzer");
+    public static final ESLogger logger= Loggers.getLogger("ik-analyzer");
     
 	//public static final String LUCENE_SPECIAL_CHAR = "&&||-()':={}[],";
 	

src/main/java/org/wltea/analyzer/sample/IKAnalzyerDemo.java

@@ -44,7 +44,7 @@ import org.wltea.analyzer.lucene.IKAnalyzer;
  */
 public class IKAnalzyerDemo {
 
-    public static ESLogger logger= Loggers.getLogger("ik-analyzer");
+    public static final ESLogger logger= Loggers.getLogger("ik-analyzer");
     
 	public static void main(String[] args){
 		//构建IK分词器，使用smart分词模式

src/main/java/org/wltea/analyzer/sample/LuceneIndexAndSearchDemo.java

@@ -64,7 +64,7 @@ import org.wltea.analyzer.lucene.IKAnalyzer;
  */
 public class LuceneIndexAndSearchDemo {
 
-    public static ESLogger logger= Loggers.getLogger("ik-analyzer");
+    public static final ESLogger logger= Loggers.getLogger("ik-analyzer");
 	
 	/**
 	 * 模拟：