February 2009 - Eugene-commits - mailman.cloud.codelutin.com

[Lutingenerator-commits] r441 - in lutingenerator/trunk/src/test/resources: models/uimodel org/codelutin
by chatellier＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: chatellier Date: 2009-02-18 17:42:27 +0000 (Wed, 18 Feb 2009) New Revision: 441 Removed: lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/ lutingenerator/trunk/src/test/resources/org/codelutin/generator/ Log: Refactor test (junit4...)

1 0

[Lutingenerator-commits] r440 - in lutingenerator/trunk: . src/test/java/org/codelutin/generator/models/state src/test/java/org/codelutin/generator/models/ui/javaxml src/test/java/org/codelutin/generator/models/xml src/test/resources src/test/resources/models src/test/resources/models/objectmodel src/test/resources/models/statemodel src/test/resources/models/uimodel src/test/resources/models/uimodel/javaxml src/test/resources/org/codelutin/generator
by chatellier＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: chatellier Date: 2009-02-18 17:16:21 +0000 (Wed, 18 Feb 2009) New Revision: 440 Added: lutingenerator/trunk/src/test/resources/models/ lutingenerator/trunk/src/test/resources/models/objectmodel/ lutingenerator/trunk/src/test/resources/models/statemodel/ lutingenerator/trunk/src/test/resources/models/uimodel/ lutingenerator/trunk/src/test/resources/models/uimodel/test.javaxml lutingenerator/trunk/src/test/resources/models/uimodel/test1.javaxml lutingenerator/trunk/src/test/resources/models/uimodel/test2.javaxml Removed: lutingenerator/trunk/src/test/resources/models/state/ lutingenerator/trunk/src/test/resources/models/ui/ lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test.javaxml lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test1.javaxml lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test2.javaxml lutingenerator/trunk/src/test/resources/models/xml/ lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ Modified: lutingenerator/trunk/changelog.txt lutingenerator/trunk/src/test/java/org/codelutin/generator/models/state/StateModelTest.java lutingenerator/trunk/src/test/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java lutingenerator/trunk/src/test/java/org/codelutin/generator/models/xml/ModelMergeTest.java Log: Refactor test (junit4...) Modified: lutingenerator/trunk/changelog.txt =================================================================== --- lutingenerator/trunk/changelog.txt 2009-02-18 17:16:00 UTC (rev 439) +++ lutingenerator/trunk/changelog.txt 2009-02-18 17:16:21 UTC (rev 440) @@ -1,5 +1,6 @@ -0.64 ?? 200812?? - * 20090129 [thimel] renmae Util class to GeneratorUtil +0.64 ?? 200902?? + * 20090218 [chatellier] Move test to junit 4 + * 20090129 [thimel] rename Util class to GeneratorUtil * 20090129 [chemit] use lutinproject 3.4 (suppress javadoc plugin invocation) 0.63 chemit 20081215 Modified: lutingenerator/trunk/src/test/java/org/codelutin/generator/models/state/StateModelTest.java =================================================================== --- lutingenerator/trunk/src/test/java/org/codelutin/generator/models/state/StateModelTest.java 2009-02-18 17:16:00 UTC (rev 439) +++ lutingenerator/trunk/src/test/java/org/codelutin/generator/models/state/StateModelTest.java 2009-02-18 17:16:21 UTC (rev 440) @@ -1,5 +1,5 @@ /* *##% Lutin Generator - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 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 @@ -17,35 +17,40 @@ package org.codelutin.generator.models.state; -import junit.framework.TestCase; -import org.codelutin.generator.StateModelGenerator; - import java.io.File; +import java.net.URISyntaxException; import java.util.Collection; import java.util.List; import java.util.Map; +import org.codelutin.generator.StateModelGenerator; +import org.codelutin.util.Resource; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + /** * StateModelTest.java * * @author chatellier * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ + * <p/> + * Last update : $Date$ + * By : $Author$ */ -public class StateModelTest extends TestCase { +public class StateModelTest { /** model */ - private StateModel stateModel; + protected StateModel stateModel; - /** init */ - public void setUp() throws Exception { - super.setUp(); + /** init + * @throws URISyntaxException */ + @Before + public void setUp() throws URISyntaxException { + File[] testFiles = { - new File(getClass().getResource("project.statemodel").toURI()), - new File(getClass().getResource("contact.statemodel").toURI()) - + new File(Resource.getURL("models/statemodel/project.statemodel").toURI()), + new File(Resource.getURL("models/statemodel/contact.statemodel").toURI()) }; StateModelGenerator generator = new StateModelGenerator(); @@ -54,15 +59,16 @@ } /** various test */ + @Test public void testCorrectStateModel() { List<StateModelStateChart> lstChart = stateModel.getStateCharts(); // trois diagrammes - assertTrue(lstChart.size() == 3); + Assert.assertTrue(lstChart.size() == 3); // les 3 ont des états for (StateModelStateChart chart : lstChart) { - assertFalse(chart.getStates().isEmpty()); + Assert.assertFalse(chart.getStates().isEmpty()); } // diagramme contactManagementUseCase @@ -72,14 +78,14 @@ cmChart = smsc; } } - assertNotNull(cmChart); + Assert.assertNotNull(cmChart); // package - assertEquals(cmChart.getPackageName(), "org.codelutin.chorem.web.contactManagement"); + Assert.assertEquals(cmChart.getPackageName(), "org.codelutin.chorem.web.contactManagement"); // six etats Collection<StateModelState> lstStates = cmChart.getStates(); - assertEquals(lstStates.size(), 6); + Assert.assertEquals(lstStates.size(), 6); // le premier etat est initial StateModelState initState = null; @@ -94,15 +100,15 @@ } // test init - assertNotNull(initState); - assertFalse(initState.isComplex()); + Assert.assertNotNull(initState); + Assert.assertFalse(initState.isComplex()); StateModelSimpleState sInitState = (StateModelSimpleState) initState; - assertTrue(sInitState.isInitial()); + Assert.assertTrue(sInitState.isInitial()); // les 3eme etat est complexe et a 4 etat - assertNotNull(sfUCState); + Assert.assertNotNull(sfUCState); StateModelComplexState cpxState = (StateModelComplexState) sfUCState; - assertEquals(cpxState.getStates().size(), 4); + Assert.assertEquals(cpxState.getStates().size(), 4); // test sur un etat Collection<StateModelState> lstStatesCpxState = cpxState.getStates(); @@ -112,8 +118,8 @@ sfState = state; } } - assertNotNull(sfState); - assertEquals(sfState.getTransitions().size(), 2); + Assert.assertNotNull(sfState); + Assert.assertEquals(sfState.getTransitions().size(), 2); // test transition StateModelTransition trEventCancel = null; @@ -122,15 +128,15 @@ trEventCancel = tr; } } - assertNotNull(trEventCancel); - assertNotNull(trEventCancel.getDestinationState()); - assertEquals(trEventCancel.getDestinationState().getName(), "finalSocietyFormCancel"); + Assert.assertNotNull(trEventCancel); + Assert.assertNotNull(trEventCancel.getDestinationState()); + Assert.assertEquals(trEventCancel.getDestinationState().getName(), "finalSocietyFormCancel"); // tagged value test Map<String, String> tagValues = stateModel.getTagValues(); - assertNotNull(tagValues); + Assert.assertNotNull(tagValues); String tagUseCaseEngineExtendedClass = tagValues.get("usecaseengineextendedclass"); - assertNotNull(tagUseCaseEngineExtendedClass); - assertEquals(tagUseCaseEngineExtendedClass, "BasePage"); + Assert.assertNotNull(tagUseCaseEngineExtendedClass); + Assert.assertEquals(tagUseCaseEngineExtendedClass, "BasePage"); } } Modified: lutingenerator/trunk/src/test/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java =================================================================== --- lutingenerator/trunk/src/test/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java 2009-02-18 17:16:00 UTC (rev 439) +++ lutingenerator/trunk/src/test/java/org/codelutin/generator/models/ui/javaxml/JavaXMLParserTest.java 2009-02-18 17:16:21 UTC (rev 440) @@ -1,5 +1,5 @@ /* *##% Lutin Generator - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 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 @@ -15,8 +15,21 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * - * JavaXMLParserTest.java +package org.codelutin.generator.models.ui.javaxml; + +import java.io.File; +import java.util.ArrayList; + +import org.codelutin.generator.models.ui.UIModel; +import org.codelutin.generator.models.ui.impl.UIModelChildImpl; +import org.codelutin.generator.models.ui.impl.UIModelEventImpl; +import org.codelutin.generator.models.ui.impl.UIModelObjectImpl; +import org.codelutin.util.Resource; +import org.junit.Assert; +import org.junit.Test; + +/** + * JavaXMLParserTest. * * Created: Aug 9, 2004 * @@ -27,36 +40,20 @@ * Mise a jour: $Date$ * par : $Author$ */ +public class JavaXMLParserTest { // JavaXMLParserTest -package org.codelutin.generator.models.ui.javaxml; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.impl.UIModelChildImpl; -import org.codelutin.generator.models.ui.impl.UIModelEventImpl; -import org.codelutin.generator.models.ui.impl.UIModelObjectImpl; - -import java.io.File; -import java.util.ArrayList; - -public class JavaXMLParserTest extends TestCase { // JavaXMLParserTest - + @Test public void testParse() throws Exception { // 1 panel, 2 boutons, gridbaglayout - File testFile = new File(getClass().getResource("test.javaxml").toURI()); + File testFile = new File(Resource.getURL("models/uimodel/test.javaxml").toURI()); // 1 panel, 1 bouton, borderlayout - File testFile1 = new File(getClass().getResource("test1.javaxml").toURI()); + File testFile1 = new File(Resource.getURL("models/uimodel/test1.javaxml").toURI()); // alarmPanel de Chorem dans une JFrame - File testFile2 = new File(getClass().getResource("test2.javaxml").toURI()); + File testFile2 = new File(Resource.getURL("models/uimodel/test2.javaxml").toURI()); - // - //File testFile3 = new File("src/test/org/codelutin/generator/models/ui/javaxml/org.codelutin.chorem.entities.ui.RelationshipUI.javaxml"); - if (testFile.exists() && testFile1.exists() && testFile2.exists()) { JavaXMLParser parser = new JavaXMLParser(); @@ -71,19 +68,19 @@ //System.out.println("UI3 : \n" + ui3); // test si l'element racine est parse - assertNotNull(ui.getRoot()); - assertNotNull(ui.getRoot().getName()); + Assert.assertNotNull(ui.getRoot()); + Assert.assertNotNull(ui.getRoot().getName()); // tests sur tous les elements du root - assertTrue(ui.getRoot().getArguments().size() == 0); - assertTrue(ui.getRoot().getChildren().size() == 2); - assertTrue(ui.getRoot().getEvents().size() == 1); - assertTrue(ui.getRoot().getProperties().size() == 2); + Assert.assertTrue(ui.getRoot().getArguments().size() == 0); + Assert.assertTrue(ui.getRoot().getChildren().size() == 2); + Assert.assertTrue(ui.getRoot().getEvents().size() == 1); + Assert.assertTrue(ui.getRoot().getProperties().size() == 2); // test si le layout est bien recupere UIModelObjectImpl object = (UIModelObjectImpl) ui.getRoot().getProperty("layout").getValue(); - assertEquals(object.getType(), "java.awt.GridBagLayout"); + Assert.assertEquals(object.getType(), "java.awt.GridBagLayout"); // test sur un event de l'enfant ArrayList children = (ArrayList) ui.getRoot().getChildren(); @@ -92,42 +89,38 @@ ArrayList events = (ArrayList) child.getObject().getEvents(); UIModelEventImpl event = (UIModelEventImpl) events.get(0); - assertEquals(event.getAction(), "actionPerformed"); - assertNotNull(event.getAddMethod()); + Assert.assertEquals(event.getAction(), "actionPerformed"); + Assert.assertNotNull(event.getAddMethod()); // test sur constraint de l'enfant UIModelObjectImpl constraint = (UIModelObjectImpl) child.getConstraint().getValue(); ArrayList argConstraint = (ArrayList) constraint.getArguments(); - assertEquals(constraint.getType(), "java.awt.GridBagConstraints"); + Assert.assertEquals(constraint.getType(), "java.awt.GridBagConstraints"); - assertEquals(argConstraint.get(1).toString(), "0"); + Assert.assertEquals(argConstraint.get(1).toString(), "0"); // test sur le nombre d'enfant d'un enfant - assertTrue(child.getObject().getChildren().size() == 0); + Assert.assertTrue(child.getObject().getChildren().size() == 0); // test sur une contrainte string (BorderLayout) ArrayList children1 = (ArrayList) ui1.getRoot().getChildren(); UIModelChildImpl child1 = (UIModelChildImpl) children1.get(0); Object constraint1 = child1.getConstraint().getValue(); - assertEquals(constraint1, "Center"); + Assert.assertEquals(constraint1, "Center"); // test sur le nombre d'enfants d'une Frame est correct ArrayList children2 = (ArrayList) ui2.getRoot().getChildren(); - assertTrue(children2.size() == 1); + Assert.assertTrue(children2.size() == 1); // test sur une contrainte d'un panel genere UIModelChildImpl child2 = (UIModelChildImpl) children2.get(0); Object constraint2 = child2.getConstraint().getValue(); - assertEquals(constraint2, "Center"); + Assert.assertEquals(constraint2, "Center"); } } - public static Test suite() { - return new TestSuite(JavaXMLParserTest.class); - } - } // JavaXMLParserTest Modified: lutingenerator/trunk/src/test/java/org/codelutin/generator/models/xml/ModelMergeTest.java =================================================================== --- lutingenerator/trunk/src/test/java/org/codelutin/generator/models/xml/ModelMergeTest.java 2009-02-18 17:16:00 UTC (rev 439) +++ lutingenerator/trunk/src/test/java/org/codelutin/generator/models/xml/ModelMergeTest.java 2009-02-18 17:16:21 UTC (rev 440) @@ -1,5 +1,5 @@ /* *##% Lutin Generator - * Copyright (C) 2004 - 2008 CodeLutin + * Copyright (C) 2004 - 2009 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 @@ -15,68 +15,71 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * -* ModelMergeTest.java -* -* Created: 18 mai 2005 -* -* @author Arnaud Thimel <thimel(a)codelutin.com> -* @version $Revision$ -*/ - - package org.codelutin.generator.models.xml; -import junit.framework.TestCase; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelClass; - import java.io.File; -import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; +import org.codelutin.generator.ObjectModelGenerator; +import org.codelutin.generator.models.object.ObjectModel; +import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.util.Resource; +import org.junit.Test; -public class ModelMergeTest extends TestCase { +/** + * ModelMergeTest. + * + * Created: 18 mai 2005 + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + * @version $Revision$ + */ +public class ModelMergeTest { - public void testMerge1() throws Exception { + @Test + public void testMerge1() throws URISyntaxException { parcourirModel(genModel(1)); } - public void testMerge2() throws Exception { + @Test + public void testMerge2() throws URISyntaxException { parcourirModel(genModel(2)); } - public void testMerge3() throws Exception { + @Test + public void testMerge3() throws URISyntaxException { parcourirModel(genModel(3)); } - public void testMerge4() throws Exception { + @Test + public void testMerge4() throws URISyntaxException { parcourirModel(genModel(4)); } - public void testMerge5() throws Exception { + @Test + public void testMerge5() throws URISyntaxException { parcourirModel(genModel(5)); } - public void testMerge6() throws Exception { + @Test + public void testMerge6() throws URISyntaxException { parcourirModel(genModel(6)); } - private ObjectModel genModel(int num) throws URISyntaxException, MalformedURLException { + protected ObjectModel genModel(int num) throws URISyntaxException { System.out.println("\n\n============================================\n\t\ttestMerge" + num + "\n============================================"); ObjectModelGenerator generator = new ObjectModelGenerator(); File[] files = new File[num]; for (int j = 1; j < (num + 1); j++) { - URL url = getClass().getResource("security" + j + ".objectmodel"); + URL url = Resource.getURL("models/objectmodel/security" + j + ".objectmodel"); files[j - 1] = new File(url.toURI()); } - generator.generate(files, new File("output")); + generator.generate(files, new File("target")); return generator.getModel(); } - private void parcourirModel(ObjectModel model) { + protected void parcourirModel(ObjectModel model) { System.out.println(":::: model tag: " + model.getTagValues()); for (Object o3 : model.getClasses()) { ObjectModelClass clazz = (ObjectModelClass) o3; @@ -98,6 +101,5 @@ System.out.println("\t" + o); } } - } } Copied: lutingenerator/trunk/src/test/resources/models (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models) Property changes on: lutingenerator/trunk/src/test/resources/models ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutingenerator/trunk/src/test/resources/models/objectmodel (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/xml) Property changes on: lutingenerator/trunk/src/test/resources/models/objectmodel ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutingenerator/trunk/src/test/resources/models/statemodel (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/state) Property changes on: lutingenerator/trunk/src/test/resources/models/statemodel ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutingenerator/trunk/src/test/resources/models/uimodel (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui) Property changes on: lutingenerator/trunk/src/test/resources/models/uimodel ___________________________________________________________________ Name: svn:mergeinfo + Deleted: lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test.javaxml =================================================================== --- lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui/javaxml/test.javaxml 2009-02-09 08:34:42 UTC (rev 417) +++ lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test.javaxml 2009-02-18 17:16:21 UTC (rev 440) @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java version="1.4.2_02" class="java.beans.XMLDecoder"> - <object class="javax.swing.JPanel"> - <void method="add"> - - <object id="JButton0" class="javax.swing.JButton"> - - <string>toto</string> - <void property="name"> - <string>bouton0</string> - </void> - - <void method="addActionListener"> - <object class="java.beans.EventHandler" method="create"> - <class>java.awt.event.ActionListener</class> - <string>this</string> - <string>on_click</string> - <string>arg</string> - <string>actionPerformed</string> - </object> - </void> - </object> - </void> - - <void method="add"> - <object id="JButton1" class="javax.swing.JButton"> - <string>titi</string> - <void property="name"> - <string>bouton1</string> - </void> - </object> - </void> - - <void property="layout"> - <object class="java.awt.GridBagLayout"> - - <void method="addLayoutComponent"> - <object idref="JButton0"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>0</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>0</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - - <void method="addLayoutComponent"> - <object idref="JButton1"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>1</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>0</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - </object> - </void> - - <void property="name"> - <string>JPanel0</string> - </void> - - <void method="addAncestorListener"> - <object class="java.beans.EventHandler" method="create"> - <class>javax.swing.event.AncestorListener</class> - <string>this</string> - <string>on_touch</string> - <string>argument</string> - <string>ancestorMoved</string> - </object> - </void> - </object> -</java> Deleted: lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test1.javaxml =================================================================== --- lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui/javaxml/test1.javaxml 2009-02-09 08:34:42 UTC (rev 417) +++ lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test1.javaxml 2009-02-18 17:16:21 UTC (rev 440) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java version="1.4.2_02" class="java.beans.XMLDecoder"> - <object class="javax.swing.JPanel"> - <void method="add"> - <object id="JButton0" class="javax.swing.JButton"> - <string>Save</string> - <void property="name"> - <string>JButton0</string> - </void> - </object> - </void> - <void property="layout"> - <object class="java.awt.BorderLayout"> - <void method="addLayoutComponent"> - <object idref="JButton0"/> - <string>Center</string> - </void> - </object> - </void> - <void property="name"> - <string>JPanel0</string> - </void> - </object> -</java> Deleted: lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test2.javaxml =================================================================== --- lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui/javaxml/test2.javaxml 2009-02-09 08:34:42 UTC (rev 417) +++ lutingenerator/trunk/src/test/resources/models/uimodel/javaxml/test2.javaxml 2009-02-18 17:16:21 UTC (rev 440) @@ -1,497 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java version="1.4.2_02" class="java.beans.XMLDecoder"> - <object class="javax.swing.JFrame"> - <void property="contentPane"> - <void method="add"> - <object id="AlarmPanel0" class="org.codelutin.chorem.entities.ui.AlarmPanel"> - <void method="add"> - <object id="AlarmAttributesPanelPanel0" class="org.codelutin.chorem.entities.ui.AlarmAttributesPanelPanel"> - <void method="add"> - <object id="JLabel0" class="javax.swing.JLabel"> - <void property="name"> - <string>sujetLabel</string> - </void> - <void property="text"> - <string>Sujet</string> - </void> - </object> - </void> - <void method="add"> - <object id="JTextField0" class="javax.swing.JTextField"> - <void property="columns"> - <int>6</int> - </void> - <void property="name"> - <string>sujetEditor</string> - </void> - </object> - </void> - <void method="add"> - <object id="JLabel1" class="javax.swing.JLabel"> - <void property="name"> - <string>activateLabel</string> - </void> - <void property="text"> - <string>Activate</string> - </void> - </object> - </void> - <void method="add"> - <object id="JCheckBox0" class="javax.swing.JCheckBox"> - <void property="name"> - <string>activateEditor</string> - </void> - </object> - </void> - <void method="add"> - <object id="JLabel2" class="javax.swing.JLabel"> - <void property="name"> - <string>descriptionLabel</string> - </void> - <void property="text"> - <string>Description</string> - </void> - </object> - </void> - <void method="add"> - <object id="JTextField1" class="javax.swing.JTextField"> - <void property="columns"> - <int>6</int> - </void> - <void property="name"> - <string>descriptionEditor</string> - </void> - </object> - </void> - <void property="border"> - <object class="javax.swing.border.TitledBorder"> - <object class="javax.swing.border.EtchedBorder"> - <int>0</int> - <null/> - <null/> - </object> - <string>Attributes</string> - <int>0</int> - <int>0</int> - <null/> - <null/> - </object> - </void> - <void property="layout"> - <void method="addLayoutComponent"> - <object idref="JTextField0"/> - <object class="java.awt.GridBagConstraints"> - <int>1</int> - <int>1</int> - <int>1</int> - <int>1</int> - <double>1.0</double> - <double>1.0</double> - <int>10</int> - <int>2</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JTextField1"/> - <object class="java.awt.GridBagConstraints"> - <int>1</int> - <int>3</int> - <int>1</int> - <int>1</int> - <double>1.0</double> - <double>1.0</double> - <int>10</int> - <int>2</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JLabel1"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>2</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JCheckBox0"/> - <object class="java.awt.GridBagConstraints"> - <int>1</int> - <int>2</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JLabel0"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>1</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JLabel2"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>3</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - </void> - <void property="name"> - <string>AlarmAttributesPanelPanel</string> - </void> - </object> - </void> - <void method="add"> - <object id="ManagementButtonsPanel0" class="org.codelutin.topia.ui.swing.ManagementButtonsPanel"> - <void method="add"> - <object id="JButton0" class="javax.swing.JButton"> - <string>Save</string> - <void method="addActionListener"> - <object class="java.beans.EventHandler" method="create"> - <class>java.awt.event.ActionListener</class> - <object idref="ManagementButtonsPanel0"/> - <string>on_save</string> - </object> - </void> - </object> - </void> - <void method="add"> - <object id="JButton1" class="javax.swing.JButton"> - <string>Cancel</string> - <void method="addActionListener"> - <object class="java.beans.EventHandler" method="create"> - <class>java.awt.event.ActionListener</class> - <object idref="ManagementButtonsPanel0"/> - <string>on_cancel</string> - </object> - </void> - </object> - </void> - <void method="add"> - <object id="JButton2" class="javax.swing.JButton"> - <string>Delete</string> - <void method="addActionListener"> - <object class="java.beans.EventHandler" method="create"> - <class>java.awt.event.ActionListener</class> - <object idref="ManagementButtonsPanel0"/> - <string>on_delete</string> - </object> - </void> - </object> - </void> - <void method="add"> - <object id="JButton3" class="javax.swing.JButton"> - <string>Search</string> - <void method="addActionListener"> - <object class="java.beans.EventHandler" method="create"> - <class>java.awt.event.ActionListener</class> - <object idref="ManagementButtonsPanel0"/> - <string>on_search</string> - </object> - </void> - </object> - </void> - <void property="layout"> - <void method="addLayoutComponent"> - <object idref="JButton1"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>1</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>2</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JButton2"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>2</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>2</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JButton3"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>3</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>2</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="JButton0"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>0</int> - <int>1</int> - <int>1</int> - <double>0.0</double> - <double>0.0</double> - <int>10</int> - <int>2</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - </void> - <void property="name"> - <string>AlarmButtonsPanel</string> - </void> - </object> - </void> - <void method="add"> - <object id="AlarmTablePanelPanel0" class="org.codelutin.chorem.entities.ui.AlarmTablePanelPanel"> - <void method="add"> - <object id="JScrollPane0" class="javax.swing.JScrollPane"> - <void property="name"> - <string>AlarmScrollPane</string> - </void> - <void property="viewport"> - <void method="add"> - <object class="javax.swing.JTable"> - <void property="model"> - <object class="org.codelutin.topia.ui.swing.TopiaTableModel"/> - </void> - </object> - </void> - </void> - </object> - </void> - <void property="border"> - <object class="javax.swing.border.TitledBorder"> - <object class="javax.swing.border.EtchedBorder"> - <int>0</int> - <null/> - <null/> - </object> - <string>Table</string> - <int>0</int> - <int>0</int> - <null/> - <null/> - </object> - </void> - <void property="layout"> - <void method="addLayoutComponent"> - <object idref="JScrollPane0"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>0</int> - <int>1</int> - <int>1</int> - <double>1.0</double> - <double>1.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - </void> - <void property="name"> - <string>AlarmTablePanelPanel</string> - </void> - </object> - </void> - <void property="layout"> - <void method="addLayoutComponent"> - <object idref="AlarmTablePanelPanel0"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>1</int> - <int>2</int> - <int>1</int> - <double>1.0</double> - <double>1.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="AlarmAttributesPanelPanel0"/> - <object class="java.awt.GridBagConstraints"> - <int>0</int> - <int>0</int> - <int>1</int> - <int>1</int> - <double>1.0</double> - <double>1.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - <void method="addLayoutComponent"> - <object idref="ManagementButtonsPanel0"/> - <object class="java.awt.GridBagConstraints"> - <int>1</int> - <int>0</int> - <int>1</int> - <int>1</int> - <double>1.0</double> - <double>1.0</double> - <int>10</int> - <int>1</int> - <object class="java.awt.Insets"> - <int>0</int> - <int>0</int> - <int>0</int> - <int>0</int> - </object> - <int>0</int> - <int>0</int> - </object> - </void> - </void> - <void property="name"> - <string>AlarmPanel2</string> - </void> - </object> - </void> - <void property="layout"> - <object class="java.awt.BorderLayout"> - <void method="addLayoutComponent"> - <object idref="AlarmPanel0"/> - <string>Center</string> - </void> - </object> - </void> - </void> - <void property="name"> - <string>JFrame1</string> - </void> - </object> -</java> Copied: lutingenerator/trunk/src/test/resources/models/uimodel/test.javaxml (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui/javaxml/test.javaxml) =================================================================== --- lutingenerator/trunk/src/test/resources/models/uimodel/test.javaxml (rev 0) +++ lutingenerator/trunk/src/test/resources/models/uimodel/test.javaxml 2009-02-18 17:16:21 UTC (rev 440) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java version="1.4.2_02" class="java.beans.XMLDecoder"> + <object class="javax.swing.JPanel"> + <void method="add"> + + <object id="JButton0" class="javax.swing.JButton"> + + <string>toto</string> + <void property="name"> + <string>bouton0</string> + </void> + + <void method="addActionListener"> + <object class="java.beans.EventHandler" method="create"> + <class>java.awt.event.ActionListener</class> + <string>this</string> + <string>on_click</string> + <string>arg</string> + <string>actionPerformed</string> + </object> + </void> + </object> + </void> + + <void method="add"> + <object id="JButton1" class="javax.swing.JButton"> + <string>titi</string> + <void property="name"> + <string>bouton1</string> + </void> + </object> + </void> + + <void property="layout"> + <object class="java.awt.GridBagLayout"> + + <void method="addLayoutComponent"> + <object idref="JButton0"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>0</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>0</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + + <void method="addLayoutComponent"> + <object idref="JButton1"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>1</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>0</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + </object> + </void> + + <void property="name"> + <string>JPanel0</string> + </void> + + <void method="addAncestorListener"> + <object class="java.beans.EventHandler" method="create"> + <class>javax.swing.event.AncestorListener</class> + <string>this</string> + <string>on_touch</string> + <string>argument</string> + <string>ancestorMoved</string> + </object> + </void> + </object> +</java> Property changes on: lutingenerator/trunk/src/test/resources/models/uimodel/test.javaxml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: lutingenerator/trunk/src/test/resources/models/uimodel/test1.javaxml (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui/javaxml/test1.javaxml) =================================================================== --- lutingenerator/trunk/src/test/resources/models/uimodel/test1.javaxml (rev 0) +++ lutingenerator/trunk/src/test/resources/models/uimodel/test1.javaxml 2009-02-18 17:16:21 UTC (rev 440) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java version="1.4.2_02" class="java.beans.XMLDecoder"> + <object class="javax.swing.JPanel"> + <void method="add"> + <object id="JButton0" class="javax.swing.JButton"> + <string>Save</string> + <void property="name"> + <string>JButton0</string> + </void> + </object> + </void> + <void property="layout"> + <object class="java.awt.BorderLayout"> + <void method="addLayoutComponent"> + <object idref="JButton0"/> + <string>Center</string> + </void> + </object> + </void> + <void property="name"> + <string>JPanel0</string> + </void> + </object> +</java> Property changes on: lutingenerator/trunk/src/test/resources/models/uimodel/test1.javaxml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: lutingenerator/trunk/src/test/resources/models/uimodel/test2.javaxml (from rev 417, lutingenerator/trunk/src/test/resources/org/codelutin/generator/models/ui/javaxml/test2.javaxml) =================================================================== --- lutingenerator/trunk/src/test/resources/models/uimodel/test2.javaxml (rev 0) +++ lutingenerator/trunk/src/test/resources/models/uimodel/test2.javaxml 2009-02-18 17:16:21 UTC (rev 440) @@ -0,0 +1,497 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java version="1.4.2_02" class="java.beans.XMLDecoder"> + <object class="javax.swing.JFrame"> + <void property="contentPane"> + <void method="add"> + <object id="AlarmPanel0" class="org.codelutin.chorem.entities.ui.AlarmPanel"> + <void method="add"> + <object id="AlarmAttributesPanelPanel0" class="org.codelutin.chorem.entities.ui.AlarmAttributesPanelPanel"> + <void method="add"> + <object id="JLabel0" class="javax.swing.JLabel"> + <void property="name"> + <string>sujetLabel</string> + </void> + <void property="text"> + <string>Sujet</string> + </void> + </object> + </void> + <void method="add"> + <object id="JTextField0" class="javax.swing.JTextField"> + <void property="columns"> + <int>6</int> + </void> + <void property="name"> + <string>sujetEditor</string> + </void> + </object> + </void> + <void method="add"> + <object id="JLabel1" class="javax.swing.JLabel"> + <void property="name"> + <string>activateLabel</string> + </void> + <void property="text"> + <string>Activate</string> + </void> + </object> + </void> + <void method="add"> + <object id="JCheckBox0" class="javax.swing.JCheckBox"> + <void property="name"> + <string>activateEditor</string> + </void> + </object> + </void> + <void method="add"> + <object id="JLabel2" class="javax.swing.JLabel"> + <void property="name"> + <string>descriptionLabel</string> + </void> + <void property="text"> + <string>Description</string> + </void> + </object> + </void> + <void method="add"> + <object id="JTextField1" class="javax.swing.JTextField"> + <void property="columns"> + <int>6</int> + </void> + <void property="name"> + <string>descriptionEditor</string> + </void> + </object> + </void> + <void property="border"> + <object class="javax.swing.border.TitledBorder"> + <object class="javax.swing.border.EtchedBorder"> + <int>0</int> + <null/> + <null/> + </object> + <string>Attributes</string> + <int>0</int> + <int>0</int> + <null/> + <null/> + </object> + </void> + <void property="layout"> + <void method="addLayoutComponent"> + <object idref="JTextField0"/> + <object class="java.awt.GridBagConstraints"> + <int>1</int> + <int>1</int> + <int>1</int> + <int>1</int> + <double>1.0</double> + <double>1.0</double> + <int>10</int> + <int>2</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JTextField1"/> + <object class="java.awt.GridBagConstraints"> + <int>1</int> + <int>3</int> + <int>1</int> + <int>1</int> + <double>1.0</double> + <double>1.0</double> + <int>10</int> + <int>2</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JLabel1"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>2</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JCheckBox0"/> + <object class="java.awt.GridBagConstraints"> + <int>1</int> + <int>2</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JLabel0"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>1</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JLabel2"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>3</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + </void> + <void property="name"> + <string>AlarmAttributesPanelPanel</string> + </void> + </object> + </void> + <void method="add"> + <object id="ManagementButtonsPanel0" class="org.codelutin.topia.ui.swing.ManagementButtonsPanel"> + <void method="add"> + <object id="JButton0" class="javax.swing.JButton"> + <string>Save</string> + <void method="addActionListener"> + <object class="java.beans.EventHandler" method="create"> + <class>java.awt.event.ActionListener</class> + <object idref="ManagementButtonsPanel0"/> + <string>on_save</string> + </object> + </void> + </object> + </void> + <void method="add"> + <object id="JButton1" class="javax.swing.JButton"> + <string>Cancel</string> + <void method="addActionListener"> + <object class="java.beans.EventHandler" method="create"> + <class>java.awt.event.ActionListener</class> + <object idref="ManagementButtonsPanel0"/> + <string>on_cancel</string> + </object> + </void> + </object> + </void> + <void method="add"> + <object id="JButton2" class="javax.swing.JButton"> + <string>Delete</string> + <void method="addActionListener"> + <object class="java.beans.EventHandler" method="create"> + <class>java.awt.event.ActionListener</class> + <object idref="ManagementButtonsPanel0"/> + <string>on_delete</string> + </object> + </void> + </object> + </void> + <void method="add"> + <object id="JButton3" class="javax.swing.JButton"> + <string>Search</string> + <void method="addActionListener"> + <object class="java.beans.EventHandler" method="create"> + <class>java.awt.event.ActionListener</class> + <object idref="ManagementButtonsPanel0"/> + <string>on_search</string> + </object> + </void> + </object> + </void> + <void property="layout"> + <void method="addLayoutComponent"> + <object idref="JButton1"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>1</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>2</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JButton2"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>2</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>2</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JButton3"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>3</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>2</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="JButton0"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>0</int> + <int>1</int> + <int>1</int> + <double>0.0</double> + <double>0.0</double> + <int>10</int> + <int>2</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + </void> + <void property="name"> + <string>AlarmButtonsPanel</string> + </void> + </object> + </void> + <void method="add"> + <object id="AlarmTablePanelPanel0" class="org.codelutin.chorem.entities.ui.AlarmTablePanelPanel"> + <void method="add"> + <object id="JScrollPane0" class="javax.swing.JScrollPane"> + <void property="name"> + <string>AlarmScrollPane</string> + </void> + <void property="viewport"> + <void method="add"> + <object class="javax.swing.JTable"> + <void property="model"> + <object class="org.codelutin.topia.ui.swing.TopiaTableModel"/> + </void> + </object> + </void> + </void> + </object> + </void> + <void property="border"> + <object class="javax.swing.border.TitledBorder"> + <object class="javax.swing.border.EtchedBorder"> + <int>0</int> + <null/> + <null/> + </object> + <string>Table</string> + <int>0</int> + <int>0</int> + <null/> + <null/> + </object> + </void> + <void property="layout"> + <void method="addLayoutComponent"> + <object idref="JScrollPane0"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>0</int> + <int>1</int> + <int>1</int> + <double>1.0</double> + <double>1.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + </void> + <void property="name"> + <string>AlarmTablePanelPanel</string> + </void> + </object> + </void> + <void property="layout"> + <void method="addLayoutComponent"> + <object idref="AlarmTablePanelPanel0"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>1</int> + <int>2</int> + <int>1</int> + <double>1.0</double> + <double>1.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="AlarmAttributesPanelPanel0"/> + <object class="java.awt.GridBagConstraints"> + <int>0</int> + <int>0</int> + <int>1</int> + <int>1</int> + <double>1.0</double> + <double>1.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + <void method="addLayoutComponent"> + <object idref="ManagementButtonsPanel0"/> + <object class="java.awt.GridBagConstraints"> + <int>1</int> + <int>0</int> + <int>1</int> + <int>1</int> + <double>1.0</double> + <double>1.0</double> + <int>10</int> + <int>1</int> + <object class="java.awt.Insets"> + <int>0</int> + <int>0</int> + <int>0</int> + <int>0</int> + </object> + <int>0</int> + <int>0</int> + </object> + </void> + </void> + <void property="name"> + <string>AlarmPanel2</string> + </void> + </object> + </void> + <void property="layout"> + <object class="java.awt.BorderLayout"> + <void method="addLayoutComponent"> + <object idref="AlarmPanel0"/> + <string>Center</string> + </void> + </object> + </void> + </void> + <void property="name"> + <string>JFrame1</string> + </void> + </object> +</java> Property changes on: lutingenerator/trunk/src/test/resources/models/uimodel/test2.javaxml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native

1 0

[Lutingenerator-commits] r439 - lutingenerator/trunk/src/site
by chatellier＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: chatellier Date: 2009-02-18 17:16:00 +0000 (Wed, 18 Feb 2009) New Revision: 439 Modified: lutingenerator/trunk/src/site/site.xml Log: Update lutin skin Modified: lutingenerator/trunk/src/site/site.xml =================================================================== --- lutingenerator/trunk/src/site/site.xml 2009-02-18 15:25:54 UTC (rev 438) +++ lutingenerator/trunk/src/site/site.xml 2009-02-18 17:16:00 UTC (rev 439) @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - + + <publishDate format="dd/MM/yyyy"/> + <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.2</version> </skin> <bannerLeft>

1 0

[Lutingenerator-commits] r438 - maven-generator-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 15:25:54 +0000 (Wed, 18 Feb 2009) New Revision: 438 Modified: maven-generator-plugin/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2009-02-18 15:25:40 UTC (rev 437) +++ maven-generator-plugin/trunk/pom.xml 2009-02-18 15:25:54 UTC (rev 438) @@ -74,8 +74,6 @@  <labs.project>lutingenerator</labs.project> -  - <lutingenerator.version>${project.version}</lutingenerator.version> <maven.version>2.0.9</maven.version> <ant.version>1.7.1</ant.version> </properties> @@ -102,13 +100,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -175,7 +173,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

[Lutingenerator-commits] r437 - lutingenerator/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 15:25:40 +0000 (Wed, 18 Feb 2009) New Revision: 437 Modified: lutingenerator/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2009-02-16 10:02:57 UTC (rev 436) +++ lutingenerator/trunk/pom.xml 2009-02-18 15:25:40 UTC (rev 437) @@ -93,9 +93,8 @@  <labs.project>lutingenerator</labs.project> -  - <generator.version>${project.version}</generator.version> - + <lutinutil.version>1.0.2</lutinutil.version> + </properties> <build> @@ -107,13 +106,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -172,7 +171,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

[Lutingenerator-commits] r436 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org 16 Feb '09

16 Feb '09

Author: chatellier Date: 2009-02-16 10:02:57 +0000 (Mon, 16 Feb 2009) New Revision: 436 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Xmi2Model.java maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java Log: Add quote near expression= values Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Xmi2Model.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Xmi2Model.java 2009-02-16 09:57:39 UTC (rev 435) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Xmi2Model.java 2009-02-16 10:02:57 UTC (rev 436) @@ -58,7 +58,7 @@ /** * Répertoire source des fichiers XMI * - * @parameter alias="srcXmiDest" expression=${generator.srcDirXmi} default-value="target/generated-sources/xmi" + * @parameter alias="srcXmiDest" expression="${generator.srcDirXmi}" default-value="target/generated-sources/xmi" * @since 0.50 */ protected File srcDirXmi; @@ -66,7 +66,7 @@ /** * Répertoire cible des fichiers générés * - * @parameter alias="srcGenDest" expression=${generator.srcGenDest} default-value="target/generated-sources/models" + * @parameter alias="srcGenDest" expression="${generator.srcGenDest}" default-value="target/generated-sources/models" * @since 0.50 */ protected File destDirModel; @@ -90,7 +90,7 @@ /** * Ecrase les fichiers générés * - * @parameter expression=${generator.overwrite} default-value="false" + * @parameter expression="${generator.overwrite}" default-value="false" * @since 0.50 */ private boolean overwrite = false; Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java 2009-02-16 09:57:39 UTC (rev 435) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java 2009-02-16 10:02:57 UTC (rev 436) @@ -46,7 +46,7 @@ /** * Répertoire source des fichier Zargo. * - * @parameter expression=${generator.srcDirZuml} default-value="src/main/xmi" alias="srcDirUml" + * @parameter expression="${generator.srcDirZuml}" default-value="src/main/xmi" alias="srcDirUml" * @since 0.50 */ protected File srcDirZuml; @@ -54,7 +54,7 @@ /** * Répertoire cible des fichiers extraits. * - * @parameter alias="srcXmiDest" expression=${generator.destDirXmi} default-value="target/generated-sources/xmi" + * @parameter alias="srcXmiDest" expression="${generator.destDirXmi}" default-value="target/generated-sources/xmi" * @since 0.50 */ protected File destDirXmi; @@ -62,7 +62,7 @@ /** * Ecrase les fichiers générés. * - * @parameter expression=${generator.overwrite} default-value="false" + * @parameter expression="${generator.overwrite}" default-value="false" * @since 0.50 */ protected boolean overwrite = false;

1 0

[Lutingenerator-commits] r435 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org 16 Feb '09

16 Feb '09

Author: chatellier Date: 2009-02-16 09:57:39 +0000 (Mon, 16 Feb 2009) New Revision: 435 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: Use project.build.sourceEncoding for default encoding Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2009-02-16 09:11:41 UTC (rev 434) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2009-02-16 09:57:39 UTC (rev 435) @@ -127,7 +127,7 @@ /** * Encoding to be used for generation of files. * - * @parameter expression="${generator.encoding}" default-value="UTF-8" + * @parameter expression="${generator.encoding}" default-value="${project.build.sourceEncoding}" * @since 0.60 */ protected String encoding;

1 0

[Lutingenerator-commits] r434 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org 16 Feb '09

16 Feb '09

Author: chatellier Date: 2009-02-16 09:11:41 +0000 (Mon, 16 Feb 2009) New Revision: 434 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java Log: Update mojo doc Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java 2009-02-13 16:52:27 UTC (rev 433) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java 2009-02-16 09:11:41 UTC (rev 434) @@ -62,7 +62,8 @@ /** * Ecrase les fichiers générés. * - * @parameter default-value="false" + * @parameter expression=${generator.overwrite} default-value="false" + * @since 0.50 */ protected boolean overwrite = false;

1 0

[Lutingenerator-commits] r433 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by chatellier＠users.labs.libre-entreprise.org 13 Feb '09

13 Feb '09

Author: chatellier Date: 2009-02-13 16:52:27 +0000 (Fri, 13 Feb 2009) New Revision: 433 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java Log: Force encoding, only if encoding param is specified Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2009-02-13 16:47:43 UTC (rev 432) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2009-02-13 16:52:27 UTC (rev 433) @@ -126,11 +126,17 @@ outputFile = outputFile.getCanonicalFile(); outputFile.getParentFile().mkdirs(); - if (log.isDebugEnabled()) { - log.debug("encoding to use "+encoding+" : "+this); + Writer output = null; + + if ( encoding != null) { + if (log.isDebugEnabled()) { + log.debug("Force encoding to " + encoding + " : " + this); + } + output = new OutputStreamWriter(new FileOutputStream(outputFile), encoding); } - Writer output = new OutputStreamWriter(new FileOutputStream(outputFile), encoding); - //Writer output = new OutputStreamWriter(new FileOutputStream(outputFile), Charset.forName("UTF-8")); + else { + output = new OutputStreamWriter(new FileOutputStream(outputFile)); + } output.write(out.getBuffer().toString()); output.close();

1 0

[Lutingenerator-commits] r432 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org 13 Feb '09

13 Feb '09

Author: chatellier Date: 2009-02-13 16:47:43 +0000 (Fri, 13 Feb 2009) New Revision: 432 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: maven.compile.encoding n'est pas une variable standard de maven Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2009-02-13 09:09:12 UTC (rev 431) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2009-02-13 16:47:43 UTC (rev 432) @@ -127,7 +127,7 @@ /** * Encoding to be used for generation of files. * - * @parameter expression="${generator.encoding}" default-value="${maven.compile.encoding}" + * @parameter expression="${generator.encoding}" default-value="UTF-8" * @since 0.60 */ protected String encoding;

1 0