February 2008 - Buix-commits - mailman.cloud.codelutin.com

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

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

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

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

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

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

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

r209 - trunk/jaxx
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 16:21:51 +0000 (Tue, 12 Feb 2008) New Revision: 209 Modified: trunk/jaxx/pom.xml trunk/jaxx/profiles.xml Log: modification configuration pour permettre les realese maven Modified: trunk/jaxx/pom.xml =================================================================== --- trunk/jaxx/pom.xml 2008-02-12 15:42:33 UTC (rev 208) +++ trunk/jaxx/pom.xml 2008-02-12 16:21:51 UTC (rev 209) @@ -85,7 +85,8 @@ this property (see in the parent pom for more explanation) --> <scm> - <url>${maven.scm.url}</url> + <developerConnection>${maven.scm.developerConnection}</developerConnection> +  </scm> </project> Modified: trunk/jaxx/profiles.xml =================================================================== --- trunk/jaxx/profiles.xml 2008-02-12 15:42:33 UTC (rev 208) +++ trunk/jaxx/profiles.xml 2008-02-12 16:21:51 UTC (rev 209) @@ -17,10 +17,10 @@ <labs.project>buix</labs.project>  - <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project}</maven.scm.url> +   - <maven.scm.developerConnection>scm:svn:svn+ssh:${username}@${labs.host}/svnroot/${labs.project}/trunk</maven.scm.developerConnection> + <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>

1 0

r208 - trunk/jaxx/src/main/java/jaxx/tags
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 15:42:33 +0000 (Tue, 12 Feb 2008) New Revision: 208 Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java Log: ajout support i18n dans jaxx :) les attributs text, title et toolTipText sont automatiquement encapsul?\195?\169s par un I18n._("XXX"), sauf si cela est d?\195?\169j?\195?\160 fait dans quel cas, on affiche un warning. Modified: trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-02-12 15:39:54 UTC (rev 207) +++ trunk/jaxx/src/main/java/jaxx/tags/DefaultComponentHandler.java 2008-02-12 15:42:33 UTC (rev 208) @@ -20,15 +20,19 @@ import java.beans.IntrospectionException; import java.io.IOException; import java.lang.reflect.Field; +import java.util.List; +import java.util.Arrays; public class DefaultComponentHandler extends DefaultObjectHandler { private String containerDelegate; + private static final List<String> I18N_ATTRIBUTES = Arrays.asList("text","title","toolTipText"); public DefaultComponentHandler(ClassDescriptor beanClass) { super(beanClass); - if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { + ClassDescriptorLoader.checkSupportClass(getClass(), beanClass, Component.class); + /*if (!ClassDescriptorLoader.getClassDescriptor(Component.class).isAssignableFrom(beanClass)) { throw new IllegalArgumentException(getClass().getName() + " does not support the class " + beanClass.getName()); - } + }*/ } @Override @@ -82,10 +86,11 @@ protected void openComponent(CompiledObject object, Element tag, JAXXCompiler compiler) throws CompilerException { String constraints = tag.getAttribute("constraints"); - if (constraints != null && constraints.length() > 0) + if (constraints != null && constraints.length() > 0) { compiler.openComponent(object, constraints); - else + } else { compiler.openComponent(object); + } } protected void closeComponent(CompiledObject object, Element tag, JAXXCompiler compiler) throws CompilerException { @@ -100,32 +105,39 @@ @Override public ClassDescriptor getPropertyType(CompiledObject object, String propertyName, JAXXCompiler compiler) throws CompilerException { if (propertyName.equals("x") || propertyName.equals("y") || propertyName.equals("width") || propertyName.equals("height") || - propertyName.equals("font-size")) + "font-size".equals(propertyName)) return ClassDescriptorLoader.getClassDescriptor(Integer.class); - if (propertyName.equals("font-face") || propertyName.equals("font-style") || propertyName.equals("font-weight")) + if (propertyName.equals("font-face") || propertyName.equals("font-style") || propertyName.equals("font-weight")) { return ClassDescriptorLoader.getClassDescriptor(String.class); + } return super.getPropertyType(object, propertyName, compiler); } @Override public String getGetPropertyCode(String id, String name, JAXXCompiler compiler) throws CompilerException { - if (name.equals("font-face")) + if (name.equals("font-face")) { return id + ".getFont().getFontName()"; - if (name.equals("font-size")) + } + if (name.equals("font-size")) { return id + ".getFont().getSize()"; - if (name.equals("font-weight")) + } + if (name.equals("font-weight")) { return "(" + id + ".getFont().getStyle() & Font.BOLD) != 0 ? \"bold\" : \"normal\""; - if (name.equals("font-style")) + } + if (name.equals("font-style")) { return "(" + id + ".getFont().getStyle() & Font.ITALIC) != 0 ? \"italic\" : \"normal\""; + } return super.getGetPropertyCode(id, name, compiler); } @Override public String getSetPropertyCode(String id, String name, String valueCode, JAXXCompiler compiler) throws CompilerException { - if (name.equals("x")) + if (name.equals("x")) { return id + ".setLocation(" + valueCode + ", " + id + ".getY());"; - if (name.equals("y")) + } + if (name.equals("y")) { return id + ".setLocation(" + id + ".getX(), " + valueCode + ");"; + } if (name.equals("width")) { // need to optimize case when both width and height are being assigned return "jaxx.runtime.Util.setComponentWidth(" + id + "," + valueCode + ");\n"; } @@ -139,34 +151,49 @@ return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont((float) " + valueCode + "));"; } if (name.equals("font-weight")) { - if (valueCode.equals("\"bold\"")) + if (valueCode.equals("\"bold\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.BOLD));"; - if (valueCode.equals("\"normal\"")) + } + if (valueCode.equals("\"normal\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.BOLD));"; - if (!valueCode.startsWith("\"")) + } + if (!valueCode.startsWith("\"")) { return "if (" + id + ".getFont() != null) { if ((" + valueCode + ").equals(\"bold\")) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.BOLD)); else " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.BOLD)); }"; + } compiler.reportError("font-weight must be either \"normal\" or \"bold\", found " + valueCode); return ""; } if (name.equals("font-style")) { - if (valueCode.equals("\"italic\"")) + if (valueCode.equals("\"italic\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.ITALIC));"; - if (valueCode.equals("\"normal\"")) + } + if (valueCode.equals("\"normal\"")) { return "if (" + id + ".getFont() != null) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.ITALIC));"; - if (!valueCode.startsWith("\"")) + } + if (!valueCode.startsWith("\"")) { return "if (" + id + ".getFont() != null) { if ((" + valueCode + ").equals(\"italic\")) " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() | Font.ITALIC)); else " + id + ".setFont(" + id + ".getFont().deriveFont(" + id + ".getFont().getStyle() & ~Font.ITALIC)); }"; + } compiler.reportError("font-style must be either \"normal\" or \"italic\", found " + valueCode); return ""; } if (ClassDescriptorLoader.getClassDescriptor(Container.class).isAssignableFrom(getBeanClass()) && name.equals("layout")) { // handle containerDelegate (e.g. contentPane on JFrame) String containerDelegate = (String) getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("containerDelegate"); - if (containerDelegate != null) + if (containerDelegate != null) { return id + '.' + containerDelegate + "().setLayout(" + valueCode + ");"; + } } + // ajout du support i18n + if (I18N_ATTRIBUTES.contains(name)) { + if (valueCode.contains("_(") || valueCode.contains(")")) { + compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '"+name+"' in component '"+id+"'"); + } else { + valueCode = "_(" + valueCode + ")"; + } + } return super.getSetPropertyCode(id, name, valueCode, compiler); } @@ -187,23 +214,19 @@ */ protected int constantValue(String key, String value) { if ((key.equals("mnemonic") || key.equals("displayedMnemonic"))) { - if (value.length() == 1) + if (value.length() == 1) { return value.charAt(0); - else { - try { - Field vk = java.awt.event.KeyEvent.class.getField(value); - return (Integer) vk.get(null); - } - catch (NoSuchFieldException e) { - throw new IllegalArgumentException("mnemonics must be either a single character or the name of a field in KeyEvent (found: '" + value + "')"); - } - catch (IllegalAccessException e) { - throw new RuntimeException(e); - } } - } else { - return super.constantValue(key, value); + try { + Field vk = java.awt.event.KeyEvent.class.getField(value); + return (Integer) vk.get(null); + } catch (NoSuchFieldException e) { + throw new IllegalArgumentException("mnemonics must be either a single character or the name of a field in KeyEvent (found: '" + value + "')"); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } } + return super.constantValue(key, value); } @@ -219,12 +242,12 @@ if (container) { try { init(); - } - catch (IntrospectionException e) { + if (Boolean.FALSE.equals(getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("isContainer"))) { + container = false; + } + } catch (IntrospectionException e) { throw new RuntimeException(e); } - if (Boolean.FALSE.equals(getJAXXBeanInfo().getJAXXBeanDescriptor().getValue("isContainer"))) - container = false; } return container; } @@ -233,11 +256,10 @@ public String getContainerDelegate() { try { init(); - } - catch (IntrospectionException e) { + return containerDelegate; + } catch (IntrospectionException e) { throw new RuntimeException(e); } - return containerDelegate; } } \ No newline at end of file

1 0

r207 - tags
by tchemit＠users.labs.libre-entreprise.org 12 Feb '08

12 Feb '08

Author: tchemit Date: 2008-02-12 15:39:54 +0000 (Tue, 12 Feb 2008) New Revision: 207 Added: tags/jaxx-1.0.4-avant-i18n/ Log: tag avant support i18n Copied: tags/jaxx-1.0.4-avant-i18n (from rev 206, trunk/jaxx)

1 0