Merge branch 'master' of Mars.Ma/demo-highlight-align into master

build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="jar" name="plugin">
     <!-- JDK路径，根据自己机器上实际位置修改-->
-    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8/Contents/Home"/>
+    <property name="jdk.home" value="C:\Program Files\Java\jdk1.8.0_211"/>
 
     <property name="libs" value="${basedir}/lib"/>
     <property name="publicLibs" value=""/>
@@ -88,8 +88,8 @@
             <param name="resources_from" value="${basedir}"/>
         </antcall>
         <antcall target="compile_javas">
-            <param name="source_jdk_version" value="1.6"/>
+            <param name="source_jdk_version" value="1.8"/>
-            <param name="target_jdk_version" value="1.6"/>
+            <param name="target_jdk_version" value="1.8"/>
             <param name="compile_jdk_version" value="${jdk.home}"/>
             <param name="compile_files" value="${basedir}/src"/>
         </antcall>

src/main/java/com/fr/plugin/cell/highlight/fun/AlignHighlightAction.java

@@ -13,7 +13,7 @@ import com.fr.stable.AssistUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
-
+import com.fanruan.api.util.AssistKit;
 /**
  * @author richie
  * @date 2015-03-26
@@ -75,7 +75,7 @@ public class AlignHighlightAction extends AbstractStyleHighlightAction {
 
     @Override
     public int hashCode() {
-        return AssistUtils.hashCode(align);
+        return AssistKit.hashCode(align);
     }
 
     public Object clone() throws CloneNotSupportedException {