Fixed issues:

+ Issue #7 + Issue #9
downdrown · Jul 28, 2015 · 63a4365 · 63a4365
1 parent f1adc03
commit 63a4365
Show file tree

Hide file tree

Showing 12 changed files with 7,747 additions and 85 deletions.
diff --git a/highchartsapi-demo/highchartsapi-demo.iml b/highchartsapi-demo/highchartsapi-demo.iml
@@ -21,13 +21,13 @@
         <setting name="additionalCompilerParameters" value="-Xss1024k" />
         <setting name="compilerParameters" value="-compileReport" />
         <setting name="compilerMaxHeapSize" value="512" />
-        <setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/vaadin/vaadin-client/7.4.2" />
+        <setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/vaadin/vaadin-client/7.5.0" />
         <setting name="gwtSdkType" value="Vaadin-Maven" />
         <setting name="webFacet" value="Web" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" 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$">
@@ -40,17 +40,17 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: at.downdrown.vaadinaddons:highchartsapi:1.7.1" level="project" />
     <orderEntry type="module" module-name="highchartsapi" />
-    <orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.4.7" level="project" />
     <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin:vaadin-push:7.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.4.vaadin5" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-push:7.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:2.2.7.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin:vaadin-client-compiler:7.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin:vaadin-shared:7.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-client-compiler:7.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-shared:7.5.0" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin.external.flute:flute:1.3.0.gg2" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin.external.streamhtmlparser:streamhtmlparser-jsilver:0.0.10.vaadin1" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin.external.google:guava:16.0.1.vaadin1" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin:vaadin-client:7.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-client:7.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
@@ -98,7 +98,7 @@
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:50.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.vaadin:vaadin-client-compiler-deps:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.vaadin:vaadin-themes:7.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin:vaadin-themes:7.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
   </component>
 </module>
diff --git a/highchartsapi-demo/pom.xml b/highchartsapi-demo/pom.xml
@@ -9,34 +9,15 @@
 	<parent>
 		<groupId>at.downdrown.vaadinaddons</groupId>
 		<artifactId>highchartsapi-root</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>7.4.2</vaadin.version>
+		<vaadin.version>7.5.0</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 	</properties>
 
-    <!--     
-	<organization>
-		<name>My Name</name>
-		<url>https://github.com/mygithubaccount/HighChartsAPI/</url>
-	</organization>
-    
-	<scm>
-		<url>git://github.com/mygithubaccount/HighChartsAPI.git</url>
-		<connection>scm:git:git://github.com/mygithubaccount/HighChartsAPI.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com:/mygithubaccount/${ComponentClassName}.git</developerConnection>
-		<tag>HighChartsAPI add-on for Vaadin</tag>
-	</scm>
-
-	<issueManagement>
-		<system>GitHub</system>
-		<url>https://github.com/mygithubaccount/HighChartsAPI/issues</url>
-	</issueManagement>
-    -->
-
 	<licenses>
 		<license>
 			<name>Apache 2</name>

diff --git a/...emo/src/main/resources/at/downdrown/vaadinaddons/highchartsapi/demo/DemoWidgetSet.gwt.xml b/...emo/src/main/resources/at/downdrown/vaadinaddons/highchartsapi/demo/DemoWidgetSet.gwt.xml
@@ -33,5 +33,5 @@
     <inherits name="com.vaadin.DefaultWidgetSet"/>
 
 
-    <inherits name="at.downdrown.vaadinaddons.highchartsapi.WidgetSet"/>
+    <!--<inherits name="at.downdrown.vaadinaddons.highchartsapi.WidgetSet"/>-->
 </module>
diff --git a/highchartsapi-demo/src/main/webapp/WEB-INF/web.xml b/highchartsapi-demo/src/main/webapp/WEB-INF/web.xml
@@ -27,10 +27,10 @@
             <param-name>UI</param-name>
             <param-value>at.downdrown.vaadinaddons.highchartsapi.demo.DemoUI</param-value>
         </init-param>
-        <init-param>
-            <param-name>widgetset</param-name>
-            <param-value>at.downdrown.vaadinaddons.highchartsapi.demo.DemoWidgetSet</param-value>
-        </init-param>
+        <!--<init-param>-->
+        <!--<param-name>widgetset</param-name>-->
+        <!--<param-value>at.downdrown.vaadinaddons.highchartsapi.demo.DemoWidgetSet</param-value>-->
+        <!--</init-param>-->
         <init-param>
             <param-name>closeIdleSessions</param-name>
             <param-value>true</param-value>

diff --git a/highchartsapi/pom.xml b/highchartsapi/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>at.downdrown.vaadinaddons</groupId>
 		<artifactId>highchartsapi-root</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.2</version>
 	</parent>
 
 	<organization>
@@ -27,10 +27,10 @@
 	</developers>
 
 	<properties>
+		<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>[7.3.10, 7.4.3]</vaadin.version>
+		<vaadin.version>[7.3.10, 7.4.8]</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
-
 		<!-- ZIP Manifest fields -->
 		<Implementation-Version>${project.version}</Implementation-Version>
 		<!-- Must not change this because of the Directory -->
@@ -40,12 +40,19 @@
 		<Vaadin-Addon>${artifactId}-${project.version}.jar</Vaadin-Addon>
 	</properties>
 
-	<scm>
-		<url>git://github.com/downdrown/VaadinHighChartsAPI.git</url>
-		<connection>scm:git:git://github.com/downdrown/VaadinHighChartsAPI.git</connection>
-		<developerConnection>scm:git:ssh://downdrown@github.com:/downdrown/VaadinHighChartsAPI.git</developerConnection>
-		<tag>HighChartsAPI add-on for Vaadin</tag>
-	</scm>
+	<distributionManagement>
+		<repository>
+			<id>vaadin_dev</id>
+			<url>http://homeserver.home:8081/nexus/content/repositories/vaadin_dev</url>
+		</repository>
+	</distributionManagement>
+
+	<!--<scm>-->
+	<!--<url>git://github.com/downdrown/VaadinHighChartsAPI.git</url>-->
+	<!--<connection>scm:git:git://github.com/downdrown/VaadinHighChartsAPI.git</connection>-->
+	<!--<developerConnection>scm:git:ssh://downdrown@github.com:/downdrown/VaadinHighChartsAPI.git</developerConnection>-->
+	<!--<tag>HighChartsAPI add-on for Vaadin</tag>-->
+	<!--</scm>-->
 
 	<issueManagement>
 		<system>GitHub</system>
@@ -115,7 +122,6 @@
 	<build>
 
 		<plugins>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -141,7 +147,7 @@
 							<!-- Package format version - do not change -->
 							<Vaadin-Package-Version>1</Vaadin-Package-Version>
 							<Vaadin-License-Title>${Vaadin-License-Title}</Vaadin-License-Title>
-							<Vaadin-Widgetsets>at.downdrown.vaadinaddons.highchartsapi.WidgetSet</Vaadin-Widgetsets>
+							<!--<Vaadin-Widgetsets>at.downdrown.vaadinaddons.highchartsapi.WidgetSet</Vaadin-Widgetsets>-->
 						</manifestEntries>
 					</archive>
 				</configuration>
@@ -195,15 +201,38 @@
 				</executions>
 			</plugin>
 
-			<!-- Testing -->
+			<!--Testing-->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.14.1</version>
 			</plugin>
+
+			<!--Sass Compiler-->
+			<!--<plugin>-->
+			<!--<groupId>org.codehaus.mojo</groupId>-->
+			<!--<artifactId>exec-maven-plugin</artifactId>-->
+			<!--<version>1.2.1</version>-->
+			<!--<executions>-->
+			<!--<execution>-->
+			<!--<phase>generate-sources</phase>-->
+			<!--<goals>-->
+			<!--<goal>java</goal>-->
+			<!--</goals>-->
+			<!--<configuration>-->
+			<!--<classpathScope>compile</classpathScope>-->
+			<!--<mainClass>com.vaadin.sass.SassCompiler</mainClass>-->
+			<!--<arguments>-->
+			<!--<argument>src/main/webapp/VAADIN/themes/heijunka/styles.scss</argument>-->
+			<!--<argument>src/main/webapp/VAADIN/themes/heijunka/styles.css</argument>-->
+			<!--</arguments>-->
+			<!--</configuration>-->
+			<!--</execution>-->
+			<!--</executions>-->
+			<!--</plugin>-->
 		</plugins>
 
-		<!-- This is needed for the sources required by the client-side compiler to be 
+		<!-- This is needed for the sources required by the client-side compiler to be
 			included in the produced JARs -->
 		<resources>
 			<resource>

diff --git a/highchartsapi/src/main/java/at/downdrown/vaadinaddons/highchartsapi/HighChart.java b/highchartsapi/src/main/java/at/downdrown/vaadinaddons/highchartsapi/HighChart.java
@@ -6,7 +6,8 @@
 
 import com.vaadin.annotations.JavaScript;
 
-@JavaScript({"http://code.jquery.com/jquery-2.1.3.min.js", "http://code.highcharts.com/highcharts.js", "highcharts-connector.js"})
+//@JavaScript({"http://code.jquery.com/jquery-2.1.3.min.js", "http://code.highcharts.com/highcharts.js", "highcharts-connector.js"})
+@JavaScript({"jquery-2.1.3.min.js", "highcharts.js", "highcharts-connector.js"})
 public class HighChart extends AbstractHighChart {
 
     private static final long serialVersionUID = -7326315426217377753L;

diff --git a/...in/java/resources/at/downdrown/vaadinaddons/highchartsapi/public/highchartsapi/styles.css b/...in/java/resources/at/downdrown/vaadinaddons/highchartsapi/public/highchartsapi/styles.css
diff --git a/...chartsapi/src/main/java/resources/Changes → highchartsapi/src/main/resources/Changes b/...chartsapi/src/main/java/resources/Changes → highchartsapi/src/main/resources/Changes
@@ -1,23 +1,23 @@
 ### Version 1.5
-+Basic Functionality.
++ Basic Functionality.
 
 ### Version 1.6
-+Different instantiation (!!!) - Take a look at the Code Samples for further info!
-+Empty Title
-+Default Background is now transparent
-+LineChart
-+BarChart
-+Margin for Chart
-+Colors interface
-+Changing Chart Colors
-+(JavaDoc)
-+(Demo UI)
++ Different instantiation (!!!) - Take a look at the Code Samples for further info!
++ Empty Title
++ Default Background is now transparent
++ LineChart
++ BarChart
++ Margin for Chart
++ Colors interface
++ Changing Chart Colors
++ (JavaDoc)
++ (Demo UI)
 
 ### Version 1.7
-+Axis Component improvements
-+PieChartPlotOptions (Will defaultly be used when none is set)
-+Changed default chart look & feel
-+Removed xAxis, yAxis components
++ Axis Component improvements
++ PieChartPlotOptions (Will defaultly be used when none is set)
++ Changed default chart look & feel
++ Removed xAxis, yAxis components
 
 ### Version 1.7.1 (Pre-Release)
 + Axis Component improvements (Axis Title, GridLine Behavior)
@@ -35,4 +35,8 @@
 
 ### Version 2.0.0
 + Fixed issue #2
-+ Fixed issue #4
++ Fixed issue #4
+
+### Version 2.1.2
++ Fixed issue #7
++ Fixed issue #9
diff --git a/highchartsapi/src/main/resources/at/downdrown/vaadinaddons/highchartsapi/WidgetSet.gwt.xml b/highchartsapi/src/main/resources/at/downdrown/vaadinaddons/highchartsapi/WidgetSet.gwt.xml