Merge branch 'refs/heads/eclipse-fixes'

Layoric · Layoric · commit cd3e95084136 · 2015-11-12T10:48:04.000+11:00
diff --git a/src/AndroidClient/.idea/encodings.xml b/src/AndroidClient/.idea/encodings.xml
diff --git a/src/AndroidClient/.idea/gradle.xml b/src/AndroidClient/.idea/gradle.xml
diff --git a/src/AndroidClient/.idea/runConfigurations.xml b/src/AndroidClient/.idea/runConfigurations.xml
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/META-INF/MANIFEST.MF b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse
 Bundle-SymbolicName: net.servicestack.eclipse;singleton:=true
-Bundle-Version: 1.0.6.qualifier
+Bundle-Version: 1.0.7.qualifier
 Bundle-Vendor: ServiceStack
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/net.servicestack.eclipse.iml b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/net.servicestack.eclipse.iml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="FacetManager">
+    <facet type="Osmorc" name="OSGi">
+      <configuration manifestGenerationMode="Manually" manifestLocation="META-INF/MANIFEST.MF" jarfileLocation="net.servicestack.eclipse.jar" outputPathType="CompilerOutputPath" bndFileLocation="" bundlorFileLocation="" bundleActivator="" bundleSymbolicName="" bundleVersion="1.0.0" ignoreFilePattern="" useProjectDefaultManifestFileLocation="false" alwaysRebuildBundleJAR="false" doNotSynchronizeWithMaven="false">
+        <additionalProperties />
+        <additionalJARContents />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/pom.xml b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/pom.xml
@@ -4,7 +4,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>1.0.6-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <artifactId>net.servicestack.eclipse</artifactId>
     <packaging>eclipse-plugin</packaging>
     <name>ServiceStackEclipse.Bundle</name>
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/nativetypes/JavaNativeTypesHandler.java b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/nativetypes/JavaNativeTypesHandler.java
@@ -20,7 +20,7 @@ public Map<String, String> parseComments(String codeOutput) {
         while (scanner.hasNextLine()) {
             String line = scanner.nextLine();
             linesOfCode.add(line);
-            if(line.startsWith("*/")) break;
+            if(line.trim().startsWith("*/")) break;
         }
         scanner.close();
 
@@ -65,7 +65,7 @@ public String generateUrl(String baseUrl, Map<String, String> options) {
 		try {
 			url = new URL(baseUrl);
 		} catch (MalformedURLException e1) {
-			// TODO Auto-generated catch block
+
 			e1.printStackTrace();
 			return null;
 		}
@@ -117,7 +117,7 @@ public String getUpdatedCode(String baseUrl, Map<String, String> options) throws
         }
 
         String javaCode = javaCodeResponse.toString();
-        if (!javaCode.startsWith("/* Options:")) {
+        if (!javaCode.trim().startsWith("/* Options:")) {
             return null;
         }
         result = javaCode;
@@ -136,7 +136,7 @@ public boolean validateServiceStackEndpoint(String baseUrl) throws IOException {
     }
 
     public boolean isFileAServiceStackReference(String fileContents) {
-        return fileContents.startsWith("/* Options:");
+        return fileContents.trim().startsWith("/* Options:");
     }
 
 
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/testers/SelectionTester.java b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/testers/SelectionTester.java
@@ -56,7 +56,7 @@ public boolean test(Object receiver, String property, Object[] args, Object expe
 				try {
 					for(int i = 0; i < 10; i++) {
 						String line = br.readLine();
-						if(line.startsWith("/* Options:")) {
+						if(line.trim().startsWith("/* Options:")) {
 							UpdateReferenceCurrentSelection.getInstance().UpdateReferenceFile = file;
 							    return true;
 						}
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.BundleTesting/pom.xml b/src/ServiceStackEclipse/ServiceStackEclipse.BundleTesting/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>net.servicestack.eclipse</groupId>
             <artifactId>net.servicestack.eclipse</artifactId>
-            <version>1.0.6-SNAPSHOT</version>
+            <version>1.0.7-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -61,5 +61,5 @@
         </plugins>
     </build>
 
-<version>1.0.6-SNAPSHOT</version>
+<version>1.0.7-SNAPSHOT</version>
 </project>
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Feature/feature.xml b/src/ServiceStackEclipse/ServiceStackEclipse.Feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.servicestack.eclipse.feature"
       label="ServiceStackEclipse"
-      version="1.0.6.qualifier"
+      version="1.0.7.qualifier"
       provider-name="ServiceStack">
 
    <description url="http://github.com/ServiceStack/ServiceStack.Java">
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Feature/pom.xml b/src/ServiceStackEclipse/ServiceStackEclipse.Feature/pom.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<version>1.0.6-SNAPSHOT</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<artifactId>net.servicestack.eclipse.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<name>ServiceStackEclipse.Feature</name>
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Repository/category.xml b/src/ServiceStackEclipse/ServiceStackEclipse.Repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/net.servicestack.eclipse.feature_1.0.6.qualifier.jar" id="net.servicestack.eclipse.feature" version="1.0.6.qualifier">
+   <feature url="features/net.servicestack.eclipse.feature_1.0.7.qualifier.jar" id="net.servicestack.eclipse.feature" version="1.0.7.qualifier">
       <category name="net.servicestack.eclipse.category"/>
    </feature>
    <category-def name="net.servicestack.eclipse.category" label="ServiceStack Tools"/>
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Repository/pom.xml b/src/ServiceStackEclipse/ServiceStackEclipse.Repository/pom.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<version>1.0.6-SNAPSHOT</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<artifactId>ServiceStackEclipse.Repository</artifactId>
 	<packaging>eclipse-repository</packaging>
 	<name>ServiceStackEclipse.Repository</name>
diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Repository/product.product b/src/ServiceStackEclipse/ServiceStackEclipse.Repository/product.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="ServiceStackEclipse" uid="net.servicestack.eclipse.product" id="net.servicestack.eclipse.ServiceStackEclipse" application="org.eclipse.ui.ide.workbench" version="1.0.6.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="ServiceStackEclipse" uid="net.servicestack.eclipse.product" id="net.servicestack.eclipse.ServiceStackEclipse" application="org.eclipse.ui.ide.workbench" version="1.0.7.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public Map<String, String> parseComments(String codeOutput) {`
`20`	`20`	`while (scanner.hasNextLine()) {`
`21`	`21`	`String line = scanner.nextLine();`
`22`	`22`	`linesOfCode.add(line);`
`23`		`- if(line.startsWith("*/")) break;`
	`23`	`+ if(line.trim().startsWith("*/")) break;`
`24`	`24`	`}`
`25`	`25`	`scanner.close();`
`26`	`26`
`@@ -65,7 +65,7 @@ public String generateUrl(String baseUrl, Map<String, String> options) {`
`65`	`65`	`try {`
`66`	`66`	`url = new URL(baseUrl);`
`67`	`67`	`} catch (MalformedURLException e1) {`
`68`		`- // TODO Auto-generated catch block`
	`68`	`+`
`69`	`69`	`e1.printStackTrace();`
`70`	`70`	`return null;`
`71`	`71`	`}`
`@@ -117,7 +117,7 @@ public String getUpdatedCode(String baseUrl, Map<String, String> options) throws`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`String javaCode = javaCodeResponse.toString();`
`120`		`- if (!javaCode.startsWith("/* Options:")) {`
	`120`	`+ if (!javaCode.trim().startsWith("/* Options:")) {`
`121`	`121`	`return null;`
`122`	`122`	`}`
`123`	`123`	`result = javaCode;`
`@@ -136,7 +136,7 @@ public boolean validateServiceStackEndpoint(String baseUrl) throws IOException {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`public boolean isFileAServiceStackReference(String fileContents) {`
`139`		`- return fileContents.startsWith("/* Options:");`
	`139`	`+ return fileContents.trim().startsWith("/* Options:");`
`140`	`140`	`}`
`141`	`141`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public boolean test(Object receiver, String property, Object[] args, Object expe`
`56`	`56`	`try {`
`57`	`57`	`for(int i = 0; i < 10; i++) {`
`58`	`58`	`String line = br.readLine();`
`59`		`- if(line.startsWith("/* Options:")) {`
	`59`	`+ if(line.trim().startsWith("/* Options:")) {`
`60`	`60`	`UpdateReferenceCurrentSelection.getInstance().UpdateReferenceFile = file;`
`61`	`61`	`return true;`
`62`	`62`	`}`