- Jaxx-commits - mailman.cloud.codelutin.com

r1913 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/script
by tchemit＠users.nuiton.org May 18, 2010

May 18, 2010

Author: tchemit Date: 2010-05-18 05:48:55 +0200 (Tue, 18 May 2010) New Revision: 1913 Url: http://nuiton.org/repositories/revision/jaxx/1913 Log: fix log Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-18 03:48:28 UTC (rev 1912) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-18 03:48:55 UTC (rev 1913) @@ -299,7 +299,7 @@ // generic declaration detected if (log.isDebugEnabled()) { - log.info("Found a declaration with generics : " + declaration); + log.debug("Found a declaration with generics : " + declaration); } int last = declaration.lastIndexOf('>'); @@ -313,7 +313,7 @@ } if (log.isDebugEnabled()) { - log.info("==> declaration without generics : " + newDeclaration); + log.debug("==> declaration without generics : " + newDeclaration); } declaration = newDeclaration; }

1 0

r1912 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/script
by tchemit＠users.nuiton.org May 18, 2010

May 18, 2010

Author: tchemit Date: 2010-05-18 05:48:28 +0200 (Tue, 18 May 2010) New Revision: 1912 Url: http://nuiton.org/repositories/revision/jaxx/1912 Log: Anomalie #620: Improve error when fail to load a script Anomalie #621: Make script parse correctly field declaration with generics Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-17 10:31:06 UTC (rev 1911) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/script/ScriptManager.java 2010-05-18 03:48:28 UTC (rev 1912) @@ -32,6 +32,8 @@ import jaxx.compiler.reflect.FieldDescriptor; import jaxx.compiler.reflect.MethodDescriptor; import jaxx.compiler.tags.TagManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.StringReader; import java.lang.reflect.Modifier; @@ -213,9 +215,14 @@ compiler.appendBodyCode(modifiers + " " + node.getText().substring(0, node.getText().length() - 1) + code + "}"); } + + /** Logger */ + static private final Log log = LogFactory.getLog(ScriptManager.class); + private void scanScriptNode(SimpleNode node) throws CompilerException { int nodeType = getLineType(node); - if (nodeType == JavaParserTreeConstants.JJTIMPORTDECLARATION) { // have to handle imports early so the preprocessing takes them into account + if (nodeType == JavaParserTreeConstants.JJTIMPORTDECLARATION) { + // have to handle imports early so the preprocessing takes them into account String text = node.getChild(0).getText().trim(); if (text.startsWith("import")) { text = text.substring("import".length()).trim(); @@ -287,6 +294,30 @@ declaration = declaration.substring(0, equals); } declaration = declaration.trim(); + if (declaration.contains("<")) { + + // generic declaration detected + + if (log.isDebugEnabled()) { + log.info("Found a declaration with generics : " + declaration); + } + + int last = declaration.lastIndexOf('>'); + + // copy everything before first '<' + String newDeclaration = declaration.substring(0, declaration.indexOf('<')); + if (last < declaration.length()) { + + // copy everithing after last '>' + newDeclaration += declaration.substring(last + 1); + } + + if (log.isDebugEnabled()) { + log.info("==> declaration without generics : " + newDeclaration); + } + declaration = newDeclaration; + } + String[] declarationTokens = declaration.split("\\s"); boolean isFinal = Arrays.asList(declarationTokens).contains("final"); boolean isStatic = Arrays.asList(declarationTokens).contains("static"); @@ -295,10 +326,19 @@ name = name.substring(0, name.length() - 1).trim(); } String className = declarationTokens[declarationTokens.length - 2]; + if (log.isInfoEnabled()) { + log.info("Found type : "+className +": ()"+ Arrays.toString(declarationTokens)); + } String type = TagManager.resolveClassName(className, compiler); + if (type == null) { + + throw new CompilerException("Could not find type of " + className+" for expression " + text); + } compiler.addScriptField(new FieldDescriptor(name, Modifier.PUBLIC, type, compiler.getClassLoader())); // TODO: determine the actual modifiers - if (equals != -1 && !isFinal && !isStatic) { // declare the field in the class body, but wait to actually initialize it + if (equals != -1 && !isFinal && !isStatic) { + + // declare the field in the class body, but wait to actually initialize it compiler.appendBodyCode(text.substring(0, equals).trim() + ";"); String initializer = text.substring(equals + 1).trim(); if (type.endsWith("[]")) {

1 0

May 17, 2010

Author: jcouteau Date: 2010-05-17 12:31:06 +0200 (Mon, 17 May 2010) New Revision: 1911 Url: http://nuiton.org/repositories/revision/jaxx/1911 Log: Add data-binding tutorial Added: trunk/jaxx-tutorial-databinding/ trunk/jaxx-tutorial-databinding/LICENSE.txt trunk/jaxx-tutorial-databinding/README.txt trunk/jaxx-tutorial-databinding/changelog.txt trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-databinding/src/ trunk/jaxx-tutorial-databinding/src/main/ trunk/jaxx-tutorial-databinding/src/main/java/ trunk/jaxx-tutorial-databinding/src/main/java/org/ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/data-binding.css trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/databinding.jaxx trunk/jaxx-tutorial-databinding/src/site/ trunk/jaxx-tutorial-databinding/src/site/rst/ trunk/jaxx-tutorial-databinding/src/site/rst/images/ trunk/jaxx-tutorial-databinding/src/site/rst/images/webstart.gif trunk/jaxx-tutorial-databinding/src/site/rst/index.rst trunk/jaxx-tutorial-databinding/src/site/site_fr.xml trunk/src/site/resources/tutos/alwaysEnabledButton.png trunk/src/site/resources/tutos/disabledButton.png trunk/src/site/resources/tutos/enabledButton.png trunk/src/site/resources/tutos/sliderAfter100.png trunk/src/site/resources/tutos/sliderBefore100.png trunk/src/site/rst/tutos/data-binding.rst Modified: trunk/jaxx-tutorial/pom.xml trunk/src/site/site_fr.xml Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-05-17 10:30:11 UTC (rev 1910) +++ trunk/jaxx-tutorial/pom.xml 2010-05-17 10:31:06 UTC (rev 1911) @@ -46,6 +46,8 @@ <modules> <module>../jaxx-tutorial-helloworld</module> <module>../jaxx-tutorial-helloworld2</module> + <module>../jaxx-tutorial-css</module> + <module>../jaxx-tutorial-databinding</module> <module>../jaxx-tutorial-config</module> </modules> Property changes on: trunk/jaxx-tutorial-databinding ___________________________________________________________________ Added: svn:ignore + target Copied: trunk/jaxx-tutorial-databinding/LICENSE.txt (from rev 1908, trunk/jaxx-tutorial-css/LICENSE.txt) =================================================================== --- trunk/jaxx-tutorial-databinding/LICENSE.txt (rev 0) +++ trunk/jaxx-tutorial-databinding/LICENSE.txt 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Copied: trunk/jaxx-tutorial-databinding/README.txt (from rev 1908, trunk/jaxx-tutorial-css/README.txt) =================================================================== --- trunk/jaxx-tutorial-databinding/README.txt (rev 0) +++ trunk/jaxx-tutorial-databinding/README.txt 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Copied: trunk/jaxx-tutorial-databinding/changelog.txt (from rev 1908, trunk/jaxx-tutorial-css/changelog.txt) =================================================================== --- trunk/jaxx-tutorial-databinding/changelog.txt (rev 0) +++ trunk/jaxx-tutorial-databinding/changelog.txt 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,2 @@ +2.1.4 + * 20100514 [couteau] - tutorial initialisation \ No newline at end of file Copied: trunk/jaxx-tutorial-databinding/pom.xml (from rev 1908, trunk/jaxx-tutorial-css/pom.xml) =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml (rev 0) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-tutorial</artifactId> + <version>2.1-SNAPSHOT</version> + <relativePath>../jaxx-tutorial</relativePath> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-tutorial-databinding</artifactId> + + <dependencies> + +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxx.version}</version> + </dependency> + + </dependencies> + +  +  +  + + <name>JAXX :: Tutorial Data-binding</name> + + <organization> + <name>Nuiton</name> + <url>http://www.nuiton.org/</url> + </organization> + +  +  +  + + <properties> + +  + + <jaxx.version>${project.version}</jaxx.version> + +  + + <main.class>org.nuiton.jaxx.tutorials.databinding.databinding</main.class> + +  + + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.5</maven.compiler.source> + +  + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + +  + <jnlp.skip>false</jnlp.skip> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <build> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3</version> + <configuration> + <archive> + <manifest> + <useUniqueVersions>false</useUniqueVersions> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + <mainClass>${main.class}</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3</version> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + + </plugins> + + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +  +  +  + + <repositories> + +  + + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + + </repositories> + + <pluginRepositories> + +  + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + + </pluginRepositories> + +</project> Added: trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/data-binding.css =================================================================== --- trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/data-binding.css (rev 0) +++ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/data-binding.css 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,14 @@ +#tuto { + title:"Data-binding Tutorial"; +} + +#button { + text:"Close" +} + + + +JSlider:{object.getValue() > 100} { + background: {new Color(object.getValue(),0,0)}; +} + Added: trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/databinding.jaxx =================================================================== --- trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/databinding.jaxx (rev 0) +++ trunk/jaxx-tutorial-databinding/src/main/java/org/nuiton/jaxx/tutorials/databinding/databinding.jaxx 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,19 @@ + <Application id='tuto'> + + <style source='data-binding.css'/> + + <JTextField id='textField' + constraints='BorderLayout.NORTH'/> + + <JButton text='Button' + constraints='BorderLayout.SOUTH' + onActionPerformed='dispose()' + enabled='{textField.getText().length() != 0}'/> + + <JSlider maximum='200'/> + + + </Application> + + + \ No newline at end of file Added: trunk/jaxx-tutorial-databinding/src/site/rst/images/webstart.gif =================================================================== (Binary files differ) Property changes on: trunk/jaxx-tutorial-databinding/src/site/rst/images/webstart.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jaxx-tutorial-databinding/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/rst/index.rst (rev 0) +++ trunk/jaxx-tutorial-databinding/src/site/rst/index.rst 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,20 @@ +============ +Tutorial CSS +============ + +Set it in action +---------------- + +|webstart| + +To run this example in `Java Web Start`_, click the `following link`_. + +For more details about the `Jaxx Demo webstart`_. + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. |webstart| image:: images/webstart.gif + +.. _following link: ./jnlp/launch.jnlp + +.. _Jaxx Demo webstart: jnlp-report.html Added: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"> + <item name="Accueil" href="index.html"/> + <item name="Lancer la démo" href="jnlp/launch.jnlp"/> + </menu> + + </body> +</project> Added: trunk/src/site/resources/tutos/alwaysEnabledButton.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/tutos/alwaysEnabledButton.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/tutos/disabledButton.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/tutos/disabledButton.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/tutos/enabledButton.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/tutos/enabledButton.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/tutos/sliderAfter100.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/tutos/sliderAfter100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/tutos/sliderBefore100.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/tutos/sliderBefore100.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/rst/tutos/data-binding.rst =================================================================== --- trunk/src/site/rst/tutos/data-binding.rst (rev 0) +++ trunk/src/site/rst/tutos/data-binding.rst 2010-05-17 10:31:06 UTC (rev 1911) @@ -0,0 +1,130 @@ +.. - +.. * #%L +.. * JAXX +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2008 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +============ +Data-binding +============ + +Dans ce tutoriel, nous allons voir comment utiliser le `data-binding`_ pour +rendre votre application dynamique très simplement. Dans cet exemple, nous +réaliserons une petite application comprenant un champ texte à remplir, un +slider qui change de couleur en fonction de sa valeur et un boutton permettant +de quitter l'application, mais qui est disponible uniquement lorsque du texte +est entré dans le champ à remplir. + +Textfield et bouton +------------------- + +Nous allons laisser de côté pour l'instant notre slider et nous focaliser sur +le textfield et le bouton. Créons tout d'abord notre vue :: + + <Application id='tuto'> + + <style source='data-binding.css'/> + + <JTextField id='textField' + constraints='BorderLayout.NORTH'/> + + <JButton text='Button' + constraints='BorderLayout.SOUTH' + onActionPerformed='dispose()'/> + + </Application> + +Si vous lancez l'application, le boutton est toujours valide. + +.. image::alwaysEnabledButton.png + +Nous allons donc le modifier et lui rajouter l'attribut :: + + enabled='{textField.getText().length() != 0}' + +Ce que cela va faire c'est rajouter les listeners adéquats pour qu'à chaque fois +que le résultat de textField.getText() change, la propriété enabled du boutton +est réévaluée. En l'occurence, dès que la taille du texte est différente de 0, +le boutton est activé. Essayez pour voir. + +.. image::disabledButton.png + +.. image::enabledButton.png + +Rajoutons le slider +------------------- + +Nous allons rajouter un slider entre notre textField et notre bouton. On +utilisera pour cela le code suivant :: + + <JSlider maximum='200'/> + +Nous souhaitons que lorsque l'on dépasse la moitié du slider (la valeur 100), la +couleur du fond passe à rouge. Nous allons rajouter cela au style de +l'application grace au data-binding. Dans notre feuille de style, rajoutons (ici +est décrit uniquement le style nous intéressant):: + +JSlider:{object.getValue() > 100} { + background: red; +} + +Cela donne : + +.. image::sliderBefore100.png + +.. image::sliderAfter100.png + +Dans le style, il est possible d'utiliser le data-binding sur object, qui sera +remplacé par l'objet en question dans l'application. Ici, comme pour notre +bouton précédemment, nous changeons une propriété (ici background) lorsque la +propriété value dépasse une certaine valeur. + +Conclusion +---------- + +Vous avez découvert comment créer des interfaces dynamiques en utilisant le +data-binding. Vous avez-vu la simplicité ? Vous sentez votre créativité +augmenter ? Avec les bases que vous venez d'acquérir, vous pouvez simplement +créer des applications au look très évolué et dynamique. Il ne reste plus que +votre patte créative à mettre en route. + + +Sources de ce tutoriel +---------------------- + +Les sources de ce tutoriel sont disponibles au `telechargement ici`_. + +.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx + +Lancer ce tutoriel +------------------ + +.. image::webstart.gif + +Pour lancer ce tutoriel via `Java Web Start`_, suivez `ce lien`_. + +Pour plus de détail sur `webstart`_. + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. _ce lien: ../jaxx-tutorial-databinding/jnlp/launch.jnlp + +.. _webstart: ../jaxx-tutorial-databinding/jnlp-report.html \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-05-17 10:30:11 UTC (rev 1910) +++ trunk/src/site/site_fr.xml 2010-05-17 10:31:06 UTC (rev 1911) @@ -62,6 +62,7 @@ <item name="Hello World" href="tutos/helloworld.html"/> <item name="Hello World 2" href="tutos/helloworld2.html"/> <item name="Feuilles de style" href="tutos/css.html"/> + <item name="Data-binding" href="tutos/data-binding.html"/> <item name="ConfigUI" href="tutos/config.html"/> </item> </menu>

1 0

r1910 - trunk/jaxx-tutorial-css
by jcouteau＠users.nuiton.org May 17, 2010

May 17, 2010

Author: jcouteau Date: 2010-05-17 12:30:11 +0200 (Mon, 17 May 2010) New Revision: 1910 Url: http://nuiton.org/repositories/revision/jaxx/1910 Log: Use good version Modified: trunk/jaxx-tutorial-css/pom.xml Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-05-14 13:09:52 UTC (rev 1909) +++ trunk/jaxx-tutorial-css/pom.xml 2010-05-17 10:30:11 UTC (rev 1910) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent>

1 0

r1909 - in trunk/src/site: . rst/tutos
by jcouteau＠users.nuiton.org May 14, 2010

May 14, 2010

Author: jcouteau Date: 2010-05-14 15:09:52 +0200 (Fri, 14 May 2010) New Revision: 1909 Url: http://nuiton.org/repositories/revision/jaxx/1909 Log: CSS tutorial doc Added: trunk/src/site/rst/tutos/css.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/rst/tutos/css.rst =================================================================== --- trunk/src/site/rst/tutos/css.rst (rev 0) +++ trunk/src/site/rst/tutos/css.rst 2010-05-14 13:09:52 UTC (rev 1909) @@ -0,0 +1,138 @@ +.. - +.. * #%L +.. * JAXX +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2008 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +CSS - Utiliser les feuilles de style +==================================== + +Dans ce troisième tutoriel, nous allons essayer de simplifier notre code JAXX en +utilisant une feuille de style. Nous allons, pour cela, nous baser sur le code +du précédent tutoriel : helloworld2. + +Le principe des feuilles de style JAXX +-------------------------------------- + +Dans JAXX, les feuilles de style permettent de sortir du fichier JAXX +toutes les instructions ayant trait au style de l'application. Cela permet aussi +de mutualiser les déclarations d'éléments graphiques (comme pour les feuilles +de style en HTML). Pour approfondir le sujet, vous pouvez consulter `la +documentation`_ + +.. _la documentation::../useStylesheets.html + +Enlever le style de notre fichier JAXX +-------------------------------------- + +Nous allons enlever toutes les informations de style de notre fichier JAXX et +ajouter un tag id à chaque élément afin de l'identifier dans notre feuille de +style. On obtient le code suivant:: + + <Application id='tuto'> + + <JLabel id='hello' + constraints='BorderLayout.NORTH'/> + + <JButton id='button' + constraints='BorderLayout.SOUTH' + onActionPerformed='dispose()'/> + + </Application> + +Cela simplifie grandement notre code. + +Créer la feuille de style +------------------------- + +Nous allons créer une feuille de style, située au même niveau de l'arborescence +que notre fichier JAXX. Nous allons référencer la feuille de style dans notre +fichier JAXX en rajoutant le code suivant en fils de notre tag Application:: + + <style source='tuto.css'/> + +Dans la feuille de style, il faut retrouver le même niveau que lors du premier +tutoriel. Nous allons donc commencer par notre Application et lui donner un +titre. + +Pour l'identifiant tuto, on veux rajouter l'attribut title et lui donner une +valeur. On écrira donc dans la feuille de style:: + + #tuto { + title:"CSS Tutorial"; + } + +Pour notre JLabel, on va décider que le même style et le même texte seront +appliqués à tous les JLabel. On mettra le texte à Hello World, la couleur à +rouge et la taille à 20. On écrira donc:: + + JLabel { + font-size:20; + foreground:red; + text:"Hello World"; + } + +Nous allons aussi mettre le texte de notre JButton:: + + #button { + text:"Close" + } + +Ajouter du style dynamique +-------------------------- + +Nous allons maintenant ajouter du style dynamique. Nous allons faire changer la +couleur de notre JLabel lorsqu'il est survolé. Nous utiliserons pour cela le +modifieur mouseover:: + + #hello:mouseover { + foreground:green; + } + +Conclusion +---------- + +Dans ce tutoriel vous avez vu comment mettre du style sur vos composants depuis +un fichier CSS externe. Cela vous permet de créer un style pour votre +application et de le changer au besoin en changeant juste la feuille de style. +Pas besoin de multiplier les fichiers à impacter. + +Sources de ce tutoriel +---------------------- + +Les sources de ce tutoriel sont disponibles au `telechargement ici`_. + +.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx + +Lancer ce tutoriel +------------------ + +.. image::webstart.gif + +Pour lancer ce tutoriel via `Java Web Start`_, suivez `ce lien`_. + +Pour plus de détail sur `webstart`_. + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. _ce lien: ../jaxx-tutorial-css/jnlp/launch.jnlp + +.. _webstart: ../jaxx-tutorial-css/jnlp-report.html \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-05-14 12:13:19 UTC (rev 1908) +++ trunk/src/site/site_fr.xml 2010-05-14 13:09:52 UTC (rev 1909) @@ -61,6 +61,7 @@ <item name="Tutoriels"> <item name="Hello World" href="tutos/helloworld.html"/> <item name="Hello World 2" href="tutos/helloworld2.html"/> + <item name="Feuilles de style" href="tutos/css.html"/> <item name="ConfigUI" href="tutos/config.html"/> </item> </menu>

1 0

May 14, 2010

Author: jcouteau Date: 2010-05-14 14:13:19 +0200 (Fri, 14 May 2010) New Revision: 1908 Url: http://nuiton.org/repositories/revision/jaxx/1908 Log: Create CSS tutorial Added: trunk/jaxx-tutorial-css/ trunk/jaxx-tutorial-css/LICENSE.txt trunk/jaxx-tutorial-css/README.txt trunk/jaxx-tutorial-css/changelog.txt trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-css/src/ trunk/jaxx-tutorial-css/src/main/ trunk/jaxx-tutorial-css/src/main/java/ trunk/jaxx-tutorial-css/src/main/java/org/ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css trunk/jaxx-tutorial-css/src/site/ trunk/jaxx-tutorial-css/src/site/rst/ trunk/jaxx-tutorial-css/src/site/rst/images/ trunk/jaxx-tutorial-css/src/site/rst/images/webstart.gif trunk/jaxx-tutorial-css/src/site/rst/index.rst trunk/jaxx-tutorial-css/src/site/site_fr.xml Property changes on: trunk/jaxx-tutorial-css ___________________________________________________________________ Added: svn:ignore + target Copied: trunk/jaxx-tutorial-css/LICENSE.txt (from rev 1901, trunk/jaxx-tutorial-helloworld2/LICENSE.txt) =================================================================== --- trunk/jaxx-tutorial-css/LICENSE.txt (rev 0) +++ trunk/jaxx-tutorial-css/LICENSE.txt 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Copied: trunk/jaxx-tutorial-css/README.txt (from rev 1901, trunk/jaxx-tutorial-helloworld2/README.txt) =================================================================== --- trunk/jaxx-tutorial-css/README.txt (rev 0) +++ trunk/jaxx-tutorial-css/README.txt 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Copied: trunk/jaxx-tutorial-css/changelog.txt (from rev 1901, trunk/jaxx-tutorial-helloworld2/changelog.txt) =================================================================== --- trunk/jaxx-tutorial-css/changelog.txt (rev 0) +++ trunk/jaxx-tutorial-css/changelog.txt 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,2 @@ +2.1.4 + * 20100514 [couteau] - tutorial initialisation \ No newline at end of file Copied: trunk/jaxx-tutorial-css/pom.xml (from rev 1901, trunk/jaxx-tutorial-helloworld2/pom.xml) =================================================================== --- trunk/jaxx-tutorial-css/pom.xml (rev 0) +++ trunk/jaxx-tutorial-css/pom.xml 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-tutorial</artifactId> + <version>2.0.2-SNAPSHOT</version> + <relativePath>../jaxx-tutorial</relativePath> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-tutorial-css</artifactId> + + <dependencies> + +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxx.version}</version> + </dependency> + + </dependencies> + +  +  +  + + <name>JAXX :: Tutorial CSS</name> + + <organization> + <name>Nuiton</name> + <url>http://www.nuiton.org/</url> + </organization> + +  +  +  + + <properties> + +  + + <jaxx.version>${project.version}</jaxx.version> + +  + + <main.class>org.nuiton.jaxx.tutorials.css.css</main.class> + +  + + <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.5</maven.compiler.source> + +  + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + +  + <jnlp.skip>false</jnlp.skip> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <build> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.3</version> + <configuration> + <archive> + <manifest> + <useUniqueVersions>false</useUniqueVersions> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + <mainClass>${main.class}</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3</version> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + + </plugins> + + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +  +  +  + + <repositories> + +  + + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + + </repositories> + + <pluginRepositories> + +  + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + + </pluginRepositories> + +</project> Added: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx =================================================================== --- trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx (rev 0) +++ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/css.jaxx 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,12 @@ + <Application id='tuto'> + + <style source='tuto.css'/> + + <JLabel id='hello' + constraints='BorderLayout.NORTH'/> + + <JButton id='button' + constraints='BorderLayout.SOUTH' + onActionPerformed='dispose()'/> + + </Application> Added: trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css =================================================================== --- trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css (rev 0) +++ trunk/jaxx-tutorial-css/src/main/java/org/nuiton/jaxx/tutorials/css/tuto.css 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,17 @@ +JLabel { + font-size:20; + foreground:red; + text:"Hello World"; +} + +#hello:mouseover { + foreground:green; +} + +#tuto { + title:"CSS Tutorial"; +} + +#button { + text:"Close" +} \ No newline at end of file Added: trunk/jaxx-tutorial-css/src/site/rst/images/webstart.gif =================================================================== (Binary files differ) Property changes on: trunk/jaxx-tutorial-css/src/site/rst/images/webstart.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jaxx-tutorial-css/src/site/rst/index.rst =================================================================== --- trunk/jaxx-tutorial-css/src/site/rst/index.rst (rev 0) +++ trunk/jaxx-tutorial-css/src/site/rst/index.rst 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,20 @@ +============ +Tutorial CSS +============ + +Set it in action +---------------- + +|webstart| + +To run this example in `Java Web Start`_, click the `following link`_. + +For more details about the `Jaxx Demo webstart`_. + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. |webstart| image:: images/webstart.gif + +.. _following link: ./jnlp/launch.jnlp + +.. _Jaxx Demo webstart: jnlp-report.html Added: trunk/jaxx-tutorial-css/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-css/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2010-05-14 12:13:19 UTC (rev 1908) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"> + <item name="Accueil" href="index.html"/> + <item name="Lancer la démo" href="jnlp/launch.jnlp"/> + </menu> + + </body> +</project>

1 0

r1907 - in trunk/src/site: resources/tutos rst/tutos
by jcouteau＠users.nuiton.org May 14, 2010

May 14, 2010

Author: jcouteau Date: 2010-05-14 11:58:04 +0200 (Fri, 14 May 2010) New Revision: 1907 Url: http://nuiton.org/repositories/revision/jaxx/1907 Log: Use zip files from redmine Removed: trunk/src/site/resources/tutos/helloworld.zip trunk/src/site/resources/tutos/helloworld2.zip Modified: trunk/src/site/rst/tutos/helloworld.rst trunk/src/site/rst/tutos/helloworld2.rst Deleted: trunk/src/site/resources/tutos/helloworld.zip =================================================================== (Binary files differ) Deleted: trunk/src/site/resources/tutos/helloworld2.zip =================================================================== (Binary files differ) Modified: trunk/src/site/rst/tutos/helloworld.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld.rst 2010-05-13 10:29:30 UTC (rev 1906) +++ trunk/src/site/rst/tutos/helloworld.rst 2010-05-14 09:58:04 UTC (rev 1907) @@ -166,7 +166,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::helloworld.zip +.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/rst/tutos/helloworld2.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld2.rst 2010-05-13 10:29:30 UTC (rev 1906) +++ trunk/src/site/rst/tutos/helloworld2.rst 2010-05-14 09:58:04 UTC (rev 1907) @@ -120,7 +120,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::helloworld2.zip +.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------

1 0

r1906 - in trunk: jaxx-tutorial-config jaxx-tutorial-helloworld jaxx-tutorial-helloworld2
by tchemit＠users.nuiton.org May 13, 2010

May 13, 2010

Author: tchemit Date: 2010-05-13 12:29:30 +0200 (Thu, 13 May 2010) New Revision: 1906 Url: http://nuiton.org/repositories/revision/jaxx/1906 Log: must use sibling dependencies to allow release Modified: trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) +++ trunk/jaxx-tutorial-config/pom.xml 2010-05-13 10:29:30 UTC (rev 1906) @@ -51,13 +51,13 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </dependency> <dependency> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-05-13 10:29:30 UTC (rev 1906) @@ -26,7 +26,7 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </dependency> <dependency> @@ -113,7 +113,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </plugin> </plugins> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-05-13 10:29:30 UTC (rev 1906) @@ -25,7 +25,7 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </dependency> <dependency> @@ -112,7 +112,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${project.version}</version> </plugin> </plugins>

1 0

r1905 - in trunk: jaxx-demo jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-helloworld jaxx-tutorial-helloworld2
by tchemit＠users.nuiton.org May 13, 2010

May 13, 2010

Author: tchemit Date: 2010-05-13 12:25:27 +0200 (Thu, 13 May 2010) New Revision: 1905 Url: http://nuiton.org/repositories/revision/jaxx/1905 Log: align versions Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-05-13 10:22:26 UTC (rev 1904) +++ trunk/jaxx-demo/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-05-13 10:22:26 UTC (rev 1904) +++ trunk/jaxx-tutorial/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-05-13 10:22:26 UTC (rev 1904) +++ trunk/jaxx-tutorial-config/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-05-13 10:22:26 UTC (rev 1904) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-05-13 10:22:26 UTC (rev 1904) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-05-13 10:25:27 UTC (rev 1905) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent>

1 0

r1904 - trunk
by tchemit＠users.nuiton.org May 13, 2010

May 13, 2010

Author: tchemit Date: 2010-05-13 12:22:26 +0200 (Thu, 13 May 2010) New Revision: 1904 Url: http://nuiton.org/repositories/revision/jaxx/1904 Log: improve release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-13 10:20:08 UTC (rev 1903) +++ trunk/pom.xml 2010-05-13 10:22:26 UTC (rev 1904) @@ -460,7 +460,7 @@ <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> - <prepareVerifyArgs>-Ptutorial -Pdemo</prepareVerifyArgs> + <prepareVerifyArgs>-Ptutorial,demo</prepareVerifyArgs> </configuration> </plugin>

1 0