Author: tchemit Date: 2012-01-18 17:06:23 +0100 (Wed, 18 Jan 2012) New Revision: 30 Url: http://forge.codelutin.com/repositories/revision/jmexico/30 Log: add a real demo module Added: trunk/jmexico-editor-demo/ trunk/jmexico-editor-demo/LICENSE.txt trunk/jmexico-editor-demo/README.txt trunk/jmexico-editor-demo/changelog.txt trunk/jmexico-editor-demo/pom.xml trunk/jmexico-editor-demo/src/ trunk/jmexico-editor-demo/src/license/ trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties trunk/jmexico-editor-demo/src/main/ trunk/jmexico-editor-demo/src/main/assembly/ trunk/jmexico-editor-demo/src/main/assembly/bin.xml trunk/jmexico-editor-demo/src/main/assembly/bin/ trunk/jmexico-editor-demo/src/main/assembly/bin/README.txt trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh trunk/jmexico-editor-demo/src/main/java/ trunk/jmexico-editor-demo/src/main/java/fr/ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java trunk/jmexico-editor-demo/src/main/resources/ trunk/jmexico-editor-demo/src/main/resources/i18n/ trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties trunk/jmexico-editor-demo/src/main/resources/log4j.properties trunk/jmexico-editor-demo/src/site/ trunk/jmexico-editor-demo/src/site/rst/ trunk/jmexico-editor-demo/src/site/rst/index.rst trunk/jmexico-editor-demo/src/site/site_fr.xml trunk/jmexico-editor-demo/src/test/ trunk/jmexico-editor-demo/src/test/java/ trunk/jmexico-editor/ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties trunk/jmexico-model/src/main/xmi/mexico.properties Removed: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/RunMexico.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUIHandler.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoUIModel.java trunk/jmexico-editor/src/main/resources/i18n/jmexico-swing-editor_en_GB.properties trunk/jmexico-editor/src/main/resources/i18n/jmexico-swing-editor_fr_FR.properties trunk/jmexico-swing-editor/ Modified: trunk/jmexico-editor/pom.xml trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditor.jaxx trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellEditor.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellRenderer.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueEditorFactory.java trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/jmexico-editor/pom.xml =================================================================== --- trunk/jmexico-swing-editor/pom.xml 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/pom.xml 2012-01-18 16:06:23 UTC (rev 30) @@ -14,7 +14,7 @@ </parent> <groupId>fr.reseaumexico</groupId> - <artifactId>jmexico-swing-editor</artifactId> + <artifactId>jmexico-editor</artifactId> <dependencies> @@ -70,12 +70,10 @@ <!-- ************************************************************* --> <name>JMexico :: Swing Editor</name> - <description>JMexico - Swing Editor module</description> + <description>JMexico - Editor module</description> <properties> - <maven.jar.main.class>fr.reseaumexico.editor.RunMexico</maven.jar.main.class> - <!-- jaxx configuration --> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> @@ -89,33 +87,7 @@ <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <useUniqueVersions>true</useUniqueVersions> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </pluginManagement> - <plugins> <plugin> @@ -129,27 +101,8 @@ </execution> </executions> </plugin> - + <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <executions> @@ -174,82 +127,5 @@ </build> - <profiles> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>jnlp</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - - <defaultGoal>verify</defaultGoal> - <plugins> - <!-- key store secrets availables --> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> - - <!-- make webstart --> - <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> - - </profile> - </profiles> - </project> \ No newline at end of file Deleted: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/RunMexico.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/RunMexico.java 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/RunMexico.java 2012-01-18 16:06:23 UTC (rev 30) @@ -1,56 +0,0 @@ -/* - * #%L - * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package fr.reseaumexico.editor; - -import fr.reseaumexico.editor.ui.MexicoMainUI; -import fr.reseaumexico.editor.ui.MexicoMainUIHandler; -import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.swing.ErrorDialogUI; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * @author sletellier <letellier@codelutin.com> - * @since 0.1 - */ -public class RunMexico { - - /** Logger */ - private static Log log = LogFactory.getLog(RunMexico.class); - - public static void main(String[] args) { - - try { - JAXXInitialContext jaxxContext = new JAXXInitialContext(); - MexicoMainUIHandler mainHandler = new MexicoMainUIHandler(); - - MexicoMainUI mainUI = mainHandler.initUI(jaxxContext); - } catch (Exception eee) { - log.error(eee.getMessage(), eee); - ErrorDialogUI.showError(eee); - System.exit(1); - } - } -} Deleted: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.css 2012-01-18 16:06:23 UTC (rev 30) @@ -1,39 +0,0 @@ -/* - * #%L - * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -#menuFile { - text:"jmexico.menu.file"; - mnemonic:F; -} -#menuFileOpen { - text:"jmexico.menu.file.open"; - mnemonic:O; -} -#menuFileSave { - text:"jmexico.menu.file.save"; - mnemonic:S; -} -#exit { - text:"jmexico.menu.exit"; -} \ No newline at end of file Deleted: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUI.jaxx 2012-01-18 16:06:23 UTC (rev 30) @@ -1,72 +0,0 @@ -<!-- - #%L - JMexico :: Swing Editor - - $Id$ - $HeadURL$ - %% - Copyright (C) 2011 Réseau Mexico, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> -<JFrame id='mainFrame' decorator='help' - width='800' height='800' - layout='{new BorderLayout()}' - onWindowClosing='getHandler().closeApplication(this)'> - - <import> - fr.reseaumexico.editor.ui.editor.InputDesignEditor - fr.reseaumexico.model.InputDesign - </import> - - <MexicoMainUIHandler id="handler" - initializer='getContextValue(MexicoMainUIHandler.class)'/> - - <MexicoUIModel id="model"/> - - <script> - <![CDATA[ - -public void setInputDesign(InputDesign inputDesign) { - getModel().setInputDesign(inputDesign); - inputDesignEditor.setInputDesign(inputDesign); -} - -public InputDesign getInputDesign() { - return getModel().getInputDesign(); -} - ]]> - </script> - - <!-- menu --> - <JMenuBar id='menu'> - <JMenu id='menuFile'> - <JMenuItem id='menuFileOpen' - onActionPerformed="getHandler().openFile(this)"/> - - <JMenuItem id='menuFileSave' - enabled='{getModel().isOptionChanged()}' - onActionPerformed="getHandler().saveFile(this)"/> - - <JSeparator/> - - <JMenuItem id='exit' - onActionPerformed="getHandler().closeApplication(this)"/> - - </JMenu> - </JMenuBar> - <InputDesignEditor id='inputDesignEditor' constraints='BorderLayout.CENTER'/> -</JFrame> Deleted: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUIHandler.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUIHandler.java 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoMainUIHandler.java 2012-01-18 16:06:23 UTC (rev 30) @@ -1,150 +0,0 @@ -/* - * #%L - * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Réseau Mexico, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package fr.reseaumexico.editor.ui; - -import fr.reseaumexico.model.InputDesign; -import fr.reseaumexico.model.event.InputDesignFactorEvent; -import fr.reseaumexico.model.event.InputDesignFactorListener; -import fr.reseaumexico.model.event.InputDesignScenarioEvent; -import fr.reseaumexico.model.event.InputDesignScenarioListener; -import fr.reseaumexico.model.parser.InputDesignParser; -import fr.reseaumexico.model.writer.InputDesignXmlWriter; -import java.io.File; -import java.io.IOException; -import javax.swing.JFileChooser; -import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.swing.ErrorDialogUI; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import static org.nuiton.i18n.I18n._; - -/** - * Handler of main UI - * - * @author sletellier <letellier@codelutin.com> - * @since 0.1 - */ -public class MexicoMainUIHandler { - - /** Logger */ - private static Log log = LogFactory.getLog(MexicoMainUIHandler.class); - - public void closeApplication(MexicoMainUI ui) { - ui.dispose(); - } - - public MexicoMainUI initUI(JAXXInitialContext context) { - - // share handler - context.add(this); - - // construt main UI - MexicoMainUI ui = new MexicoMainUI(context); - - // display - ui.setVisible(true); - - // synch to error dialog - ErrorDialogUI.init(ui); - - return ui; - } - - public void openFile(final MexicoMainUI ui) { - JFileChooser fileChooser = new JFileChooser(); - fileChooser.setDialogTitle(_("jmexico.file.open.dialog")); - int returnVal = fileChooser.showOpenDialog(ui); - if(returnVal == JFileChooser.APPROVE_OPTION) { - File selectedFile = fileChooser.getSelectedFile(); - InputDesign inputDesign = readInputDesignFile(selectedFile); - - // add listener to listen option values changes - inputDesign.addInputDesignFactorListener(new InputDesignFactorListener() { - - @Override - public void onFactorValueChange(InputDesignFactorEvent event) { - ui.setInputDesign(event.getSource()); - } - }); - // add listener to listen option values changes - inputDesign.addInputDesignScenarioListener(new InputDesignScenarioListener() { - - @Override - public void onScenarioAdded(InputDesignScenarioEvent event) { - ui.setInputDesign(event.getSource()); - } - - @Override - public void onScenarioRemoved(InputDesignScenarioEvent event) { - ui.setInputDesign(event.getSource()); - } - }); - - ui.setInputDesign(inputDesign); - - // keep selected file - ui.getModel().setInputDesignFile(selectedFile); - } - } - - public void saveFile(MexicoMainUI ui) { - // get selected file - File selectedFile = ui.getModel().getInputDesignFile(); - - // save modified model - try { - InputDesignXmlWriter writer = new InputDesignXmlWriter(selectedFile, ui.getInputDesign()); - try { - writer.write(); - } finally { - writer.close(); - ui.getModel().setOptionChanged(false); - } - } catch (IOException eee) { - log.error("Failed to save inputDesign file '" + selectedFile.getName() + "'", eee); - ErrorDialogUI.showError(eee); - } - } - - protected InputDesign readInputDesignFile(File selectedFile) { - InputDesign inputDesignModel = null; - try { - // parse inputDesign - InputDesignParser inputDesignParser = new InputDesignParser(selectedFile); - try { - inputDesignModel = inputDesignParser.getModel(); - } finally { - inputDesignParser.close(); - } - - } catch (Exception eee) { - log.error("Failed to read inputDesign file '" + selectedFile.getName() + "'", eee); - ErrorDialogUI.showError(eee); - } - - return inputDesignModel; - } -} Deleted: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoUIModel.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoUIModel.java 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/MexicoUIModel.java 2012-01-18 16:06:23 UTC (rev 30) @@ -1,97 +0,0 @@ -/* - * #%L - * JMexico :: Swing Editor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package fr.reseaumexico.editor.ui; - -import fr.reseaumexico.model.InputDesign; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.File; - -/** - * @author sletellier <letellier@codelutin.com> - */ -public class MexicoUIModel { - - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - public static final String PROPERTY_OPTION_CHANGED = "optionChanged"; - public static final String PROPERTY_INPUT_DESIGN = "inputDesign"; - public static final String PROPERTY_INPUT_DESIGN_FILE = "inputDesignFile"; - - protected InputDesign inputDesign; - protected File inputDesignFile; - protected boolean optionChanged; - - public File getInputDesignFile() { - return inputDesignFile; - } - - public void setInputDesignFile(File inputDesignFile) { - File oldInputDesignFile = getInputDesignFile(); - this.inputDesignFile = inputDesignFile; - firePropertyChange(PROPERTY_INPUT_DESIGN_FILE, oldInputDesignFile, inputDesignFile); - } - - public InputDesign getInputDesign() { - return inputDesign; - } - - public void setInputDesign(InputDesign inputDesign) { - InputDesign oldInputDesign = getInputDesign(); - this.inputDesign = inputDesign; - setOptionChanged(true); - firePropertyChange(PROPERTY_INPUT_DESIGN, oldInputDesign, inputDesign); - } - - public boolean isOptionChanged() { - return optionChanged; - } - - public void setOptionChanged(boolean optionChanged) { - boolean oldValue = isOptionChanged(); - this.optionChanged = optionChanged; - firePropertyChange(PROPERTY_OPTION_CHANGED, oldValue, optionChanged); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } -} Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditor.jaxx =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditor.jaxx 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/InputDesignEditor.jaxx 2012-01-18 16:06:23 UTC (rev 30) @@ -25,8 +25,6 @@ <JPanel id='inputDesignEditor' layout='{new BorderLayout()}'> <import> - javax.swing.table.TableModel - javax.swing.table.DefaultTableModel fr.reseaumexico.model.InputDesign fr.reseaumexico.model.Factor fr.reseaumexico.editor.ui.editor.InputDesignTableModel @@ -70,8 +68,7 @@ </script> <JScrollPane constraints='BorderLayout.CENTER'> - <JTable id='inputDesignTable' - model='{getModel()}'/> + <JTable id='inputDesignTable' model='{getModel()}'/> </JScrollPane> <JPanel id='factorActionPanel' constraints='BorderLayout.SOUTH'> Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellEditor.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellEditor.java 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellEditor.java 2012-01-18 16:06:23 UTC (rev 30) @@ -54,7 +54,7 @@ protected Object currentValue; protected JTextField defaultInlineEditor; protected FactorValueEditorFactory.FactorValueCellEditor specificEditor; - protected boolean isEditing = false; + protected boolean isEditing; protected FactorValueEditorFactory factory; public FactorValueCellEditor(JAXXContext context) { Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellRenderer.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellRenderer.java 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueCellRenderer.java 2012-01-18 16:06:23 UTC (rev 30) @@ -48,9 +48,9 @@ if (factory == null) { factory = new FactorValueEditorFactory(); } - - this.delegate = new DefaultTableCellRenderer(); + delegate = new DefaultTableCellRenderer(); + } @Override Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueEditorFactory.java =================================================================== --- trunk/jmexico-swing-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueEditorFactory.java 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/ui/editor/factorValue/FactorValueEditorFactory.java 2012-01-18 16:06:23 UTC (rev 30) @@ -31,6 +31,7 @@ import java.awt.Component; import java.util.Map; import javax.swing.JCheckBox; +import javax.swing.JDialog; import javax.swing.JTextField; import jaxx.runtime.swing.editor.NumberEditor; import org.apache.commons.lang3.StringUtils; @@ -46,11 +47,11 @@ protected Map<Factor, FactorValueCellEditor<?>> factorValueEditorCache = Maps.newHashMap(); /** - * Provide specific {@link javax.swing.JDialog} editor for factor value + * Provide specific {@link JDialog} editor for factor value * * @param factor concerned * @param value value to edit - * @return {@link FactorValueEditor} contain editor to open as {@link javax.swing.JDialog}, + * @return {@link FactorValueEditor} contain editor to open as {@link JDialog}, * null if cell editor must be used */ public FactorValueEditor getDialogEditor(Factor factor, Object value) { @@ -121,17 +122,17 @@ return getCellEditor(factor, value); } - protected static interface FactorValueCellRenderer { + protected interface FactorValueCellRenderer { - public abstract Component getComponent(); - public abstract void setValue(Object value); + Component getComponent(); + void setValue(Object value); } - protected static interface FactorValueCellEditor<B> extends FactorValueCellRenderer { + protected interface FactorValueCellEditor<B> extends FactorValueCellRenderer { - public abstract B getValue(); - public abstract void setValue(Object value); - public abstract Component getComponent(); + B getValue(); + void setValue(Object value); + Component getComponent(); } protected static class DefaultFactorValueInlineEditor implements FactorValueCellEditor<String> { @@ -139,8 +140,8 @@ protected JTextField component; public DefaultFactorValueInlineEditor() { - this.component = new JTextField(); - this.component.setBorder(null); + component = new JTextField(); + component.setBorder(null); } @Override @@ -164,7 +165,7 @@ protected JCheckBox checkBox; public BooleanFactorValueInlineEditor() { - this.checkBox = new JCheckBox(); + checkBox = new JCheckBox(); } @Override @@ -175,7 +176,7 @@ @Override public void setValue(Object value) { if (value != null) { - this.checkBox.setSelected((Boolean)value); + checkBox.setSelected((Boolean) value); } } @@ -190,7 +191,7 @@ protected NumberEditor numberEditor; public IntegerFactorValueInlineEditor() { - this.numberEditor = new NumberEditor(); + numberEditor = new NumberEditor(); numberEditor.getTextField().setBorder(null); numberEditor.setUseFloat(false); @@ -220,7 +221,7 @@ protected NumberEditor numberEditor; public DecimalFactorValueInlineEditor() { - this.numberEditor = new NumberEditor(); + numberEditor = new NumberEditor(); numberEditor.getTextField().setBorder(null); numberEditor.setModelType(Double.class); Added: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties (rev 0) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,7 @@ +jmexico.error.scenario.name.used=Error \: scenario name '%1$s' is already used. +jmexico.error.title=Error +jmexico.factor.name=Factor +jmexico.scenario.inputName=Name of scenario to add \: +jmexico.scenario.inputName.title=Input a name for scenario to add +jmexico.scenario.selectRemove=Select scenario to delete +jmexico.scenario.selectRemove.title=Select scenario to remove Property changes on: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties (rev 0) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,7 @@ +jmexico.error.scenario.name.used=Erreur \: le scenario '%1$s' est déjà utilisé. +jmexico.error.title=Erreur +jmexico.factor.name=Facteur +jmexico.scenario.inputName=Nom du scénario à ajouter \: +jmexico.scenario.inputName.title=Enter un nom pour le scenario à ajouter +jmexico.scenario.selectRemove=Selection du scénario à supprimer +jmexico.scenario.selectRemove.title=Select scenario to remove Property changes on: trunk/jmexico-editor/src/main/resources/i18n/jmexico-editor_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/jmexico-editor/src/main/resources/i18n/jmexico-swing-editor_en_GB.properties =================================================================== --- trunk/jmexico-swing-editor/src/main/resources/i18n/jmexico-swing-editor_en_GB.properties 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-swing-editor_en_GB.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -1,15 +0,0 @@ -jmexico.add.scenario=Add a scenario -jmexico.error.scenario.name.used=Error \: scenario name '%1$s' is already used. -jmexico.error.title=Error -jmexico.factor.name=Factor -jmexico.file.open.dialog=Open an InputDesign file. -jmexico.input.msg=New value -jmexico.menu.exit=Exit -jmexico.menu.file=File -jmexico.menu.file.open=Open -jmexico.menu.file.save=Save -jmexico.remove.scenario=Delete a scenario -jmexico.scenario.inputName=Name of scenario to add \: -jmexico.scenario.inputName.title=Input a name for scenario to add -jmexico.scenario.selectRemove=Select scenario to delete -jmexico.scenario.selectRemove.title=Select scenario to remove Deleted: trunk/jmexico-editor/src/main/resources/i18n/jmexico-swing-editor_fr_FR.properties =================================================================== --- trunk/jmexico-swing-editor/src/main/resources/i18n/jmexico-swing-editor_fr_FR.properties 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/jmexico-editor/src/main/resources/i18n/jmexico-swing-editor_fr_FR.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -1,15 +0,0 @@ -jmexico.add.scenario=Ajout d'un scenario -jmexico.error.scenario.name.used=Erreur \: le scenario '%1$s' est déjà utilisé. -jmexico.error.title=Erreur -jmexico.factor.name=Facteur -jmexico.file.open.dialog=Ouvrir un fichier InputDesign -jmexico.input.msg=Nouvelle valeur -jmexico.menu.exit=Quitter -jmexico.menu.file=Fichier -jmexico.menu.file.open=Ouvrir -jmexico.menu.file.save=Sauvegarder -jmexico.remove.scenario=Suppression d'un scenario -jmexico.scenario.inputName=Nom du scénario à ajouter \: -jmexico.scenario.inputName.title=Enter un nom pour le scenario à ajouter -jmexico.scenario.selectRemove=Selection du scénario à supprimer -jmexico.scenario.selectRemove.title=Select scenario to remove Property changes on: trunk/jmexico-editor-demo ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml *.log Added: trunk/jmexico-editor-demo/LICENSE.txt =================================================================== --- trunk/jmexico-editor-demo/LICENSE.txt (rev 0) +++ trunk/jmexico-editor-demo/LICENSE.txt 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/jmexico-editor-demo/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/jmexico-editor-demo/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/pom.xml =================================================================== --- trunk/jmexico-editor-demo/pom.xml (rev 0) +++ trunk/jmexico-editor-demo/pom.xml 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>fr.reseaumexico</groupId> + <artifactId>jmexico</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>fr.reseaumexico</groupId> + <artifactId>jmexico-editor-demo</artifactId> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jmexico-model</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jmexico-editor</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <!-- jaxx dependencies --> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + </dependency> + + <!-- logging dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>JMexico :: Swing Editor</name> + <description>JMexico - Swing Editor module</description> + + <properties> + + <maven.jar.main.class>fr.reseaumexico.editor.demo.RunMexicoEditorDemo</maven.jar.main.class> + + <!-- jaxx configuration --> + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> + + <i18n.bundleOutputName>jmexico-editor-demo-i18n</i18n.bundleOutputName> + + <!-- generate license bundled files --> + <license.generateBundle>true</license.generateBundle> + + </properties> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <build> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <useUniqueVersions>true</useUniqueVersions> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + </plugins> + + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <id>scan-sources</id> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + <!--<configuration>--> + <!--<entries>--> + <!--<entry>--> + <!--<basedir>${maven.gen.dir}/java/</basedir>--> + <!--</entry>--> + <!--</entries>--> + <!--</configuration>--> + </execution> + <execution> + <id>make-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>update-project-license</goal> + <goal>add-third-party</goal> + </goals> + <configuration> + <licenseMerges> + <licenseMerge> + The Apache Software License, Version 2.0|Apache License, Version 2.0 + </licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + + <profiles> + + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <profile> + <id>jnlp</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + + <defaultGoal>verify</defaultGoal> + <plugins> + <!-- key store secrets availables --> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + + <!-- make webstart --> + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> + +</project> \ No newline at end of file Property changes on: trunk/jmexico-editor-demo/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License, version 1.1 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 16 12:09:15 CET 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Property changes on: trunk/jmexico-editor-demo/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/main/assembly/bin/README.txt =================================================================== --- trunk/jmexico-editor-demo/src/main/assembly/bin/README.txt (rev 0) +++ trunk/jmexico-editor-demo/src/main/assembly/bin/README.txt 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,16 @@ +Démarrage de la démo +-------------------- + +Pour lancer la démo, taper la commande suivante dans une console : + +./go.sh + +ou + +./go.bat + +Vous pouvez aussi dans un explorateur double cliquer sur le fichier jar dans +ce même répertoire. + +Note : Pour cela votre explorateur de fichier doit être configurer pour lancer + des applications java. Added: trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat =================================================================== --- trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat (rev 0) +++ trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1 @@ +java -Xmx512M -Xms512M -jar ${project.build.finalName}.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin/go.bat ___________________________________________________________________ Added: svn:executable + * Added: trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh =================================================================== --- trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh (rev 0) +++ trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,28 @@ +### +# #%L +# ObServe :: Client +# +# $Id: go.sh 1306 2011-02-15 21:15:22Z chemit $ +# $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-cli/src/main/assembly/bi... $ +# %% +# Copyright (C) 2008 - 2010 IRD, Codelutin, 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 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#!/bin/sh + +MX=512M +java -Xmx$MX -Xms$MX -jar ${project.build.finalName}.jar "$@" \ No newline at end of file Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin/go.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/jmexico-editor-demo/src/main/assembly/bin.xml =================================================================== --- trunk/jmexico-editor-demo/src/main/assembly/bin.xml (rev 0) +++ trunk/jmexico-editor-demo/src/main/assembly/bin.xml 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,69 @@ +<!-- + #%L + ObServe :: Client + + $Id: bin.xml 1391 2011-04-15 11:53:14Z chemit $ + $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-cli/src/main/assembly/bi... $ + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> +<assembly> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + + <fileSets> + + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>${project.build.finalName}.jar</include> + </includes> + </fileSet> + + <fileSet> + <directory>target/classes</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>THIRD-PARTY.txt</include> + <include>LICENSE.txt</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/bin</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0755</fileMode> + <filtered>true</filtered> + <includes> + <include>go.*</include> + <include>README.txt</include> + </includes> + </fileSet> + + </fileSets> +</assembly> Property changes on: trunk/jmexico-editor-demo/src/main/assembly/bin.xml ___________________________________________________________________ Added: svn:executable + * Added: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css (rev 0) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.css 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,39 @@ +/* + * #%L + * JMexico :: Swing Editor + * + * $Id: MexicoMainUI.css 24 2012-01-18 09:54:16Z sletellier $ + * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * %% + * Copyright (C) 2011 Réseau Mexico, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +#menuFile { + text:"jmexico.menu.file"; + mnemonic:F; +} +#menuFileOpen { + text:"jmexico.menu.file.open"; + mnemonic:O; +} +#menuFileSave { + text:"jmexico.menu.file.save"; + mnemonic:S; +} +#exit { + text:"jmexico.menu.exit"; +} \ No newline at end of file Added: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx (rev 0) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUI.jaxx 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,72 @@ +<!-- + #%L + JMexico :: Swing Editor + + $Id: MexicoMainUI.jaxx 26 2012-01-18 10:25:02Z sletellier $ + $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + %% + Copyright (C) 2011 Réseau Mexico, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> +<JFrame id='mainFrame' decorator='help' + width='800' height='800' + layout='{new BorderLayout()}' + onWindowClosing='getHandler().closeApplication(this)'> + + <import> + fr.reseaumexico.editor.ui.editor.InputDesignEditor + fr.reseaumexico.model.InputDesign + </import> + + <MexicoEditorDemoUIHandler id="handler" + initializer='getContextValue(MexicoEditorDemoUIHandler.class)'/> + + <MexicoEditorDemoUIModel id="model"/> + + <script> + <![CDATA[ + +public void setInputDesign(InputDesign inputDesign) { + getModel().setInputDesign(inputDesign); + inputDesignEditor.setInputDesign(inputDesign); +} + +public InputDesign getInputDesign() { + return getModel().getInputDesign(); +} + ]]> + </script> + + <!-- menu --> + <JMenuBar id='menu'> + <JMenu id='menuFile'> + <JMenuItem id='menuFileOpen' + onActionPerformed="getHandler().openFile(this)"/> + + <JMenuItem id='menuFileSave' + enabled='{getModel().isOptionChanged()}' + onActionPerformed="getHandler().saveFile(this)"/> + + <JSeparator/> + + <JMenuItem id='exit' + onActionPerformed="getHandler().closeApplication(this)"/> + + </JMenu> + </JMenuBar> + <InputDesignEditor id='inputDesignEditor' constraints='BorderLayout.CENTER'/> +</JFrame> Added: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java (rev 0) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIHandler.java 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,151 @@ +/* + * #%L + * JMexico :: Swing Editor + * + * $Id: MexicoMainUIHandler.java 26 2012-01-18 10:25:02Z sletellier $ + * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * %% + * Copyright (C) 2011 Réseau Mexico, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package fr.reseaumexico.editor.demo; + +import fr.reseaumexico.model.InputDesign; +import fr.reseaumexico.model.event.InputDesignFactorEvent; +import fr.reseaumexico.model.event.InputDesignFactorListener; +import fr.reseaumexico.model.event.InputDesignScenarioEvent; +import fr.reseaumexico.model.event.InputDesignScenarioListener; +import fr.reseaumexico.model.parser.InputDesignParser; +import fr.reseaumexico.model.writer.InputDesignXmlWriter; +import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.swing.ErrorDialogUI; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.*; +import java.io.File; +import java.io.IOException; + +import static org.nuiton.i18n.I18n._; + +/** + * Handler of main UI + * + * @author sletellier <letellier@codelutin.com> + * @since 0.1 + */ +public class MexicoEditorDemoUIHandler { + + /** Logger */ + private static Log log = LogFactory.getLog(MexicoEditorDemoUIHandler.class); + + public void closeApplication(MexicoEditorDemoUI ui) { + ui.dispose(); + } + + public MexicoEditorDemoUI initUI(JAXXInitialContext context) { + + // share handler + context.add(this); + + // construt main UI + MexicoEditorDemoUI ui = new MexicoEditorDemoUI(context); + + // display + ui.setVisible(true); + + // synch to error dialog + ErrorDialogUI.init(ui); + + return ui; + } + + public void openFile(final MexicoEditorDemoUI ui) { + JFileChooser fileChooser = new JFileChooser(); + fileChooser.setDialogTitle(_("jmexico.file.open.dialog")); + int returnVal = fileChooser.showOpenDialog(ui); + if (returnVal == JFileChooser.APPROVE_OPTION) { + File selectedFile = fileChooser.getSelectedFile(); + InputDesign inputDesign = readInputDesignFile(selectedFile); + + // add listener to listen option values changes + inputDesign.addInputDesignFactorListener(new InputDesignFactorListener() { + + @Override + public void onFactorValueChange(InputDesignFactorEvent event) { + ui.setInputDesign(event.getSource()); + } + }); + // add listener to listen option values changes + inputDesign.addInputDesignScenarioListener(new InputDesignScenarioListener() { + + @Override + public void onScenarioAdded(InputDesignScenarioEvent event) { + ui.setInputDesign(event.getSource()); + } + + @Override + public void onScenarioRemoved(InputDesignScenarioEvent event) { + ui.setInputDesign(event.getSource()); + } + }); + + ui.setInputDesign(inputDesign); + + // keep selected file + ui.getModel().setInputDesignFile(selectedFile); + } + } + + public void saveFile(MexicoEditorDemoUI ui) { + // get selected file + File selectedFile = ui.getModel().getInputDesignFile(); + + // save modified model + try { + InputDesignXmlWriter writer = new InputDesignXmlWriter(selectedFile, ui.getInputDesign()); + try { + writer.write(); + } finally { + writer.close(); + ui.getModel().setOptionChanged(false); + } + } catch (IOException eee) { + log.error("Failed to save inputDesign file '" + selectedFile.getName() + "'", eee); + ErrorDialogUI.showError(eee); + } + } + + protected InputDesign readInputDesignFile(File selectedFile) { + InputDesign inputDesignModel = null; + try { + // parse inputDesign + InputDesignParser inputDesignParser = new InputDesignParser(selectedFile); + try { + inputDesignModel = inputDesignParser.getModel(); + } finally { + inputDesignParser.close(); + } + + } catch (Exception eee) { + log.error("Failed to read inputDesign file '" + selectedFile.getName() + "'", eee); + ErrorDialogUI.showError(eee); + } + + return inputDesignModel; + } +} Added: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java (rev 0) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,96 @@ +/* + * #%L + * JMexico :: Swing Editor + * + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * %% + * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package fr.reseaumexico.editor.demo; + +import fr.reseaumexico.model.InputDesign; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.File; + +/** @author sletellier <letellier@codelutin.com> */ +public class MexicoEditorDemoUIModel { + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public static final String PROPERTY_OPTION_CHANGED = "optionChanged"; + public static final String PROPERTY_INPUT_DESIGN = "inputDesign"; + public static final String PROPERTY_INPUT_DESIGN_FILE = "inputDesignFile"; + + protected InputDesign inputDesign; + protected File inputDesignFile; + protected boolean optionChanged; + + public File getInputDesignFile() { + return inputDesignFile; + } + + public void setInputDesignFile(File inputDesignFile) { + File oldInputDesignFile = getInputDesignFile(); + this.inputDesignFile = inputDesignFile; + firePropertyChange(PROPERTY_INPUT_DESIGN_FILE, oldInputDesignFile, inputDesignFile); + } + + public InputDesign getInputDesign() { + return inputDesign; + } + + public void setInputDesign(InputDesign inputDesign) { + InputDesign oldInputDesign = getInputDesign(); + this.inputDesign = inputDesign; + setOptionChanged(true); + firePropertyChange(PROPERTY_INPUT_DESIGN, oldInputDesign, inputDesign); + } + + public boolean isOptionChanged() { + return optionChanged; + } + + public void setOptionChanged(boolean optionChanged) { + boolean oldValue = isOptionChanged(); + this.optionChanged = optionChanged; + firePropertyChange(PROPERTY_OPTION_CHANGED, oldValue, optionChanged); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } +} Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/MexicoEditorDemoUIModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java =================================================================== --- trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java (rev 0) +++ trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,58 @@ +/* + * #%L + * JMexico :: Swing Editor + * + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ + * %% + * Copyright (C) 2011 Réseau Mexico, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package fr.reseaumexico.editor.demo; + +import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.swing.ErrorDialogUI; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; + +/** + * @author sletellier <letellier@codelutin.com> + * @since 0.1 + */ +public class RunMexicoEditorDemo { + + /** Logger */ + private static Log log = LogFactory.getLog(RunMexicoEditorDemo.class); + + public static void main(String[] args) { + + try { + + I18n.init(new DefaultI18nInitializer("jmexico-editor-demo-i18n"), null); + JAXXInitialContext jaxxContext = new JAXXInitialContext(); + MexicoEditorDemoUIHandler mainHandler = new MexicoEditorDemoUIHandler(); + + MexicoEditorDemoUI mainUI = mainHandler.initUI(jaxxContext); + } catch (Exception eee) { + log.error(eee.getMessage(), eee); + ErrorDialogUI.showError(eee); + System.exit(1); + } + } +} Property changes on: trunk/jmexico-editor-demo/src/main/java/fr/reseaumexico/editor/demo/RunMexicoEditorDemo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties =================================================================== --- trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties (rev 0) +++ trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1 @@ +jmexico.file.open.dialog=Open an InputDesign file. Property changes on: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties =================================================================== --- trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties (rev 0) +++ trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1 @@ +jmexico.file.open.dialog=Ouvrir un fichier InputDesign Property changes on: trunk/jmexico-editor-demo/src/main/resources/i18n/jmexico-editor-demo_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/main/resources/log4j.properties =================================================================== --- trunk/jmexico-editor-demo/src/main/resources/log4j.properties (rev 0) +++ trunk/jmexico-editor-demo/src/main/resources/log4j.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,34 @@ +### +# #%L +# JMexico :: Swing Editor +# +# $Id$ +# $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/ma... $ +# %% +# Copyright (C) 2011 Réseau Mexico, Codelutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout + +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n + +# mexicos +log4j.logger.fr.reseaumexico.editor=INFO Property changes on: trunk/jmexico-editor-demo/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-editor-demo/src/site/rst/index.rst =================================================================== --- trunk/jmexico-editor-demo/src/site/rst/index.rst (rev 0) +++ trunk/jmexico-editor-demo/src/site/rst/index.rst 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,43 @@ +.. - +.. * #%L +.. * JMexico :: Swing Editor +.. * +.. * $Id: index.rst 28 2012-01-18 11:35:09Z tchemit $ +.. * $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/si... $ +.. * %% +.. * Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +====================== +JMexico - Swing Editor +====================== + +:Authors: Tony Chemit <chemit@codelutin.com> + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Présentation +------------ + +Démo de l'éditeur d'input design. + +Continuer cette documentation. Added: trunk/jmexico-editor-demo/src/site/site_fr.xml =================================================================== --- trunk/jmexico-editor-demo/src/site/site_fr.xml (rev 0) +++ trunk/jmexico-editor-demo/src/site/site_fr.xml 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JMexico :: Swing Editor + + $Id$ + $HeadURL: http://svn.forge.codelutin.com/svn/jmexico/trunk/jmexico-swing-editor/src/si... $ + %% + Copyright (C) 2011 - 2012 Réseau Mexico, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Lancer la démo" href="jnlp/launch.jnlp"/> + </menu> + + </body> +</project> Property changes on: trunk/jmexico-editor-demo/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/jmexico-model/src/main/xmi/mexico.properties =================================================================== --- trunk/jmexico-model/src/main/xmi/mexico.properties (rev 0) +++ trunk/jmexico-model/src/main/xmi/mexico.properties 2012-01-18 16:06:23 UTC (rev 30) @@ -0,0 +1,4 @@ + +model.tagValue.constantPrefix=PROPERTY_ +model.tagValue.version=0.1 +model.tagValue.doNotGenerateBooleanGetMethods=true Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/pom.xml 2012-01-18 16:06:23 UTC (rev 30) @@ -22,7 +22,8 @@ <modules> <module>jmexico-model</module> - <module>jmexico-swing-editor</module> + <module>jmexico-editor</module> + <module>jmexico-editor-demo</module> </modules> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-01-18 11:41:27 UTC (rev 29) +++ trunk/src/site/site_fr.xml 2012-01-18 16:06:23 UTC (rev 30) @@ -59,7 +59,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Lancer la démo" href="jmexico-swing-editor/jnlp/launch.jnlp"/> + <item name="Lancer la démo" href="jmexico-editor-demo/jnlp/launch.jnlp"/> </menu> <menu ref="reports"/> </body>