release 3.1.0

Jamling · Jamling · commit 59c5cf057b71 · 2018-03-02T09:34:22.000+08:00
diff --git a/cn.ieclipse.smartqq.feature/feature.xml b/cn.ieclipse.smartqq.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="cn.ieclipse.smartqq.feature"
       label="SmartQQ Feature"
-      version="3.0.4.qualifier"
+      version="3.1.0.qualifier"
       provider-name="ieclipse.cn"
       plugin="cn.ieclipse.smartqq">
 
@@ -38,6 +38,7 @@
       <import plugin="ch.qos.logback.core"/>
       <import plugin="org.eclipse.ui.browser"/>
       <import plugin="cn.ieclipse.pde.explorer" version="4.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.workbench"/>
    </requires>
 
    <plugin
diff --git a/cn.ieclipse.smartqq/.classpath b/cn.ieclipse.smartqq/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="libs/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/>
 	<classpathentry kind="lib" path="libs/gson-2.8.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/cn.ieclipse.smartqq/META-INF/MANIFEST.MF b/cn.ieclipse.smartqq/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SmartQQ
 Bundle-SymbolicName: cn.ieclipse.smartqq;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.1.0.qualifier
 Bundle-Activator: cn.ieclipse.smartim.IMPlugin
 Bundle-Vendor: ieclipse.cn
 Require-Bundle: org.eclipse.ui,
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui,
  ch.qos.logback.core,
  org.eclipse.ui.browser,
  cn.ieclipse.pde.explorer;bundle-version="4.1.0",
- org.eclipse.ui.workbench
+ org.eclipse.ui.workbench,
+ org.junit;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
diff --git a/cn.ieclipse.smartqq/build.properties b/cn.ieclipse.smartqq/build.properties
@@ -10,4 +10,3 @@ jars.compile.order = .,\
                      libs/
 javacDefaultEncoding.. = UTF-8
 additional.bundles = org.junit
-
diff --git a/cn.ieclipse.smartqq/plugin.xml b/cn.ieclipse.smartqq/plugin.xml
@@ -25,50 +25,6 @@
             restorable="true">
       </view>
    </extension>
-   <extension
-         point="org.eclipse.ui.console.consolePageParticipants">
-      <consolePageParticipant
-            class="cn.ieclipse.smartim.console.IMChatConsolePageParticipant"
-            id="cn.ieclipse.smartqq.consolePageParticipant1">
-         <enablement>
-            <instanceof
-                  value="cn.ieclipse.smartim.console.IMChatConsole">
-            </instanceof></enablement>
-      </consolePageParticipant>
-   </extension>
-   <extension
-         point="org.eclipse.ui.console.consolePatternMatchListeners">
-      <consolePatternMatchListener
-            class="cn.ieclipse.smartim.console.SenderMatchDelegate"
-            flags="Pattern.MULTILINE"
-            id="cn.ieclipse.smartqq.consolePatternMatchListener1"
-            regex="^\d{2}:\d{2}:\d{2} [^:]+: ">
-         <enablement>
-            <instanceof
-                  value="cn.ieclipse.smartim.console.IMChatConsole">
-            </instanceof></enablement>
-      </consolePatternMatchListener>
-      <consolePatternMatchListener
-            class="cn.ieclipse.smartim.console.UrlMatchDelegate"
-            id="cn.ieclipse.smartqq.consolePatternMatchListener2"
-            regex="(https?|ftp|file)://[-a-zA-Z0-9+&amp;@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&amp;@#/%=~_|]">
-         <enablement>
-             <instanceof
-                  value="cn.ieclipse.smartim.console.IMChatConsole">
-            </instanceof>
-         </enablement>
-      </consolePatternMatchListener>
-      <consolePatternMatchListener
-            class="cn.ieclipse.smartim.console.ReviewMatchDelegate"
-            id="cn.ieclipse.smartqq.consolePatternMatchListener3"
-            qualifier="Code: "
-            regex="Code: [\S ]+:[\d]+ ?">
-         <enablement>
-            <instanceof
-                  value="cn.ieclipse.smartim.console.IMChatConsole">
-            </instanceof></enablement>
-      </consolePatternMatchListener>
-   </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
diff --git a/cn.ieclipse.smartqq/src/cn/ieclipse/smartim/IMHistoryManager.java b/cn.ieclipse.smartqq/src/cn/ieclipse/smartim/IMHistoryManager.java
@@ -84,7 +84,7 @@ public void flush() {
                     fs.flush();
                 }
             }
+            stores.clear();
         }
-        stores.clear();
     }
 }
diff --git a/cn.ieclipse.smartqq/test/cn/ieclipse/smartim/console/UrlLinkTest.java b/cn.ieclipse.smartqq/test/cn/ieclipse/smartim/console/UrlLinkTest.java
@@ -11,6 +11,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import cn.ieclipse.smartim.common.IMUtils;
 import cn.ieclipse.util.Patterns;
 
 public class UrlLinkTest {
@@ -40,23 +41,12 @@ public void test() {
                 System.out.println(url);
                 assertTrue("Matches", true);
                 
-                String chstr = "(.+?)(" + UCS_CHAR + "+$)";
+                String chstr = "(.+?)(" + IMUtils.UCS_CHAR + "+$)";
                 System.out.println(url.replaceAll(chstr, "$1"));
             }
             else {
                 fail(str + " Not matches");
             }
         }
     }
-    
-    public static final String UCS_CHAR = "[" + "\u00A0-\uD7FF"
-            + "\uF900-\uFDCF" + "\uFDF0-\uFFEF" + "\uD800\uDC00-\uD83F\uDFFD"
-            + "\uD840\uDC00-\uD87F\uDFFD" + "\uD880\uDC00-\uD8BF\uDFFD"
-            + "\uD8C0\uDC00-\uD8FF\uDFFD" + "\uD900\uDC00-\uD93F\uDFFD"
-            + "\uD940\uDC00-\uD97F\uDFFD" + "\uD980\uDC00-\uD9BF\uDFFD"
-            + "\uD9C0\uDC00-\uD9FF\uDFFD" + "\uDA00\uDC00-\uDA3F\uDFFD"
-            + "\uDA40\uDC00-\uDA7F\uDFFD" + "\uDA80\uDC00-\uDABF\uDFFD"
-            + "\uDAC0\uDC00-\uDAFF\uDFFD" + "\uDB00\uDC00-\uDB3F\uDFFD"
-            + "\uDB44\uDC00-\uDB7F\uDFFD"
-            + "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]";
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void flush() {`
`84`	`84`	`fs.flush();`
`85`	`85`	`}`
`86`	`86`	`}`
	`87`	`+ stores.clear();`
`87`	`88`	`}`
`88`		`- stores.clear();`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import org.junit.Before;`
`12`	`12`	`import org.junit.Test;`
`13`	`13`
	`14`	`+import cn.ieclipse.smartim.common.IMUtils;`
`14`	`15`	`import cn.ieclipse.util.Patterns;`
`15`	`16`
`16`	`17`	`public class UrlLinkTest {`
`@@ -40,23 +41,12 @@ public void test() {`
`40`	`41`	`System.out.println(url);`
`41`	`42`	`assertTrue("Matches", true);`
`42`	`43`
`43`		`- String chstr = "(.+?)(" + UCS_CHAR + "+$)";`
	`44`	`+ String chstr = "(.+?)(" + IMUtils.UCS_CHAR + "+$)";`
`44`	`45`	`System.out.println(url.replaceAll(chstr, "$1"));`
`45`	`46`	`}`
`46`	`47`	`else {`
`47`	`48`	`fail(str + " Not matches");`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`
`51`		`-`
`52`		`- public static final String UCS_CHAR = "[" + "\u00A0-\uD7FF"`
`53`		`- + "\uF900-\uFDCF" + "\uFDF0-\uFFEF" + "\uD800\uDC00-\uD83F\uDFFD"`
`54`		`- + "\uD840\uDC00-\uD87F\uDFFD" + "\uD880\uDC00-\uD8BF\uDFFD"`
`55`		`- + "\uD8C0\uDC00-\uD8FF\uDFFD" + "\uD900\uDC00-\uD93F\uDFFD"`
`56`		`- + "\uD940\uDC00-\uD97F\uDFFD" + "\uD980\uDC00-\uD9BF\uDFFD"`
`57`		`- + "\uD9C0\uDC00-\uD9FF\uDFFD" + "\uDA00\uDC00-\uDA3F\uDFFD"`
`58`		`- + "\uDA40\uDC00-\uDA7F\uDFFD" + "\uDA80\uDC00-\uDABF\uDFFD"`
`59`		`- + "\uDAC0\uDC00-\uDAFF\uDFFD" + "\uDB00\uDC00-\uDB3F\uDFFD"`
`60`		`- + "\uDB44\uDC00-\uDB7F\uDFFD"`
`61`		`- + "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]";`
`62`	`52`	`}`