Author: tchemit Date: 2008-07-27 10:36:26 +0000 (Sun, 27 Jul 2008) New Revision: 930 Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionActionRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionParserContexts.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java trunk/commandline/commandline-core/src/site/site_fr.xml trunk/commandline/commandline-ui/pom.xml trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ClassCellEditor.java trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableModel.java trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableRenderer.java trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/ConfigTab.jaxx trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JConfigUI.jaxx trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JLoginUI.jaxx trunk/commandline/commandline-ui/src/site/site_fr.xml trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java trunk/commandline/maven-plugin/pom.xml trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefaultOptionAction.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserContexts.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserUtil.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/util/AbstractGeneratorGoal.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser1.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserTest.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserUtilForTest.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java Log: reformat Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/AbstractContext.java 2008-07-27 10:36:26 UTC (rev 930) @@ -375,7 +375,7 @@ } public void accept(ContextVisitor visitor) { - visitor.enterParser(getParser()); + visitor.enterParser(getParser()); for (ConfigKey<?> configKey : configKeys) { visitor.enterConfig(configKey); } Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionActionRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionActionRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionActionRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -1,9 +1,10 @@ package org.codelutin.option; /** - * Action wrapper for OptionAction + * Action wrapper for OptionAction * - * @author chemit */ + * @author chemit + */ public interface OptionActionRunnable<O extends Option, P extends OptionParser, C extends AbstractContext<P>, A extends OptionAction<O, P, C>> { void run(A action) throws Exception; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionParserContexts.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionParserContexts.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/OptionParserContexts.java 2008-07-27 10:36:26 UTC (rev 930) @@ -276,7 +276,7 @@ // instanciate real options from safe contexts for (OptionContext context : getContexts()) { OptionKey key = context.getKey(); - result.registerOption(key,context.instanciate(key)); + result.registerOption(key, context.instanciate(key)); } // transfert unused arguments Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionChangeConfigRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -19,10 +19,10 @@ import org.codelutin.option.Config; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; +import org.codelutin.option.Context; import org.codelutin.option.Option; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; -import org.codelutin.option.Context; /** * OptionAction to change a property in a config. Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionEditConfigRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -18,9 +18,9 @@ import org.codelutin.option.AbstractContext; import org.codelutin.option.Config; import org.codelutin.option.ConfigKey; +import org.codelutin.option.Context; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; -import org.codelutin.option.Context; /** @author chemit */ public class OptionActionEditConfigRunnable implements OptionActionRunnable { @@ -39,7 +39,7 @@ configs[i++] = context.getConfig(o); } javax.swing.JDialog ui = (javax.swing.JDialog) Class.forName(UI_FQN).newInstance(); - ui.getClass().getMethod("init", AbstractContext.class, Config[].class).invoke(ui, context,configs); + ui.getClass().getMethod("init", AbstractContext.class, Config[].class).invoke(ui, context, configs); ui.setVisible(true); } } \ No newline at end of file Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpConfigRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -18,9 +18,9 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; +import org.codelutin.option.Context; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; -import org.codelutin.option.Context; import static org.codelutin.option.ParserUtil.addTitle; import org.codelutin.util.ReflectUtil; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionHelpRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -18,10 +18,10 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.option.ConfigKey; import org.codelutin.option.ConfigPropertyKey; +import org.codelutin.option.Context; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; import org.codelutin.option.OptionKey; -import org.codelutin.option.Context; import static org.codelutin.option.ParserUtil.addTitle; import org.codelutin.option.def.OptionDefinition; import org.codelutin.util.ReflectUtil; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionResetConfigRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -16,9 +16,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; +import org.codelutin.option.Context; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; -import org.codelutin.option.Context; import java.io.File; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionShowConfigRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -16,10 +16,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.option.ConfigKey; +import org.codelutin.option.Context; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; import org.codelutin.option.ParserUtil; -import org.codelutin.option.Context; import java.io.StringWriter; @@ -37,7 +37,7 @@ if (category.equals("all")) { for (ConfigKey<?> configKey : context.getConfigKeys()) { - ParserUtil.printConfig(writer, context.getConfig(configKey)); + ParserUtil.printConfig(writer, context.getConfig(configKey)); } log.info(writer); } else { Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/actions/OptionActionUiRunnable.java 2008-07-27 10:36:26 UTC (rev 930) @@ -15,9 +15,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.option.Context; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionActionRunnable; -import org.codelutin.option.Context; /** @author chemit */ public class OptionActionUiRunnable implements OptionActionRunnable { Modified: trunk/commandline/commandline-core/src/site/site_fr.xml =================================================================== --- trunk/commandline/commandline-core/src/site/site_fr.xml 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-core/src/site/site_fr.xml 2008-07-27 10:36:26 UTC (rev 930) @@ -1,45 +1,47 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="LutinCommndline"> - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin CommandLine</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + <bannerLeft> + <name>Lutin CommandLine</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="R�aliser sa premi�re application" href="firstusage.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/lutincommandli..." name="T�l�chargement"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="R�aliser sa premi�re application" href="firstusage.html"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/lutincommandli..." + name="T�l�chargement"/> + </menu> - <menu name="D�veloppeur"> - <item name="Implantation" href="devel/implementation.html"/> - <item name="A faire" href="Todo.html"/> - </menu> + <menu name="D�veloppeur"> + <item name="Implantation" href="devel/implementation.html"/> + <item name="A faire" href="Todo.html"/> + </menu> - ${reports} + ${reports} - </body> + </body> </project> Modified: trunk/commandline/commandline-ui/pom.xml =================================================================== --- trunk/commandline/commandline-ui/pom.xml 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/pom.xml 2008-07-27 10:36:26 UTC (rev 930) @@ -48,7 +48,7 @@ <packaging>jar</packaging> <build> - + <plugins> <!-- jaxx --> Modified: trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ClassCellEditor.java =================================================================== --- trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ClassCellEditor.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ClassCellEditor.java 2008-07-27 10:36:26 UTC (rev 930) @@ -62,9 +62,9 @@ if (converter != null) { return converter.convert(Class.class, o); } - o =Class.forName(o+""); + o = Class.forName(o + ""); } catch (Exception e) { - o=null; + o = null; } return o; } Modified: trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableModel.java =================================================================== --- trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableModel.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableModel.java 2008-07-27 10:36:26 UTC (rev 930) @@ -212,7 +212,7 @@ ConfigPropertyKey<?> key = getKey(row); Object val; - if (aValue==null || key.getType() ==aValue.getClass()) { + if (aValue == null || key.getType() == aValue.getClass()) { // we have directly the value, no conversion need val = aValue; } else { @@ -227,7 +227,7 @@ } catch (Exception e) { val = null; } - } + } props.put(key, val); fireTableRowsUpdated(row, row); } Modified: trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableRenderer.java =================================================================== --- trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableRenderer.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigTableRenderer.java 2008-07-27 10:36:26 UTC (rev 930) @@ -69,7 +69,7 @@ } if (cellRenderer == null) { throw new IllegalStateException("no renderer find for column " + column); - } + } cellRenderer.setEnabled(!isFinal); cellRenderer.setFont(isModified ? font2 : font); return cellRenderer; Modified: trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java =================================================================== --- trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/java/org/codelutin/option/ui/ConfigUIHandler.java 2008-07-27 10:36:26 UTC (rev 930) @@ -21,7 +21,7 @@ import org.codelutin.option.Config; import org.codelutin.option.Context; -import javax.swing.*; +import javax.swing.JTable; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; Modified: trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/ConfigTab.jaxx =================================================================== --- trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/ConfigTab.jaxx 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/ConfigTab.jaxx 2008-07-27 10:36:26 UTC (rev 930) @@ -1,44 +1,50 @@ <Table weightx="1"> <script> -protected ConfigUIHandler handler; + protected ConfigUIHandler handler; -public ConfigUIHandler getHandler() { - if (handler == null) handler = new ConfigUIHandler(this); - return handler; -} + public ConfigUIHandler getHandler() { + if (handler == null) handler = new ConfigUIHandler(this); + return handler; + } -public void dispose() { - getHandler().dispose(); -} + public void dispose() { + getHandler().dispose(); + } -protected void doSave() { getHandler().doSave(); } -protected void doReset() { getHandler().doReset(); } -protected void doSelectNormal() { if (normal.isSelected()) getHandler().getTableModel().setType(ConfigTableModel.TypeModel.nontech); } -protected void doSelectAll() { if (all.isSelected()) getHandler().getTableModel().setType(ConfigTableModel.TypeModel.all); } -protected void doSelectTechnical() { if (onlytech.isSelected()) getHandler().getTableModel().setType(ConfigTableModel.TypeModel.tech); } + protected void doSave() { getHandler().doSave(); } + protected void doReset() { getHandler().doReset(); } + protected void doSelectNormal() { if (normal.isSelected()) + getHandler().getTableModel().setType(ConfigTableModel.TypeModel.nontech); } + protected void doSelectAll() { if (all.isSelected()) + getHandler().getTableModel().setType(ConfigTableModel.TypeModel.all); } + protected void doSelectTechnical() { if (onlytech.isSelected()) + getHandler().getTableModel().setType(ConfigTableModel.TypeModel.tech); } </script> - <row> - <cell weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' horizontalScrollBarPolicy='31' > - <JTable id="main" rowSelectionAllowed="false" autoResizeMode='auto_resize_last_column'/> - </JScrollPane> - </cell> - </row> <row> + <cell weighty="1" weightx='1' fill='both'> + <JScrollPane id='scroll' verticalScrollBarPolicy='20' horizontalScrollBarPolicy='31'> + <JTable id="main" rowSelectionAllowed="false" autoResizeMode='auto_resize_last_column'/> + </JScrollPane> + </cell> + </row> + <row> <cell columns='2' fill='both'> <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JRadioButton id='normal' selected='true' buttonGroup='type' text='lutinutil.common.toggle.normal' onActionPerformed='doSelectNormal()'/> - <JRadioButton id='onlytech' selected='false' buttonGroup='type' text='lutinutil.common.toggle.technical' onActionPerformed='doSelectTechnical()'/> - <JRadioButton id='all' selected='false' buttonGroup='type' text='lutinutil.common.toggle.all' onActionPerformed='doSelectAll()'/> + <JRadioButton id='normal' selected='true' buttonGroup='type' text='lutinutil.common.toggle.normal' + onActionPerformed='doSelectNormal()'/> + <JRadioButton id='onlytech' selected='false' buttonGroup='type' text='lutinutil.common.toggle.technical' + onActionPerformed='doSelectTechnical()'/> + <JRadioButton id='all' selected='false' buttonGroup='type' text='lutinutil.common.toggle.all' + onActionPerformed='doSelectAll()'/> </JPanel> </cell> </row> - <row fill='horizontal'> - <cell> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='save' text='lutinutil.common.save' onActionPerformed='doSave()'/> - <JButton id='reset' text='lutinutil.common.reset' onActionPerformed='doReset()'/> - </JPanel> - </cell> - </row> - </Table> + <row fill='horizontal'> + <cell> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='save' text='lutinutil.common.save' onActionPerformed='doSave()'/> + <JButton id='reset' text='lutinutil.common.reset' onActionPerformed='doReset()'/> + </JPanel> + </cell> + </row> +</Table> Modified: trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JConfigUI.jaxx =================================================================== --- trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JConfigUI.jaxx 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JConfigUI.jaxx 2008-07-27 10:36:26 UTC (rev 930) @@ -1,22 +1,22 @@ <JDialog title='lutinutil.config.title' modal='true' defaultCloseOperation='DISPOSE_ON_CLOSE' width='500' height='300'> <script> -public ListCellRenderer getListener() { return null; } + public ListCellRenderer getListener() { return null; } -public void onValueChanged() {} + public void onValueChanged() {} -Action quitAction ; + Action quitAction ; -JRootPane rootPane = getRootPane(); -rootPane.setDefaultButton(quit); -quitAction = new AbstractAction(quit.getText()) { - private static final long serialVersionUID = -869095664995763057L; - public void actionPerformed(ActionEvent e) { + JRootPane rootPane = getRootPane(); + rootPane.setDefaultButton(quit); + quitAction = new AbstractAction(quit.getText()) { + private static final long serialVersionUID = -869095664995763057L; + public void actionPerformed(ActionEvent e) { dispose(); - } -}; -rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"quit"); -rootPane.getActionMap().put("quit", quitAction); + } + }; + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"),"quit"); + rootPane.getActionMap().put("quit", quitAction); </script> <DefaultListModel id='listModel'/> <java.awt.CardLayout id='cardLayout'/> @@ -27,7 +27,8 @@ <row> <cell weighty='1' fill='both' weightx='1'> <JScrollPane> - <JList id='list' onValueChanged='onValueChanged()' cellRenderer='{getListener()}' model='{listModel}'/> + <JList id='list' onValueChanged='onValueChanged()' cellRenderer='{getListener()}' + model='{listModel}'/> </JScrollPane> </cell> </row> Modified: trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JLoginUI.jaxx =================================================================== --- trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JLoginUI.jaxx 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/main/uimodel/org/codelutin/option/ui/JLoginUI.jaxx 2008-07-27 10:36:26 UTC (rev 930) @@ -1,20 +1,20 @@ <JDialog title="lutinutil.connexion" modal='true' locationRelativeTo="{null}" defaultCloseOperation="dispose_on_close"> - <script> - protected LoginUIHandler handler; + <script> + protected LoginUIHandler handler; - public boolean launch(String login,String password) { + public boolean launch(String login,String password) { if (login != null) { - this.getLogin().setText(login); + this.getLogin().setText(login); } if (password!=null) { - this.getPassword().setText(password); + this.getPassword().setText(password); } check(); setVisible(true); return !handler.cancel; - } + } - public JLoginUI(JFrame instance, LoginUIHandler handler) { + public JLoginUI(JFrame instance, LoginUIHandler handler) { super(instance); this.handler = handler; this.handler.setUi(this); @@ -22,23 +22,23 @@ setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); JRootPane rootPane = getRootPane(); rootPane.setDefaultButton(ok); - } + } - protected void doConnect() { + protected void doConnect() { handler.doConnect(); if (handler.isCancel()) { - doCancel(); + doCancel(); } - } + } - protected void doCancel() { + protected void doCancel() { handler.doCancel(); dispose(); - } + } - protected void check() { + protected void check() { ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0); - } + } </script> Modified: trunk/commandline/commandline-ui/src/site/site_fr.xml =================================================================== --- trunk/commandline/commandline-ui/src/site/site_fr.xml 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/site/site_fr.xml 2008-07-27 10:36:26 UTC (rev 930) @@ -1,45 +1,47 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="LutinCommndline"> - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin CommandLine</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + <bannerLeft> + <name>Lutin CommandLine</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="R�aliser sa premi�re application" href="firstusage.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/lutincommandli..." name="T�l�chargement"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="R�aliser sa premi�re application" href="firstusage.html"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/lutincommandli..." + name="T�l�chargement"/> + </menu> - <menu name="D�veloppeur"> - <item name="Implantation" href="devel/implementation.html"/> - <item name="A faire" href="Todo.html"/> - </menu> + <menu name="D�veloppeur"> + <item name="Implantation" href="devel/implementation.html"/> + <item name="A faire" href="Todo.html"/> + </menu> - ${reports} + ${reports} - </body> + </body> </project> Modified: trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java =================================================================== --- trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java 2008-07-27 10:36:26 UTC (rev 930) @@ -21,16 +21,15 @@ import org.codelutin.i18n.LanguageEnum; import org.codelutin.option.Config; import org.codelutin.option.ConfigPropertyKey; +import static org.codelutin.option.ConfigPropertyKey.newConfigPropertyKey; import org.codelutin.option.OptionKey; -import static org.codelutin.option.ConfigPropertyKey.newConfigPropertyKey; import static org.codelutin.option.def.ConfigPropertyModifier.MANDATORY; +import org.codelutin.util.SimplePaginationEnum; import java.io.File; import java.net.URL; import java.util.Locale; -import org.codelutin.util.SimplePaginationEnum; - /** * TODO javadoc * @@ -63,6 +62,7 @@ super("main", "main description"); init(); } + protected void init() throws Exception { loadFromDefaultValue(); clearModified(); @@ -94,6 +94,7 @@ super("local", "local description"); init(); } + protected void init() throws Exception { loadFromDefaultValue(); clearModified(); @@ -124,6 +125,7 @@ super("remote", "remote description"); init(); } + protected void init() throws Exception { loadFromDefaultValue(); clearModified(); Modified: trunk/commandline/maven-plugin/pom.xml =================================================================== --- trunk/commandline/maven-plugin/pom.xml 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/pom.xml 2008-07-27 10:36:26 UTC (rev 930) @@ -24,7 +24,7 @@ <artifactId>commandline-core</artifactId> <scope>compile</scope> </dependency> - + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -37,7 +37,7 @@ <artifactId>maven-plugin-api</artifactId> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> @@ -53,9 +53,9 @@ <version>0.7-SNAPSHOT</version> <description> - Plugin maven 2 pour la generation du parser d'options, des - configurations et du context d'application en se basant sur - la librairie commandline. + Plugin maven 2 pour la generation du parser d'options, des + configurations et du context d'application en se basant sur + la librairie commandline. </description> <inceptionYear>2008</inceptionYear> Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java 2008-07-27 10:36:26 UTC (rev 930) @@ -17,7 +17,7 @@ import org.codelutin.option.ParserUtil; /** - * Classe abstraite d�finissant un context de parser de d�finitions. + * Classe abstraite d�finissant un context de parser de d�finitions. * * @author tony */ Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefaultOptionAction.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefaultOptionAction.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefaultOptionAction.java 2008-07-27 10:36:26 UTC (rev 930) @@ -35,11 +35,11 @@ changeConfig("--config * <key:String> <value:String> [@categories@] "), help("--help|-h"), - + helpConfig("--help-config * <all|@categories@>"), resetConfig("--reset-config"), - + ui("--ui <flag:Boolean>"); private final String def; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserContexts.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserContexts.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserContexts.java 2008-07-27 10:36:26 UTC (rev 930) @@ -578,7 +578,7 @@ public static class ConfigsContext extends AbsractDefinitionContext<ParserContext, ConfigContext> { protected final List<ConfigLoaderEntry> source; - + protected List<String> safeCategories; public ConfigsContext(ParserContext parent, List<ConfigLoaderEntry> configs) { @@ -674,9 +674,9 @@ String value = sourceP.getModifiers().trim(); String[] mods = value.split(","); - if (value.length()==0 || mods.length == 0) { + if (value.length() == 0 || mods.length == 0) { _mods.put(key, 0); - mods =new String[0]; + mods = new String[0]; } List<Integer> modifiers = new ArrayList<Integer>(); for (String mod : mods) { Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserUtil.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserUtil.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/DefinitionParserUtil.java 2008-07-27 10:36:26 UTC (rev 930) @@ -44,7 +44,7 @@ final static String ODEFINITION_KEY_SUFFIX = ".option.definition"; final static String CDEFINITION_KEY_FACTOR = ".config.definition."; final static String CMODIFIERS_KEY_FACTOR = ".config.modifiers."; - + static class ConfigDefEntry extends AbstractMap.SimpleEntry<String, String> { private static final long serialVersionUID = -5430904379928407190L; String def; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java 2008-07-27 10:36:26 UTC (rev 930) @@ -39,7 +39,7 @@ public ConfigLoader(Map<String, String> injects) { super(CONFIG_DEFINITION_PATTERN, ConfigLoaderEntry.class); - this.injects=injects; + this.injects = injects; this.defaultProperties = MandatoryConfigProperty.getConfigPropertyKeys(); } @@ -55,7 +55,7 @@ configs.add(detectMainConfig); } - if (detectMainConfig!=null) { + if (detectMainConfig != null) { for (MandatoryConfigProperty configProperty : MandatoryConfigProperty.values()) { ConfigPropertyLoaderEntry loaderEntry = new ConfigPropertyLoaderEntry(configProperty.getEntryKey(), configProperty.name()); loaderEntry.setModifiers(configProperty.getModifiers()); Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java 2008-07-27 10:36:26 UTC (rev 930) @@ -37,7 +37,7 @@ log.warn("detected generic config property key " + key + ", will use the generic one..."); // clean source source.remove(key); - source.remove("main.config.modifiers."+value); + source.remove("main.config.modifiers." + value); return false; } return true; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java 2008-07-27 10:36:26 UTC (rev 930) @@ -32,7 +32,7 @@ } public void load(Properties source, List<ConfigPropertyLoaderEntry> result) { - definition = source.get(getFullKey())+""; + definition = source.get(getFullKey()) + ""; source.remove(getFullKey()); String modifiersKey = getModifierFullKey(); Object cv = source.get(modifiersKey); Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java 2008-07-27 10:36:26 UTC (rev 930) @@ -58,7 +58,7 @@ for (Map.Entry<String, String> entry : keys.entrySet()) { String key = entry.getKey(); - if (needLoad(key, entry.getValue(), result,source)) { + if (needLoad(key, entry.getValue(), result, source)) { // found a entry to treate E e = eConstructor.newInstance(key, entry.getValue()); e.load(source, result); Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java 2008-07-27 10:36:26 UTC (rev 930) @@ -30,9 +30,9 @@ public OptionLoader() { super(OPTION_PATTERN, OptionLoaderEntry.class); - this.defaultOptions = DefaultOptionAction.getConfigKeys(); + this.defaultOptions = DefaultOptionAction.getConfigKeys(); } - + public OptionLoader(String categoriesStr) { super(OPTION_PATTERN, OptionLoaderEntry.class); this.defaultOptions = DefaultOptionAction.getConfigKeys(); @@ -72,7 +72,7 @@ boolean need = true; if (defaultOptions.contains(key)) { // do not add this, this is a generated option - log.warn("generic option detected '" + value+ "', will use generic version instead..."); + log.warn("generic option detected '" + value + "', will use generic version instead..."); need = false; source.remove(key); } Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java 2008-07-27 10:36:26 UTC (rev 930) @@ -27,7 +27,7 @@ } public void load(Properties source, List<OptionLoaderEntry> result) { - this.definition = source.get(getFullKey())+""; + this.definition = source.get(getFullKey()) + ""; source.remove(getFullKey()); } Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java 2008-07-27 10:36:26 UTC (rev 930) @@ -66,7 +66,7 @@ * @parameter expression="${jaxx.copyToCP}" default-value="true" */ protected boolean copyToCP; - + /** * @description Chemin du fichier de propriétés contenant les définitions d'options à utiliser pour générer la factory de définitions d'options. * @parameter expression="${commandline.source}" Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java 2008-07-27 10:36:26 UTC (rev 930) @@ -21,9 +21,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.option.generate.JavaGeneratorContext; import org.codelutin.util.FileUtil; import org.codelutin.util.StringUtil; -import org.codelutin.option.generate.JavaGeneratorContext; import java.io.File; import java.io.IOException; @@ -137,20 +137,20 @@ this.userName = System.getProperty("user.name", getClass().getSimpleName()); } - protected AbstractJavaGenerator(JavaGeneratorContext context,int modifiers, String pack, String simpleName, String superClass, String... interfaceClass) { + protected AbstractJavaGenerator(JavaGeneratorContext context, int modifiers, String pack, String simpleName, String superClass, String... interfaceClass) { this.context = context; this.out = context.getOut(); - this.timestamp = context.getTimestamp(); - this.i18nPrefix = context.getI18nPrefix(); - this.pack = pack; - this.simpleName = simpleName; - this.simpleNameWithNoType = getNameWithNoType(simpleName); - this.superClass = superClass; - this.superClassWithNoType = getNameWithNoType(superClass); - this.interfaceClass = interfaceClass; - this.modifiers = modifiers; - this.userName = System.getProperty("user.name", getClass().getSimpleName()); - } + this.timestamp = context.getTimestamp(); + this.i18nPrefix = context.getI18nPrefix(); + this.pack = pack; + this.simpleName = simpleName; + this.simpleNameWithNoType = getNameWithNoType(simpleName); + this.superClass = superClass; + this.superClassWithNoType = getNameWithNoType(superClass); + this.interfaceClass = interfaceClass; + this.modifiers = modifiers; + this.userName = System.getProperty("user.name", getClass().getSimpleName()); + } protected String getNameWithNoType(String simpleName) { int pos = simpleName.indexOf('<'); Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java 2008-07-27 10:36:26 UTC (rev 930) @@ -1,9 +1,9 @@ package org.codelutin.option.generate.java; +import org.apache.commons.lang.StringUtils; import org.codelutin.option.def.DefaultOptionAction; import org.codelutin.option.def.DefinitionParserContexts.OptionContext; import org.codelutin.option.generate.JavaGeneratorContext; -import org.apache.commons.lang.StringUtils; import java.lang.reflect.Modifier; @@ -20,7 +20,7 @@ String runnable; if (option == null) { runnable = getFQN(); - } else { + } else { runnable = "org.codelutin.option.actions.OptionAction" + StringUtils.capitalize(context.getKey()); } addConstructor(null, Modifier.PUBLIC, "super(\"" + runnable + "Runnable\");", new String[]{Exception.class.getSimpleName()}); Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/util/AbstractGeneratorGoal.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/util/AbstractGeneratorGoal.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/util/AbstractGeneratorGoal.java 2008-07-27 10:36:26 UTC (rev 930) @@ -22,8 +22,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; +import org.codelutin.i18n.I18n; import org.codelutin.util.StringUtil; -import org.codelutin.i18n.I18n; import java.io.File; @@ -110,7 +110,7 @@ } catch (Exception e) { throw new MojoExecutionException(e.getMessage(), e); } finally { - getLog().info(getClass().getSimpleName()+" - total time " + StringUtil.convertTime(timestamp,System.nanoTime())); + getLog().info(getClass().getSimpleName() + " - total time " + StringUtil.convertTime(timestamp, System.nanoTime())); } } @@ -175,6 +175,7 @@ /** * permet d'ajout le r�pertoire de g�n�ration des fichiers java dans les r�pertoires * de compilation du projet Maven. + * * @param dirGen le repertoire de generation des fichiers java */ public void fixCompileSourceRoots(File dirGen) { Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser.java 2008-07-27 10:36:26 UTC (rev 930) @@ -1,11 +1,9 @@ package org.codelutin.option; -import org.codelutin.option.def.ParserTest.AbstractHelpAction; -import org.codelutin.option.def.ParserTest.OptionHelp; import org.codelutin.option.def.OptionDefinition; import org.codelutin.option.def.OptionDefinitionBuilder; -import org.codelutin.option.OptionParser; -import org.codelutin.option.OptionKey; +import org.codelutin.option.def.ParserTest.AbstractHelpAction; +import org.codelutin.option.def.ParserTest.OptionHelp; /** @author chemit */ public class MyParser extends OptionParser { Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser1.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser1.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/MyParser1.java 2008-07-27 10:36:26 UTC (rev 930) @@ -1,17 +1,14 @@ package org.codelutin.option; +import org.codelutin.option.def.ArgumentType; +import org.codelutin.option.def.OptionDefinition; +import org.codelutin.option.def.OptionDefinitionBuilder; import org.codelutin.option.def.ParserTest.AbstractHelp1Action; import org.codelutin.option.def.ParserTest.AbstractMandatory1Action; import org.codelutin.option.def.ParserTest.AbstractMandatory2Action; import org.codelutin.option.def.ParserTest.AbstractOptional1Action; import org.codelutin.option.def.ParserTest.AbstractOptional2Action; import org.codelutin.option.def.ParserTest.OptionHelp1; -import org.codelutin.option.def.OptionDefinition; -import org.codelutin.option.def.OptionDefinitionBuilder; -import org.codelutin.option.def.ArgumentType; -import org.codelutin.option.OptionParser; -import org.codelutin.option.OptionKey; -import org.codelutin.option.Option; /** @author chemit */ public class MyParser1 extends OptionParser { Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserTest.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserTest.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserTest.java 2008-07-27 10:36:26 UTC (rev 930) @@ -1,21 +1,20 @@ package org.codelutin.option.def; import junit.framework.TestCase; - -import java.io.IOException; -import java.util.Arrays; - import org.codelutin.i18n.I18n; import org.codelutin.log.LutinLogFactory; -import org.codelutin.option.Option; import org.codelutin.option.Argument; -import org.codelutin.option.OptionAction; -import org.codelutin.option.OptionParser; import org.codelutin.option.MyContext; import org.codelutin.option.MyContext1; import org.codelutin.option.MyParser; import org.codelutin.option.MyParser1; +import org.codelutin.option.Option; +import org.codelutin.option.OptionAction; +import org.codelutin.option.OptionParser; +import java.io.IOException; +import java.util.Arrays; + /** * OptionParser Tester. * @@ -26,14 +25,14 @@ public class ParserTest extends TestCase { static boolean first; - + static { if (!first) { I18n.init(); System.setProperty("org.apache.commons.logging.LogFactory", LutinLogFactory.class.getName()); first = true; - } + } } static int counter = 0; Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserUtilForTest.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserUtilForTest.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/ParserUtilForTest.java 2008-07-27 10:36:26 UTC (rev 930) @@ -15,7 +15,6 @@ import junit.framework.Assert; import org.codelutin.i18n.I18n; import org.codelutin.log.LutinLogFactory; -import org.codelutin.option.def.DefinitionParser; import org.codelutin.option.OptionParser; import org.codelutin.option.OptionParserResult; import org.codelutin.option.ParserFailedException; @@ -76,7 +75,7 @@ assertEquals(nbOptions, result.size()); assertEquals(nbErrors, e == null ? 0 : e.getNbErrors()); - assertEquals(nbUnused, result.getNbUnsued()); + assertEquals(nbUnused, result.getNbUnsued()); } Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java 2008-07-27 10:36:26 UTC (rev 930) @@ -25,10 +25,10 @@ import java.io.File; import java.io.FileInputStream; import java.net.URL; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Properties; -import java.util.Map; -import java.util.HashMap; /** @author chemit */ public class PropertiesLoaderTest extends TestCase { @@ -48,10 +48,10 @@ } public void testConfigCategory() throws Exception { - Map<String, String> injects =new HashMap<String, String>(); + Map<String, String> injects = new HashMap<String, String>(); - injects.put(MandatoryConfigProperty.encoding.name(),"UTF-8"); - + injects.put(MandatoryConfigProperty.encoding.name(), "UTF-8"); + ConfigLoader configLoader = new ConfigLoader(injects); File f; @@ -84,9 +84,9 @@ currentSize = currentSize - result2.size() * 2; } // we have 2 mandatories value, - int nbMandatories = MandatoryConfigProperty.values().length-2; - currentSize+= nbMandatories*2; - + int nbMandatories = MandatoryConfigProperty.values().length - 2; + currentSize += nbMandatories * 2; + assertEquals(currentSize, p.size()); OptionLoader optionLoader = new OptionLoader(configLoader.getCategoriesStr()); Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java 2008-07-27 10:35:17 UTC (rev 929) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java 2008-07-27 10:36:26 UTC (rev 930) @@ -18,6 +18,8 @@ package org.codelutin.option.generate; import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.i18n.I18n; import org.codelutin.option.Config; import org.codelutin.option.Option; @@ -25,8 +27,6 @@ import org.codelutin.option.OptionParser; import org.codelutin.option.def.DefaultOptionAction; import org.codelutin.option.def.DefinitionParserFromProperties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -57,7 +57,7 @@ goal.setPrefix("Test"); goal.setVerbose(false); goal.setSource(new File(HERE + "/src/test/testOptions.properties")); - + goal.setPackageName("org.codelutin.option.test1"); goal._version = "0.0.1"; goal.setParserSuperClass(OptionParser.class.getName());