Author: tchemit Date: 2014-01-10 19:05:55 +0100 (Fri, 10 Jan 2014) New Revision: 2767 Url: http://nuiton.org/projects/jaxx/repository/revisions/2767 Log: fix broker + webstart config Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2014-01-10 16:52:31 UTC (rev 2766) +++ trunk/jaxx-demo/pom.xml 2014-01-10 18:05:55 UTC (rev 2767) @@ -64,7 +64,6 @@ <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> - <webstartPluginVersion>1.0-beta-5-SNAPSHOT</webstartPluginVersion> </properties> <dependencies> @@ -349,7 +348,7 @@ <id>generate-jnlp</id> <phase>package</phase> <goals> - <goal>jnlp-single2</goal> + <goal>jnlp-single</goal> </goals> </execution> </executions> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java 2014-01-10 16:52:31 UTC (rev 2766) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoHelpBroker.java 2014-01-10 18:05:55 UTC (rev 2767) @@ -122,8 +122,13 @@ public String getMessage(ComponentTreeNode componentTree) { String message = super.getMessage(componentTree); Component userObject = componentTree.getUserObject(); - Rectangle rectangle = new Rectangle(userObject.getLocationOnScreen(), userObject.getSize()); - return message + (userObject.isVisible() ? " visible" : "") + " - " + rectangle; + if (userObject.isShowing() && userObject.isVisible()) { + Rectangle rectangle = new Rectangle(userObject.getLocationOnScreen(), userObject.getSize()); + message += " visible - " + rectangle; + } else { + message += " invisible"; + } + return message; } }; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-10 16:52:31 UTC (rev 2766) +++ trunk/pom.xml 2014-01-10 18:05:55 UTC (rev 2767) @@ -124,6 +124,8 @@ <swingXVersion>1.6.5-1</swingXVersion> <plexusUtilVersion>3.0.15</plexusUtilVersion> + <webstartPluginVersion>1.0-beta-5</webstartPluginVersion> + <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -449,10 +451,11 @@ <makeArchive>false</makeArchive> <verbose>false</verbose> <updateManifestEntries> - <Application-Name>jTimer ${project.version}</Application-Name> + <Application-Name>JAXX Demo ${project.version}</Application-Name> <Permissions>all-permissions</Permissions> <Codebase>*</Codebase> </updateManifestEntries> + <filenameMapping>simple</filenameMapping> <!-- TODO Use this this webstart 1.0-beta-5 --> <!--<outputJarVersions>true</outputJarVersions>--> <jnlp> @@ -472,11 +475,9 @@ <gen>false</gen> </keystoreConfig> </sign> + <gzip>true</gzip> <unsign>true</unsign> - <canUnsign>true</canUnsign> - <unsignAlreadySignedJars>true</unsignAlreadySignedJars> - <!--Can't use pack2000 since there is some already signed jar--> <pack200> <enabled>true</enabled> <passFiles> @@ -484,22 +485,14 @@ </passFiles> </pack200> <jnlpExtensions> - <!--jnlpExtension> - <name>sun</name> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <includes> - <include>javax.help:javahelp</include> - </includes> - </jnlpExtension--> - <!--jnlpExtension> + <jnlpExtension> <name>jxlayer</name> <title>Swing labs JXLayer</title> <vendor>Swing Labs</vendor> <includes> <include>org.swinglabs:jxlayer</include> </includes> - </jnlpExtension--> + </jnlpExtension> </jnlpExtensions> </configuration> </plugin>