1. Fixed #5

2. Support #6
zkoss · Jul 31, 2015 · a8d79da · a8d79da
1 parent 2976db5
commit a8d79da
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 11 deletions.
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>org.zkoss.zkidea</id>
   <name>ZK</name>
-  <version>0.1.4</version>
+  <version>0.1.5</version>
   <vendor email="info@zkoss.org" url="http://www.zkoss.org">ZK Framework</vendor>
   <depends>org.jetbrains.idea.maven</depends>
 
@@ -11,11 +11,43 @@
        <p> This plugin can be installed on IntelliJ platform 141.1532 or greater. </p>
     ]]></description>
 
-  <!--<change-notes><![CDATA[-->
-  <!--Add change notes here.<br>-->
-  <!--<em>most HTML tags may be used</em>-->
-  <!--]]>-->
-  <!--</change-notes>-->
+  <change-notes><![CDATA[
+      <p>0.1.5</p>
+      <ul>
+           <li> [enhancement] #6 - JDK 6 or 7 support </li>
+           <li> [bug] #5 - v0.1.4 cannot work well on Windows environment </li>
+      </ul>
+      <br>
+      <p>0.1.4</p>
+      <ul>
+           <li> Fixed an issue about stackoverflow exception </li>
+      </ul>
+      <br>
+      <p>0.1.3</p>
+      <ul>
+           <li> Support ZK Maven archetypes to create project </li>
+           <li> some bugs fixed </li>
+      </ul>
+      <br>
+      <p>0.1.2</p>
+      <ul>
+           <li> Support MVVM annotation content assistant </li>
+           <li> Support to upgrade zul.xsd file automatically </li>
+           <li> Support MVVM annotation to go to declaration for Java class </li>
+      </ul>
+      <br>
+      <p>0.1.1</p>
+      <ul>
+           <li> Update zul.xsd to ZK 7.0.6-FL version </li>
+      </ul>
+      <br>
+      <p>0.1.0</p>
+      <ul>
+           <li> ZUL editor supports content assistant. </li>
+           <li> ZUL editor supports syntax checking.</li>
+      </ul>
+      <br>
+  ]]></change-notes>
 
   <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
   <idea-version since-build="131"/>

diff --git a/src/org/zkoss/zkidea/completion/MVVMAnnotationCompletionProvider.java b/src/org/zkoss/zkidea/completion/MVVMAnnotationCompletionProvider.java
@@ -11,6 +11,9 @@
 */
 package org.zkoss.zkidea.completion;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.intellij.codeInsight.completion.CompletionContributor;
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionResultSet;
@@ -23,9 +26,6 @@
 import com.intellij.psi.xml.XmlFile;
 import org.zkoss.zkidea.dom.ZulDomUtil;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * @author jumperchen
  */
@@ -52,6 +52,7 @@ public void fillCompletionVariants(CompletionParameters parameters, CompletionRe
 						CompletionResultSet completionResultSet = result.withPrefixMatcher(query);
 
 						// TODO: support idspace resolver.
+						// TODO: should ignore different namespace
 						// get annotation value
 						String annotVal = "";
 						int end = value.indexOf(CompletionUtilCore.DUMMY_IDENTIFIER);

diff --git a/src/org/zkoss/zkidea/project/ZKPathManager.java b/src/org/zkoss/zkidea/project/ZKPathManager.java
@@ -26,6 +26,10 @@ public static String getPluginTempPath() {
 	}
 
 	public static String getPluginResourcePath(String classPath) {
+		// fix for #5 windows issue
+		if ("\\".equals(File.separator)) {
+			classPath = classPath.replaceAll("/", "\\\\");
+		}
 		if (classPath.startsWith("/") || classPath.startsWith("\\"))
 			return getPluginTempPath() + File.separator + "classes" + classPath;
 		return  getPluginTempPath() + File.separator + "classes" + File.separator + classPath;

diff --git a/zkidea.iml b/zkidea.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />