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

r1433 - trunk
by tchemit＠users.nuiton.org 15 Aug '09

15 Aug '09

Author: tchemit Date: 2009-08-15 17:12:10 +0200 (Sat, 15 Aug 2009) New Revision: 1433 Modified: trunk/TODO Log: add TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-08-15 15:11:20 UTC (rev 1432) +++ trunk/TODO 2009-08-15 15:12:10 UTC (rev 1433) @@ -1,4 +1,4 @@ -- passer en maven 2! +- passer en maven 2 ! * prevoir dans le fichier de configuration de la palette: - les proprietes par defaut

1 0

Migration du projet / Project migration
by root＠nuiton.com 04 Aug '09

04 Aug '09

Bonjour à tous, Dans l'optique de dissocier au maximum les projets libres initiés par la société Code Lutin de celle-ci et permettre une meilleur implication de la communauté du libre dans ces derniers, nous vous annonçons que le site de développement du projet n'est plus hébergé sur le labs libre-entreprise mais sur la plateforme www.nuiton.org. La plupart de la migration a été réalisée, nous vous invitons à utiliser d'ors et déjà la plateforme http://www.nuiton.org (le projet sur le labs libre-entreprise n'est plus accessible publiquement) Les listes de diffusions ont été migrées et tous les utilisateurs ont normalement du être réabonnés aux nouvelles listes. La nouvelle adresse de cette liste: buix-commits(a)list.nuiton.org Nous sommes désolés des désagréments causés et vous remercions de votre soutien. Cordialement, L'équipe de développement. ---------------------------- Dear all, In order to separate the libre projects that Code Lutin has initiated and the company itself, and also to encourage the implication of the libre community, we recently moved the project's development site from the libre-entreprise labs to the www.nuiton.org platform. Most of the migration is complete, we invite you to use, from now on, the platform http://www.nuiton.org (the project on libre-entreprise labs is now longer publicly available). The mailing-lists have been migrated and everybody should have been automatically subscribing the new lists. New mail address for this list: buix-commits(a)list.nuiton.org We are sorry for the inconvenience, and thank you for your support. Best regards, The development team.

1 0

r1514 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: tchemit Date: 2009-07-31 18:06:47 +0200 (Fri, 31 Jul 2009) New Revision: 1514 Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java Log: add a policy to deal with tabs in WizardUI Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java 2009-07-30 22:28:43 UTC (rev 1513) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUILancher.java 2009-07-31 16:06:47 UTC (rev 1514) @@ -98,7 +98,7 @@ try { doAction(ui); } finally { - doClose(ui,false); + doClose(ui, false); } } }); @@ -110,7 +110,7 @@ try { doCancel(ui); } finally { - doClose(ui,true); + doClose(ui, true); } } }); @@ -138,7 +138,7 @@ try { doAction(ui); } finally { - doClose(ui,false); + doClose(ui, false); } } }); @@ -150,7 +150,7 @@ try { doCancel(ui); } finally { - doClose(ui,true); + doClose(ui, true); } } }); Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2009-07-30 22:28:43 UTC (rev 1513) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2009-07-31 16:06:47 UTC (rev 1514) @@ -1,11 +1,16 @@ package jaxx.runtime.swing.wizard; +import java.awt.Component; import java.beans.IndexedPropertyChangeEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Array; +import javax.swing.JTabbedPane; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.nuiton.i18n.I18n._; + /** * Classe de méthodes utiles sur les wizard. * @@ -14,6 +19,9 @@ */ public class WizardUtil { + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WizardUI.class); + protected WizardUtil() { } @@ -35,7 +43,7 @@ return true; } - public static void addDebugLogListener(final Log log, WizardModel model) { + public static void addDebugLogListener(final Log log, WizardModel<?> model) { if (log.isDebugEnabled()) { model.addPropertyChangeListener(new PropertyChangeListener() { @@ -47,7 +55,7 @@ } } - public static void addTraceLogListener(final Log log, WizardModel model) { + public static void addTraceLogListener(final Log log, WizardModel<?> model) { if (log.isTraceEnabled()) { model.addPropertyChangeListener(new PropertyChangeListener() { @@ -94,4 +102,56 @@ } }); } + + /** + * Ajoute un listener sur le modele pour gere la politique d'affichage des + * onglets. + * + * Dans cette implantation, les onglets sont ouverts jusqu'a l'etape courante. + * Lorsque l'on revient en arrière, les onglets d'etapes superieurs sont + * fermes. + * + * @param <E> le type d'un etape de l'assistant + * @param <M> le type du modele de l'assistant + * @param ui l'ui de l'assitant + * @since 1.7.1 + */ + public static <E extends WizardStep, M extends WizardModel<E>> void addTabsDisplayUntilStepListener(final WizardUI<E, M> ui) { + // on écoute les changements d'étapes + ui.getModel().addPropertyChangeListener(WizardModel.STEP_PROPERTY_NAME, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + M model = (M) evt.getSource(); + E oldStep = (E) evt.getOldValue(); + E newStep = (E) evt.getNewValue(); + log.debug("step has changed <old:" + oldStep + ", new:" + newStep + ">"); + int oldStepIndex = oldStep == null ? -1 : model.getStepIndex(oldStep); + int newStepIndex = model.getStepIndex(newStep); + JTabbedPane tabs = ui.getTabs(); + if (oldStepIndex + 1 == newStepIndex) { + // creation d'un nouvel onglet + WizardStepUI<E, M> c = ui.getStepUI(newStep); + String title = _(newStep.getLabel()); + String tip = _(newStep.getDescription()); + tabs.addTab(title, null, (Component) c, tip); + // selection du nouvel onglet + int index = tabs.indexOfComponent((Component) c); + if (index > -1) { + tabs.setSelectedIndex(index); + } + } else if (oldStepIndex > newStepIndex) { + // il s'agit d'un retour en arrière + // on supprime tous les onglets obsoletes + int index = newStepIndex + 1; + while (tabs.getTabCount() > index) { + log.trace("remove tab : " + index); + tabs.remove(index); + } + } else { + throw new IllegalStateException("can not go from " + oldStep + " to " + newStep); + } + } + }); + } }

1 0

r1551 - in trunk/guix-test-swing/src/main/java: . net net/kevinmorin net/kevinmorin/km org/nuiton/guix org/nuiton/guix/demo org/nuiton/guix/otherpackage
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 16:44:02 +0200 (Fri, 31 Jul 2009) New Revision: 1551 Added: trunk/guix-test-swing/src/main/java/net/ trunk/guix-test-swing/src/main/java/net/kevinmorin/ trunk/guix-test-swing/src/main/java/net/kevinmorin/km/ trunk/guix-test-swing/src/main/java/net/kevinmorin/km/KevinMorin.guix trunk/guix-test-swing/src/main/java/org/nuiton/guix/otherpackage/ trunk/guix-test-swing/src/main/java/org/nuiton/guix/otherpackage/GuixDemo4.guix Modified: trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/Controller.java trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.css trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.guix Log: Update the example with the new feature Added: trunk/guix-test-swing/src/main/java/net/kevinmorin/km/KevinMorin.guix =================================================================== --- trunk/guix-test-swing/src/main/java/net/kevinmorin/km/KevinMorin.guix (rev 0) +++ trunk/guix-test-swing/src/main/java/net/kevinmorin/km/KevinMorin.guix 2009-07-31 14:44:02 UTC (rev 1551) @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<Panel> + <Label text="Kevin" /> + <Label text="Morin" /> +</Panel> \ No newline at end of file Modified: trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/Controller.java =================================================================== --- trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/Controller.java 2009-07-31 14:43:49 UTC (rev 1550) +++ trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/Controller.java 2009-07-31 14:44:02 UTC (rev 1551) @@ -22,6 +22,7 @@ private java.lang.String text = "controller"; private int num = 0; + private java.lang.String cssText = ""; public Controller() { System.out.println("Dude, it's bloody raining"); @@ -46,4 +47,13 @@ public void setNum(int num) { this.num = num; } + + public java.lang.String getCssText() { + return cssText; + } + + public void setCssText(java.lang.String cssText) { + this.cssText = cssText; + } + } Modified: trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.css =================================================================== --- trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.css 2009-07-31 14:43:49 UTC (rev 1550) +++ trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.css 2009-07-31 14:44:02 UTC (rev 1551) @@ -1,37 +1,41 @@ #button:{getText( ) . startsWith( "-" )} { foreground: "new java.awt.Color(0,255,0)"; -} - -#label -{ - foreground : "new java.awt.Color(0,120,255)"; -} - -#label:onMouseEntered -{ - foreground : "new java.awt.Color(255,120,0)"; -} - -#label:onMouseExited -{ - foreground : "new java.awt.Color(0,120,255)"; -} - -JToolBar { - border : "new javax.swing.border.EtchedBorder()"; - constraint : "BorderLayout.NORTH"; -} - -#tabPanel { - constraint : "BorderLayout.CENTER"; - size : "800,400"; -} - -#bouton1, #textfield { - size: "100,35"; -} - -.table { - border : "new javax.swing.border.EtchedBorder()"; -} +} + +#label +{ + foreground : "new java.awt.Color(0,120,255)"; +} + +#label:onMouseEntered +{ + foreground : "new java.awt.Color(255,120,0)"; +} + +#label:onMouseExited +{ + foreground : "new java.awt.Color(0,120,255)"; +} + +JToolBar { + border : "new javax.swing.border.EtchedBorder()"; + constraint : "BorderLayout.NORTH"; +} + +#tabPanel { + constraint : "BorderLayout.CENTER"; + size : "800,400"; +} + +#bouton1, #textfield { + size: "100,35"; +} + +.table { + border : "new javax.swing.border.EtchedBorder()"; +} + +Controller { + cssText : "cssText"; +} Modified: trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.guix =================================================================== --- trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.guix 2009-07-31 14:43:49 UTC (rev 1550) +++ trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.guix 2009-07-31 14:44:02 UTC (rev 1551) @@ -7,6 +7,7 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import java.awt.BorderLayout; +import javax.swing.JFrame; private Button b = new Button("test"); @@ -15,6 +16,7 @@ THURSDAY, FRIDAY, SATURDAY } +this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { if(gd2.getButton().isSelected()) { @@ -83,10 +85,10 @@ </Row> <Row insets="0,0,0,0"> <Cell columns="2"> - <GuixDemo3 id="bt31" text="bt31" /> + <net.kevinmorin.km.KevinMorin /> </Cell> <Cell insets="2,2,2,2"> - <GuixDemo3 id="bt32" text="bt32" /> + <org.nuiton.guix.otherpackage.GuixDemo4 id="bt32" /> </Cell> </Row> <Row> Added: trunk/guix-test-swing/src/main/java/org/nuiton/guix/otherpackage/GuixDemo4.guix =================================================================== --- trunk/guix-test-swing/src/main/java/org/nuiton/guix/otherpackage/GuixDemo4.guix (rev 0) +++ trunk/guix-test-swing/src/main/java/org/nuiton/guix/otherpackage/GuixDemo4.guix 2009-07-31 14:44:02 UTC (rev 1551) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<Button text="GuixDemo4"> +</Button>

1 0

r1550 - in trunk/guix-test-gwt: . src/main/java/org/nuiton/guix/client src/main/java/org/nuiton/guix/client/demo src/main/java/org/nuiton/guix/client/km src/main/java/org/nuiton/guix/client/otherpackage src/main/java/org/nuiton/guix/demo
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 16:43:49 +0200 (Fri, 31 Jul 2009) New Revision: 1550 Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.css trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.script trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo2.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo3.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/JButton.css trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/scriptFile.script trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/km/ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/km/KevinMorin.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/otherpackage/ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/otherpackage/GuixDemo4.jaxx Removed: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.css trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.script trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo2.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo3.guix trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/JButton.css trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/scriptFile.script Modified: trunk/guix-test-gwt/pom.xml Log: Update the example with the new feature Modified: trunk/guix-test-gwt/pom.xml =================================================================== --- trunk/guix-test-gwt/pom.xml 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/pom.xml 2009-07-31 14:43:49 UTC (rev 1550) @@ -172,10 +172,10 @@ <artifactId>maven-guix-plugin</artifactId> <version>${project.version}</version> <configuration> - <guixFilesDir>${project.basedir}/src/main/java/org/nuiton/guix/demo/</guixFilesDir> + <guixFilesDir>${project.basedir}/src/main/java/org/nuiton/guix/client/demo/</guixFilesDir> <targetDirectory>${project.basedir}/target/generatedFiles/</targetDirectory> - <rootPackage>org.nuiton.guix</rootPackage> - <mainClass>org.nuiton.guix.GuixDemo</mainClass> + <rootPackage>org.nuiton.guix.client.demo</rootPackage> + <mainClass>org.nuiton.guix.client.demo.GuixDemo</mainClass> <launcherName>org.nuiton.guix.Index</launcherName> <generationLanguage>GWT</generationLanguage> </configuration> Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.css =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.css (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.css 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,29 @@ +#button:{object . getText( ) . startsWith( "-" )} +{ + foreground: red; +} + +#label +{ + background : blue; +} + + +.bold +{ + font-weight : bold; +} + +.Table +{ + border : 3px groove #FFF; +} +.Row +{ + border : 2px groove red; +} +.Cell +{ + border : 1px groove green; +} + Property changes on: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.css ___________________________________________________________________ Added: svn:executable + * Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.guix (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,112 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<Application title="Guix GWT Demo" theme="com.google.gwt.user.theme.dark.Dark"> +<script><![CDATA[ +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.Command; + +private Button b = new Button("test"); + +private Command cmd = new Command() { + public void execute() { + final com.google.gwt.user.client.ui.PopupPanel pp = new com.google.gwt.user.client.ui.PopupPanel(true); + pp.add(new com.google.gwt.user.client.ui.Label("Action performed!")); + pp.show(); + } +}; + +public enum Day { + SUNDAY, MONDAY, TUESDAY, WEDNESDAY, + THURSDAY, FRIDAY, SATURDAY + } + +b.addClickListener(new com.google.gwt.user.client.ui.ClickListener() { + public void onClick(com.google.gwt.user.client.ui.Widget sender) { + if(gd2.getButton().isDown()) { + table1.setSize(String.valueOf(com.google.gwt.user.client.Random.nextInt(800)), + String.valueOf(com.google.gwt.user.client.Random.nextInt(400))); + } + } +}); + +/** +* test +* @since 0.0.1 +*/ +public void test2(String test) throws NullPointerException, ArrayIndexOutOfBoundsException { + System.out.println(test); +} + +public void beforeCreation() { + System.out.println("before Creation"); +} + +public void beforeBinding() { + this.add(b); +} + +]]></script> + + <org.nuiton.guix.client.Controller id="c1" text="c1" /> + <org.nuiton.guix.client.Controller id="c2" num="10" /> + <MenuBar> + <Menu text="menu 1"> + <MenuItem id="item1" text="item11" action='cmd' /> + <MenuItem text="item12" action='cmd' /> + </Menu> + <Menu text="menu 2"> + <MenuItem text="item21" action='cmd' /> + <Menu text='item22'> + <MenuItem text="item221" action='cmd' /> + <MenuItem text="item222" action='cmd' /> + </Menu> + </Menu> + </MenuBar> + <java.util.ArrayList id="list" /> + <TabPanel size='800px","400px'> + <Table id="table1" name="Table"> + <Row> + <Cell> +  + <TextField id="textfield" text='test' enabled="{gd2.getButton().down && gd22.button.isSelected()}" onFocus='{System.out.println("dude !")}'/> + </Cell> + <Cell> + <Label id="label" visible="{textfield.enabled}" text="{textfield.getText()}" styleClass="bold" /> + </Cell> + <Cell rows='3'> + <Label id="label2" text="color" style="color: yellow" /> + </Cell> + </Row> + <Row insets="0,0,0,0"> + <Cell columns="3"> + <GuixDemo3 id="bt3" text="bt3" onClick='{System.out.println("beau gosse");list.add("test" + list.size())}'/> + </Cell> + </Row> + <Row insets="0,0,0,0"> + <Cell columns="2"> + <org.nuiton.guix.client.otherpackage.GuixDemo4 id="bt31" /> + </Cell> + <Cell insets="2,2,2,2"> + <org.nuiton.guix.client.km.KevinMorin /> + </Cell> + </Row> + <Row> + <Cell columns="3"> + <Label text="{c1.getText()} : {c1.getNum()}" /> + </Cell> + </Row> + <Row> + <Cell columns="3"> + <Label text="{c2.getText()} : {c2.getNum()}" /> + </Cell> + </Row> + <Row> + <Cell columns="2"> + <Label id="label3" text="list size : {list.size()}" style="color: yellow" /> + </Cell> + </Row> + </Table> + <GuixDemo2 id="gd2" name="GD2" /> + <GuixDemo2 id="gd22" name="GD22" /> + </TabPanel> +</Application> Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.script =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.script (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo.script 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,3 @@ +public void testSameName() { + System.out.println("load the script file with the same name"); +} Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo2.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo2.guix (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo2.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<Panel> +<script> + public enum Day { + SUNDAY, MONDAY, TUESDAY, WEDNESDAY, + THURSDAY, FRIDAY, SATURDAY + } +</script> + <ToggleButton id="button" constructor='"Up","Down"' down ="true" onClick='{System.out.println("hey dude !")}'/> +</Panel> Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo3.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo3.guix (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/GuixDemo3.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<Button text="GuixDemo3"> +</Button> Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/JButton.css =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/JButton.css (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/JButton.css 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,30 @@ +JButton { + font-size: 18; + width: 80; + height: 35; +} + +JButton.digit { + foreground: blue; +} + +JButton#dot { + font-size: 20; +} + +JButton.operator { + font-size: 16; + foreground: #009900; +} + +JButton.clear { + foreground: red; +} + +JButton:mouseover { + font-weight: bold; +} + +JButton.operator:mouseover { + font-weight: normal; +} Property changes on: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/JButton.css ___________________________________________________________________ Added: svn:executable + * Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/scriptFile.script =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/scriptFile.script (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/scriptFile.script 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,3 @@ +public void testOtherName() { + System.out.println("load the script file with a specified name"); +} Property changes on: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/demo/scriptFile.script ___________________________________________________________________ Added: svn:executable + * Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/km/KevinMorin.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/km/KevinMorin.guix (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/km/KevinMorin.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<Panel> + <Label text="Kevin" /> + <Label text="Morin" /> +</Panel> \ No newline at end of file Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/otherpackage/GuixDemo4.jaxx =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/otherpackage/GuixDemo4.jaxx (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/otherpackage/GuixDemo4.jaxx 2009-07-31 14:43:49 UTC (rev 1550) @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<ToggleButton text="GuixDemo3_other"> +</ToggleButton> Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.css =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.css 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.css 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,29 +0,0 @@ -#button:{object . getText( ) . startsWith( "-" )} -{ - foreground: red; -} - -#label -{ - background : blue; -} - - -.bold -{ - font-weight : bold; -} - -.Table -{ - border : 3px groove #FFF; -} -.Row -{ - border : 2px groove red; -} -.Cell -{ - border : 1px groove green; -} - Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.guix 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,112 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<Application title="Guix GWT Demo" theme="com.google.gwt.user.theme.dark.Dark"> -<script><![CDATA[ -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.Command; - -private Button b = new Button("test"); - -private Command cmd = new Command() { - public void execute() { - final com.google.gwt.user.client.ui.PopupPanel pp = new com.google.gwt.user.client.ui.PopupPanel(true); - pp.add(new com.google.gwt.user.client.ui.Label("Action performed!")); - pp.show(); - } -}; - -public enum Day { - SUNDAY, MONDAY, TUESDAY, WEDNESDAY, - THURSDAY, FRIDAY, SATURDAY - } - -b.addClickListener(new com.google.gwt.user.client.ui.ClickListener() { - public void onClick(com.google.gwt.user.client.ui.Widget sender) { - if(gd2.getButton().isDown()) { - table1.setSize(String.valueOf(com.google.gwt.user.client.Random.nextInt(800)), - String.valueOf(com.google.gwt.user.client.Random.nextInt(400))); - } - } -}); - -/** -* test -* @since 0.0.1 -*/ -public void test2(String test) throws NullPointerException, ArrayIndexOutOfBoundsException { - System.out.println(test); -} - -public void beforeCreation() { - System.out.println("before Creation"); -} - -public void beforeBinding() { - this.add(b); -} - -]]></script> - - <org.nuiton.guix.client.Controller id="c1" text="c1" /> - <org.nuiton.guix.client.Controller id="c2" num="10" /> - <MenuBar> - <Menu text="menu 1"> - <MenuItem id="item1" text="item11" action='cmd' /> - <MenuItem text="item12" action='cmd' /> - </Menu> - <Menu text="menu 2"> - <MenuItem text="item21" action='cmd' /> - <Menu text='item22'> - <MenuItem text="item221" action='cmd' /> - <MenuItem text="item222" action='cmd' /> - </Menu> - </Menu> - </MenuBar> - <java.util.ArrayList id="list" /> - <TabPanel size='800px","400px'> - <Table id="table1" name="Table"> - <Row> - <Cell> -  - <TextField id="textfield" text='test' enabled="{gd2.getButton().down && gd22.button.isSelected()}" onFocus='{System.out.println("dude !")}'/> - </Cell> - <Cell> - <Label id="label" visible="{textfield.enabled}" text="{textfield.getText()}" styleClass="bold" /> - </Cell> - <Cell rows='3'> - <Label id="label2" text="color" style="color: yellow" /> - </Cell> - </Row> - <Row insets="0,0,0,0"> - <Cell columns="3"> - <GuixDemo3 id="bt3" text="bt3" onClick='{System.out.println("beau gosse");list.add("test" + list.size())}'/> - </Cell> - </Row> - <Row insets="0,0,0,0"> - <Cell columns="2"> - <GuixDemo3 id="bt31" text="bt31" /> - </Cell> - <Cell insets="2,2,2,2"> - <GuixDemo3 id="bt32" text="bt32" /> - </Cell> - </Row> - <Row> - <Cell columns="3"> - <Label text="{c1.getText()} : {c1.getNum()}" /> - </Cell> - </Row> - <Row> - <Cell columns="3"> - <Label text="{c2.getText()} : {c2.getNum()}" /> - </Cell> - </Row> - <Row> - <Cell columns="2"> - <Label id="label3" text="list size : {list.size()}" style="color: yellow" /> - </Cell> - </Row> - </Table> - <GuixDemo2 id="gd2" name="GD2" /> - <GuixDemo2 id="gd22" name="GD22" /> - </TabPanel> -</Application> Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.script =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.script 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.script 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,3 +0,0 @@ -public void testSameName() { - System.out.println("load the script file with the same name"); -} Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo2.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo2.guix 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo2.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<Panel> -<script> - public enum Day { - SUNDAY, MONDAY, TUESDAY, WEDNESDAY, - THURSDAY, FRIDAY, SATURDAY - } -</script> - <ToggleButton id="button" constructor='"Up","Down"' down ="true" onClick='{System.out.println("hey dude !")}'/> -</Panel> Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo3.guix =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo3.guix 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo3.guix 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,4 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<Button text="GuixDemo3"> -</Button> Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/JButton.css =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/JButton.css 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/JButton.css 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,30 +0,0 @@ -JButton { - font-size: 18; - width: 80; - height: 35; -} - -JButton.digit { - foreground: blue; -} - -JButton#dot { - font-size: 20; -} - -JButton.operator { - font-size: 16; - foreground: #009900; -} - -JButton.clear { - foreground: red; -} - -JButton:mouseover { - font-weight: bold; -} - -JButton.operator:mouseover { - font-weight: normal; -} Deleted: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/scriptFile.script =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/scriptFile.script 2009-07-31 14:43:26 UTC (rev 1549) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/scriptFile.script 2009-07-31 14:43:49 UTC (rev 1550) @@ -1,3 +0,0 @@ -public void testOtherName() { - System.out.println("load the script file with a specified name"); -}

1 0

r1549 - trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 16:43:26 +0200 (Fri, 31 Jul 2009) New Revision: 1549 Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java Log: Look in the source dirctory the guix files corresponding to tags without compiled classes Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java =================================================================== --- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java 2009-07-31 14:43:26 UTC (rev 1549) @@ -558,13 +558,14 @@ } /** + * Generates the code to set the attributes of the gmo when gmo's class is an uncompiled java file * - * @param jFile - * @param gmo - * @param creationMethod + * @param jFile the JavaFile describing th uncompiled java file + * @param gmo the GuixModelObject instance of the clas represented by jFile + * @param creationMethod the StringBuffer containing the creation method */ private void processAttributes(JavaFile jFile, GuixModelObject gmo, StringBuffer creationMethod) { - //processCSSAttributes(gmo, seh, clazz); + processCSSAttributes(gmo, jFile); //browses the attributes for (AttributeDescriptor attr : gmo.getAttributeDescriptors()) { boolean addQuote = false; @@ -703,6 +704,92 @@ gmo.getAttributeDescriptors().addAll(ads); } + /** + * Transform the css attributes into AttributeDescriptors + * + * @param gmo the GuixModelObject which has got the css attributes + * @param jFile the JavaFile describing th uncompiled java file + */ + private void processCSSAttributes(GuixModelObject gmo, JavaFile jFile) { + Map<String, String> cssIds = new HashMap<String, String>(); + Map<String, String> cssStyleClasses = new HashMap<String, String>(); + Map<String, String> cssJavaClasses = new HashMap<String, String>(); + List<AttributeDescriptor> ads = new ArrayList<AttributeDescriptor>(); + for (StyleSheet ss : styleSheets) { + for (Selector sel : ss.getSelectors()) { + if((sel.getId() == null || sel.getId().equals(gmo.getId())) + && (sel.getStyleClass() == null || sel.getStyleClass().equals(gmo.getStyleClass())) + && (sel.getJavaClassName() == null || sel.getJavaClassName().equals(gmo.getClassDescriptor().getName()))) { + boolean realAttribute = true; + if (sel.getPseudoClass() != null && sel.getPseudoClass().startsWith("on") && Character.isUpperCase(sel.getPseudoClass().charAt(2))) { + //the swing event does not start by "on" + String lowerCaseAttribute = (sel.getPseudoClass().length() > 2) ? Character.toLowerCase(sel.getPseudoClass().charAt(2)) + sel.getPseudoClass().substring(3) : sel.getPseudoClass(); + StringBuffer eventAction = new StringBuffer(); + + for (Rule rule : sel.getRules()) { + for (Entry<String, String> entry : rule.getProperties().entrySet()) { + String capitalizedAttribute = (entry.getKey().length() > 0) ? Character.toUpperCase(entry.getKey().charAt(0)) + entry.getKey().substring(1) : entry.getKey(); + //checks if the setter for this attribute exists + JavaMethod method = null; + for(JavaMethod m : jFile.getMethods()) { + if(m.getName().equals("set" + capitalizedAttribute)) { + method = m; + break; + } + } + //if yes + if(method != null) { + //checks if the parameter of the setter is a String + boolean addQuote = method.getArguments()[0].getType().equals(String.class.getName()); + //generates the code to set the attribute to object + eventAction.append(gmo.getId()).append(".set").append(capitalizedAttribute).append("(").append(addQuote ? "\"" : "").append(entry.getValue()).append(addQuote ? "\"" : "").append(");\n"); + } + else if(log.isErrorEnabled()) { + log.error(entry.getKey() + " cannot be set."); + } + } + } + } + if (sel.getId() != null && sel.getId().equals(gmo.getId())) { + for (Rule rule : sel.getRules()) { + for (Entry<String, String> entry : rule.getProperties().entrySet()) { + cssIds.put(entry.getKey(), entry.getValue()); + } + } + } + else if (sel.getStyleClass() != null && sel.getStyleClass().equals(gmo.getStyleClass())) { + for (Rule rule : sel.getRules()) { + for (Entry<String, String> entry : rule.getProperties().entrySet()) { + cssStyleClasses.put(entry.getKey(), entry.getValue()); + } + } + } + else if (sel.getJavaClassName() != null && sel.getJavaClassName().equals(gmo.getClassDescriptor().getName())) { + for (Rule rule : sel.getRules()) { + for (Entry<String, String> entry : rule.getProperties().entrySet()) { + cssJavaClasses.put(entry.getKey(), entry.getValue()); + } + } + } + } + } + } + for(Entry<String, String> entry : cssIds.entrySet()) { + ads.add(new AttributeDescriptor(entry.getKey(), entry.getValue())); + } + for(Entry<String, String> entry : cssStyleClasses.entrySet()) { + if(!cssIds.containsKey(entry.getKey())) { + ads.add(new AttributeDescriptor(entry.getKey(), entry.getValue())); + } + } + for(Entry<String, String> entry : cssJavaClasses.entrySet()) { + if(!cssIds.containsKey(entry.getKey()) && !cssStyleClasses.containsKey(entry.getKey())) { + ads.add(new AttributeDescriptor(entry.getKey(), entry.getValue())); + } + } + gmo.getAttributeDescriptors().addAll(ads); + } + public Map<String, Map<String, String>> getBindings2Generate() { return bindings2Generate; }

1 0

r1548 - trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 16:43:13 +0200 (Fri, 31 Jul 2009) New Revision: 1548 Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtConfigGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtJavaFileGenerator.java Log: Look in the source dirctory the guix files corresponding to tags without compiled classes Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java 2009-07-31 14:42:59 UTC (rev 1547) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) @@ -78,7 +78,7 @@ super(gmo, classes); jf = new JavaFile(Modifier.PUBLIC | Modifier.ABSTRACT, JavaFile.ABSTRACT_CLASS, - gmo.getClassDescriptor().getPackageName() + ".client", + gmo.getClassDescriptor().getPackageName(), gmo.getClassDescriptor().getName() + "Abstract", null, gmo.getJavadoc()); @@ -405,21 +405,21 @@ && TagManager.getGuixClassHandler(gmo.getClassDescriptor().getName()) != null) { jf.addField(new JavaField(Modifier.FINAL | Modifier.PRIVATE, clazz.getName(), gmo.getId(), - " new " + clazz.getSimpleName() + "(" + + " new " + clazz.getName() + "(" + ((gmo.getConstructor() != null) ? gmo.getConstructor() : "") + ")", gmo.getJavadoc(), th), false); } //if gmo is the root ModelObject, it equals "this" else if(gmo.getParent() == null) { jf.addField(new JavaField(Modifier.FINAL | Modifier.PRIVATE, - (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().getPackageName() + ".client." + gmo.getClassDescriptor().getName() + "Abstract" : gmo.getClassDescriptor().getPackageName() + "." + gmo.getClassDescriptor().getName(), + (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Abstract" : gmo.getClassDescriptor().toString(), gmo.getClassDescriptor().getName().toLowerCase(), "this", gmo.getJavadoc(), th), false); } else { jf.addField(new JavaField(Modifier.FINAL | Modifier.PRIVATE, - (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().getPackageName() + ".client." + gmo.getClassDescriptor().getName() + "Abstract" : gmo.getClassDescriptor().getPackageName() + "." + gmo.getClassDescriptor().getName(), - gmo.getId(), "new " + ((classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().getName() + "Impl" : gmo.getClassDescriptor().getName()) + "(" + + (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Abstract" : gmo.getClassDescriptor().toString(), + gmo.getId(), "new " + ((classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Impl" : gmo.getClassDescriptor().toString()) + "(" + ((gmo.getConstructor() != null) ? gmo.getConstructor() : "") + ")", gmo.getJavadoc(), th), false); } @@ -553,10 +553,11 @@ } /** + * Generates the code to set the attributes of the gmo when gmo's class is an uncompiled java file * - * @param jFile - * @param gmo - * @param creationMethod + * @param jFile the JavaFile describing th uncompiled java file + * @param gmo the GuixModelObject instance of the clas represented by jFile + * @param creationMethod the StringBuffer containing the creation method */ private void processAttributes(JavaFile jFile, GuixModelObject gmo, StringBuffer creationMethod) { //processCSSAttributes(gmo, seh, clazz); Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtConfigGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtConfigGenerator.java 2009-07-31 14:42:59 UTC (rev 1547) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtConfigGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) @@ -89,7 +89,7 @@ serializer.comment("Specify the app entry point class."); serializer.startTag("","entry-point"); serializer.attribute("", "class", gmo.getClassDescriptor().getPackageName() - + ".client." + gmo.getClassDescriptor().getName() + "Impl"); + + "." + gmo.getClassDescriptor().getName() + "Impl"); serializer.endTag("","entry-point"); serializer.comment("Specify the application specific style sheet."); Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java 2009-07-31 14:42:59 UTC (rev 1547) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) @@ -57,13 +57,9 @@ if (!outDir.exists()) { outDir.mkdirs(); } - File outDirClient = new File(outDir, "client"); - if (!outDirClient.exists()) { - outDirClient.mkdirs(); - } - File out = new File(outDirClient, gmoClassName + ".java"); - File outAbstract = new File(outDirClient, gmoClassName + "Abstract.java"); - File outImpl = new File(outDirClient, gmoClassName + "Impl.java"); + File out = new File(outDir, gmoClassName + ".java"); + File outAbstract = new File(outDir, gmoClassName + "Abstract.java"); + File outImpl = new File(outDir, gmoClassName + "Impl.java"); if (lastModification > out.lastModified()) { try { @@ -89,8 +85,13 @@ gimg.addMainMethod(); GwtConfigGenerator gcg = new GwtConfigGenerator(gmo, getCSSFiles()); GwtHtmlGenerator ghg = new GwtHtmlGenerator(gmo, launcherName); - File outConfigMain = new File(outDir, launcherName.substring(launcherName.lastIndexOf('.') + 1) + ".gwt.xml"); - File publicDir = new File(outDir, "public"); + File clientDir = outDir; + while(!clientDir.getPath().substring(clientDir.getPath().lastIndexOf(File.separatorChar) + 1).equals("client")) { + + clientDir = clientDir.getParentFile(); + } + File outConfigMain = new File(clientDir.getParentFile(), launcherName.substring(launcherName.lastIndexOf('.') + 1) + ".gwt.xml"); + File publicDir = new File(clientDir.getParentFile(), "public"); if (!publicDir.exists()) { publicDir.mkdirs(); } Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java 2009-07-31 14:42:59 UTC (rev 1547) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) @@ -24,7 +24,6 @@ //~--- JDK imports ------------------------------------------------------------ -import java.io.File; import java.lang.reflect.Modifier; import java.util.List; @@ -45,7 +44,7 @@ super(gmo, classes); jf = new JavaFile(Modifier.PUBLIC, JavaFile.CLASS, - gmo.getClassDescriptor().getPackageName() + ".client", + gmo.getClassDescriptor().getPackageName(), gmo.getClassDescriptor().getName() + "Impl", gmo.getClassDescriptor().getName() + "Abstract", gmo.getJavadoc()); Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java 2009-07-31 14:42:59 UTC (rev 1547) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) @@ -24,7 +24,6 @@ //~--- JDK imports ------------------------------------------------------------ -import java.io.File; import java.lang.reflect.Modifier; import java.util.List; @@ -46,7 +45,7 @@ this.classes = classes; jf = new JavaFile(Modifier.PUBLIC, JavaFile.INTERFACE, - gmo.getClassDescriptor().getPackageName() + ".client", + gmo.getClassDescriptor().getPackageName(), gmo.getClassDescriptor().getName(), null, gmo.getJavadoc()); } Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtJavaFileGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtJavaFileGenerator.java 2009-07-31 14:42:59 UTC (rev 1547) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtJavaFileGenerator.java 2009-07-31 14:43:13 UTC (rev 1548) @@ -75,7 +75,7 @@ else if (imports != null && !imports.contains(child.getClassDescriptor().toString())) { imports.add(child.getClassDescriptor().toString()); jf.addImport(classes.contains(child.getClassDescriptor().toString()) ? - child.getClassDescriptor().getPackageName() + ".client." + + child.getClassDescriptor().getPackageName() + "." + child.getClassDescriptor().getName() + "Abstract" : child.getClassDescriptor().toString()); }

1 0

r1547 - in trunk/guix-compiler/src: main/java/org/nuiton/guix main/java/org/nuiton/guix/compiler main/java/org/nuiton/guix/generator test/java/org/nuiton/guix
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 16:42:59 +0200 (Fri, 31 Jul 2009) New Revision: 1547 Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java trunk/guix-compiler/src/test/java/org/nuiton/guix/GuixLauncherTest.java Log: Look in the source dirctory the guix files corresponding to tags without compiled classes Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java 2009-07-31 14:41:51 UTC (rev 1546) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java 2009-07-31 14:42:59 UTC (rev 1547) @@ -56,7 +56,7 @@ /** original list of files to compile */ protected final File[] files; /** original list of classes to compile */ - protected final String[] classNames; + protected final List<String> classNames = new ArrayList<String>(); /** Files to be treated while compilation. */ protected List<File> guixFiles = new ArrayList<File>(); /** Class names corresponding to the files in the guixFiles list. */ @@ -102,26 +102,30 @@ this.targetDirectory = targetDirectory; this.rootPackage = rootPackage != null ? rootPackage : ""; if (files != null) { - classNames = new String[files.length]; for (int i = 0; i < files.length; i++) { String path = files[i].getAbsolutePath(); if (baseDir != null) { - classNames[i] = (rootPackage.length() > 0 ? rootPackage + "." : "") + path.substring(baseDir.getAbsolutePath().length() + 1, - path.lastIndexOf('.')).replace(File.separatorChar, '.'); + classNames.add((rootPackage.length() > 0 ? rootPackage + "." : "") + path.substring(baseDir.getAbsolutePath().length() + 1, + path.lastIndexOf('.')).replace(File.separatorChar, '.')); } else { - classNames[i] = path.substring(0, path.lastIndexOf('.')); + classNames.add( path.substring(0, path.lastIndexOf('.'))); } } } - else { - classNames = null; - } this.mainClass = mainClass != null ? mainClass : ""; this.launcherName = launcherName != null ? launcherName : "Main"; this.generatorClass = generatorClass; } + public File getSrcDirectory() { + return srcDirectory; + } + + public File getTargetDirectory() { + return targetDirectory; + } + /** * Compiles a set of files. * @@ -134,7 +138,7 @@ log.info("Start compiling"); } guixFiles.addAll(Arrays.asList(files)); - guixFileClassNames.addAll(Arrays.asList(classNames)); + guixFileClassNames.addAll(classNames); boolean success = true; try { @@ -226,7 +230,7 @@ gen.setLastModification(rootModelObjects.get(mo)); gen.setMainClass((mo.getClassDescriptor().getPackageName() + "." + mo.getClassDescriptor().getName()).equals(mainClass)); gen.setSerializer(serializer); - gen.setClasses(Arrays.asList(classNames)); + gen.setClasses(classNames); gen.setLauncherName(launcherName); gen.setCSSFiles(mo.getCssFiles()); //generates the file without databinding @@ -475,4 +479,39 @@ } return result; } + + /** + * Adds a root GuixModelObject with its last modification time + * + * @param gmo the root GuixModelObject to add + * @param l its last modification time + */ + public void addRootModelObject(GuixModelObject gmo, Long l) { + rootModelObjects.put(gmo, l); + } + + public void addClassName(String className) { + if(!classNames.contains(className)) { + classNames.add(className); + } + } + + /** + * Ads a file to the compiled files list + * + * @param f the file to add + */ + public void addCompiledFile(File f) { + compiledFiles.add(f); + } + + /** + * Has the file f already been compiled + * + * @param f the file we'd like to know if it has already been compiled + * @return true if f has already been compiled + */ + public boolean isFileAlreadyCompiled(File f) { + return compiledFiles.contains(f); + } } Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java 2009-07-31 14:41:51 UTC (rev 1546) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java 2009-07-31 14:42:59 UTC (rev 1547) @@ -299,6 +299,32 @@ tagName = xpp.getName(); } + try { + Class.forName(tagPackageName + "." + tagName); + + } + catch(ClassNotFoundException eee) { + try { + File f = new File(launcher.getSrcDirectory(), tagPackageName.replace('.', File.separatorChar) + File.separatorChar + tagName + ".guix"); + if(!f.exists()) { + f = new File(launcher.getSrcDirectory(), tagPackageName.replace('.', File.separatorChar) + File.separatorChar + tagName + ".jaxx"); + } + if(f.exists() && !launcher.isFileAlreadyCompiled(f)) { + GuixCompiler gc = new GuixCompiler(f, launcher, tagPackageName); + GuixModelObject rootMO = gc.compile(); + launcher.addCompiledFile(f); + launcher.addClassName(tagPackageName + "." + tagName); + launcher.addRootModelObject(rootMO, gc.getLastModification()); + if (gc.isFailed()) { + failed = true; + } + } + } + catch(NullPointerException eeee) { + + } + } + String id = ((xpp.getAttributeValue("", "id") != null) ? xpp.getAttributeValue("", "id") : "_" + tagName + index++); Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java 2009-07-31 14:41:51 UTC (rev 1546) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java 2009-07-31 14:42:59 UTC (rev 1547) @@ -19,8 +19,6 @@ package org.nuiton.guix.generator; import org.nuiton.guix.CompilerException; -import org.nuiton.guix.compiler.GuixCompiler; -import org.nuiton.guix.GuixLauncher; import org.nuiton.guix.parser.JavaParser; import org.nuiton.guix.parser.JavaParserTreeConstants; import org.nuiton.guix.parser.ParseException; Modified: trunk/guix-compiler/src/test/java/org/nuiton/guix/GuixLauncherTest.java =================================================================== --- trunk/guix-compiler/src/test/java/org/nuiton/guix/GuixLauncherTest.java 2009-07-31 14:41:51 UTC (rev 1546) +++ trunk/guix-compiler/src/test/java/org/nuiton/guix/GuixLauncherTest.java 2009-07-31 14:42:59 UTC (rev 1547) @@ -42,7 +42,7 @@ GuixInitializer.initialize(); GuixLauncher gl = new GuixLauncher(null,null,null,null,null,null,null,null); - assertTrue(gl.files == null || gl.classNames.length == gl.files.length); + assertTrue(gl.files == null || gl.classNames.size() == gl.files.length); assertTrue(gl.compile()); assertTrue(gl.files == null || gl.rootModelObjects.size() == gl.files.length); @@ -51,7 +51,7 @@ File dir = new File("target/test"); File dir2 = new File(dir.getAbsolutePath()); gl = new GuixLauncher(new File[]{f2},dir2,"org.nuiton.guix",null,f2.getParentFile(),null,null,null); - assertTrue(gl.files == null || gl.classNames.length == gl.files.length); + assertTrue(gl.files == null || gl.classNames.size() == gl.files.length); assertTrue(gl.compile()); }

1 0

r1546 - trunk/maven-guix-plugin/src/main/java/org/nuiton/guix
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 16:41:51 +0200 (Fri, 31 Jul 2009) New Revision: 1546 Modified: trunk/maven-guix-plugin/src/main/java/org/nuiton/guix/GuixMojo.java Log: Handles teh jaxx files as sources Modified: trunk/maven-guix-plugin/src/main/java/org/nuiton/guix/GuixMojo.java =================================================================== --- trunk/maven-guix-plugin/src/main/java/org/nuiton/guix/GuixMojo.java 2009-07-31 07:47:36 UTC (rev 1545) +++ trunk/maven-guix-plugin/src/main/java/org/nuiton/guix/GuixMojo.java 2009-07-31 14:41:51 UTC (rev 1546) @@ -130,7 +130,7 @@ if (f.isDirectory() && !f.isHidden()) { result.addAll(goDeeperInto(f)); } - else if (f.getName().endsWith(".guix")) { + else if (f.getName().endsWith(".guix") || f.getName().endsWith(".jaxx")) { getLog().debug("found " + f.getName()); result.add(f); }

1 0

r1545 - trunk/guix-compiler/src/main/java/org/nuiton/guix/generator
by kmorin＠users.labs.libre-entreprise.org 31 Jul '09

31 Jul '09

Author: kmorin Date: 2009-07-31 09:47:36 +0200 (Fri, 31 Jul 2009) New Revision: 1545 Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java Log: add licence Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java 2009-07-30 15:00:19 UTC (rev 1544) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java 2009-07-31 07:47:36 UTC (rev 1545) @@ -1,3 +1,21 @@ +/** + * *##% guix-compiler + * Copyright (C) 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 + * 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>. ##%* + */ package org.nuiton.guix.generator; import org.nuiton.guix.CompilerException;

1 0