From e81fcd92546198ebcfe112b6179f02fe36e9bd1f Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Fri, 10 May 2019 03:55:16 +0000 Subject: [PATCH] v4.7.1u Update --- README.md | 57 +- bin/ipkg/PackageEntry.class | Bin 3469 -> 3721 bytes bin/ipkg/PackageFeed.class | Bin 4682 -> 4787 bytes bin/ipkg/PackageFilter.class | Bin 1709 -> 1709 bytes bin/ipkg/PackageManager.class | Bin 10595 -> 10987 bytes bin/ipkg/PackageSorter.class | Bin 961 -> 961 bytes bin/resources/NewJFrame.properties | 0 bin/resources/WebOSQuickInstallApp.properties | 2 +- bin/utils/FileUtils.class | Bin 3998 -> 3994 bytes bin/utils/MD5.class | Bin 1849 -> 2074 bytes bin/wosqi/About$2.class | Bin 636 -> 636 bytes bin/wosqi/About$3.class | Bin 646 -> 646 bytes bin/wosqi/About$4.class | Bin 646 -> 646 bytes bin/wosqi/About$5.class | Bin 646 -> 646 bytes bin/wosqi/About.class | Bin 6973 -> 7368 bytes bin/wosqi/Bundle.properties | 4 +- bin/wosqi/Bundle_de.properties | 2 +- bin/wosqi/Bundle_fr.properties | 2 +- bin/wosqi/Bundle_zh.properties | 2 +- bin/wosqi/DeviceManagement$1.class | Bin 714 -> 714 bytes bin/wosqi/DeviceManagement$10.class | Bin 749 -> 749 bytes bin/wosqi/DeviceManagement$11.class | Bin 720 -> 720 bytes bin/wosqi/DeviceManagement$2.class | Bin 699 -> 699 bytes bin/wosqi/DeviceManagement$3.class | Bin 718 -> 718 bytes bin/wosqi/DeviceManagement$4.class | Bin 704 -> 704 bytes bin/wosqi/DeviceManagement$5.class | Bin 718 -> 718 bytes bin/wosqi/DeviceManagement$6.class | Bin 1149 -> 1149 bytes bin/wosqi/DeviceManagement$7.class | Bin 966 -> 966 bytes bin/wosqi/DeviceManagement$8.class | Bin 698 -> 698 bytes bin/wosqi/DeviceManagement$9.class | Bin 749 -> 749 bytes bin/wosqi/DeviceManagement$DoDeleteApps.class | Bin 644 -> 644 bytes bin/wosqi/DeviceManagement$DoDispose.class | Bin 581 -> 581 bytes .../DeviceManagement$DoLoadDetails.class | Bin 603 -> 603 bytes .../DeviceManagement$DoLoadPackages.class | Bin 601 -> 601 bytes bin/wosqi/DeviceManagement.class | Bin 22075 -> 22014 bytes bin/wosqi/DeviceManagement.form | 372 -- bin/wosqi/FeedLoader$1.class | Bin 928 -> 928 bytes bin/wosqi/FeedLoader$DoDispose.class | Bin 545 -> 545 bytes bin/wosqi/FeedLoader$DoLoad.class | Bin 1020 -> 1012 bytes bin/wosqi/FeedLoader.class | Bin 6707 -> 6663 bytes bin/wosqi/FeedLoader.form | 167 - bin/wosqi/FeedViewer$1.class | Bin 718 -> 718 bytes bin/wosqi/FeedViewer$10.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$11.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$12.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$13.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$14.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$15.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$16.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$17.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$18.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$19.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$2.class | Bin 718 -> 718 bytes bin/wosqi/FeedViewer$20.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$21.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$22.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$23.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$24.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$25.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$26.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$27.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$28.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$29.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$3.class | Bin 711 -> 711 bytes bin/wosqi/FeedViewer$30.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$31.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$32.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$33.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$34.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$35.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$36.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$37.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$38.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$39.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$4.class | Bin 666 -> 666 bytes bin/wosqi/FeedViewer$40.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$41.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$42.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$43.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$44.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$45.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$46.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$47.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$48.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$49.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$5.class | Bin 713 -> 713 bytes bin/wosqi/FeedViewer$50.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$51.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$52.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$53.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$54.class | Bin 715 -> 715 bytes bin/wosqi/FeedViewer$55.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$56.class | Bin 668 -> 668 bytes bin/wosqi/FeedViewer$57.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$58.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$59.class | Bin 679 -> 679 bytes bin/wosqi/FeedViewer$6.class | Bin 731 -> 731 bytes bin/wosqi/FeedViewer$60.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$61.class | Bin 714 -> 714 bytes bin/wosqi/FeedViewer$62.class | Bin 735 -> 735 bytes bin/wosqi/FeedViewer$63.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$7.class | Bin 677 -> 677 bytes bin/wosqi/FeedViewer$8.class | Bin 711 -> 711 bytes bin/wosqi/FeedViewer$9.class | Bin 733 -> 733 bytes bin/wosqi/FeedViewer$DoDispose.class | Bin 545 -> 545 bytes bin/wosqi/FeedViewer$DoLoad.class | Bin 1151 -> 1151 bytes bin/wosqi/FeedViewer$DoSecondaryLoad.class | Bin 561 -> 561 bytes bin/wosqi/FeedViewer$ImageLayeredPane.class | Bin 1505 -> 1505 bytes bin/wosqi/FeedViewer.class | Bin 67842 -> 67842 bytes bin/wosqi/FeedViewer.form | 3658 ----------------- bin/wosqi/InstalledPatchInfo.form | 332 -- bin/wosqi/InstalledPkgInfo.form | 277 -- bin/wosqi/Installer.form | 160 - bin/wosqi/MainView$1.class | Bin 1119 -> 1119 bytes bin/wosqi/MainView$10.class | Bin 703 -> 703 bytes bin/wosqi/MainView$11.class | Bin 703 -> 703 bytes bin/wosqi/MainView$12.class | Bin 703 -> 703 bytes bin/wosqi/MainView$13.class | Bin 703 -> 703 bytes bin/wosqi/MainView$14.class | Bin 703 -> 703 bytes bin/wosqi/MainView$15.class | Bin 703 -> 703 bytes bin/wosqi/MainView$16.class | Bin 703 -> 703 bytes bin/wosqi/MainView$17.class | Bin 703 -> 703 bytes bin/wosqi/MainView$18.class | Bin 703 -> 703 bytes bin/wosqi/MainView$19.class | Bin 704 -> 704 bytes bin/wosqi/MainView$2.class | Bin 699 -> 699 bytes bin/wosqi/MainView$20.class | Bin 706 -> 706 bytes bin/wosqi/MainView$3.class | Bin 699 -> 699 bytes bin/wosqi/MainView$4.class | Bin 1075 -> 1075 bytes bin/wosqi/MainView$5.class | Bin 699 -> 699 bytes bin/wosqi/MainView$6.class | Bin 699 -> 699 bytes bin/wosqi/MainView$7.class | Bin 699 -> 699 bytes bin/wosqi/MainView$8.class | Bin 989 -> 989 bytes bin/wosqi/MainView$9.class | Bin 701 -> 701 bytes bin/wosqi/MainView$CheckConnection.class | Bin 569 -> 569 bytes bin/wosqi/MainView$DoInstallDrivers.class | Bin 1654 -> 1654 bytes bin/wosqi/MainView$DoctorChooseFilter.class | Bin 1319 -> 1319 bytes bin/wosqi/MainView$FirstCheckConnection.class | Bin 589 -> 589 bytes bin/wosqi/MainView$ImagePanel.class | Bin 1463 -> 1463 bytes bin/wosqi/MainView$WebOSChooseFilter.class | Bin 1368 -> 1368 bytes bin/wosqi/MainView$WebOSFileFilter.class | Bin 1028 -> 1028 bytes bin/wosqi/MainView.class | Bin 32758 -> 32758 bytes bin/wosqi/MainView.form | 545 --- bin/wosqi/ReceiveFile.form | 213 - bin/wosqi/SendFile.form | 213 - bin/wosqi/Settings.form | 352 -- bin/wosqi/Usage.form | 134 - bin/wosqi/WebOSQuickInstallApp$1.class | Bin 805 -> 805 bytes bin/wosqi/WebOSQuickInstallApp.class | Bin 4546 -> 4678 bytes src/ipkg/PackageEntry.java | 127 +- src/ipkg/PackageFeed.java | 199 +- src/ipkg/PackageFilter.java | 8 + src/ipkg/PackageManager.java | 479 ++- src/ipkg/PackageSorter.java | 32 +- src/resources/NewJFrame.properties | 0 src/resources/WebOSQuickInstallApp.properties | 2 +- src/utils/FileUtils.java | 138 +- src/utils/MD5.java | 40 +- src/wosqi/About.java | 65 +- src/wosqi/Bundle.properties | 4 +- src/wosqi/Bundle_de.properties | 2 +- src/wosqi/Bundle_fr.properties | 2 +- src/wosqi/Bundle_zh.properties | 2 +- src/wosqi/DeviceManagement.form | 372 -- src/wosqi/DeviceManagement.java | 617 ++- src/wosqi/FeedLoader.form | 167 - src/wosqi/FeedLoader.java | 78 +- src/wosqi/FeedViewer.form | 3658 ----------------- src/wosqi/FeedViewer.java | 6 + src/wosqi/InstalledPatchInfo.form | 332 -- src/wosqi/InstalledPkgInfo.form | 277 -- src/wosqi/Installer.form | 160 - src/wosqi/MainView.form | 545 --- src/wosqi/MainView.java | 3 + src/wosqi/ReceiveFile.form | 213 - src/wosqi/SendFile.form | 213 - src/wosqi/Settings.form | 352 -- src/wosqi/Usage.form | 134 - src/wosqi/WebOSQuickInstallApp.java | 3 +- 178 files changed, 1374 insertions(+), 13348 deletions(-) delete mode 100644 bin/resources/NewJFrame.properties delete mode 100644 bin/wosqi/DeviceManagement.form delete mode 100644 bin/wosqi/FeedLoader.form delete mode 100644 bin/wosqi/FeedViewer.form delete mode 100644 bin/wosqi/InstalledPatchInfo.form delete mode 100644 bin/wosqi/InstalledPkgInfo.form delete mode 100644 bin/wosqi/Installer.form delete mode 100644 bin/wosqi/MainView.form delete mode 100644 bin/wosqi/ReceiveFile.form delete mode 100644 bin/wosqi/SendFile.form delete mode 100644 bin/wosqi/Settings.form delete mode 100644 bin/wosqi/Usage.form delete mode 100644 src/resources/NewJFrame.properties delete mode 100644 src/wosqi/DeviceManagement.form delete mode 100644 src/wosqi/FeedLoader.form delete mode 100644 src/wosqi/FeedViewer.form delete mode 100644 src/wosqi/InstalledPatchInfo.form delete mode 100644 src/wosqi/InstalledPkgInfo.form delete mode 100644 src/wosqi/Installer.form delete mode 100644 src/wosqi/MainView.form delete mode 100644 src/wosqi/ReceiveFile.form delete mode 100644 src/wosqi/SendFile.form delete mode 100644 src/wosqi/Settings.form delete mode 100644 src/wosqi/Usage.form diff --git a/README.md b/README.md index 1d3b080..2dfd62a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -WebOS Quick Install v4.7.0u +WebOS Quick Install v4.7.1u =================== > **NOTICE: THIS TOOL IS DESIGNED FOR LEGACY PALM/HP WEBOS AND SOME VERSIONS OF LUNEOS. IT IS NOT COMPATIBLE WITH WEBOS OSE OR LG WEBOS.** @@ -29,40 +29,22 @@ Powered by JayCanuck's [webOSLib java library](https://github.com/JayCanuck/java * Supports English, French, German, and Simplified Chinese ------------------------------ -**What's new in v4.7.0u:** +What's new in v4.7.1u: ------------------------------ -1. Now uses user Java preferences rather than system Java preferences +1. Fixed some code spacing and indentation -2. Fixed several NullPointerException errors +2. Removed unnecessary files -3. Fixed blank package description icons/screenshots in Package Viewer window +3. Fixed compatibility with early versions of Java 7 -4. Imported and made use of JPowerShell API in order to implement an awesome powershell self-elevating permissions hack that triggers UAC to start novacom (from https://github.com/profesorfalken/jPowerShell) - -5. Converted project from NetBeans to Eclispe - -6. Converted project from Java 6/CC1.5 to Java 12/CC11. Java 7 or above is now reccomended, as is the use of OpenJDK (https://www.adoptopenjdk.net) - -7. Install folder is no longer created until novacom is detected - -8. Most of the novacom driver detection code is re-written from the ground up to better support Linux and macOS on all architectures, including armhf. This means that novacom can now be detected accurately on headless servers, or even a Raspberry Pi! Windows novacom detection support is retained from earlier versions - -9. On Windows and Linux, if novacom is installed, but not running, it will now be started. (This is not needed on macOS, because novacomd runs perpetually once installed) - -11. If the Install folder is empty, it will now be deleted upon exit - -12. Re-hosted webos-clock-themer repository at https://github.com/NotAlexNoyle/WebOS-Clock-Themer/ - -13. Updated "about" window - -14. Several other minor edits and bug fixes (see the commit history at https://github.com/NotAlexNoyle/WebOS-Quick-Install for a comprehensive comparison) +4. Bumped version number, and made title automatically adapt to new version numbers ------------------------------ -**Planned for future versions:** +Planned for future versions: ------------------------------ -1. Fix a lot of code spacing, order, and indentation +1. Fix more code spacing and indentation (Currently up to FeedViewer.java) 2. Fix several eclipse warnings @@ -78,20 +60,29 @@ Powered by JayCanuck's [webOSLib java library](https://github.com/JayCanuck/java 8. Add support for BSDs and Solaris-based operating systems (and possibly more) -9. Fix missing splash screen +9. Distrbute operating system-specific packages with icons (.exe, .app, etc) instead of .jar for everything. -10. Distrbute operating system-specific packages with icons (.exe, .app, etc) instead of .jar for everything. +10. Fix armhf device detection -11. Fix armhf device detection +11. Locate and remove unwanted loop when loading image assets in PackageViewer upon first launch -12. Locate and remove unwanted loop when loading image assets in PackageViewer upon first launch +12. Fix layout of About window on MacOS -13. Fix layout of About window on MacOS +13. Fix Linux novacomd installation, and add support for installing novacomd on armhf -14. Fix Linux novacomd installation, and add support for installing novacomd on armhf +14. Work on community feedback and implement community requests! -15. Work on community feedback and implement community requests! +15. Fix code order / refactor in general. +16. Update translations + +17. Resolve this issue: https://github.com/JayCanuck/webos-quick-install/issues/4 + +18. Fulfill this request: https://github.com/JayCanuck/webos-quick-install/issues/3 + +19. Add "continue anyway" option in the "there are no devices currently connected" pane, and change "ok" to "quit" + +20. Fix splash screen **Requirements** diff --git a/bin/ipkg/PackageEntry.class b/bin/ipkg/PackageEntry.class index 5277ea8ca70c98828d87f0acbb3361c38b7122cb..7391733e9aace10641c9a6592793209a3e4261a1 100644 GIT binary patch delta 1212 zcmYk4?NgLh7{-5Rmwj>DAp;C~v$d3zw=F%Qh~5 z#>W{x@Nm{DaThqx@u9WaUE@8&n4gchU?toSEcSBIP&6Yn4J%Q7U76tGqp4J_v&YIs=Db&5QyTO%8IoF}xN(%MQhyJ(?@&GgYq zKke+HLoMFIQ92pbi?f6{$2P{;&INXIQ5lzomZFzR4aOF6#wzxWEDA_LmLfY$Q`t02 zzNIdGVT?s|@BOQ|!0?@YN)Ta7rCwIA8l7X&DsiUKWs) z-urYUFcsQyVY93{+YF+6W`s>PM&K@~xr4#f}QMw7>#LU==w zcJ7+Ft;CxYQ|J0wx%IZ( zqqf}OR~+w{{oZwrxAQm|{escvYn+w`=hGfEr#%>#2Rq8I*qAG*W7dk&w5?nc)sJue~$LFXy*%D<+wrBb2_Q+(1ePLbj!6E`iD3eWy3o={$< zqZt`Dh4sB;{Gi#sMLs`LxRswY-ao4)zo@mp{jY7cGh|en&!pNYxmt>z)|oAkN!#~Q X{9ILgGhOrGxJ{wS*W)SGb};=fcklox delta 986 zcmY+C*-ukZ5XOJElwK$W_aF$aEP~defcqY!h%Jc`+_!3xRCcWUQgH!s!R0E7;%?ML z6Ezw%n)u*@4@QlDg3rbWpN&z!-hzoQXU?26^Ue3oOh@*a5$+GaU%v&WaqpSCFfqYo zpY=J>UpcU*I3Z71pPe;^Y(^(}|tAxLrVXP&Ob*i{t`Zh{aP<*$D&sHi4v4(2>Y|~HJW>pwx!X$jcap-+N zE(~D|-~b2p5@1l@ZG$4RaQ;!Vq7DuW@;L4q4qsaXrq zqOmuVD_bDzWrsLMG{oJu$kA~g|3uDUg)P#nMYuw@uwv4N;P|6T|0%OtQwzr&ut7ZH z0*QSfMr=}G7J$E$utO+h-M4XEifp~q|$8^|C=r% ziZNMCZn91Iq7lOvi6W#pN0en5Q?gG}qY1hhv-n}lob$ipzyp$-``+`O^PY2_=eg%y zsF

7M4H$1gMqLNh{*1_0Y~wUaqlAa3lv(ZmtVuJKNja+Up|CeFp|ok?!O`q9@Xq zOhxv^Bi)H)f4t{5JL*Yi-SD!^iv7N)tW?A+hC0C?KRD2p=x=_!FL@~5)YTui$QP%5 z&C|5mBgj^Z8p-jBm%~C%qN_jE+}9I-rmc6?@AEP!xps$Dq{i*3BfcGBF*Aa^lLJ+E^&HurE` zPma>W7(1EZe&)2^X&&Gltz6_mexQvjJfsReEW#sVsluh~mP$Hg2fNeK#2&eiz0yXf zJi$Im&@BVRaz22^rx@d55H&;GoQMNY0RwZ+J=;d0H;$E-hRvhAX7*y6ZW>L3qvkn|n;}Nb5z=oNn|gDMF*CxuW|VO=&4l@g zNi)lo`IKohN5*`{tm*^3SgV3^3l+LE<}APPE20XO@EgCYio+(CKk%w$8~BsIa7el8 z`#1mKR8j#>Xw<3jZe7hNP;*rO-CDA?a<7+JvhVfB#BIOfuW0#qjsw#SRb_-Xafj>2 z3B2r(aCDmDj5yw2SuB1}!8o)D3L{(BIcnmotmmO zP!5*tnm{m}CD}?OSF^8cEK9#JX_Z(sDDI3{4Pi5eH|hvGJ2P@q?4~L#}yzCy|bjt9nNATdO|Mg8xIjL;1sbh46(o`cijasVeEOb#@n3 z)^8Qp1s%NaspXOm*pIYuc}@I=byT6X0)`eT)bpZ6n%Sg2qi>_EvU8|^ixf%m8q0DW jYfEp!lD5smu}q;d&DM){gW_!QXHykK+!EHXk&^!aKl z$vo<*rHT3OyKsen+NyETFV1D7N%g~giSJM04Z0sIbHxf)8QnB$5T8aG$Z(%QyDj#y z(7KCQOEbe3H(RGbmN#gnNE`cE!a;JpM;=EzM_9@+9^fR)_>c#gqJt|e=UZ0r0}nC7 z!xGRb3r(I@9+6JEiqcQF4ACPaJSy8Qj?pW7>63SPOb)S94zpTL&@UHwT)yN9xyF-n zou@Qpjn=VFI~dST)@v_=x`C&46GJ-6GrEPPI?e{&$3{KCvwDb4>d5I~HtR7)b%KJP zr?^EwVXIEDjTX~k#56FWY|pISR6pk@enxETCVt^pQ|X{q@f(q4PT_a{ASNxQ&!7B- zXQY!{u&!s6?k^)e8?pAen;O{A3oZx`{&c8>Q zlj%K0@|~DuauYO`m^ps;>&7#NkJ&7YO~TF{#$wE}o%V0LtTt}FG1LA9wX?lVfS znLS>oi#J(mR%#gF?Xv!TR2Xnj=9M2%2Bg*%YElieyTlB-MCMCfd8ZchU|_bs>E5rY PtqK$5Q-~}uv`YFvej%#( diff --git a/bin/ipkg/PackageFilter.class b/bin/ipkg/PackageFilter.class index adbcb383e7e84cf0279fa43f69cbbe35f67f6fb2..79b156e844bca9579a3cea213a8abcd7a857c58b 100644 GIT binary patch delta 69 zcmZ3>yOwuDJgX`v13v>7gB$}lgDwLPgAD^OgEs>oLljUni$Q>)ib0T}lYxD53#%ok X2m>2~7*L(WyOwuDJgX`@13v=?gB$}VgDwLXgAD^WgEs>YLlgrqLly%cLlscAlYwn=3#%ok W5Ca>7Fi>7(@-bF7M)AqKYzqKfwF+qf diff --git a/bin/ipkg/PackageManager.class b/bin/ipkg/PackageManager.class index 84408426ebc7bad78bdca92e70689c2cd1fd3721..a2db9452918c881f0f8655075ca02c5bddfa37c9 100644 GIT binary patch delta 3642 zcmai04RDm@5q_Tc{*v=Z2$w)ET#^e!a!E`A7=8>8gaoJ|Bp4(C5$Gj3!iCEvBnJ|V zIaCmZDB@Q!!2+U=nYLmP=mBL$turzf>x}5M{fk)i*J{!l`2+26T47`n=IACDJMd@L5*cyvpfA)` zR^Qz2Zwb#Tye%0QSm!_h)+8<^OukTW5*zeEFsM6qhl9&Gp0M|Xecj=nrhx8PlU%0S zzd6w2uj=gR@`VGmbVGz{PIh zX}SIiGTRhvm5_x!&3;d-KkV=B2!#BtrAh20)Lo^z{f!QGvq$dL(6DxZuZ)^g-A0(VPJV%NI2l{c5o{`7fN*bx_kVx zW@j$@9K2V1(K$8}(RKN@T(2vM_gy1_vEkVqv*OWJ1VU||b;2Cu?hg>t;$Dw1&J*XA zf&Bk;n=l8${toS9XMpgn1fxY#2(DW z5!{M5F%Ms0KK_O(Tt+p%mNVa?M!2w;cGNNxOIRS3DZx@MmhTGO!8R;sPXvwZ#R~4k zO76uf9>Hp!z*@eB7QTyCeuQ?np^ z=3zhJdQc^&?RZhV7#MDAhIfU`2@pvd1SI>lAy@dmM&BBwr(bGb^? zufY`|hDj7xae@e#MO`u{G9MQ04>{gQuKgRNE08yGk^nkd^eACY4!~9sv&ek+2!gf6 z;#$3qlMduM-OmvqV`wdn0pvB%s!B`*EtfgUqJt=tFB+XJ5v2Abuh%4 z{8K8-2B=d6)a{CH-AELd4_|$v_!Mt0J}Umrkir@iM9l`G^YuH^B2HN`hBl02GA2q6 z6wx7FXtcPUCRBH#nHdOhyhyqcVh-+>vpcxbD{vNG2j}iMoXNOfk||ZprDLN3r;<~5 z#L=w6Bu+Qb48_qj!z)lZTT!to%2`Kc zs0@Fsq5>>4t~54wBoSeoVN|NS-k%Z*D~)J9APQ}wWpE@~b*AZNVQIg1$&(wIJA@S_ zE=!!_E{j3#g~r#(SiELlo4G5jE~^k)*gT=gWpPI-@|g+wlnU#$7@3)2P6Vm1L=R8{ zdeN5%Pz}Z)0!|a4rX!Uzku6|&ISW(8hg&!gvssO5E|fl3BZX+O6rUyNW<7ejT+}q8 zU#izmk=-YZ)XPYNlmhWHfy!VU6A@=%vSg#(h@M3r3t3{$ zD!=}C^sLuKPeirx6WsCGDZT%TPZBdrouosu#A(1>=@#~8i`!*qxM*eZ34D5zw?$c_ zo`y{@H=Ft^vx`q~iJXwS(q^!Is=nZ4y)n5lHo4uHWX6x_Yf&!S51VNi5wls845>U> z9eq}1=^rN>jnrCT2ylgytDIaN2 zD9Wx1bM_F<#3aLpg%^tp4SOufJ9dj0&&v`McZEeyiFiF4LPpHiNL{~Q7k)vQ zvkfP3QuzESAK-(GF{ z@j!%?Jj5D4&3Zn=Wqgi}9Oj+;8CUb?+{l->iO1wMH6XV=CHFnehj@mM@K-#@*Ljp@ z8RZ*%mA~dW`JLx)_*=fk_xUzI;XAy@cljs2$1D7R-}6I7eylQhLFMs}Y7#H1B1S$_ zCH!1X;g_nMXVqN(L$LU#s^(?2gx{()ysFw2)E1=#9jl5co4QXWt6eJ1$lh~OP$h*% zvR4goyEG`Nc`}M+uTs0D#8nHbPr)Vl=uK-Fqr{b+l7OcpiHdt(_f3j{8DB}lKP)4Q zw8;UZT3cyGSU`OrHm0DRyJeIlr!BGG$D<-KpiA(0LgLkg#5s|8M3+$2acdUUF6~9H z`NJN!VdJCn$M29wjw-f(gDiDb9y=Brq|00&Wm87XwSEV$jJ50n zcTQ}@zEPH?OGr)M!)qP*F|Dbf)Ujw~Nuso9dkfOdi=y1C{iL9vLf&P`DibLxOH7SN zsdA%S2?3P{OJseO@)}^58x4GQ9PDIy1TN6*-m*yx#vwJ*Fm(}(b7tS}1i%|@qkN>%yKidgo7 Y*to8-sS0gQ;keZOM##yh^j-e=-=oAMr~m)} delta 3134 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 diff --git a/bin/resources/NewJFrame.properties b/bin/resources/NewJFrame.properties deleted file mode 100644 index e69de29..0000000 diff --git a/bin/resources/WebOSQuickInstallApp.properties b/bin/resources/WebOSQuickInstallApp.properties index 1caaad2..e674fd4 100644 --- a/bin/resources/WebOSQuickInstallApp.properties +++ b/bin/resources/WebOSQuickInstallApp.properties @@ -2,7 +2,7 @@ Application.name = WebOS Quick Install Application.title = WebOS Quick Install -Application.version = v4.7.0u +Application.version = v4.7.1u Application.vendor = NotAlexNoyle Application.homepage = http://github.com/NotAlexNoyle/WebOS-Quick-Install Application.description = An advanced tool for installing and managing packages on webOS devices. diff --git a/bin/utils/FileUtils.class b/bin/utils/FileUtils.class index d66a54913e5eb3bab658f015353541e732315abb..e07def745a344d72895d839d7c310a41cf19c7db 100644 GIT binary patch delta 339 zcmWNMTPs9i6o#KYlJ=ZL6(7-5hxh8ZWuB%{RDC757=X_llVrL9Wa zkd`KHioRbfVO;+~^CBJ*Hp>KAQHB&Dk!`GL+q&jwOhq7L?V4=BvA)bh;G!ce8V)Jp z2p=cPlGO#L^l`>4=gg5~AJ;^KG3(D92Xg}v{Bm5$cde^$biu9YJ7vFDw!D%W=6Tfq d0-HRs$Fp(D)1ep5M_x;{6ju!Dzg0c_`~&QVI&}a5 delta 319 zcmXYs%Pxaa6otP-gum4`>R#nfFL75jDC!;rZ7FG~YbyDPL=%RFje&`Qi8C|s3}#+} zcn9J=tbv@tKKsksd#(NAzPfK8j`_Bq&gEnZKhQ=qVY*Z!wByo2f=<#R({!_<|2jS7 zh}b>fm3gx7zK3#2Dj2|#K1_^W;zTv)l4Mvl!yt1Ev8ZmD5!M)GlQ9a6v&#e}v5MG< zSXIm;WuN^&X3E~R-o`RC$lGCtAhSx9rC-~U%xh{vyO(TJ;KHoh>ws&%>|@|Q5vN6Y zHfWTKpDpFcks_~GV25pPDB5%|YkqAlSpUDfB!{x@*jMrcsVnk1l>Ue!$0Dbkb4HD- M?F)Ivv-ME)4^de#;$ScnZMR&64hro@&OYO5%IfMYwB(k}v2BP-Ud zT+B{?fLnB-XpBF=KjOboPir(WliWG?ocBKOIrn}Jyb1ch|NQa|NYQ%lpVW_r$x|>` zRRnjfmsYZ6b?V8=;elhfO^U23^lr~lL<)m)qnj-4H#$zm*|)8B+DAzd&z8&Uk`j627 zLj)P)91DcV5tecQi->#dSyZO`)pIyC%CIQTa-Ikm7-vepX)ZELk_4BTcQ?G-M{m*4 z9ZxKj5K|47_Yg_nN4EJeuIKgv%lcqx}+!X7I$2X_P_K=ca~Q&8^M3 z(6diGKM~O%|G1oltgu#O#yc`wUM5?WyC`r=_IXN!9^82)Ca(^EBS)Fnz=s&#E;v>H}!X-HbrDpeFAvyi4Vm54~JL_EUmynt=3 zl!XVd^$?cc0H0}2^8e?*eV0f5)#v^Ad3y)2h~sB(Sg}8q*pfhAf_84*SVryA*r?Ud z1hypTPN!})sz&Mhs@AA_uq{DdD`m1-FA6AW@L|_3y1oJ$+~~p(>m<67g^m+wu+U={ z)s)m}Kd85nK6Id;(*ec+g4~W^7}E&BKp68Fu|w|DyL(7bsLwB%Gc9EDi5Aw)C%E$Q zCMPmc{}B{sFsqDFcE=$w!QLd9r>F!NZKGg;PQeYGs&YgSyxF8$87u7fLjEP7EMN*c zl7vD~dr;Ib3YECO_=24#x7uuD@bI4?!YrK_bTCKmBwq@vtaC^^%xOne*~9ehhmOjlKZS`naR2}S diff --git a/bin/wosqi/About$2.class b/bin/wosqi/About$2.class index 688e57caca53535f11013e810ae36c3b97dd07b4..8c6ceda1e138a366449a28fed4aca9f5763655dc 100644 GIT binary patch delta 23 fcmeyv@`q)^J4QzT$?q8*Sc4fj7(yqTFnIs~ZO8|C delta 23 fcmeyv@`q)^J4VKU$?q8*SVI^%7{Vr-FnIs~ZRH1i diff --git a/bin/wosqi/About$3.class b/bin/wosqi/About$3.class index f16d685d99ba70bb527bcfd25d46fd1ddd376170..000219823ddda0c7dd6b3a19ae360632696a92b3 100644 GIT binary patch delta 23 ecmZo;ZDZZ=gOM?5@=rzw)-(nVhK$K}OdbGTB?jgI delta 23 ecmZo;ZDZZ=gOM?L@=rzw)^r9AhRn%!OdbGTLI&vo diff --git a/bin/wosqi/About$4.class b/bin/wosqi/About$4.class index e7ca87d433a34b0e9f093dd19f8660b5de2f5b9e..1756e0ab50c0483b6959a5e69cc94b531176c9a2 100644 GIT binary patch delta 23 ecmZo;ZDZZ=gORa(@=rzw)=CBrhN{VSOdbGVWd|St delta 23 ecmZo;ZDZZ=gORav@=rzw)@lY0hMLKCOdbGVp9dxY diff --git a/bin/wosqi/About$5.class b/bin/wosqi/About$5.class index 6fdf9cd86270d53b482a3b3b2c77445ce99a023e..9d6db5c7d56368c27f257a8b4d4256e4ed13d6f6 100644 GIT binary patch delta 19 bcmZo;ZDZZ=gOPFGb_f4bmr!XuK+CM$XL;#aK4bM*%9IzBHUvQSZ3OCyUf^7*0+0$X)!@)FXs~# zO}D-s&s^T`xPHv-POjw%#2dhVMH(sGw}!>4BjYhomLG4H3u)0?ltnyVn3e4DJ;b~EW^)e z!XIeHUwEDxEi6TxRd|smRxyq?T4?85tma0n;bwGj2P}S$1otDwlSuP>xI71s7m?xL z=u<$yDo0jT!&eU@r{-ZmJ&r;31lFskF|1z5V}okLi1P8O8pdmC6JA%NcvF3Wx71N= zRHyN_I*U!}65dfa@UAA_(+}W%Jsq3%Y;4i<5a@br)s6T-$FNPeW4m@Rs@LH|J&KR? zXZTo;;S)WMPxTq>)aUV~{uR6Qb?nwRut(S2#9re*>@&)-$C!ZwMg)h9Y8*C9$rs?b zQHSwhcV!2^4q76!gSn9!ej`~UznysJm$3hoE91_7p-fGX+oIJ@8x*o=d`WS!P`ko?q_Flb;MUnI}61k3WfLU*2i<^#@}Te3kq Oie)$5I4INpVa31H;{aU% delta 720 zcmb7?%S+Tz6vsd3-k%vF=FB+eSY{$vp&&^pYC*UtDz(reCVY-%S}8p&%|#QvFcY&b zmG(3!D+?P@QhfA)ics5xw5vr>e?aa^tc$d07p=Y@&N=sf&pqe9%O1~+n3x-R4rEDv zf5c$44wo`h7C9hvg?n6f~$9j;bV%sT3Mj8ck|7$JIK5Y6BJ=B%d)m}z+SM!k1b92<+pPRi~mm$gk diff --git a/bin/wosqi/Bundle.properties b/bin/wosqi/Bundle.properties index 9ee0f20..50aa7cd 100644 --- a/bin/wosqi/Bundle.properties +++ b/bin/wosqi/Bundle.properties @@ -4,7 +4,7 @@ MainView.name = WebOS Quick Install MainView.id = WOSQI MainView.title = WebOS Quick Install -MainView.version = v4.7.0u +MainView.version = v4.7.1u MainView.vendor = Alexander Noyle MainView.vendorId = NotAlexNoyle MainView.homepage = https://github.com/NotAlexNoyle/WebOS-Quick-Install @@ -114,7 +114,7 @@ InstalledPatchInfo.jLabel5.text=Description: InstalledPatchInfo.jLabel11.text=Author: About.closeButton.text=Close About.jLabel5.text=Donate to support the original developer: -About.appVersionLabel.text=Version v4.7.0u +About.appVersionLabel.text=Version v4.7.1u About.jLabel2.text=Open Source under the Apache License 2.0 About.jLabel4.text=Copyright 2009-2014 Jason Robitaille. About.jLabel7.text=Donate to support the new maintainer: diff --git a/bin/wosqi/Bundle_de.properties b/bin/wosqi/Bundle_de.properties index 0e97b95..61c0466 100644 --- a/bin/wosqi/Bundle_de.properties +++ b/bin/wosqi/Bundle_de.properties @@ -106,7 +106,7 @@ InstalledPatchInfo.jLabel5.text=Beschreibung: InstalledPatchInfo.jLabel11.text=Author: About.closeButton.text=Schlie\u00dfen About.jLabel5.text=Unterst\u00fctzen Sie die Entwicklung -About.appVersionLabel.text=Version 4.5.0 +About.appVersionLabel.text=Version v4.7.1u About.jLabel2.text=Deutsche \u00dcbersetzung von Tobias Kaller About.jLabel4.text=Copyright \u00a9 2009-2013 Jason Robitaille. All rights reserved. About.jLabel6.text=

Jason Robitaille and Canuck Coding are in no way affiliated with HP, LG or their affiliates. Palm, Pre, Pixi, Veer, TouchPad, and WebOS are among the trademarks owned by or licensed to Hewlett-Packard Development Company, L.P. www.hpwebos.com

diff --git a/bin/wosqi/Bundle_fr.properties b/bin/wosqi/Bundle_fr.properties index 6e102ba..54bdf09 100644 --- a/bin/wosqi/Bundle_fr.properties +++ b/bin/wosqi/Bundle_fr.properties @@ -106,7 +106,7 @@ InstalledPatchInfo.jLabel5.text=Description: InstalledPatchInfo.jLabel11.text=Auteur: About.closeButton.text=Fermer About.jLabel5.text=Aide de soutien au d\u00e9veloppement -About.appVersionLabel.text=Version 4.5.0 +About.appVersionLabel.text=Version v4.7.1u About.jLabel2.text=La traduction de fran\u00e7ais a fait par Jake Morrison. About.jLabel4.text=Copyright \u00a9 2009-2013 Jason Robitaille. Tous droits r\u00e9serv\u00e9s. About.jLabel6.text=

Jason Robitaille et Canuck Coding sont en aucun cas affili\u00e9 avec HP ou LG ou des sous filiales. Palm, Pre, Pixi, Veer, TouchPad, et WebOS sont des marques commerciales ou des marques d\u00e9pos\u00e9es appartenant \u00e0 ou sous licence de Hewlett-Packard www.hpwebos.com

diff --git a/bin/wosqi/Bundle_zh.properties b/bin/wosqi/Bundle_zh.properties index 35ae9ef..a504222 100644 --- a/bin/wosqi/Bundle_zh.properties +++ b/bin/wosqi/Bundle_zh.properties @@ -106,7 +106,7 @@ InstalledPatchInfo.jLabel5.text=\u63cf\u8ff0: InstalledPatchInfo.jLabel11.text=\u4f5c\u8005: About.closeButton.text=\u5173\u95ed About.jLabel5.text=\u5e2e\u52a9 -About.appVersionLabel.text=\u7248\u672c\u53f7 4.5.0 +About.appVersionLabel.text=\u7248\u672c\u53f7 v4.7.1u About.jLabel2.text=\u7b80\u4f53\u4e2d\u6587\u7ffb\u8bd1:medigi8@twitter About.jLabel4.text=\u7248\u6743\u5f52Jason Robitaille\u6240\u6709,\u76d7\u7248\u5fc5\u7a76. About.jLabel6.text=

\u6b64\u4e3a\u4e2a\u4eba\u4f5c\u54c1,\u4e0ePalm\u516c\u53f8\u65e0\u5173.Palm,Pre,Pixi,Veer,TouchPad\u548cWebOS\u6ce8\u518c\u5546\u6807\u5f52 Hewlett-Packard\u516c\u53f8\u6240\u6709.

diff --git a/bin/wosqi/DeviceManagement$1.class b/bin/wosqi/DeviceManagement$1.class index 1f08e12ae66890b21105ab84b18ad0faf22f364b..a5083e6b601de3d2fa1eed1cfc1630ab62369461 100644 GIT binary patch delta 25 gcmX@bdWv;}H4_sP>ttIddp0Ic1`a0f$xTci08Z!yD*ylh delta 25 gcmX@bdWv;}H4_tK_+(oqdp5>M1`fuk$xTci09Zl>82|tP diff --git a/bin/wosqi/DeviceManagement$10.class b/bin/wosqi/DeviceManagement$10.class index 1867f2f00cc7ddbcf0505a508ade2238ff784cc3..3868a351290bdeeb5be69c06d4063535b68e5914 100644 GIT binary patch delta 25 hcmaFM`j&M=91|1MjL8X1_H0aZ7&w^bOdVzI=BNG$T%E``5_H0aR8912MPwrsy003kj2Q>fy delta 25 hcmcb>dVzI=BNG$j`N_^q_H2w788{d(P3~aw003xE2cG}{ diff --git a/bin/wosqi/DeviceManagement$2.class b/bin/wosqi/DeviceManagement$2.class index c8e0cba787895f069c718e5ba55e7501b1ffeb03..1fc2163f083d7f9c201ecb96219d1bb038a28ca6 100644 GIT binary patch delta 25 gcmdnZx|?-_4igg--()=|dp0H^1`Z~X$;C__080A=`v3p{ delta 25 gcmdnZx|?-_4igh&%w#<#dp5>61`fvf$;C__08`xs-2eap diff --git a/bin/wosqi/DeviceManagement$3.class b/bin/wosqi/DeviceManagement$3.class index 883627606cc5dd96699136f4032dd1cb589807af..f4015b5f73a0f269f0ce83eedb876bf3e5d31803 100644 GIT binary patch delta 25 gcmX@ddX9C2Jrfg?Y1`fuw$!$y?09yVAQ2+n{ diff --git a/bin/wosqi/DeviceManagement$4.class b/bin/wosqi/DeviceManagement$4.class index 0bdb4e20fa72c96a0743a6bf39fd37e46ba8c5d3..c4aed31f70d4c0ff47bd6dfc4374a3fb74218bdd 100644 GIT binary patch delta 25 gcmX@WdVqC8UO$Q diff --git a/bin/wosqi/DeviceManagement$5.class b/bin/wosqi/DeviceManagement$5.class index 1803861ee27ef716d43f69d4ad0de3f2a58930b7..d15792c28ea1506431e6fdd89458a6cab0d6921f 100644 GIT binary patch delta 25 gcmX@ddX9C2Jrfg?-egB6dp0H`1`Z~Z$!$y?096VFx&QzG delta 25 gcmX@ddX9C2JrfgS!DL4!dp5=*1`fvJ$!$y?09=FycmMzZ diff --git a/bin/wosqi/DeviceManagement$6.class b/bin/wosqi/DeviceManagement$6.class index 06d86e38c23a1dab794315a5ba67182728f4a6b1..2339bca454deb868755390698d52eb32501441cf 100644 GIT binary patch delta 48 zcmey%@t0#mC9@cl6$3Yu4TBJq9fK^B6N5673xfue)#QHWKqe-y$&Z-bnV145YqJCa E00NK-Jpcdz delta 48 zcmey%@t0#mC9@b~1p_x@1A`D_BZDksGlMc?3xft@#pHhGKqkhH$&Z-bnHYN}YqJCa E05R62$O*|RauWZ+<&HTeOPCmZ7&AagE|DL>hdS&NNvK9IWr$d#Qu Hn^_wG(FqV3 diff --git a/bin/wosqi/DeviceManagement$8.class b/bin/wosqi/DeviceManagement$8.class index 1903090e2ccce750cb9e07078858637812c4c58c..f0ea188241e03940e2a17384049e4abcd7919524 100644 GIT binary patch delta 25 gcmdnRx{Gy#HWL$5!DL+~dp4#L1`ejO$wf>a09GOf8~^|S delta 25 hcmdnRx{Gy#HWL%$qRF~U_H2wx7&sW0PA+2d003LO2C4u6 diff --git a/bin/wosqi/DeviceManagement$9.class b/bin/wosqi/DeviceManagement$9.class index 881b67462b17966efdd569ccc224a2a67669ac1a..8d5cef88c5ed05b093f4fdef416c65b933399e64 100644 GIT binary patch delta 25 gcmaFM`j&M=91{~$`{V>Bdp4$S1`ej)$xE3$0BOSqU;qFB delta 25 hcmaFM`j&M=91|1c*2xJ>_H2yX88{esOkT?50RV302jTz# diff --git a/bin/wosqi/DeviceManagement$DoDeleteApps.class b/bin/wosqi/DeviceManagement$DoDeleteApps.class index 8dd6463e7f46aef8b1e5d6fa88beb59f11f3c0d0..1b0d8ca35ee5ef1ab061d947688a83d9b7494d6b 100644 GIT binary patch delta 32 ncmZo+ZDHN;iIIu9Ve%J7KVIe*1`g&{27cx?265)e{!FF-nZ5`B delta 32 ncmZo+ZDHN;iIIt^dGZ%VKVGI*1`eh+27ab?263jz{!FF-nd1ln diff --git a/bin/wosqi/DeviceManagement$DoDispose.class b/bin/wosqi/DeviceManagement$DoDispose.class index 17bf19a077c487fdcfcbfdc05b4b49eb1cff8da5..a9d724c21fb40f768d185a047cb50c7bab4b38c5 100644 GIT binary patch delta 25 hcmX@ga+GDmX+|dIp2=q!?bw(nFt9UEnk>j<0swDA2TlM0 delta 25 hcmX@ga+GDmX+|cduE}Q^?bw)l7}%M5Ckrx}003^q2S5M- diff --git a/bin/wosqi/DeviceManagement$DoLoadDetails.class b/bin/wosqi/DeviceManagement$DoLoadDetails.class index 9fa05686d12621f6911f2a6fd71ab810c7e7a079..40ac09ec950a5c389e171aa003fe1e34c0801907 100644 GIT binary patch delta 25 hcmcc3a+_ttLq;a%oXL+F?bw(L7}%MMCaW`<0045)2V4LE delta 25 hcmcc3a+_ttLq;a1iph@|?bw*A7}%MrC#y4=0049M2Y3Jg diff --git a/bin/wosqi/DeviceManagement$DoLoadPackages.class b/bin/wosqi/DeviceManagement$DoLoadPackages.class index cd7f813010eae5657d9ee74689dc71c61e62c285..cfcd8bbd2d41405c2b308a4d2975d2eb884d0cb1 100644 GIT binary patch delta 25 hcmcb~a+77leMTncvdIq_?bw*B7}%L>CaW@;0047S2XFuY delta 25 hcmcb~a+77leMTmxy2%e2?bw(a7}%K_C#y1<0049W2Y>(o diff --git a/bin/wosqi/DeviceManagement.class b/bin/wosqi/DeviceManagement.class index 79ac401a3ea7858a46a7b372b19c21b6042ccad0..06663ff3dd3196a2c263c00c38329d56d1a59d97 100644 GIT binary patch delta 8327 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 diff --git a/bin/wosqi/DeviceManagement.form b/bin/wosqi/DeviceManagement.form deleted file mode 100644 index daf1555..0000000 --- a/bin/wosqi/DeviceManagement.form +++ /dev/null @@ -1,372 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/bin/wosqi/FeedLoader$1.class b/bin/wosqi/FeedLoader$1.class index 5ec06f3ba6c6149b3dbd4fbc9c98971f27f6f622..38ca2dbeda8af2df32b2ebeda973aa5d1dc66959 100644 GIT binary patch delta 51 zcmZ3$zJPs02@|95oqkQWQ&$xbe1)&>As Cy$sL* delta 51 zcmZ3$zJPs02@|9JAg Ch73~x diff --git a/bin/wosqi/FeedLoader$DoDispose.class b/bin/wosqi/FeedLoader$DoDispose.class index 38c0abd183398ce2d7226b7c976c1963cebbb556..56122eaf4f95847440c5d92d5f01fa2dd4a414fd 100644 GIT binary patch delta 23 fcmZ3;vXEuN3P#5DlUFj@vuFt7*;T7GOT1UU|2o*1hWYMonv?24XBx#9aWb@37<=L=iYdQGUYKj9#iSh?H z_!s2p;wDECIr!%C>UDX)-uL#X{qEBwF5}B|=W>z-SV*IQ3<}AnNYhF&HYzn6D4~N= zrYOTl1tF@4QA2`yF0dOvIb(8p@5#MYd(SlLl#_H^m}$|&R;p>kK|9U38PK6oI$5TR zHM-fPhkbg9&_|qpl1y-emsciv*M}cW^NUZ?@Jl8$lE<9XGA|Am#KocvvLquci1xu|Ouam(EnVgZu71_>P^ng6v*TvlF-X|4SUqCp8R_r02B69Ik zLNS$wt(4MF8H<#&X4x%s_o?ETYEG%)oJMYG;+1ATY>6+M_@hn2@JS?oiK9dE=#&z= zq=s(s(IdU|$}oL0P5+)OGa%axN|1m!49PVka>J-RGA2)q%L^0o&ZPV@t+C8#3bUHe zoR%@K^(<&ROB!HVCt1-cR&|jz-8Fr{x*oEjCv57u=?k{?k{$a6cBq10v4Qg(UnB=k Vt2@=nb!W - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/FeedViewer$1.class b/bin/wosqi/FeedViewer$1.class index 09e43f769203bdd381f84a258bcd907d6be2fa50..f389ca32a15215a2d408b3b91bee353d9f490c6c 100644 GIT binary patch delta 23 fcmX@ddX9C20~6zh$&O48teY4(m^V*uWAXq1T=@q$ delta 23 fcmX@ddX9C20~6z_$&O48tZNuJnAc8jWAXq1TuTQg diff --git a/bin/wosqi/FeedViewer$10.class b/bin/wosqi/FeedViewer$10.class index d68f1011a42a1675a436287b3e48ca00f9627c7a..b406ded254cefbe2ab160656e11c961025c05216 100644 GIT binary patch delta 23 ecmcc1dY5&BKNDl?S?^ delta 23 fcmX@jdYW~EEfeFW$#zT*tXmj3Shh}XX7T_4Tu%ou diff --git a/bin/wosqi/FeedViewer$13.class b/bin/wosqi/FeedViewer$13.class index 8a44e4d8f606ca632b33be78f9d7efa5daf61daf..e06741047a2df463673f6dc388a81ee60913425f 100644 GIT binary patch delta 23 fcmX@fdXja6H523A$u>+5toIo>SRPDnWbyz2V3G%? delta 23 fcmX@fdXja6H523Y$u>+5tT!1rSZ+;jWbyz2U*rds diff --git a/bin/wosqi/FeedViewer$14.class b/bin/wosqi/FeedViewer$14.class index ada1fc34fb4f75a391747846e5be7d4981dd326d..13487219fdfdfa0ff0c3ce379f3bfbe0e9abfa4d 100644 GIT binary patch delta 23 fcmcc5dY^SeAQR)u$w5pGtgjh3Sl&#Y&g20AXrc%? delta 23 fcmcc5dY^SeAQR)`$w5pGtWOy@Se{Lu&g20AXY>ds diff --git a/bin/wosqi/FeedViewer$15.class b/bin/wosqi/FeedViewer$15.class index 56898946b7f8b0c07170c9dd09a9923d1091a87c..63d20f566fdb1cd139215ed29c6d124f506f063a 100644 GIT binary patch delta 24 fcmZ3^x}0@`BopKR$x=-AY^;n79IQ-}jgCc delta 23 ecmX@fdXja6H4`J-WE&<2Rt^RZR?f+dOdbG8Jq05G diff --git a/bin/wosqi/FeedViewer$17.class b/bin/wosqi/FeedViewer$17.class index 22886537ae0172d35ecd5b34629ed716343dfe68..92c496b618208b2dd3cd7be3995274d0bd111f6b 100644 GIT binary patch delta 23 ecmcc1dY5&BKNF+U){x1KOdbGGyaogS delta 23 ecmX@fdXja6H4~%vWE&<2R$m4VR=>%OOdbGG4h8Z6 diff --git a/bin/wosqi/FeedViewer$2.class b/bin/wosqi/FeedViewer$2.class index 31de11f2736ff94e99cba006cd67c29026781ed0..4c2e015615b4842f09382d1ea4cbc2af134e6b97 100644 GIT binary patch delta 23 fcmX@ddX9C20~6!!$&O48ta}+anDZ}%*0#wZOdbG8um!mQ diff --git a/bin/wosqi/FeedViewer$23.class b/bin/wosqi/FeedViewer$23.class index 2f3258aea98f86b67b3a677aee672172c6c6ff0e..0b8160ec30b9216f7a997457a6b3b49ad400ae65 100644 GIT binary patch delta 23 fcmX@jdYW~EEfeGH$#zT*taBMSSm#Y{X7T_4S-J-7 delta 23 fcmX@jdYW~EEfeF^$#zT*tkW4dSZ7RbX7T_4Squi+ diff --git a/bin/wosqi/FeedViewer$24.class b/bin/wosqi/FeedViewer$24.class index 94995c5d2e884f05e88474f51c74ab57c190f1d3..79cf36fd3307e70a358028e47f4312ad22337f2f 100644 GIT binary patch delta 23 fcmcc5dY^SeAQR)U$w5pGtS1;aSWix#&g20AWU&X) delta 23 fcmcc5dY^SeAQR(($w5pGtcMslSPxI0&g20AWCI7k diff --git a/bin/wosqi/FeedViewer$25.class b/bin/wosqi/FeedViewer$25.class index 87debe72df5629230bc38cf338f7e93abb8cc38f..e8b274d4f35cacd633d9e9526ebe50580b32985e 100644 GIT binary patch delta 23 fcmX@fdXja6H522_$u>+5thX6BSno`3Wbyz2U?c~e delta 23 fcmX@fdXja6H523I$u>+5tXCO0Sg%cPWbyz2Uv>wI diff --git a/bin/wosqi/FeedViewer$26.class b/bin/wosqi/FeedViewer$26.class index d2826dd4e4e40bd0896405efffad5c5771348f8c..80975de0236a127364929192ae986e5584565b3b 100644 GIT binary patch delta 23 fcmZ3^x}0@`BopJW$x=)XtbZ6dSpQCrXYv35S%n8x delta 23 fcmZ3^x}0@`BopJ8$x=)XtltXYv35Sl0(b diff --git a/bin/wosqi/FeedViewer$27.class b/bin/wosqi/FeedViewer$27.class index 0ad095b0f21183491a4fef109335161701025d3a..e538b53cf4d42a8dc8a961e8c15880b24a6e10ac 100644 GIT binary patch delta 23 ecmX@jdYW~EEfXX6WIHAYR$c}UHonQtOdbG9a0NX8 delta 23 ecmX@jdYW~EEfXW_WIHAYR(1vsHjc^7OdbG8!UZb; diff --git a/bin/wosqi/FeedViewer$28.class b/bin/wosqi/FeedViewer$28.class index 856ec91c5d24395e3e31a24dd4333b4979bd4549..bff6349b6cb2ee549097960406f0d6c2de56d1fb 100644 GIT binary patch delta 23 ecmcc1dY5&BKNF+M7w%o~0OdbGJ delta 23 ecmX@bdWv;}4HIMeWLqW&)=CBrwyMcZOdbGLUIu&s diff --git a/bin/wosqi/FeedViewer$33.class b/bin/wosqi/FeedViewer$33.class index 6b683e97bd7a423b4550caf233722f67b8a0a077..bbbfdebae99dff07338272290f8dd04ce90d0142 100644 GIT binary patch delta 23 fcmcc5dY^SeAQR)X$w5pGtTPxm*k(?i&g20AUq=T* delta 23 fcmcc5dY^SeAQR(+$w5pGtdkfx*d|Y&&g20AUYQ3l diff --git a/bin/wosqi/FeedViewer$34.class b/bin/wosqi/FeedViewer$34.class index b0afe07b2af898595e64ae9ae31e1ebbaf43c4dc..cb9509795f9da4580a6f017759612a334532d561 100644 GIT binary patch delta 23 fcmcc1dY5&BKNI7r$pK6btY;WF*v?L#%H#n6WRC~b delta 23 fcmcc1dY5&BKNI7T$pK6btj8EQ*p5%0%H#n6W8nwF diff --git a/bin/wosqi/FeedViewer$35.class b/bin/wosqi/FeedViewer$35.class index 65699761395d2813ab390d0ba8dcdc1c95c671a4..3d704a28c36b9e5129112dc6eced1c9641ce805d 100644 GIT binary patch delta 23 fcmZ3^x}0@`BopJi$x=)XtREOS*gj5cJ|33OdbF_Sp+@+ diff --git a/bin/wosqi/FeedViewer$38.class b/bin/wosqi/FeedViewer$38.class index ceb3861016a40b0a70e852def586de4fded14c2b..cd4e0a7bac38ef74d7290ce456d7876505b0e242 100644 GIT binary patch delta 23 ecmX@fdXja6H4~%dWE&<2R%-?hcALqKOdbGE5Cy&f delta 23 ecmX@fdXja6H4~%pWE&<2R#OHJcC*QiOdbGDVg;-K diff --git a/bin/wosqi/FeedViewer$39.class b/bin/wosqi/FeedViewer$39.class index e3cee02e4c06e87ad181498be83bbe0b54c49f8c..d3c3c0f450da4cf92e3fe86f03b80a84a212e456 100644 GIT binary patch delta 23 ecmcc1dY5&BKNDln*9LV)6h0QjrG4 diff --git a/bin/wosqi/FeedViewer$40.class b/bin/wosqi/FeedViewer$40.class index 2b133b154e5c3095f644f6dbe3c69ce1d5de16a9..b941c31c79663d070e265590c12f365db65e58a2 100644 GIT binary patch delta 23 ecmbQkI)`-w9}{ETWPT&o delta 23 ecmbQkI)`-w9}{E5WPT;M*_PWXOOdbGBE(O{E diff --git a/bin/wosqi/FeedViewer$42.class b/bin/wosqi/FeedViewer$42.class index 5f64258130ae5f1512bf457dc39411759e7e38eb..cb4af8ec83915c100ac470480e7457a1468f5d99 100644 GIT binary patch delta 23 fcmcc5dY^SeAQR){$w5pGtWy~{*r!dN&g20AUiJq% delta 23 fcmcc5dY^SeAQNNnk delta 23 fcmX@bdWv;}4HM(y$+k=mtVYm delta 23 fcmbQkI)`-w9~0w+$^1+Xtd|%#*e_2GVe$X~QFR8Q diff --git a/bin/wosqi/FeedViewer$47.class b/bin/wosqi/FeedViewer$47.class index 5bb0c14f1792d5a3032ed81e60d4f124e14f01d9..74d85b68eb10bd4ce3629a2b03fb401fe1af5d82 100644 GIT binary patch delta 23 fcmcc1dY5&BKNI7N$pK6btgje2*k4bc%H#n6XZr{* delta 23 fcmcc1dY5&BKNI7l$pK6btWOv?*q=_G%H#n6XH5tl diff --git a/bin/wosqi/FeedViewer$48.class b/bin/wosqi/FeedViewer$48.class index 2035efa5887ed83945a0dfadb6d01c3c8e887e2f..9eb0517a40b937d5f1d255536876ba7bad998ff3 100644 GIT binary patch delta 23 ecmcc5dY^SeAQPj&;(Y%B~694w5J8<{)+TNMTl delta 24 gcmX@fdXja6H522H$u>;(Y|OtHIGBG=Ze;QR0BBJM`Tzg` diff --git a/bin/wosqi/FeedViewer$50.class b/bin/wosqi/FeedViewer$50.class index 88ba50a08a20cba71ff1b2f8dd7b6d3b9e88f0ad..8f40861620de725c542c220e77318ad3d3b60f95 100644 GIT binary patch delta 23 ecmX@bdWv;}4HKi|WLqW&R%Zqd4wuPIOdbGFOaO5$OdbGI;|4eY delta 23 ecmX@jdYW~EEfZtJWIHAY)+h!Jj_AqFOdbGIH3lXC diff --git a/bin/wosqi/FeedViewer$52.class b/bin/wosqi/FeedViewer$52.class index 77e408e6e0cc2c18a87b8e4152fb2c7cdbd3d207..ac5d4b5a621524548fd6ebe51229121062e81199 100644 GIT binary patch delta 23 ecmX@bdWv;}4HIMDWLqW&)&d3&j>5@JOdbGKWd>sa delta 23 ecmX@bdWv;}4HIL=WLqW&)+`1Nj_k=zOdbGJw+2xF diff --git a/bin/wosqi/FeedViewer$53.class b/bin/wosqi/FeedViewer$53.class index 168beb8d8307ac2451bd8ba9f762ab95de72f520..85ac90e72a84014ad4c95a035320108c84b708ce 100644 GIT binary patch delta 23 ecmcc5dY^SeAQNNb;M*j=IUynLGeoL diff --git a/bin/wosqi/FeedViewer$57.class b/bin/wosqi/FeedViewer$57.class index a1cccdc84eb1e13cdb64b85cf8dc7f73eb7b48ea..59c3f4c3ffe7618c385f5c9bc90b67b985b62546 100644 GIT binary patch delta 23 fcmZ3^x}0@`BopKF$x=)XtS=cjI9^STXYv35S8xX( delta 23 fcmZ3^x}0@`BopJq$x=)XtdAKuIG#+7XYv35R>B7j diff --git a/bin/wosqi/FeedViewer$58.class b/bin/wosqi/FeedViewer$58.class index 72ef2b601085e17d325a8d813ac3fa08f161176f..994ccce43caad5f22f190acc3c6fa9a7601a6b52 100644 GIT binary patch delta 24 gcmcc1dY5&BKNI8s$pK9EY@Cb?9Gpy(r!si}0AcF}e*gdg delta 24 gcmcc1dY5&BKNI86$pK9EY#hHCI5_@Hp339_0B%OdbGEhXu$0 delta 23 ecmX@bdWv;}4HKiuWLqW&Rx<_;PV>o4OdbGD*#))$ diff --git a/bin/wosqi/FeedViewer$62.class b/bin/wosqi/FeedViewer$62.class index 09a72e8400f32b6a198a736a3152e544d4ae3c2b..656063f23c16b8820f6e8cbe9f20941629cc8a76 100644 GIT binary patch delta 23 ecmcc5dY^SeAQPk8 delta 23 fcmZ3;vXEuN3P#2mlUFj@v(92*=bk6c0cE delta 55 zcmey*@t^ diff --git a/bin/wosqi/FeedViewer$DoSecondaryLoad.class b/bin/wosqi/FeedViewer$DoSecondaryLoad.class index 713e758ad12d9c5780287302caef091f9752bf25..d0be9d658ce1ae99fe2da3b7601df0ef63fb4f04 100644 GIT binary patch delta 23 fcmdnUvXN!O4o1e!lXo)Ovuvf3%~#l3&8*&3&H>;3&Q{^3&a2~ b3&j953&sFB3&)d21y}{j01OMulcNPb+}9K* delta 69 zcmV-L0J{I-3*if}p#%lC01ykelcofFCAa_u3%LLZ3%URf3%dXy3%md&3%vj;3%&p^ b3%>v~3%~$53&E2{1y}{d01OMolcNPb(gPFI diff --git a/bin/wosqi/FeedViewer.class b/bin/wosqi/FeedViewer.class index ea3788497f80367a3de18fe3285d6827266dc430..ee56942e49b044603ea72775e79b5238f8186396 100644 GIT binary patch delta 7763 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 - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/InstalledPatchInfo.form b/bin/wosqi/InstalledPatchInfo.form deleted file mode 100644 index 9a7b2be..0000000 --- a/bin/wosqi/InstalledPatchInfo.form +++ /dev/null @@ -1,332 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/InstalledPkgInfo.form b/bin/wosqi/InstalledPkgInfo.form deleted file mode 100644 index 53d00f4..0000000 --- a/bin/wosqi/InstalledPkgInfo.form +++ /dev/null @@ -1,277 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/Installer.form b/bin/wosqi/Installer.form deleted file mode 100644 index d263b74..0000000 --- a/bin/wosqi/Installer.form +++ /dev/null @@ -1,160 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/MainView$1.class b/bin/wosqi/MainView$1.class index 8a829b04db72aa402ab66d547fd2d9e1ce4118ac..647365fb97e9ed50dc87140698c19af5dc63f665 100644 GIT binary patch delta 43 ycmcc5ai3#D7&Bx3L#)`>LnX3T#PztsH delta 43 ycmcc5ai3#D7&Bwegu^ delta 23 fcmX@adWdy{2@~U{$)-#WtXmj3n72-@V)6h0S&Ih( diff --git a/bin/wosqi/MainView$3.class b/bin/wosqi/MainView$3.class index fb1aae3f6e92d89500634f3635976c9ff919ee0a..fc4ab44d6c957d9c0f43348eddf92d0f8376a4e6 100644 GIT binary patch delta 23 fcmdnZx|?-_E)(O?$$CrqW0|pI5 delta 41 zcmV+^0M`Gr2(t*VGy@UN01E=v01^V%03rg}04V~_lSKnk0p63C14selli>qW0bdO- diff --git a/bin/wosqi/MainView$5.class b/bin/wosqi/MainView$5.class index ff46129dcca8e36d563306f0170da39ac694a078..e2a7e74944e08bc76341e553042915521c90a0a9 100644 GIT binary patch delta 23 ecmdnZx|?-_E)ygBWIZMaR!#;EX0FM_OdbG43IyH& delta 23 ecmdnZx|?-_E)yfmWIZMaRyGC>X7XCXY!gnfmvyCGP5qL6$1ye_2j9{9su_k3uyoV delta 37 tcmcc1ewTg2UM5C^$@`cr7>y=>XYyh-Vc=jko$SW!HQA9_Y4Rp!Z2;)23kU!J diff --git a/bin/wosqi/MainView$9.class b/bin/wosqi/MainView$9.class index d78103fd4570627facbeae77850fc2479feb09e7..98f189cd52a55edc94712832cea07d38bce71961 100644 GIT binary patch delta 23 ecmdnXx|el>J`J`ENu)HEbR==EFBEdEE5>w PSSB$fu}qn)$L0Y5;&u+S diff --git a/bin/wosqi/MainView$DoctorChooseFilter.class b/bin/wosqi/MainView$DoctorChooseFilter.class index 1861e10ad39e2fb5c35c06297163fc5cd95b909f..e102a73a0d5841afd394493c8e8994ed1ffe895d 100644 GIT binary patch delta 49 zcmV-10M7rX3a1LN&jSg<00{)c02Tzolh^}o5yk)%1jhg=1jqm@1jYa~1j&lF0-BYg7lV delta 23 fcmX@ha+YPo6-LInldm$`v(9H=XIVN~lF0-BYW)YK diff --git a/bin/wosqi/MainView$ImagePanel.class b/bin/wosqi/MainView$ImagePanel.class index c184e3bca02eb836de4b4aacdb56c101baff2441..8313759b2ce4871383fe27c8630e5ab42cc5f9af 100644 GIT binary patch delta 65 zcmV-H0KWgX3%3ifdjtir01yPRlYj(!A+rDp1hfDS1hoJl1hxPr1h)Vx1h@b%1i1h- X1iAn@1iOINfs^GSg96Kg$r{XQf=?JkSe`N{u{>i?VR^!!%kq5keCAXD3E&K- delta 43 zcmZqSXyMo(&&+w3fs^GPg96Ll$r{XQf)5!)SROGbu{>r_VR^`)%kpIMeCAXD2nGy} diff --git a/bin/wosqi/MainView.class b/bin/wosqi/MainView.class index 9e7f09ae3b22be505d43475802cb843a4131bf54..6bd3df3f0c6494f7b8fd3811bdf100e460b1d537 100644 GIT binary patch delta 2564 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 - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title2" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/ReceiveFile.form b/bin/wosqi/ReceiveFile.form deleted file mode 100644 index 241c5a2..0000000 --- a/bin/wosqi/ReceiveFile.form +++ /dev/null @@ -1,213 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/SendFile.form b/bin/wosqi/SendFile.form deleted file mode 100644 index 0f9c034..0000000 --- a/bin/wosqi/SendFile.form +++ /dev/null @@ -1,213 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/Settings.form b/bin/wosqi/Settings.form deleted file mode 100644 index 5b67bcb..0000000 --- a/bin/wosqi/Settings.form +++ /dev/null @@ -1,352 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/Usage.form b/bin/wosqi/Usage.form deleted file mode 100644 index 0d37963..0000000 --- a/bin/wosqi/Usage.form +++ /dev/null @@ -1,134 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/wosqi/WebOSQuickInstallApp$1.class b/bin/wosqi/WebOSQuickInstallApp$1.class index ac21631c58ef4a453ede087b1ce3cb5cc9319c86..e4dde56a3fc86c3aa7a3dc5bf453d612410c38d7 100644 GIT binary patch delta 31 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 otherVal) { + result = true; break; - } else if (selfVal < otherVal) { + + } + else if (selfVal < otherVal) { + result = false; break; + } - if(self.length-1==i && other.length-1>i) { - otherVal = Integer.parseInt(other[i+1]); - if(otherVal>=0) { + if(self.length - 1 == i && other.length - 1 > i) { + + otherVal = Integer.parseInt(other[i + 1]); + if(otherVal >= 0) { + result = false; - } else { - result = true; + } + else { + + result = true; + + } + break; + } - if(other.length-1==i && self.length-1>i) { - selfVal = Integer.parseInt(self[i+1]); - if(selfVal>0) { + if(other.length - 1 == i && self.length - 1 > i) { + + selfVal = Integer.parseInt(self[i + 1]); + if(selfVal > 0) { + result = true; - } else { - result = false; + } + else { + + result = false; + + } + result = true; break; + } + } + return result; + } public String getDownloadUrl() { + String url = null; OnlineFile online; - if(source!=null) { + if(source != null) { + if(source.has("Location")) { + try { + online = new OnlineFile(source.getString("Location")); + if(online.exists()) { + url = online.toString(); + + } - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: OnlineFile requested not found."); + + } + } + } - if((url==null) && (file!=null)) { + + if((url == null) && (file != null)) { + online = new OnlineFile(file); if(online.exists()) { + url = online.toString(); - } else { - url = null; + } + else { + + url = null; + + } + } + return url; + } public String getFormattedDate() { + String result = null; - if(source!=null) { + if(source != null) { + if(source.has("LastUpdated")) { + try { - Date d = new Date(Long.parseLong(source - .getString("LastUpdated"))*1000); + + Date d = new Date(Long.parseLong(source.getString("LastUpdated")) * 1000); result = DateFormat.getDateTimeInstance().format(d); - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Date format invalid."); + + } + } + } + return result; + } @Override public String toString() { + return name; + } @Override public boolean equals(Object o) { + boolean result = false; if(o instanceof String) { + String currId = (String) o; result = currId.equals(id); - } else if(o instanceof PackageEntry) { + + } + else if(o instanceof PackageEntry) { + PackageEntry pkgCurr = (PackageEntry) o; result = pkgCurr.id.equals(id); + } + return result; + } + } diff --git a/src/ipkg/PackageFeed.java b/src/ipkg/PackageFeed.java index d34f580..4326689 100644 --- a/src/ipkg/PackageFeed.java +++ b/src/ipkg/PackageFeed.java @@ -9,123 +9,230 @@ import java.io.InputStreamReader; import java.util.zip.GZIPInputStream; import org.json.JSONObject; +/** + * @author Jason Robitaille + * @maintainer NotAlexNoyle + */ public class PackageFeed { + public ArrayList packages; private File feed; private String urlBase; - public PackageFeed(File f, String base){ + public PackageFeed(File f, String base) { + feed = f; urlBase = base; packages = new ArrayList(0); scan(); + } private void scan() { + BufferedReader input = null; packages.clear(); try { + if(feed.getName().toLowerCase().endsWith(".gz")) { - input = new BufferedReader(new InputStreamReader( - new GZIPInputStream(new FileInputStream(feed)), "UTF-8")); - } else { - input = new BufferedReader(new InputStreamReader( - new FileInputStream(feed), "UTF-8")); + + input = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(feed)), "UTF-8")); + } - } catch(Exception e) { + else { + + input = new BufferedReader(new InputStreamReader(new FileInputStream(feed), "UTF-8")); + + } + + } + catch(Exception e) { + System.err.println("Error opening package list " + feed.getAbsolutePath()); input = null; + } - if(input!=null) { + + if(input != null) { + try { + String line = input.readLine(); - while(line!=null) { + while(line != null) { + PackageEntry curr = new PackageEntry(); line = line.trim(); - while(!line.equals("")) { - if(!line.endsWith(":")) { + while(! line.equals("")) { + + if(! line.endsWith(":")) { + if(line.startsWith("Package")) { - curr.id = line.substring(line.indexOf(":")+1).trim(); - } else if(line.startsWith("Description")){ - curr.name =line.substring(line.indexOf(":")+1).trim(); - } else if(line.startsWith("Version")){ - curr.version = line.substring(line.indexOf(":")+1).trim(); - } else if(line.startsWith("Depends")) { - curr.depends = line.substring(line.indexOf(":")+1).split(","); - for(int i=0; i", "").trim(); - } else if(line.startsWith("Size")) { - String size = line.substring(line.indexOf(":")+1).trim(); - if(size.length()>0) { + + } + else if(line.startsWith("Maintainer")){ + + curr.developer = line.substring(line.indexOf(":") + 1).replaceAll("\\<.*?\\>", "").trim(); + + } + else if(line.startsWith("Size")) { + + String size = line.substring(line.indexOf(":") + 1).trim(); + if(size.length() > 0) { + curr.size = Long.parseLong(size); + } - } else if(line.startsWith("Architecture")) { - curr.arch = line.substring(line.indexOf(":")+1).trim().toLowerCase(); - } else if(line.startsWith("MD5Sum")) { - curr.md5sum = line.substring(line.indexOf(":")+1).trim(); - } else if(line.startsWith("Filename")) { - curr.file = urlBase + line.substring(line.indexOf(":")+1).trim(); - } else if(line.startsWith("Source")) { + + } + else if(line.startsWith("Architecture")) { + + curr.arch = line.substring(line.indexOf(":") + 1).trim().toLowerCase(); + + } + else if(line.startsWith("MD5Sum")) { + + curr.md5sum = line.substring(line.indexOf(":") + 1).trim(); + + } + else if(line.startsWith("Filename")) { + + curr.file = urlBase + line.substring(line.indexOf(":") + 1).trim(); + + } + else if(line.startsWith("Source")) { + try { - curr.source = new JSONObject(line.substring(line.indexOf(":")+1).trim()); - } catch(Exception e) { - if(curr.id!=null) { + + curr.source = new JSONObject(line.substring(line.indexOf(":") +1).trim()); + + } + catch(Exception e) { + + if(curr.id != null) { + System.err.println("Error reading source JSON of " + curr.id); curr.id = null; break; + } + } + } + } + line = input.readLine(); + } - if(curr.id!=null && curr.name!=null) { - if(!packages.contains(curr)) { + if(curr.id != null && curr.name != null) { + + if(! packages.contains(curr)) { + packages.add(curr); + } + } + line = input.readLine(); + } - } catch(Exception e) { - System.err.println("Error parsing package feed: " + e.getMessage()); + } + catch(Exception e) { + + System.err.println("Error parsing package feed: " + e.getMessage()); + + } + } - if(input!=null) + + if(input != null) { + try { + input.close(); - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Input could not be closed."); + + } + + } + } public int indexOf(String id) { + int index = -1; - for(int i=0; i-1) { - base = url.substring(0, index+1); + if(index > -1) { + + base = url.substring(0, index + 1); + } + OnlineFile online = new OnlineFile(url); File f = online.download(); - if(f==null) { //2nd try if 1st failed + // Second attempt if first download failed + if(f == null) { + f = online.download(); + } - if(base!=null && f!=null) { + + if(base != null && f != null) { + result = new PackageFeed(f, base); + } + return result; + } + } \ No newline at end of file diff --git a/src/ipkg/PackageFilter.java b/src/ipkg/PackageFilter.java index b6f852d..a7f1e37 100644 --- a/src/ipkg/PackageFilter.java +++ b/src/ipkg/PackageFilter.java @@ -2,8 +2,10 @@ package ipkg; /** * @author Jason Robitaille + * @maintainer NotAlexNoyle */ public enum PackageFilter { + Applications("Application"), Kernels("Kernel"), Linux_Apps("Linux Application"), @@ -16,10 +18,16 @@ public enum PackageFilter { private String type; PackageFilter(String val) { + type = val; + } + @Override public String toString() { + return type; + } + } diff --git a/src/ipkg/PackageManager.java b/src/ipkg/PackageManager.java index 1f20829..1361370 100644 --- a/src/ipkg/PackageManager.java +++ b/src/ipkg/PackageManager.java @@ -15,8 +15,10 @@ import wosqi.WebOSQuickInstallApp; /** * @author Jason Robitaille + * @maintainer NotAlexNoyle */ public class PackageManager { + public final String ALL_CATEGORIES; private final String[] defaultFeeds; private boolean[] feedStates; @@ -30,7 +32,9 @@ public class PackageManager { private ResourceBundle bundle; public PackageManager(DeviceInfo info, ArrayList apps) { + this(info, apps, null); + } public PackageManager(DeviceInfo info, ArrayList apps, JTextArea display) { @@ -71,7 +75,7 @@ public class PackageManager { int numFeeds = prefs.getInt("numCustomFeeds", 0); feedStates = new boolean[defaultFeeds.length + numFeeds]; feedUrls = new String[defaultFeeds.length + numFeeds]; - for(int i=0; i list) { - for(int i=0; i-1) { - PackageEntry existing = packages.get(index); - if(curr.newerThan(existing)) { - packages.set(index, curr); - } - } else { - packages.add(curr); - } - } - } - - public PackageEntry getEntryById(String id) { - PackageEntry result = null; - int index = indexOf(id); - if(index>-1) { - result = packages.get(index); - } - return result; - } - - private int indexOf(String id) { - int result = -1; - for(int i=0; i list) { + + for(int i = 0; i < list.size(); i++) { + + PackageEntry curr = list.get(i); + int index = indexOf(curr.id); + if(index > -1) { + + PackageEntry existing = packages.get(index); + if(curr.newerThan(existing)) { + + packages.set(index, curr); + + } + + } + else { + + packages.add(curr); + + } + + } + + } + + public PackageEntry getEntryById(String id) { + + PackageEntry result = null; + int index = indexOf(id); + if(index > -1) { + + result = packages.get(index); + + } + + return result; + + } + + private int indexOf(String id) { + + int result = -1; + for(int i = 0; i < packages.size(); i++) { + + if(packages.get(i).id.equals(id)) { + + result = i; + break; + + } + + } + + return result; + + } + + public void setFilter(PackageFilter filter) { + + filtered = new ArrayList(0); + for(int i = 0; i < packages.size(); i++) { + + PackageEntry curr = (PackageEntry) packages.get(i); + if(filter == PackageFilter.None) { + + filtered.add(curr); + + } + else { + + String type = PackageFilter.Applications.toString(); + if(curr.source != null) { + + if(curr.source.has("Type")) { + + try { + + type = curr.source.getString("Type"); + + } + + catch(Exception e) { + + System.out.println("ERROR: Package has no type!"); + + } + + } + + } + + if(type.equals(filter.toString())) { + + filtered.add(curr); + + } + + } + + } + } public ArrayList getCategories() { + ArrayList result = new ArrayList(0); result.add(ALL_CATEGORIES); - for(int i=0; i0 && - !category.toLowerCase().equals("unavailable")) { - if(!result.contains(category)) { + if(category.length() > 0 && ! category.toLowerCase().equals("unavailable")) { + + if(! result.contains(category)) { + result.add(category); + } + } - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Package has invalid category!"); + + } + } + } + } + Collections.sort(result); return result; + } public ArrayList getPackagesByCategory(String category) { + return getPackagesByCategory(category, false); + } - public ArrayList getPackagesByCategory(String category, - boolean includeInstalled) { + public ArrayList getPackagesByCategory(String category, boolean includeInstalled) { + ArrayList results = new ArrayList(0); - for(int i=0; i minVal) { + result &= true; break; - } else if (verVal < minVal) { + + } + else if (verVal < minVal) { + result &= false; break; + } - if(deviceVer.length-1==i && min.length-1>i) { - minVal = Integer.parseInt(min[i+1]); - if(minVal>0) { + + if(deviceVer.length - 1 == i && min.length - 1 > i) { + + minVal = Integer.parseInt(min[i + 1]); + if(minVal > 0) { + result &= false; - } else { - result &= true; + } + else { + + result &= true; + + } + break; + } - if(min.length-1==i && deviceVer.length-1>i) { + + if(min.length - 1 == i && deviceVer.length - 1 > i) { + result &=true; break; + } + } - } catch(Exception e) { - e.printStackTrace(); + } + catch(Exception e) { + + e.printStackTrace(); + + } + } + if(result && item.source.has("MaxWebOSVersion")) { + try { + String[] max = item.source.getString("MaxWebOSVersion").split("\\."); - for(int i=0; i maxVal) { + + } + else if (verVal > maxVal) { + result &= false; break; + } - if(deviceVer.length-1==i && max.length-1>i) { + + if(deviceVer.length - 1 == i && max.length - 1 > i) { + result &= true; break; + } - if(max.length-1==i && deviceVer.length-1>i) { - verVal = Integer.parseInt(deviceVer[i+1]); - if(verVal>0) { + + if(max.length - 1 == i && deviceVer.length - 1 > i) { + + verVal = Integer.parseInt(deviceVer[i + 1]); + if(verVal > 0) { + result &= false; - } else { - result &= true; + } + else { + + result &= true; + + } + break; + } + } - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: WebOS version parsing failed."); + + } + } + if(result && item.source.has("Category")) { + try { + String category = item.source.getString("Category"); if(category.toLowerCase().equals("unavailable")) { + result &= false; + } - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Category availability could not be determined."); + + } + } + } + return result; + } public ArrayList getUpdates() { + ArrayList results = new ArrayList(0); - for(int i=0; i-1) { + if(index > -1) { + if(curr.isUpdate(installed.get(index))) { + results.add(curr); + } + } + } + return results; + } public void setInstalledAppList(ArrayList apps) { + installed = apps; + } public boolean hasPackages() { - return (packages.size()>0); + + return (packages.size() > 0); + } public boolean isInstalled(PackageEntry pkg) { + return installed.contains(new InstalledEntry(pkg.id)); + } -} + +} \ No newline at end of file diff --git a/src/ipkg/PackageSorter.java b/src/ipkg/PackageSorter.java index 6ca18eb..fbad93e 100644 --- a/src/ipkg/PackageSorter.java +++ b/src/ipkg/PackageSorter.java @@ -4,26 +4,46 @@ import java.util.Comparator; /** * @author Jason Robitaille + * @maintainer NotAlexNoyle */ public class PackageSorter implements Comparator { + boolean ascending; PackageSorter(boolean ascending) { + this.ascending = ascending; + } + public int compare(Object a, Object b) { + int i; PackageEntry data1 = (PackageEntry)a; PackageEntry data2 = (PackageEntry)b; if (ascending) { + i = data1.name.compareToIgnoreCase(data2.name); - if(i==0) + if(i == 0) { + i = data1.id.compareToIgnoreCase(data2.id); - } else { - i = data2.name.compareToIgnoreCase(data1.name); - if(i==0) - i = data2.id.compareToIgnoreCase(data1.id); + + } + } + else { + + i = data2.name.compareToIgnoreCase(data1.name); + if(i == 0) { + + i = data2.id.compareToIgnoreCase(data1.id); + + } + + } + return i; + } -} + +} \ No newline at end of file diff --git a/src/resources/NewJFrame.properties b/src/resources/NewJFrame.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/resources/WebOSQuickInstallApp.properties b/src/resources/WebOSQuickInstallApp.properties index 1caaad2..e674fd4 100644 --- a/src/resources/WebOSQuickInstallApp.properties +++ b/src/resources/WebOSQuickInstallApp.properties @@ -2,7 +2,7 @@ Application.name = WebOS Quick Install Application.title = WebOS Quick Install -Application.version = v4.7.0u +Application.version = v4.7.1u Application.vendor = NotAlexNoyle Application.homepage = http://github.com/NotAlexNoyle/WebOS-Quick-Install Application.description = An advanced tool for installing and managing packages on webOS devices. diff --git a/src/utils/FileUtils.java b/src/utils/FileUtils.java index 3356595..e09cb02 100644 --- a/src/utils/FileUtils.java +++ b/src/utils/FileUtils.java @@ -7,94 +7,164 @@ import java.io.IOException; import org.jdesktop.application.Application; /** - * - * @author Jason + * @author Jason Robitaille + * @maintainer NotAlexNoyle */ public class FileUtils { + public static File appDirectory() { + File app, dir; try { - app = new File(Application.getInstance() - .getClass().getProtectionDomain().getCodeSource().getLocation().toURI()); - dir = app.getParentFile(); - } catch(Exception e) { - app = new File(Application.getInstance().getClass().getProtectionDomain() - .getCodeSource().getLocation() - .getPath().replaceAll("%20", " ")); + + app = new File(Application.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().toURI()); dir = app.getParentFile(); + } + catch(Exception e) { + + app = new File(Application.getInstance().getClass().getProtectionDomain().getCodeSource().getLocation().getPath().replaceAll("%20", " ")); + dir = app.getParentFile(); + + } + return dir; + } public static void copy(File from, File to) throws IOException { + FileInputStream fis = new FileInputStream(from); FileOutputStream fos = new FileOutputStream(to); try { + byte[] buf = new byte[1024]; int i = 0; while ((i = fis.read(buf)) != -1) { + fos.write(buf, 0, i); + } - } catch (IOException e) { - throw e; - } finally { - if (fis != null) - fis.close(); - if (fos != null) - fos.close(); + } + catch (IOException e) { + + throw e; + + } + finally { + + if (fis != null) { + + fis.close(); + + } + + if (fos != null) { + + fos.close(); + + } + + } + } public static String getFilename(File file) { + return getFilename(file.getName()); + } public static String getFilename(String file) { + String name = file; int index = name.lastIndexOf("\\"); - if(index>-1) { + if(index > -1) { + name = name.substring(index+1, name.length()); - } else { - index = name.lastIndexOf("/"); - if(index>-1) - name = name.substring(index+1, name.length()); + } + else { + + index = name.lastIndexOf("/"); + if(index > -1) { + + name = name.substring(index+1, name.length()); + + } + + } + return name; + } public static String formatFilesize(File file) { + return formatFilesize(file.length()); + } public static String formatFilesize(long size) { + String result = ""; - if(size<1000) { //bytes + // bytes + if(size < 1000) { + result = size + "B"; - } else if((size/1024)<1000) { //kilobytes - result = roundNicely(((double)size)/1024.0) + "KB"; - } else { - result = roundNicely((((double)size)/1024.0)/1024.0) + "MB"; + } + //kilobytes + else if((size / 1024) < 1000) { + + result = roundNicely(((double)size) / 1024.0) + "KB"; + + } + else { + + result = roundNicely((((double)size) / 1024.0) /1024.0) + "MB"; + + } + return result; + } private static String roundNicely(double dbl) { - long rounded = Math.round((dbl*100.0)); - String result = String.valueOf(((double)rounded)/100.0); - if(dbl<10) { - result = String.valueOf(Math.round(dbl*100.0)/100.0); - } else if(dbl<100) { - result = String.valueOf(Math.round(dbl*10.0)/10.0); - } else { + + long rounded = Math.round((dbl * 100.0)); + String result = String.valueOf(((double)rounded) / 100.0); + if(dbl < 10) { + + result = String.valueOf(Math.round(dbl * 100.0) / 100.0); + + } + else if(dbl < 100) { + + result = String.valueOf(Math.round(dbl * 10.0) / 10.0); + + } + else { + result = String.valueOf(((long)dbl)); + } + if(result.endsWith(".0")) { + result = result.replace(".0", ""); + } + return result; + } public static String getMD5Sum(File file) { + return MD5.getMD5Checksum(file); + } -} + +} \ No newline at end of file diff --git a/src/utils/MD5.java b/src/utils/MD5.java index 2d062d6..d899646 100644 --- a/src/utils/MD5.java +++ b/src/utils/MD5.java @@ -7,48 +7,78 @@ import java.security.MessageDigest; /** * @author Jason Robitaille + * @maintainer NotAlexNoyle */ public class MD5 { + private static final byte[] HEX_CHAR_TABLE = { + (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f' - }; + + }; public static byte[] createChecksum(File f) throws Exception { + InputStream fis = new FileInputStream(f); byte[] buffer = new byte[2048]; MessageDigest complete = MessageDigest.getInstance("MD5"); int numRead; do { + numRead = fis.read(buffer); + if (numRead > 0) { + complete.update(buffer, 0, numRead); - } - } while (numRead != -1); + + } + + } + while (numRead != -1); + fis.close(); + return complete.digest(); + } public static String getMD5Checksum(File f) { + String result = null; try { + byte[] raw = createChecksum(f); result = getHexString(raw); - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Could not get md5 checksum."); + + } + return result; + } private static String getHexString(byte[] raw) throws Exception { + byte[] hex = new byte[2 * raw.length]; int index = 0; for (byte b : raw) { + int v = b & 0xFF; hex[index++] = HEX_CHAR_TABLE[v >>> 4]; hex[index++] = HEX_CHAR_TABLE[v & 0xF]; + } + return new String(hex, "ASCII"); + } -} + +} \ No newline at end of file diff --git a/src/wosqi/About.java b/src/wosqi/About.java index 1f08e25..8dfd276 100644 --- a/src/wosqi/About.java +++ b/src/wosqi/About.java @@ -9,6 +9,10 @@ import javax.swing.JLabel; import org.jdesktop.application.Action; +/** + * @author Jason Robitaille + * @maintainer NotAlexNoyle + */ public class About extends javax.swing.JDialog { private ResourceBundle bundle; @@ -30,12 +34,8 @@ public class About extends javax.swing.JDialog { } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ - // //GEN-BEGIN:initComponents + // This method is called from within the constructor to initialize the form. + // WARNING: Do NOT modify this code. The content of this method is always regenerated by the Form Editor. private void initComponents() { jLayeredPane1 = new javax.swing.JLayeredPane(); @@ -69,7 +69,6 @@ public class About extends javax.swing.JDialog { jLayeredPane1.setBackground(new java.awt.Color(192, 192, 192)); jLayeredPane1.setName("jLayeredPane1"); jLayeredPane1.setOpaque(true); - javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(About.class, this); closeButton.setAction(actionMap.get("closeAboutBox")); closeButton.setBackground(new java.awt.Color(192, 192, 192)); @@ -86,10 +85,10 @@ public class About extends javax.swing.JDialog { } }); + jLayeredPane1.add(closeButton); closeButton.setBounds(130, 310, 90, 25); - - jLabel5.setFont(jLabel5.getFont().deriveFont((jLabel5.getFont().getStyle() | java.awt.Font.ITALIC), jLabel5.getFont().getSize()+1)); + jLabel5.setFont(jLabel5.getFont().deriveFont((jLabel5.getFont().getStyle() | java.awt.Font.ITALIC), jLabel5.getFont().getSize() + 1)); jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resources/donate.gif"))); jLabel5.setText(bundle.getString("About.jLabel5.text")); @@ -105,7 +104,6 @@ public class About extends javax.swing.JDialog { } }); - jLayeredPane1.add(jLabel5); jLabel5.setBounds(10, 120, 330, 50); @@ -158,9 +156,13 @@ public class About extends javax.swing.JDialog { jLabel2.setText(bundle.getString("About.jLabel2.text")); jLabel2.setName("jLabel2"); jLabel2.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + jLabel2MouseClicked(evt); + } + }); jLayeredPane1.add(jLabel2); jLabel2.setBounds(10, 80, 330, 40); @@ -168,16 +170,21 @@ public class About extends javax.swing.JDialog { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE) + ); layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE) + ); pack(); - }// //GEN-END:initComponents + + } private void formKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_formKeyPressed @@ -192,21 +199,47 @@ public class About extends javax.swing.JDialog { }//GEN-LAST:event_closeButtonKeyTyped private void jLabel5MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel5MouseClicked + try { + Desktop.getDesktop().browse(new URI("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7G5QLAXMVVSGY")); - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Link could not be opened."); + + } + }//GEN-LAST:event_jLabel5MouseClicked private void jLabel7MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel7MouseClicked + try { + Desktop.getDesktop().browse(new URI("https://www.paypal.me/NotAlexNoyle")); - } catch(Exception e) {} + + } + catch(Exception e) { + + System.out.println("ERROR: Link could not be opened."); + + } + }//GEN-LAST:event_jLabel7MouseClicked private void jLabel2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel2MouseClicked - /*try { + try { + Desktop.getDesktop().browse(new URI("https://github.com/JayCanuck/webos-quick-install")); - } catch(Exception e) {}*/ + + } + catch(Exception e) { + + System.out.println("ERROR: Link could not be opeend."); + + } + }//GEN-LAST:event_jLabel2MouseClicked // Variables declaration - do not modify//GEN-BEGIN:variables @@ -219,4 +252,4 @@ public class About extends javax.swing.JDialog { private javax.swing.JLayeredPane jLayeredPane1; // End of variables declaration//GEN-END:variables -} +} \ No newline at end of file diff --git a/src/wosqi/Bundle.properties b/src/wosqi/Bundle.properties index 9ee0f20..50aa7cd 100644 --- a/src/wosqi/Bundle.properties +++ b/src/wosqi/Bundle.properties @@ -4,7 +4,7 @@ MainView.name = WebOS Quick Install MainView.id = WOSQI MainView.title = WebOS Quick Install -MainView.version = v4.7.0u +MainView.version = v4.7.1u MainView.vendor = Alexander Noyle MainView.vendorId = NotAlexNoyle MainView.homepage = https://github.com/NotAlexNoyle/WebOS-Quick-Install @@ -114,7 +114,7 @@ InstalledPatchInfo.jLabel5.text=Description: InstalledPatchInfo.jLabel11.text=Author: About.closeButton.text=Close About.jLabel5.text=Donate to support the original developer: -About.appVersionLabel.text=Version v4.7.0u +About.appVersionLabel.text=Version v4.7.1u About.jLabel2.text=Open Source under the Apache License 2.0 About.jLabel4.text=Copyright 2009-2014 Jason Robitaille. About.jLabel7.text=Donate to support the new maintainer: diff --git a/src/wosqi/Bundle_de.properties b/src/wosqi/Bundle_de.properties index 0e97b95..61c0466 100644 --- a/src/wosqi/Bundle_de.properties +++ b/src/wosqi/Bundle_de.properties @@ -106,7 +106,7 @@ InstalledPatchInfo.jLabel5.text=Beschreibung: InstalledPatchInfo.jLabel11.text=Author: About.closeButton.text=Schlie\u00dfen About.jLabel5.text=Unterst\u00fctzen Sie die Entwicklung -About.appVersionLabel.text=Version 4.5.0 +About.appVersionLabel.text=Version v4.7.1u About.jLabel2.text=Deutsche \u00dcbersetzung von Tobias Kaller About.jLabel4.text=Copyright \u00a9 2009-2013 Jason Robitaille. All rights reserved. About.jLabel6.text=

Jason Robitaille and Canuck Coding are in no way affiliated with HP, LG or their affiliates. Palm, Pre, Pixi, Veer, TouchPad, and WebOS are among the trademarks owned by or licensed to Hewlett-Packard Development Company, L.P. www.hpwebos.com

diff --git a/src/wosqi/Bundle_fr.properties b/src/wosqi/Bundle_fr.properties index 6e102ba..54bdf09 100644 --- a/src/wosqi/Bundle_fr.properties +++ b/src/wosqi/Bundle_fr.properties @@ -106,7 +106,7 @@ InstalledPatchInfo.jLabel5.text=Description: InstalledPatchInfo.jLabel11.text=Auteur: About.closeButton.text=Fermer About.jLabel5.text=Aide de soutien au d\u00e9veloppement -About.appVersionLabel.text=Version 4.5.0 +About.appVersionLabel.text=Version v4.7.1u About.jLabel2.text=La traduction de fran\u00e7ais a fait par Jake Morrison. About.jLabel4.text=Copyright \u00a9 2009-2013 Jason Robitaille. Tous droits r\u00e9serv\u00e9s. About.jLabel6.text=

Jason Robitaille et Canuck Coding sont en aucun cas affili\u00e9 avec HP ou LG ou des sous filiales. Palm, Pre, Pixi, Veer, TouchPad, et WebOS sont des marques commerciales ou des marques d\u00e9pos\u00e9es appartenant \u00e0 ou sous licence de Hewlett-Packard www.hpwebos.com

diff --git a/src/wosqi/Bundle_zh.properties b/src/wosqi/Bundle_zh.properties index 35ae9ef..a504222 100644 --- a/src/wosqi/Bundle_zh.properties +++ b/src/wosqi/Bundle_zh.properties @@ -106,7 +106,7 @@ InstalledPatchInfo.jLabel5.text=\u63cf\u8ff0: InstalledPatchInfo.jLabel11.text=\u4f5c\u8005: About.closeButton.text=\u5173\u95ed About.jLabel5.text=\u5e2e\u52a9 -About.appVersionLabel.text=\u7248\u672c\u53f7 4.5.0 +About.appVersionLabel.text=\u7248\u672c\u53f7 v4.7.1u About.jLabel2.text=\u7b80\u4f53\u4e2d\u6587\u7ffb\u8bd1:medigi8@twitter About.jLabel4.text=\u7248\u6743\u5f52Jason Robitaille\u6240\u6709,\u76d7\u7248\u5fc5\u7a76. About.jLabel6.text=

\u6b64\u4e3a\u4e2a\u4eba\u4f5c\u54c1,\u4e0ePalm\u516c\u53f8\u65e0\u5173.Palm,Pre,Pixi,Veer,TouchPad\u548cWebOS\u6ce8\u518c\u5546\u6807\u5f52 Hewlett-Packard\u516c\u53f8\u6240\u6709.

diff --git a/src/wosqi/DeviceManagement.form b/src/wosqi/DeviceManagement.form deleted file mode 100644 index daf1555..0000000 --- a/src/wosqi/DeviceManagement.form +++ /dev/null @@ -1,372 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/wosqi/DeviceManagement.java b/src/wosqi/DeviceManagement.java index 7cdb0b0..29891dc 100644 --- a/src/wosqi/DeviceManagement.java +++ b/src/wosqi/DeviceManagement.java @@ -19,7 +19,12 @@ import javax.swing.JFrame; import org.json.JSONArray; import org.json.JSONObject; +/** + * @author Jason Robitaille + * @maintainer NotAlexNoyle + */ public class DeviceManagement extends javax.swing.JDialog { + private ResourceBundle bundle; private WebOSConnection webOS; private DefaultTableModel modTable; @@ -29,6 +34,7 @@ public class DeviceManagement extends javax.swing.JDialog { private Timer t; public DeviceManagement(java.awt.Frame parent, WebOSConnection connection) { + super(parent); bundle = WebOSQuickInstallApp.bundle; initComponents(); @@ -41,50 +47,84 @@ public class DeviceManagement extends javax.swing.JDialog { modTable.addRow(new Object[] {bundle.getString("LOADING_LIST..."),Boolean.FALSE}); this.getContentPane().requestFocus(); t = new Timer(); + if(!webOS.isConnected()) { + DeviceInfo info = webOS.getDeviceInfo(); - if(info!=null && !info.model().equals(DeviceInfo.Model.Unknown.toString())) { - JOptionPane.showMessageDialog(rootPane, MessageFormat.format(bundle - .getString("{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN."), - new Object[] {info.model()})); - } else { - JOptionPane.showMessageDialog(rootPane, bundle - .getString("DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.")); + if(info != null && ! info.model().equals(DeviceInfo.Model.Unknown.toString())) { + + JOptionPane.showMessageDialog(rootPane, MessageFormat.format(bundle.getString("{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN."), new Object[] {info.model()})); } + else { + + JOptionPane.showMessageDialog(rootPane, bundle.getString("DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.")); + + } + t.schedule(new DoDispose(), 200); - } else { + + } + else { + t.schedule(new DoLoadDetails(), 100); webOS.configPkgMgr(); + } + } private void loadDeviceDetails() { + DeviceInfo info = webOS.getDeviceInfo(); URL imgURL; if(info.model().equals(DeviceInfo.Model.Emulator.toString())) { + imgURL = getClass().getResource("/resources/Emulator 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.Palm_Pixi.toString()) || - info.model().equals(DeviceInfo.Model.Palm_Pixi_Plus.toString())) { - imgURL = getClass().getResource("/resources/Palm Pixi 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.Palm_Pre.toString()) || - info.model().equals(DeviceInfo.Model.Palm_Pre_Plus.toString())) { - imgURL = getClass().getResource("/resources/Palm Pre 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.Palm_Pre_2.toString())) { - imgURL = getClass().getResource("/resources/Palm Pre 2 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.HP_Veer.toString())) { - imgURL = getClass().getResource("/resources/HP Veer 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.HP_TouchPad.toString())) { - imgURL = getClass().getResource("/resources/HP TouchPad 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.HP_Pre_3.toString())) { - imgURL = getClass().getResource("/resources/HP Pre 3 64x64.png"); - } else if(info.model().equals(DeviceInfo.Model.Samsung_Galaxy_Nexus.toString()) - || info.model().equals(DeviceInfo.Model.LG_Nexus_4.toString()) - || info.model().equals(DeviceInfo.Model.Asus_Nexus_7.toString())) { - imgURL = getClass().getResource("/resources/LuneOS 64x64.png"); - } else { //unknown/Open webOS generic - imgURL = getClass().getResource("/resources/Open webOS 64x64.png"); + } + else if(info.model().equals(DeviceInfo.Model.Palm_Pixi.toString()) || info.model().equals(DeviceInfo.Model.Palm_Pixi_Plus.toString())) { + + imgURL = getClass().getResource("/resources/Palm Pixi 64x64.png"); + + } + else if(info.model().equals(DeviceInfo.Model.Palm_Pre.toString()) || info.model().equals(DeviceInfo.Model.Palm_Pre_Plus.toString())) { + + imgURL = getClass().getResource("/resources/Palm Pre 64x64.png"); + + } + else if(info.model().equals(DeviceInfo.Model.Palm_Pre_2.toString())) { + + imgURL = getClass().getResource("/resources/Palm Pre 2 64x64.png"); + + } + else if(info.model().equals(DeviceInfo.Model.HP_Veer.toString())) { + + imgURL = getClass().getResource("/resources/HP Veer 64x64.png"); + + } + else if(info.model().equals(DeviceInfo.Model.HP_TouchPad.toString())) { + + imgURL = getClass().getResource("/resources/HP TouchPad 64x64.png"); + + } + else if(info.model().equals(DeviceInfo.Model.HP_Pre_3.toString())) { + + imgURL = getClass().getResource("/resources/HP Pre 3 64x64.png"); + + } + else if(info.model().equals(DeviceInfo.Model.Samsung_Galaxy_Nexus.toString()) || info.model().equals(DeviceInfo.Model.LG_Nexus_4.toString()) || info.model().equals(DeviceInfo.Model.Asus_Nexus_7.toString())) { + + imgURL = getClass().getResource("/resources/LuneOS 64x64.png"); + + } + // Unknown/Generic WebOS Device + else { + + imgURL = getClass().getResource("/resources/Open webOS 64x64.png"); + + } + jLabel7.setIcon(new ImageIcon(imgURL)); jLabel2.setText(bundle.getString("DEVICE:") + " " + info.name()); jLabel1.setText(bundle.getString("OS:") + " " + info.os()); @@ -92,226 +132,360 @@ public class DeviceManagement extends javax.swing.JDialog { jLabel10.setText(bundle.getString("BUILD_NAME:") + " " + info.buildName()); jLabel4.setText(bundle.getString("BUILD_TIME:") + " " + info.buildTime()); - if(!info.model().equals(DeviceInfo.Model.Emulator.toString())) { + if(! info.model().equals(DeviceInfo.Model.Emulator.toString())) { + try { - String out = webOS.runProgram("/bin/grep", new String[] {"-e", "Processor", - "-e", "BogoMIPS", "-e", "Hardware", "/proc/cpuinfo"}); + + String out = webOS.runProgram("/bin/grep", new String[] {"-e", "Processor", "-e", "BogoMIPS", "-e", "Hardware", "/proc/cpuinfo"}); String[] tokens = out.split("\n"); - for(int i=0; i0) { + while(modTable.getRowCount() > 0) { + modTable.removeRow(0); + } - for(int i=0; i-1 && rightBrace>-1) { - out = out.substring(leftBrace, rightBrace+1); + if(leftBrace > -1 && rightBrace > -1) { + + out = out.substring(leftBrace, rightBrace + 1); results = new JSONObject(out).getJSONArray("apps"); + } - } catch(Exception e) { - System.err.println("Unable to get apps list from luna-send: " + - e.getMessage()); + } + catch(Exception e) { + + System.err.println("Unable to get apps list from luna-send: " + e.getMessage()); + + } + return results; + } private JSONObject getAppInfoFromId(String appid) { + JSONObject result = null; - for(int i=0; i warn = webOS.whatDependsRecursive(curr.getId()); - if(warn.size()>0) { - String warnMsg = "" + - MessageFormat.format(bundle - .getString("DEPENDANT_PACKAGES_EXIST_WARNING"), - new Object[] {modTable.getValueAt(i, 0)}) + "\n"; - for(int j=0; j 0) { + + String warnMsg = "" + MessageFormat.format(bundle.getString("DEPENDANT_PACKAGES_EXIST_WARNING"), new Object[] {modTable.getValueAt(i, 0)}) + "\n"; + for(int j = 0; j < warn.size(); j++) { + warnMsg += "\n" + pkgs.get(indexOfPackage(warn.get(j))).getName(); + } - if(JOptionPane.showConfirmDialog(rootPane, warnMsg, - bundle.getString("WARNING"), JOptionPane.OK_CANCEL_OPTION, - JOptionPane.WARNING_MESSAGE)==JOptionPane.OK_OPTION) { - uninstallPackage(curr); + + if(JOptionPane.showConfirmDialog(rootPane, warnMsg, bundle.getString("WARNING"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE)==JOptionPane.OK_OPTION) { + + uninstallPackage(curr); uninstall(); break; - } else { + + } + else { + break; + } - } else { - if(uninstallPackage(curr)) { - i--; - } + } + else { + + if(uninstallPackage(curr)) { + + i--; + + } + + } + } + } + webOS.executeRestartFlags(); + } public int indexOfPackage(String appid) { + int result = -1; - for(int i=0; i depends = webOS.whatDepends(entry.getId()); - if(depends.size()>0) { - for(int i=0; i 0) { + + for(int i = 0; i < depends.size(); i++) { + int index = indexOfPackage(depends.get(i)); - if(index>-1) { + if(index > -1) { + continueOn &= uninstallPackage(pkgs.get(index)); - if(!continueOn) { + + if(! continueOn) { + break; + } + } + } + } + if(continueOn && webOS.uninstall(curr.getId())) { + pkgs.remove(curr); int index = indexOfFiltered(curr.getId()); - if(index>-1) { + if(index > -1) { + modTable.removeRow(index); filtered.remove(index); + } + continueOn = true; - } else { - continueOn = false; + } + else { + + continueOn = false; + + } + return continueOn; + } @Action public void closeManagement() { + dispose(); + } private void setState(boolean enable) { + jComboBox1.setEnabled(enable); jButton1.setEnabled(enable); jTable1.setEnabled(enable); if(enable) { + jTable1.setBackground(new Color(255, 255, 255)); setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - } else { + + } + else { + jTable1.setBackground(new Color(230, 230, 230)); setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); + } + } - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ + // This method is called from within the constructor to initialize the form. + // WARNING: Do NOT modify this code. The content of this method is always regenerated by the Form Editor. // //GEN-BEGIN:initComponents private void initComponents() { @@ -336,121 +510,165 @@ public class DeviceManagement extends javax.swing.JDialog { jLabel5 = new javax.swing.JLabel(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle(bundle.getString("MainView.jMenuItem5.text")); // NOI18N + setTitle(bundle.getString("MainView.jMenuItem5.text")); setModal(true); - setName("aboutBox"); // NOI18N + setName("aboutBox"); setResizable(false); addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent evt) { + formWindowClosing(evt); + } + }); addKeyListener(new java.awt.event.KeyAdapter() { + public void keyPressed(java.awt.event.KeyEvent evt) { + formKeyPressed(evt); + } + }); - jLayeredPane1.setName("jLayeredPane1"); // NOI18N + jLayeredPane1.setName("jLayeredPane1"); jLayeredPane1.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + jLayeredPane1MouseClicked(evt); + } + }); jLayeredPane1.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyTyped(java.awt.event.KeyEvent evt) { + jLayeredPane1KeyTyped(evt); + } + }); - jLayeredPane3.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("DeviceManagement.jLayeredPane3.border.title"))); // NOI18N - jLayeredPane3.setName("jLayeredPane3"); // NOI18N + jLayeredPane3.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("DeviceManagement.jLayeredPane3.border.title"))); + jLayeredPane3.setName("jLayeredPane3"); jLayeredPane3.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + jLayeredPane3MouseClicked(evt); + } + }); - jScrollPane1.setName("jScrollPane1"); // NOI18N + jScrollPane1.setName("jScrollPane1"); - jTable1.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - - }, - new String [] { - "Name", "" - } - ) { + jTable1.setModel(new javax.swing.table.DefaultTableModel(new Object [][] {}, new String [] {"Name", ""}) { + Class[] types = new Class [] { + java.lang.String.class, java.lang.Boolean.class + }; + boolean[] canEdit = new boolean [] { + false, true + }; public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } public boolean isCellEditable(int rowIndex, int columnIndex) { + return canEdit [columnIndex]; + } + }); jTable1.setFillsViewportHeight(true); jTable1.setFocusable(false); jTable1.setGridColor(new java.awt.Color(192, 192, 192)); - jTable1.setName("jTable1"); // NOI18N + jTable1.setName("jTable1"); jTable1.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); jTable1.setShowVerticalLines(false); jTable1.getTableHeader().setResizingAllowed(false); jTable1.getTableHeader().setReorderingAllowed(false); jTable1.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + jTable1MouseClicked(evt); + } public void mousePressed(java.awt.event.MouseEvent evt) { + jTable1MousePressed(evt); + } public void mouseReleased(java.awt.event.MouseEvent evt) { + jTable1MouseReleased(evt); + } + }); jTable1.addKeyListener(new java.awt.event.KeyAdapter() { + public void keyTyped(java.awt.event.KeyEvent evt) { + jTable1KeyTyped(evt); + } + }); jScrollPane1.setViewportView(jTable1); jTable1.getColumnModel().getColumn(0).setResizable(false); jTable1.getColumnModel().getColumn(0).setPreferredWidth(250); - jTable1.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("DeviceManagement.jTable1.columnModel.title0")); // NOI18N + jTable1.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("DeviceManagement.jTable1.columnModel.title0")); jTable1.getColumnModel().getColumn(1).setResizable(false); jTable1.getColumnModel().getColumn(1).setPreferredWidth(50); - jTable1.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("DeviceManagement.jTable1.columnModel.title1")); // NOI18N + jTable1.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("DeviceManagement.jTable1.columnModel.title1")); jScrollPane1.setBounds(20, 50, 240, 260); jLayeredPane3.add(jScrollPane1, javax.swing.JLayeredPane.DEFAULT_LAYER); jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Packages", "Patches" })); jComboBox1.setFocusable(false); - jComboBox1.setName("jComboBox1"); // NOI18N + jComboBox1.setName("jComboBox1"); jComboBox1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jComboBox1ActionPerformed(evt); + } + }); jComboBox1.setBounds(154, 20, 100, 20); jLayeredPane3.add(jComboBox1, javax.swing.JLayeredPane.DEFAULT_LAYER); javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(DeviceManagement.class, this); - jButton1.setAction(actionMap.get("uninstall")); // NOI18N - jButton1.setText(bundle.getString("DeviceManagement.jButton1.text")); // NOI18N + jButton1.setAction(actionMap.get("uninstall")); + jButton1.setText(bundle.getString("DeviceManagement.jButton1.text")); jButton1.setFocusable(false); - jButton1.setName("jButton1"); // NOI18N + jButton1.setName("jButton1"); jButton1.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jButton1ActionPerformed(evt); + } + }); jButton1.setBounds(150, 320, 110, 23); jLayeredPane3.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER); @@ -458,71 +676,75 @@ public class DeviceManagement extends javax.swing.JDialog { jLayeredPane3.setBounds(320, 10, 280, 360); jLayeredPane1.add(jLayeredPane3, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLayeredPane2.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("DeviceManagement.jLayeredPane2.border.title"))); // NOI18N - jLayeredPane2.setName("jLayeredPane2"); // NOI18N + jLayeredPane2.setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("DeviceManagement.jLayeredPane2.border.title"))); + jLayeredPane2.setName("jLayeredPane2"); jLayeredPane2.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + jLayeredPane2MouseClicked(evt); + } + }); jLabel7.setVerticalAlignment(javax.swing.SwingConstants.TOP); - jLabel7.setName("jLabel7"); // NOI18N + jLabel7.setName("jLabel7"); jLabel7.setBounds(190, 20, 70, 70); jLayeredPane2.add(jLabel7, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel3.setText(bundle.getString("DeviceManagement.jLabel3.text")); // NOI18N - jLabel3.setName("jLabel3"); // NOI18N + jLabel3.setText(bundle.getString("DeviceManagement.jLabel3.text")); + jLabel3.setName("jLabel3"); jLabel3.setBounds(20, 180, 250, 20); jLayeredPane2.add(jLabel3, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel13.setText(bundle.getString("DeviceManagement.jLabel13.text")); // NOI18N - jLabel13.setName("jLabel13"); // NOI18N + jLabel13.setText(bundle.getString("DeviceManagement.jLabel13.text")); + jLabel13.setName("jLabel13"); jLabel13.setBounds(20, 300, 250, 20); jLayeredPane2.add(jLabel13, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel8.setText(bundle.getString("DeviceManagement.jLabel8.text")); // NOI18N - jLabel8.setName("jLabel8"); // NOI18N + jLabel8.setText(bundle.getString("DeviceManagement.jLabel8.text")); + jLabel8.setName("jLabel8"); jLabel8.setBounds(20, 240, 250, 20); jLayeredPane2.add(jLabel8, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel12.setText(bundle.getString("DeviceManagement.jLabel12.text")); // NOI18N - jLabel12.setName("jLabel12"); // NOI18N + jLabel12.setText(bundle.getString("DeviceManagement.jLabel12.text")); + jLabel12.setName("jLabel12"); jLabel12.setBounds(20, 270, 250, 20); jLayeredPane2.add(jLabel12, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel11.setText(bundle.getString("DeviceManagement.jLabel11.text")); // NOI18N - jLabel11.setName("jLabel11"); // NOI18N + jLabel11.setText(bundle.getString("DeviceManagement.jLabel11.text")); + jLabel11.setName("jLabel11"); jLabel11.setBounds(20, 330, 250, 20); jLayeredPane2.add(jLabel11, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel9.setText(bundle.getString("DeviceManagement.jLabel9.text")); // NOI18N - jLabel9.setName("jLabel9"); // NOI18N + jLabel9.setText(bundle.getString("DeviceManagement.jLabel9.text")); + jLabel9.setName("jLabel9"); jLabel9.setBounds(20, 210, 250, 20); jLayeredPane2.add(jLabel9, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel4.setText(bundle.getString("DeviceManagement.jLabel4.text")); // NOI18N - jLabel4.setName("jLabel4"); // NOI18N + jLabel4.setText(bundle.getString("DeviceManagement.jLabel4.text")); + jLabel4.setName("jLabel4"); jLabel4.setBounds(20, 150, 250, 20); jLayeredPane2.add(jLabel4, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel1.setText(bundle.getString("DeviceManagement.jLabel1.text")); // NOI18N - jLabel1.setName("jLabel1"); // NOI18N + jLabel1.setText(bundle.getString("DeviceManagement.jLabel1.text")); + jLabel1.setName("jLabel1"); jLabel1.setBounds(20, 60, 170, 20); jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel10.setText(bundle.getString("DeviceManagement.jLabel10.text")); // NOI18N - jLabel10.setName("jLabel10"); // NOI18N + jLabel10.setText(bundle.getString("DeviceManagement.jLabel10.text")); + jLabel10.setName("jLabel10"); jLabel10.setBounds(20, 120, 250, 20); jLayeredPane2.add(jLabel10, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel2.setText(bundle.getString("DeviceManagement.jLabel2.text")); // NOI18N - jLabel2.setName("jLabel2"); // NOI18N + jLabel2.setText(bundle.getString("DeviceManagement.jLabel2.text")); + jLabel2.setName("jLabel2"); jLabel2.setBounds(20, 30, 170, 20); jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER); - jLabel5.setText(bundle.getString("DeviceManagement.jLabel5.text")); // NOI18N - jLabel5.setName("jLabel5"); // NOI18N + jLabel5.setText(bundle.getString("DeviceManagement.jLabel5.text")); + jLabel5.setName("jLabel5"); jLabel5.setBounds(20, 90, 170, 20); jLayeredPane2.add(jLabel5, javax.swing.JLayeredPane.DEFAULT_LAYER); @@ -531,19 +753,15 @@ public class DeviceManagement extends javax.swing.JDialog { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 619, javax.swing.GroupLayout.PREFERRED_SIZE) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 385, javax.swing.GroupLayout.PREFERRED_SIZE) - ); + layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 619, javax.swing.GroupLayout.PREFERRED_SIZE)); + layout.setVerticalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 385, javax.swing.GroupLayout.PREFERRED_SIZE)); pack(); + }// //GEN-END:initComponents private void formKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_formKeyPressed + }//GEN-LAST:event_formKeyPressed private void jTable1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jTable1MouseClicked @@ -551,60 +769,86 @@ public class DeviceManagement extends javax.swing.JDialog { }//GEN-LAST:event_jTable1MouseClicked private void jTable1KeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jTable1KeyTyped + }//GEN-LAST:event_jTable1KeyTyped private void jLayeredPane1KeyTyped(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jLayeredPane1KeyTyped + }//GEN-LAST:event_jLayeredPane1KeyTyped private void jLayeredPane2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLayeredPane2MouseClicked + }//GEN-LAST:event_jLayeredPane2MouseClicked private void jLayeredPane3MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLayeredPane3MouseClicked + }//GEN-LAST:event_jLayeredPane3MouseClicked private void jLayeredPane1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLayeredPane1MouseClicked + }//GEN-LAST:event_jLayeredPane1MouseClicked private void jTable1MousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jTable1MousePressed + int i = jTable1.rowAtPoint(evt.getPoint()); - if(i>-1) { - if(jTable1.columnAtPoint(evt.getPoint())==0) { + if(i > -1) { + + if(jTable1.columnAtPoint(evt.getPoint()) == 0) { + JFrame mainFrame = WebOSQuickInstallApp.getApplication().getMainFrame(); - if(jComboBox1.getSelectedIndex()==0) { - InstalledPkgInfo info = new InstalledPkgInfo(mainFrame, webOS, - filtered.get(i)); - info.setLocationRelativeTo(mainFrame); - WebOSQuickInstallApp.getApplication().show(info); - } else { - InstalledPatchInfo info = new InstalledPatchInfo(mainFrame, webOS, - filtered.get(i)); + if(jComboBox1.getSelectedIndex() == 0) { + + InstalledPkgInfo info = new InstalledPkgInfo(mainFrame, webOS, filtered.get(i)); info.setLocationRelativeTo(mainFrame); WebOSQuickInstallApp.getApplication().show(info); + } + else { + + InstalledPatchInfo info = new InstalledPatchInfo(mainFrame, webOS, filtered.get(i)); + info.setLocationRelativeTo(mainFrame); + WebOSQuickInstallApp.getApplication().show(info); + + } + } + } + int row = jTable1.getSelectedRow(); - if(row>-1) { + if(row > -1) { + jTable1.removeRowSelectionInterval(row, row); + } + }//GEN-LAST:event_jTable1MousePressed private void jTable1MouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jTable1MouseReleased + int row = jTable1.getSelectedRow(); - if(row>-1) { + if(row > -1) { + jTable1.removeRowSelectionInterval(row, row); + } + }//GEN-LAST:event_jTable1MouseReleased private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing + }//GEN-LAST:event_formWindowClosing private void jComboBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jComboBox1ActionPerformed + t.schedule(new DoLoadPackages(), 50); + }//GEN-LAST:event_jComboBox1ActionPerformed private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed + t.schedule(new DoDeleteApps(), 50); + }//GEN-LAST:event_jButton1ActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables @@ -629,27 +873,46 @@ public class DeviceManagement extends javax.swing.JDialog { private javax.swing.JTable jTable1; // End of variables declaration//GEN-END:variables - class DoLoadDetails extends TimerTask { + class DoLoadDetails extends TimerTask { + public void run() { + loadDeviceDetails(); + } + } - class DoLoadPackages extends TimerTask { + class DoLoadPackages extends TimerTask { + public void run() { + loadPackages(); + } + } - class DoDeleteApps extends TimerTask { + + class DoDeleteApps extends TimerTask { + public void run() { + setState(false); uninstall(); setState(true); + } + } - class DoDispose extends TimerTask { + + class DoDispose extends TimerTask { + public void run() { + dispose(); + } + } -} + +} \ No newline at end of file diff --git a/src/wosqi/FeedLoader.form b/src/wosqi/FeedLoader.form deleted file mode 100644 index b625adf..0000000 --- a/src/wosqi/FeedLoader.form +++ /dev/null @@ -1,167 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/FeedLoader.java b/src/wosqi/FeedLoader.java index 59bb7ea..d7d1099 100644 --- a/src/wosqi/FeedLoader.java +++ b/src/wosqi/FeedLoader.java @@ -9,32 +9,46 @@ import java.util.Timer; import java.util.TimerTask; import javax.swing.JOptionPane; +/** + * @author Jason Robitaille + * @maintainer NotAlexNoyle + */ public class FeedLoader extends javax.swing.JDialog { + private ResourceBundle bundle; private WebOSConnection webOS; public PackageManager pkgMgr; public Timer t; public FeedLoader(java.awt.Frame parent, WebOSConnection connection) { + super(parent); bundle = WebOSQuickInstallApp.bundle; initComponents(); t = new Timer(); webOS = connection; - if(!webOS.isConnected()) { + if(! webOS.isConnected()) { + DeviceInfo info = webOS.getDeviceInfo(); - if(info!=null && !info.model().equals(DeviceInfo.Model.Unknown.toString())) { - JOptionPane.showMessageDialog(rootPane, MessageFormat.format(bundle - .getString("{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN."), - new Object[] {info.model()})); - } else { - JOptionPane.showMessageDialog(rootPane, bundle - .getString("DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.")); + if(info != null && ! info.model().equals(DeviceInfo.Model.Unknown.toString())) { + + JOptionPane.showMessageDialog(rootPane, MessageFormat.format(bundle.getString("{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN."), new Object[] {info.model()})); + } + else { + + JOptionPane.showMessageDialog(rootPane, bundle.getString("DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.")); + } + t.schedule(new DoDispose(), 200); - } else { - t.schedule(new DoLoad(), 200); + } + else { + + t.schedule(new DoLoad(), 200); + + } + } /** This method is called from within the constructor to @@ -57,30 +71,38 @@ public class FeedLoader extends javax.swing.JDialog { setForeground(new java.awt.Color(219, 219, 219)); setIconImage(null); setModal(true); - setName("transfer"); // NOI18N + setName("transfer"); setResizable(false); setUndecorated(true); addWindowListener(new java.awt.event.WindowAdapter() { + public void windowActivated(java.awt.event.WindowEvent evt) { + formWindowActivated(evt); + } public void windowClosed(java.awt.event.WindowEvent evt) { + formWindowClosed(evt); + } public void windowOpened(java.awt.event.WindowEvent evt) { + formWindowOpened(evt); + } + }); jLayeredPane1.setBackground(new java.awt.Color(219, 219, 219)); jLayeredPane1.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153)), javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED, java.awt.Color.lightGray, new java.awt.Color(204, 204, 204), null, null))); - jLayeredPane1.setName("jLayeredPane1"); // NOI18N + jLayeredPane1.setName("jLayeredPane1"); jLayeredPane1.setOpaque(true); jScrollPane2.setBorder(null); jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); jScrollPane2.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); - jScrollPane2.setName("jScrollPane2"); // NOI18N + jScrollPane2.setName("jScrollPane2"); jTextArea2.setBackground(new java.awt.Color(219, 219, 219)); jTextArea2.setColumns(20); @@ -97,7 +119,7 @@ public class FeedLoader extends javax.swing.JDialog { jScrollPane2.setBounds(10, 20, 240, 30); jLabel6.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); - jLabel6.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resources/activity.gif"))); // NOI18N + jLabel6.setIcon(new javax.swing.ImageIcon(getClass().getResource("/resources/activity.gif"))); jLabel6.setText(bundle.getString("FeedLoader.jLabel6.text")); jLabel6.setName("jLabel6"); jLayeredPane1.add(jLabel6); @@ -112,16 +134,11 @@ public class FeedLoader extends javax.swing.JDialog { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE) - ); + layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE)); + layout.setVerticalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE)); pack(); + }// //GEN-END:initComponents private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened @@ -129,9 +146,11 @@ public class FeedLoader extends javax.swing.JDialog { }//GEN-LAST:event_formWindowOpened private void formWindowActivated(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowActivated + }//GEN-LAST:event_formWindowActivated private void formWindowClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosed + }//GEN-LAST:event_formWindowClosed // Variables declaration - do not modify//GEN-BEGIN:variables @@ -143,15 +162,24 @@ public class FeedLoader extends javax.swing.JDialog { // End of variables declaration//GEN-END:variables class DoLoad extends TimerTask { + public void run() { - pkgMgr = new PackageManager(webOS.getDeviceInfo(), webOS.listInstalled(), - jTextArea2); + + pkgMgr = new PackageManager(webOS.getDeviceInfo(), webOS.listInstalled(), jTextArea2); dispose(); + } + } + class DoDispose extends TimerTask { + public void run() { + dispose(); + } + } -} + +} \ No newline at end of file diff --git a/src/wosqi/FeedViewer.form b/src/wosqi/FeedViewer.form deleted file mode 100644 index adc2d06..0000000 --- a/src/wosqi/FeedViewer.form +++ /dev/null @@ -1,3658 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/FeedViewer.java b/src/wosqi/FeedViewer.java index 6796471..e42efaa 100644 --- a/src/wosqi/FeedViewer.java +++ b/src/wosqi/FeedViewer.java @@ -44,7 +44,12 @@ import ipkg.PackageEntry; import ipkg.PackageFilter; import ipkg.PackageManager; +/** + * @author Jason Robitaille + * @maintainer NotAlexNoyle + */ public class FeedViewer extends javax.swing.JDialog { + private ResourceBundle bundle; private PackageManager pkgMgr; private final String UNKNOWN_VALUE; @@ -76,6 +81,7 @@ public class FeedViewer extends javax.swing.JDialog { private static final int BUFFER_SIZE = 4096; public FeedViewer(java.awt.Frame parent, WebOSConnection wc, PackageManager pm) { + super(parent); bundle = WebOSQuickInstallApp.bundle; URL bgURL = getClass().getResource("/resources/background2.jpg"); diff --git a/src/wosqi/InstalledPatchInfo.form b/src/wosqi/InstalledPatchInfo.form deleted file mode 100644 index 9a7b2be..0000000 --- a/src/wosqi/InstalledPatchInfo.form +++ /dev/null @@ -1,332 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/InstalledPkgInfo.form b/src/wosqi/InstalledPkgInfo.form deleted file mode 100644 index 53d00f4..0000000 --- a/src/wosqi/InstalledPkgInfo.form +++ /dev/null @@ -1,277 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/Installer.form b/src/wosqi/Installer.form deleted file mode 100644 index d263b74..0000000 --- a/src/wosqi/Installer.form +++ /dev/null @@ -1,160 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/MainView.form b/src/wosqi/MainView.form deleted file mode 100644 index 16d602c..0000000 --- a/src/wosqi/MainView.form +++ /dev/null @@ -1,545 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title2" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/MainView.java b/src/wosqi/MainView.java index aea286e..dc4b0f1 100644 --- a/src/wosqi/MainView.java +++ b/src/wosqi/MainView.java @@ -8,6 +8,7 @@ import java.awt.Desktop; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Image; +import java.awt.geom.RoundRectangle2D; import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -23,6 +24,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.prefs.Preferences; +import javax.imageio.ImageIO; import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -32,6 +34,7 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPasswordField; +import javax.swing.JWindow; import javax.swing.UIManager; import javax.swing.table.DefaultTableModel; diff --git a/src/wosqi/ReceiveFile.form b/src/wosqi/ReceiveFile.form deleted file mode 100644 index 241c5a2..0000000 --- a/src/wosqi/ReceiveFile.form +++ /dev/null @@ -1,213 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/SendFile.form b/src/wosqi/SendFile.form deleted file mode 100644 index 0f9c034..0000000 --- a/src/wosqi/SendFile.form +++ /dev/null @@ -1,213 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/Settings.form b/src/wosqi/Settings.form deleted file mode 100644 index 5b67bcb..0000000 --- a/src/wosqi/Settings.form +++ /dev/null @@ -1,352 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString("{key}")"/> - - - - - - - <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString("{key}")"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/Usage.form b/src/wosqi/Usage.form deleted file mode 100644 index 0d37963..0000000 --- a/src/wosqi/Usage.form +++ /dev/null @@ -1,134 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wosqi/WebOSQuickInstallApp.java b/src/wosqi/WebOSQuickInstallApp.java index 9ae7e01..cc5083c 100644 --- a/src/wosqi/WebOSQuickInstallApp.java +++ b/src/wosqi/WebOSQuickInstallApp.java @@ -35,7 +35,7 @@ public class WebOSQuickInstallApp extends SingleFrameApplication { app.getFrame().setResizable(false); app.getFrame().setSize(630, 400); app.getFrame().setVisible(true); - app.getFrame().setTitle("WebOS Quick Install (v4.7.0u)"); + app.getFrame().setTitle(bundle.getString("MainView.title") + " " + bundle.getString("MainView.version")); show(app); } @@ -60,6 +60,7 @@ public class WebOSQuickInstallApp extends SingleFrameApplication { * Main method launching the application. */ public static void main(String[] args) { + Logger logger = Logger.getLogger(org.jdesktop.application.SessionStorage.class.getName()); logger.setLevel(java.util.logging.Level.OFF);