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

[Buix-commits] r219 - trunk/maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org 21 Feb '08

21 Feb '08

Author: tchemit Date: 2008-02-21 21:03:46 +0000 (Thu, 21 Feb 2008) New Revision: 219 Removed: trunk/maven-jaxx-plugin/profiles.xml Modified: trunk/maven-jaxx-plugin/pom.xml Log: on utilisepasle profiles.xml positionnement phase Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2008-02-21 18:45:15 UTC (rev 218) +++ trunk/maven-jaxx-plugin/pom.xml 2008-02-21 21:03:46 UTC (rev 219) @@ -75,4 +75,38 @@ <scm> <url>${maven.scm.url}</url> </scm> + + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>user.locale</name> + <value>ISO-8859-15</value> + </property> + </activation> + <properties> + +  + <labs.id>38</labs.id> + +  + <labs.project>buix</labs.project> + +  + <maven.test.skip>false</maven.test.skip> + +  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> + +  + <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> + +  + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> + + </properties> + </profile> + </profiles> </project> Deleted: trunk/maven-jaxx-plugin/profiles.xml =================================================================== --- trunk/maven-jaxx-plugin/profiles.xml 2008-02-21 18:45:15 UTC (rev 218) +++ trunk/maven-jaxx-plugin/profiles.xml 2008-02-21 21:03:46 UTC (rev 219) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings> - <profiles> - <profile> - <id>project</id> - <properties> - -  - <labs.id>38</labs.id> - -  - <labs.project>buix</labs.project> - -  - <maven.test.skip>false</maven.test.skip> - -  - <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/?root=buix</maven.scm.url> - -  - <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/buix/trunk</maven.scm.developerConnection> - -  - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/buix/trunk</maven.scm.connection> - - </properties> - </profile> - </profiles> -</settings>

1 0

[Buix-commits] r218 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 21 Feb '08

21 Feb '08

Author: tchemit Date: 2008-02-21 18:45:15 +0000 (Thu, 21 Feb 2008) New Revision: 218 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: supression log + i18n Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-21 12:33:59 UTC (rev 217) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-21 18:45:15 UTC (rev 218) @@ -151,7 +151,9 @@ if (cache.containsKey(actionKey)) { // use cached action AbstractAction action = cache.get(actionKey); - log.info("use cache action "+action); + if (log.isDebugEnabled()) { + log.debug("use cache action " + action); + } return action; } return null; @@ -176,7 +178,9 @@ result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - log.info("create action "+actionKey + " : " + result); + if (log.isDebugEnabled()) { + log.debug("create action " + actionKey + " : " + result); + } // recherche de l'annotation de configuration ActionConfig anno = initActionConfig(component, result);

1 0

[Buix-commits] r217 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org 21 Feb '08

21 Feb '08

Author: tchemit Date: 2008-02-21 12:33:59 +0000 (Thu, 21 Feb 2008) New Revision: 217 Removed: trunk/jaxx/profiles.xml Modified: trunk/jaxx/pom.xml Log: on utilise plus le fichier profiles.xmlcar il n'est pas bien detecte dans les ide, de plus nous n'avons qu'un seul profile toujours active... suppression lutin-processor car rien a processer! Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-19 15:09:24 UTC (rev 216) +++ trunk/jaxx/pom.xml 2008-02-21 12:33:59 UTC (rev 217) @@ -80,6 +80,37 @@ <packaging>jar</packaging> + <profiles> + <profile> + <id>project</id> + + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <properties> + +  + <labs.id>38</labs.id> + +  + <labs.project>buix</labs.project> + +  +  + +  + <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection> + +  + <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection> + +  + <maven.jar.main.class>jaxx.compiler.JAXXCompiler</maven.jar.main.class> + + </properties> + </profile> + </profiles>    Deleted: trunk/jaxx/profiles.xml =================================================================== --- trunk/jaxx/profiles.xml 2008-02-19 15:09:24 UTC (rev 216) +++ trunk/jaxx/profiles.xml 2008-02-21 12:33:59 UTC (rev 217) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<settings> - <profiles> - <profile> - <id>project</id> - - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <properties> - -  - <labs.id>38</labs.id> - -  - <labs.project>buix</labs.project> - -  -  - -  - <maven.scm.developerConnection>scm:svn:svn+ssh://tchemit@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection> - -  - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.connection> - -  - <maven.jar.main.class>jaxx.compiler.JAXXCompiler</maven.jar.main.class> - - </properties> - </profile> - </profiles> -</settings>

1 0

[Buix-commits] r216 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 19 Feb '08

19 Feb '08

Author: tchemit Date: 2008-02-19 15:09:24 +0000 (Tue, 19 Feb 2008) New Revision: 216 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: add a simple ActionFactory implementation with a properties file as source Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-14 06:17:57 UTC (rev 215) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-02-19 15:09:24 UTC (rev 216) @@ -51,7 +51,7 @@ */ public abstract class ActionFactory { - private static Log log = LogFactory.getLog(ActionFactory.class); + protected static Log log = LogFactory.getLog(ActionFactory.class); /** dictionary of known actions implementations */ private Map<String, Class<? extends AbstractAction>> impls; @@ -123,6 +123,7 @@ Boolean value = (Boolean) action.getValue("hideActionText"); component.setHideActionText(value != null && value); + action.setEnabled(true); result.add(action); continue; } @@ -142,6 +143,19 @@ return result.toArray(new AbstractAction[result.size()]); } + public AbstractAction newAction0(String actionKey) { + // on v�rifie que l'action existe bien + checkRegistredAction(actionKey); + + // try in cache + if (cache.containsKey(actionKey)) { + // use cached action + AbstractAction action = cache.get(actionKey); + log.info("use cache action "+action); + return action; + } + return null; + } /** * @param actionKey le nom de l'action tel que d�finie dans le fichier * de mapping (sans le prefix action.) @@ -150,22 +164,19 @@ */ public AbstractAction newAction(String actionKey, AbstractButton component) { - // on v�rifie que l'action existe bien - checkRegistredAction(actionKey); - - // try in cache - if (cache.containsKey(actionKey)) { - // use cached action - return cache.get(actionKey); + // try first in cache + AbstractAction result =newAction0(actionKey); + if (result!=null) { + return result; } // on r�cup�re la classe d'implantation de l'action Class<? extends AbstractAction> klazz = impls.get(actionKey); try { - AbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - log.debug(actionKey + " : " + result); + log.info("create action "+actionKey + " : " + result); // recherche de l'annotation de configuration ActionConfig anno = initActionConfig(component, result); @@ -216,20 +227,17 @@ */ public AbstractAction newAction(String actionKey, JComboBox component) { - // on v�rifie que l'action existe bien - checkRegistredAction(actionKey); - - // try in cache - if (cache.containsKey(actionKey)) { - // use cached action - return cache.get(actionKey); + // try first in cache + AbstractAction result =newAction0(actionKey); + if (result!=null) { + return result; } // on r�cup�re la classe d'implantation de l'action Class<? extends AbstractAction> klazz = impls.get(actionKey); try { - AbstractAction result = klazz.getConstructor(String.class).newInstance(actionKey); + result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); log.debug(actionKey + " : " + result); @@ -316,7 +324,7 @@ result.putValue("hideActionText", anno.hideActionText()); result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(component!=null && (component.isEnabled() || anno.enabled())); + result.setEnabled(anno.enabled()); } return anno; Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/SimpleActionFactoryImpl.java 2008-02-19 15:09:24 UTC (rev 216) @@ -0,0 +1,118 @@ +/* +* ##% Copyright (C) 2007, 2008 Code Lutin, Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* 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 Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +import static org.codelutin.i18n.I18n._; +import org.codelutin.util.Resource; + +import javax.swing.AbstractAction; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.TreeMap; + +/** + * A simple implementation of {@link ActionFactory} using a properties file to + * load action mapping. + * <p/> + * An entry is in that form : <code>action.actionName=fqn</code> where + * <p/> + * <code>actionName</code> is the key of action used in factory, and + * <code>fqn</code> is the fully qualified name of the implemented action class. + * + * @author chemit + */ +public class SimpleActionFactoryImpl extends ActionFactory { + /** default file where to load action mapping */ + protected static final String ACTIONS_FILE_PATH = "/actions.properties"; + + /** default prefix for an entryin mapping file. */ + protected static final String ACTION_KEY_PREFIX = "action."; + + /** real file where to load actions mapping */ + protected String actionFilePath; + + public SimpleActionFactoryImpl() { + this(ACTIONS_FILE_PATH); + } + + public SimpleActionFactoryImpl(String actionFilePath) { + this.actionFilePath = actionFilePath; + } + + @SuppressWarnings({"unchecked"}) + protected Map<String, Class<? extends AbstractAction>> init() { + Properties properties = new Properties(); + List<URL> urls = Resource.getURLs(".*jaxx/.+-actions\\.properties"); + for (URL url : urls) { + InputStream inputStream=null; + try { + inputStream = url.openStream(); + log.info("load " + url); + properties.load(inputStream); + } catch (IOException e) { + log.warn(_("jaxx.error.load.actions.file", e.getMessage())); + //throw new RuntimeException(_("jaxx.error.load.actions.file", e.getMessage())); + } finally { + if (inputStream!=null) { + try { + inputStream.close(); + } catch (IOException e) { + log.warn(_("jaxx.error.close.actions.file", e.getMessage())); + //throw new RuntimeException(_("jaxx.error.load.actions.file", e.getMessage())); + } + } + } + } + Map<String, Class<? extends AbstractAction>> cache = new TreeMap<String, Class<? extends AbstractAction>>(); + int prefix = ACTION_KEY_PREFIX.length(); + for (Map.Entry<Object, Object> objectObjectEntry : properties.entrySet()) { + String key = objectObjectEntry.getKey() + ""; + String qfn = objectObjectEntry.getValue() + ""; + try { + Class<? extends AbstractAction> implCass; + implCass = (Class<? extends AbstractAction>) Class.forName(qfn); + log.debug("found action " + implCass); + cache.put(key.substring(prefix), implCass); + } catch (ClassNotFoundException e) { + throw new RuntimeException(_("jaxx.error.load.actions.class", key, qfn)); + } + } + return cache; + } + + String[] getFilenames(Locale l) { + String prefix = ".*jaxx/.+"; + String postfix = "actions\\.properties"; + java.util.List<String> result = new ArrayList<String>(); + if (!"".equals(l.getLanguage())) { + if (!"".equals(l.getCountry())) { + result.add(prefix + "-" + l.getLanguage() + "_" + + l.getCountry() + postfix); + } + result.add(prefix + "-" + l.getLanguage() + postfix); + } + result.add(prefix + postfix); + return result.toArray(new String[result.size()]); + } +}

1 0

[Buix-commits] r215 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 14 Feb '08

14 Feb '08

Author: tchemit Date: 2008-02-14 06:17:57 +0000 (Thu, 14 Feb 2008) New Revision: 215 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: les contenus de tab sont des JAXXTab Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-12 21:31:13 UTC (rev 214) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-14 06:17:57 UTC (rev 215) @@ -89,7 +89,7 @@ return configs.get(tabName); } - public JComponent getUI(String tabName) { + public JAXXTab getUI(String tabName) { return cache.get(tabName); }

1 0

[Buix-commits] r214 - trunk/maven-jaxx-plugin/src/test/java/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 21:31:13 +0000 (Tue, 12 Feb 2008) New Revision: 214 Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java Log: pour le moment, il n'est pas possible de lancer la compilation sur les fichier g?\195?\169n?\195?\169r?\195?\169 car il nous faut lutinutil en dependance. TODO : utiliser un vrai test maven PlexusTestCase ou equivalent afin de pouvoir inclure facilement des dependances (ici lutinutil) Modified: trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-02-12 21:12:54 UTC (rev 213) +++ trunk/maven-jaxx-plugin/src/test/java/jaxx/CompilerTest.java 2008-02-12 21:31:13 UTC (rev 214) @@ -61,7 +61,9 @@ goal.setIncludes(new String[]{"**\\/" + PREFIX_PACKAGE + "\\/" + packageName + "\\/*.jaxx"}); goal.setOptimize(anno.optimize()); goal.setVerbose(anno.verbose()); - goal.setRunJavac(anno.runJavac()); + //TODO Use the maven plexus TestCase inorder to include dependencies + goal.setRunJavac(false); + //goal.setRunJavac(anno.runJavac()); goal.setJavaOpts(anno.javaOpts()); System.out.println(getName());

1 0

[Buix-commits] r213 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 21:12:54 +0000 (Tue, 12 Feb 2008) New Revision: 213 Modified: trunk/jaxx/pom.xml Log: ajout dependance sur javaHelp 2 Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:46:18 UTC (rev 212) +++ trunk/jaxx/pom.xml 2008-02-12 21:12:54 UTC (rev 213) @@ -44,6 +44,12 @@ <scope>system</scope> <systemPath>${java.home}/../lib/dt.jar</systemPath> </dependency> +  + <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + <version>2.0.02</version> + </dependency> </dependencies>

1 0

[Buix-commits] r212 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 16:46:18 +0000 (Tue, 12 Feb 2008) New Revision: 212 Modified: trunk/jaxx/pom.xml Log: rendez moi les accents... Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:40:30 UTC (rev 211) +++ trunk/jaxx/pom.xml 2008-02-12 16:46:18 UTC (rev 212) @@ -36,7 +36,7 @@ <version>1.6.0</version> <scope>compile</scope> </dependency> -  +  <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId>

1 0

[Buix-commits] r211 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 16:40:30 +0000 (Tue, 12 Feb 2008) New Revision: 211 Modified: trunk/jaxx/pom.xml Log: retour en arri?\195?\168re c maven qui changera la version tout seul Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:23:10 UTC (rev 210) +++ trunk/jaxx/pom.xml 2008-02-12 16:40:30 UTC (rev 211) @@ -1,7 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -39,7 +36,7 @@ <version>1.6.0</version> <scope>compile</scope> </dependency> -  +  <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> @@ -54,7 +51,7 @@  <name>Jaxx core library</name> - <version>1.0.5</version> + <version>1.0.4-SNAPSHOT</version> <description>Library of framework jaxx</description> <inceptionYear>2008</inceptionYear>

1 0

[Buix-commits] r210 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 16:23:10 +0000 (Tue, 12 Feb 2008) New Revision: 210 Modified: trunk/jaxx/pom.xml Log: modification configuration pour permettre les realese maven Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 16:21:51 UTC (rev 209) +++ trunk/jaxx/pom.xml 2008-02-12 16:23:10 UTC (rev 210) @@ -54,7 +54,7 @@  <name>Jaxx core library</name> - <version>1.0.4-SNAPSHOT</version> + <version>1.0.5</version> <description>Library of framework jaxx</description> <inceptionYear>2008</inceptionYear>

1 0