4.6.0 restructure and add adb support for Open webOS and LuneOS

JayCanuck · Dec 1, 2014 · d5aa6ea · d5aa6ea
1 parent 693f91f
commit d5aa6ea
Show file tree

Hide file tree

Showing 84 changed files with 1,962 additions and 1,792 deletions.
diff --git a/WebOSQuickInstall-4.5.0.jar b/WebOSQuickInstall-4.5.0.jar
diff --git a/build.xml b/build.xml
@@ -51,8 +51,7 @@
       -init-macrodef-junit:     defines macro for junit execution
       -init-macrodef-debug:     defines macro for class debugging
       -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar:                  JAR building
       run:                      execution of project 
       -javadoc-build:           Javadoc generation
       test-report:              JUnit report generation

diff --git a/lib/appframework-1.0.3.jar b/lib/appframework-1.0.3.jar
diff --git a/lib/filedrop.jar b/lib/filedrop.jar
diff --git a/lib/json.jar b/lib/json.jar
diff --git a/lib/swing-layout-1.0.4.jar b/lib/swing-layout-1.0.4.jar
diff --git a/lib/swing-worker-1.1.jar b/lib/swing-worker-1.1.jar
diff --git a/lib/tar.jar b/lib/tar.jar
diff --git a/lib/webOSLib-1.1.0.jar b/lib/webOSLib-1.1.0.jar
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=daa99d1c
-build.xml.script.CRC32=07fb21b2
-build.xml.stylesheet.CRC32=28e38971@1.56.1.46
+build.xml.data.CRC32=55741110
+build.xml.script.CRC32=44bd54c4
+build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=daa99d1c
-nbproject/build-impl.xml.script.CRC32=6a017077
-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
+nbproject/build-impl.xml.data.CRC32=55741110
+nbproject/build-impl.xml.script.CRC32=721adad8
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -0,0 +1,4 @@
+file.reference.filedrop.jar=C:\\Users\\Jason\\NetBeans Projects\\filedrop.jar
+file.reference.json.jar=C:\\Users\\Jason\\NetBeans Projects\\json.jar
+file.reference.tar.jar=C:\\Users\\Jason\\NetBeans Projects\\tar.jar
+user.properties.file=C:\\Users\\Jason\\AppData\\Roaming\\NetBeans\\8.0.1\\build.properties
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group/>
+    </open-files>
+</project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -25,7 +25,7 @@ excludes=
 file.reference.filedrop.jar=C:\\Users\\Jason\\NetBeansProjects\\filedrop.jar
 file.reference.json.jar=C:\\Users\\Jason\\NetBeansProjects\\json.jar
 file.reference.tar.jar=C:\\Users\\Jason\\NetBeansProjects\\tar.jar
-file.reference.webOSLib.jar=C:\\Users\\Jason\\NetBeansProjects\\webOSLib.jar
+file.reference.webOSLib-1.1.0.jar=C:\\Users\\Jason\\NetBeans Projects\\webOSLib-1.1.0.jar
 includes=**
 jar.compress=false
 javac.classpath=\
@@ -34,7 +34,7 @@ javac.classpath=\
     ${file.reference.filedrop.jar}:\
     ${file.reference.tar.jar}:\
     ${file.reference.json.jar}:\
-    ${file.reference.webOSLib.jar}
+    ${file.reference.webOSLib-1.1.0.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -62,7 +62,7 @@ jnlp.descriptor=application
 jnlp.enabled=false
 jnlp.offline-allowed=false
 jnlp.signed=false
-main.class=ca.canucksoftware.wosqi.WebOSQuickInstallApp
+main.class=ca.canuckcoding.wosqi.WebOSQuickInstallApp
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform

diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -13,7 +13,7 @@
             </test-roots>
         </data>
         <swingapp xmlns="http://www.netbeans.org/ns/form-swingapp/1">
-            <application-class name="ca.canucksoftware.wosqi.WebOSQuickInstallApp"/>
+            <application-class name="ca.canuckcoding.wosqi.WebOSQuickInstallApp"/>
         </swingapp>
     </configuration>
 </project>
diff --git a/src/META-INF/services/org.jdesktop.application.Application b/src/META-INF/services/org.jdesktop.application.Application
@@ -1 +1 @@
-ca.canucksoftware.wosqi.WebOSQuickInstallApp
+ca.canuckcoding.wosqi.WebOSQuickInstallApp
diff --git a/src/ca/canucksoftware/ipkg/PackageEntry.java → src/ca/canuckcoding/ipkg/PackageEntry.java b/src/ca/canucksoftware/ipkg/PackageEntry.java → src/ca/canuckcoding/ipkg/PackageEntry.java
@@ -1,8 +1,8 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
-import ca.canucksoftware.utils.OnlineFile;
-import ca.canucksoftware.webos.InstalledEntry;
+import ca.canuckcoding.utils.OnlineFile;
+import ca.canuckcoding.webos.InstalledEntry;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.regex.Pattern;

diff --git a/src/ca/canucksoftware/ipkg/PackageFeed.java → src/ca/canuckcoding/ipkg/PackageFeed.java b/src/ca/canucksoftware/ipkg/PackageFeed.java → src/ca/canuckcoding/ipkg/PackageFeed.java
@@ -2,9 +2,9 @@
  * PackageFeed.java
  */
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
-import ca.canucksoftware.utils.OnlineFile;
+import ca.canuckcoding.utils.OnlineFile;
 import java.util.ArrayList;
 import java.io.File;
 import java.io.BufferedReader;

diff --git a/...ca/canucksoftware/ipkg/PackageFilter.java → src/ca/canuckcoding/ipkg/PackageFilter.java b/...ca/canucksoftware/ipkg/PackageFilter.java → src/ca/canuckcoding/ipkg/PackageFilter.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
 /**
  * @author Jason Robitaille

diff --git a/...a/canucksoftware/ipkg/PackageManager.java → src/ca/canuckcoding/ipkg/PackageManager.java b/...a/canucksoftware/ipkg/PackageManager.java → src/ca/canuckcoding/ipkg/PackageManager.java
@@ -1,9 +1,9 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
-import ca.canucksoftware.webos.InstalledEntry;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.wosqi.WebOSQuickInstallApp;
+import ca.canuckcoding.webos.InstalledEntry;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.wosqi.WebOSQuickInstallApp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.ResourceBundle;
@@ -37,16 +37,24 @@ public PackageManager(DeviceInfo info, ArrayList<InstalledEntry> apps, JTextArea
         label = display;
         bundle = WebOSQuickInstallApp.bundle;
         ALL_CATEGORIES = "--" + bundle.getString("ALL") + "--";
-        defaultFeeds = new String[] {
-            "http://ipkg.preware.net/feeds/precentral/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-internals/all/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-internals/" + device.arch() + "/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-patches/" + device.version() + "/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-kernels/" + device.version() + "/Packages.gz",
-            "http://www.prethemer.com/feeds/preware/themes/Packages.gz",
-            "http://ipkg.preware.net/feeds/precentral-themes/Packages.gz",
-            "http://webos-clock-themer.googlecode.com/svn/trunk/WebOS%20Clock%20Theme%20Builder/feed/Packages.gz"
-        };
+        if(info.os().toLowerCase().contains("luneos")) {
+            defaultFeeds = new String[] {
+                "http://ipkg.preware.net/feeds/precentral/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/all/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/" + device.arch() + "/Packages.gz"
+            };
+        } else {
+            defaultFeeds = new String[] {
+                "http://ipkg.preware.net/feeds/precentral/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/all/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/" + device.arch() + "/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-patches/" + device.version() + "/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-kernels/" + device.version() + "/Packages.gz",
+                "http://www.prethemer.com/feeds/preware/themes/Packages.gz",
+                "http://ipkg.preware.net/feeds/precentral-themes/Packages.gz",
+                "http://webos-clock-themer.googlecode.com/svn/trunk/WebOS%20Clock%20Theme%20Builder/feed/Packages.gz"
+            };
+        }
         Preferences prefs = Preferences.systemRoot();
         int numFeeds = prefs.getInt("numCustomFeeds", 0);
         feedStates = new boolean[defaultFeeds.length + numFeeds];

diff --git a/...ca/canucksoftware/ipkg/PackageSorter.java → src/ca/canuckcoding/ipkg/PackageSorter.java b/...ca/canucksoftware/ipkg/PackageSorter.java → src/ca/canuckcoding/ipkg/PackageSorter.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
 import java.util.Comparator;
 

diff --git a/src/ca/canucksoftware/utils/FileUtils.java → src/ca/canuckcoding/utils/FileUtils.java b/src/ca/canucksoftware/utils/FileUtils.java → src/ca/canuckcoding/utils/FileUtils.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.utils;
+package ca.canuckcoding.utils;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/src/ca/canucksoftware/utils/MD5.java → src/ca/canuckcoding/utils/MD5.java b/src/ca/canucksoftware/utils/MD5.java → src/ca/canuckcoding/utils/MD5.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.utils;
+package ca.canuckcoding.utils;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/src/ca/canucksoftware/wosqi/About.form → src/ca/canuckcoding/wosqi/About.form b/src/ca/canucksoftware/wosqi/About.form → src/ca/canuckcoding/wosqi/About.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="modal" type="boolean" value="true"/>
@@ -9,6 +9,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="formKeyPressed"/>
@@ -48,7 +49,9 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Component class="javax.swing.JButton" name="closeButton">
           <Properties>
@@ -64,7 +67,7 @@
               </FontInfo>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.closeButton.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.closeButton.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="name" type="java.lang.String" value="closeButton" noResource="true"/>
@@ -73,8 +76,8 @@
             <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="closeButtonKeyTyped"/>
           </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="130" y="310" width="90" height="-1" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="130" y="310" width="90" height="-1"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -87,10 +90,10 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/donate.gif"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/donate.gif"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
@@ -101,22 +104,22 @@
             <EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="jLabel5MouseMoved"/>
           </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="120" width="330" height="50" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="120" width="330" height="50"/>
             </Constraint>
           </Constraints>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel1">
           <Properties>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/title.png"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/title.png"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="0" y="0" width="350" height="60" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="0" y="0" width="350" height="60"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -128,13 +131,13 @@
               </FontInfo>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="20" y="200" width="310" height="110" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="20" y="200" width="310" height="110"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -147,7 +150,7 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.appVersionLabel.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.appVersionLabel.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="appVersionLabel" noResource="true"/>
           </Properties>
@@ -156,8 +159,8 @@
             <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
           </AuxValues>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="50" width="330" height="30" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="50" width="330" height="30"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -170,32 +173,35 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="20" y="170" width="310" height="40" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="20" y="170" width="310" height="40"/>
             </Constraint>
           </Constraints>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel2">
           <Properties>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
               <FontInfo relative="true">
-                <Font component="jLabel2" property="font" relativeSize="true" size="3"/>
+                <Font component="jLabel2" property="font" relativeSize="true" size="1"/>
               </FontInfo>
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
           </Properties>
+          <Events>
+            <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel2MouseClicked"/>
+          </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="80" width="330" height="30" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="80" width="330" height="40"/>
             </Constraint>
           </Constraints>
         </Component>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ca.canucksoftware.wosqi.WebOSQuickInstallApp
		ca.canuckcoding.wosqi.WebOSQuickInstallApp