From 0e83ad6ee6da69c5821797b50011d74faa304732 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@warp.ovh>
Date: Fri, 28 Sep 2018 11:17:46 +0200
Subject: [PATCH] Updated pom.xml

---
 Flow                                          |  2 +-
 core/.classpath                               |  4 +--
 core/.settings/org.eclipse.jdt.core.prefs     |  8 ++---
 core/pom.xml                                  | 17 +---------
 desktop/.classpath                            | 12 +++----
 desktop/.settings/org.eclipse.jdt.core.prefs  |  8 ++---
 desktop/pom.xml                               | 17 +---------
 engine-jogl/.classpath                        |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ++---
 engine-jogl/pom.xml                           | 17 +---------
 hardware/.classpath                           |  2 +-
 hardware/.settings/org.eclipse.jdt.core.prefs |  8 ++---
 hardware/pom.xml                              | 17 +---------
 pom.xml                                       | 31 +++++--------------
 rules/.classpath                              |  2 +-
 rules/.settings/org.eclipse.jdt.core.prefs    |  8 ++---
 rules/pom.xml                                 | 13 +-------
 teavm/.classpath                              |  2 +-
 teavm/.settings/org.eclipse.jdt.core.prefs    |  6 ++--
 teavm/pom.xml                                 | 20 +++++++++---
 .../gui/graphicengine/html/HtmlEngine.java    |  4 +--
 21 files changed, 66 insertions(+), 142 deletions(-)

diff --git a/Flow b/Flow
index f1f1cb19..e1597fb7 160000
--- a/Flow
+++ b/Flow
@@ -1 +1 @@
-Subproject commit f1f1cb19604cd4179f7fc71d36fc52cb3b7c8e64
+Subproject commit e1597fb7442120bf4722f5a412b1c5eb84ba2966
diff --git a/core/.classpath b/core/.classpath
index cab3585c..b345b80b 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -13,12 +13,12 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
index f494d1de..9cfef2dd 100644
--- a/core/.settings/org.eclipse.jdt.core.prefs
+++ b/core/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=9
diff --git a/core/pom.xml b/core/pom.xml
index 5eba8b56..9ed6c5ce 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
 	<version>${project.version}</version>
 	</parent>
 	<artifactId>warppi-core</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>pom</packaging>
 
 	<name>WarpPI Calculator Core</name>
 	<description>WarpPI Calculator core project</description>
@@ -45,25 +45,10 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>it.cavallium.warppi.*</Export-Package>
-						<Bundle-SymbolicName>warppi-core</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/desktop/.classpath b/desktop/.classpath
index 1c983a1c..eb124529 100644
--- a/desktop/.classpath
+++ b/desktop/.classpath
@@ -6,6 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -13,7 +18,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -23,10 +28,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/desktop/.settings/org.eclipse.jdt.core.prefs b/desktop/.settings/org.eclipse.jdt.core.prefs
index f494d1de..967e92e1 100644
--- a/desktop/.settings/org.eclipse.jdt.core.prefs
+++ b/desktop/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.compliance=10
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/desktop/pom.xml b/desktop/pom.xml
index 4a18a5a3..45dd9d1e 100644
--- a/desktop/pom.xml
+++ b/desktop/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>warppi-desktop</artifactId>
 
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>WarpPI Calculator Desktop</name>
 	<description>WarpPI Calculator desktop project</description>
@@ -55,25 +55,10 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>it.cavallium.warppi.*</Export-Package>
-						<Bundle-SymbolicName>warppi-desktop</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
 			<!-- Maven Assembly Plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/engine-jogl/.classpath b/engine-jogl/.classpath
index 5e8a55fe..23ded4e6 100644
--- a/engine-jogl/.classpath
+++ b/engine-jogl/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/engine-jogl/.settings/org.eclipse.jdt.core.prefs b/engine-jogl/.settings/org.eclipse.jdt.core.prefs
index b8947ec6..1ed387a4 100644
--- a/engine-jogl/.settings/org.eclipse.jdt.core.prefs
+++ b/engine-jogl/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=9
diff --git a/engine-jogl/pom.xml b/engine-jogl/pom.xml
index 75e1731d..27a81534 100644
--- a/engine-jogl/pom.xml
+++ b/engine-jogl/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>warppi-engine-jogl</artifactId>
 
-	<packaging>bundle</packaging>
+	<packaging>pom</packaging>
 
 	<name>WarpPI Calculator JOGL Engine</name>
 	<description>WarpPI Calculator engine-jogl project</description>
@@ -37,25 +37,10 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>it.cavallium.warppi.*</Export-Package>
-						<Bundle-SymbolicName>warppi-engine-jogl</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/hardware/.classpath b/hardware/.classpath
index e1938397..cd5f6472 100644
--- a/hardware/.classpath
+++ b/hardware/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/hardware/.settings/org.eclipse.jdt.core.prefs b/hardware/.settings/org.eclipse.jdt.core.prefs
index f494d1de..967e92e1 100644
--- a/hardware/.settings/org.eclipse.jdt.core.prefs
+++ b/hardware/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.compliance=10
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/hardware/pom.xml b/hardware/pom.xml
index b28906e3..22e5800f 100644
--- a/hardware/pom.xml
+++ b/hardware/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>warppi-hardware</artifactId>
 
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
 
 	<name>WarpPI Calculator Hardware</name>
 	<description>WarpPI Calculator hardware project</description>
@@ -55,25 +55,10 @@
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>it.cavallium.warppi.*</Export-Package>
-						<Bundle-SymbolicName>warppi-hardware</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
 			<!-- Maven Assembly Plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 4819bd3e..787b1fa8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,10 @@
 	<properties>
 		<project.version>0.9.0a0</project.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.9</maven.compiler.source>
-		<maven.compiler.target>1.9</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
+		<java.version>11</java.version>
 		<src.dir>src/main/java</src.dir>
 		<src.dir2>src/main/java</src.dir2>
 		<src.resdir>src/main/resources</src.resdir>
@@ -130,28 +132,11 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.7.0</version>
+					<version>3.8.0</version>
 					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.0.0</version>
-					<executions>
-						<execution>
-							<id>build-javadoc</id>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-							<phase>post-integration-test</phase>
-						</execution>
-					</executions>
-					<configuration>
-						<show>protected</show>
-						<failOnError>false</failOnError>
+						<source>${maven.compiler.source}</source>
+						<target>${maven.compiler.target}</target>
+						<release>${maven.compiler.release}</release>
 					</configuration>
 				</plugin>
 				<plugin>
diff --git a/rules/.classpath b/rules/.classpath
index e1938397..323a5242 100644
--- a/rules/.classpath
+++ b/rules/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/rules/.settings/org.eclipse.jdt.core.prefs b/rules/.settings/org.eclipse.jdt.core.prefs
index f494d1de..9cfef2dd 100644
--- a/rules/.settings/org.eclipse.jdt.core.prefs
+++ b/rules/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=9
diff --git a/rules/pom.xml b/rules/pom.xml
index b3a93025..0c92c7b8 100644
--- a/rules/pom.xml
+++ b/rules/pom.xml
@@ -9,7 +9,7 @@
 		<version>${project.version}</version>
 	</parent>
 	<artifactId>warppi-rules</artifactId>
-	<packaging>bundle</packaging>
+	<packaging>pom</packaging>
 
 	<name>WarpPI Calculator Rules</name>
 	<description>WarpPI Calculator rules project</description>
@@ -24,17 +24,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Export-Package>rules.*</Export-Package>
-						<Bundle-SymbolicName>warppi-rules</Bundle-SymbolicName>
-					</instructions>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
diff --git a/teavm/.classpath b/teavm/.classpath
index ee04d99a..e1938397 100644
--- a/teavm/.classpath
+++ b/teavm/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/teavm/.settings/org.eclipse.jdt.core.prefs b/teavm/.settings/org.eclipse.jdt.core.prefs
index e029c71e..f494d1de 100644
--- a/teavm/.settings/org.eclipse.jdt.core.prefs
+++ b/teavm/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/teavm/pom.xml b/teavm/pom.xml
index fc136472..18747d4c 100644
--- a/teavm/pom.xml
+++ b/teavm/pom.xml
@@ -10,7 +10,14 @@
 	</parent>
 	<artifactId>warppi-teavm</artifactId>
 	<packaging>jar</packaging>
-
+	
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.release>1.8</maven.compiler.release>
+		<java.version>1.8</java.version>
+	</properties>
+		
 	<name>WarpPI Calculator TeaVM</name>
 	<description>WarpPI Calculator teavm project</description>
 	<dependencies>
@@ -28,7 +35,14 @@
 			<groupId>org.teavm</groupId>
 			<artifactId>teavm-classlib</artifactId>
 			<version>0.6.0-dev-567</version>
+			<scope>provided</scope>
 		</dependency>
+		<dependency>
+	      <groupId>org.teavm</groupId>
+	      <artifactId>teavm-extras-slf4j</artifactId>
+	      <version>0.6.0-dev-567</version>
+	      <scope>provided</scope>
+	    </dependency>
 	</dependencies>
 	<repositories>
 		<repository>
@@ -94,10 +108,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
diff --git a/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
index 09ba7273..f8f22535 100644
--- a/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
+++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java
@@ -97,8 +97,8 @@ public class HtmlEngine implements GraphicEngine {
 					canvas.setHeight((int)(320 / 1));
 					canvas.getStyle().setProperty("zoom", "" + (windowZoom + 1));
 				} else {
-					canvas.setWidth((int)(480 / (windowZoom + 1)));
-					canvas.setHeight((int)(320 / (windowZoom + 1)));
+					canvas.setWidth((int)(480 * 2));
+					canvas.setHeight((int)(320 * 2));
 				}
 				canvas.getStyle().setProperty("max-height", (int)(44 / windowZoom) + "vh");
 				width = 480 / windowZoom.intValue();