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

r1463 - trunk
by tchemit＠users.nuiton.org Nov. 21, 2010

Nov. 21, 2010

Author: tchemit Date: 2010-11-21 15:31:11 +0100 (Sun, 21 Nov 2010) New Revision: 1463 Url: http://nuiton.org/repositories/revision/buix/1463 Log: Update mavenpom4redmine to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:30:03 UTC (rev 1462) +++ trunk/pom.xml 2010-11-21 14:31:11 UTC (rev 1463) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1462 - trunk
by tchemit＠users.nuiton.org Oct. 29, 2010

Oct. 29, 2010

Author: tchemit Date: 2010-10-29 10:30:03 +0200 (Fri, 29 Oct 2010) New Revision: 1462 Url: http://nuiton.org/repositories/revision/buix/1462 Log: Update mavenpom4redmine to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:39:01 UTC (rev 1461) +++ trunk/pom.xml 2010-10-29 08:30:03 UTC (rev 1462) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.3.2</version> + <version>2.4</version> </parent> <artifactId>buix</artifactId>

1 0

r1461 - trunk
by tchemit＠users.nuiton.org Oct. 17, 2010

Oct. 17, 2010

Author: tchemit Date: 2010-10-17 03:39:01 +0200 (Sun, 17 Oct 2010) New Revision: 1461 Url: http://nuiton.org/repositories/revision/buix/1461 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-08 23:51:26 UTC (rev 1460) +++ trunk/pom.xml 2010-10-17 01:39:01 UTC (rev 1461) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <artifactId>buix</artifactId>

1 0

r1460 - trunk
by tchemit＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: tchemit Date: 2010-10-09 01:51:26 +0200 (Sat, 09 Oct 2010) New Revision: 1460 Url: http://nuiton.org/repositories/revision/buix/1460 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:54:16 UTC (rev 1459) +++ trunk/pom.xml 2010-10-08 23:51:26 UTC (rev 1460) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1459 - trunk
by tchemit＠users.nuiton.org Oct. 3, 2010

Oct. 3, 2010

Author: tchemit Date: 2010-10-03 17:54:16 +0200 (Sun, 03 Oct 2010) New Revision: 1459 Url: http://nuiton.org/repositories/revision/buix/1459 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:10:22 UTC (rev 1458) +++ trunk/pom.xml 2010-10-03 15:54:16 UTC (rev 1459) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <artifactId>buix</artifactId>

1 0

r1458 - trunk
by tchemit＠users.nuiton.org Sept. 29, 2010

Sept. 29, 2010

Author: tchemit Date: 2010-09-29 10:10:22 +0200 (Wed, 29 Sep 2010) New Revision: 1458 Url: http://nuiton.org/repositories/revision/buix/1458 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:29:43 UTC (rev 1457) +++ trunk/pom.xml 2010-09-29 08:10:22 UTC (rev 1458) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>buix</artifactId>

1 0

r1457 - trunk
by tchemit＠users.nuiton.org Sept. 9, 2010

Sept. 9, 2010

Author: tchemit Date: 2010-09-09 11:29:43 +0200 (Thu, 09 Sep 2010) New Revision: 1457 Url: http://nuiton.org/repositories/revision/buix/1457 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:19:22 UTC (rev 1456) +++ trunk/pom.xml 2010-09-09 09:29:43 UTC (rev 1457) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>buix</artifactId>

1 0

r1456 - trunk
by tchemit＠users.nuiton.org Aug. 29, 2010

Aug. 29, 2010

Author: tchemit Date: 2010-08-29 16:19:22 +0200 (Sun, 29 Aug 2010) New Revision: 1456 Url: http://nuiton.org/repositories/revision/buix/1456 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-11 14:46:01 UTC (rev 1455) +++ trunk/pom.xml 2010-08-29 14:19:22 UTC (rev 1456) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>buix</artifactId>

1 0

r1455 - trunk
by tchemit＠users.nuiton.org Aug. 11, 2010

Aug. 11, 2010

Author: tchemit Date: 2010-08-11 16:46:01 +0200 (Wed, 11 Aug 2010) New Revision: 1455 Url: http://nuiton.org/repositories/revision/buix/1455 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 13:15:32 UTC (rev 1454) +++ trunk/pom.xml 2010-08-11 14:46:01 UTC (rev 1455) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <artifactId>buix</artifactId>

1 0

r1454 - trunk
by tchemit＠users.nuiton.org July 1, 2010

July 1, 2010

Author: tchemit Date: 2010-07-01 15:15:32 +0200 (Thu, 01 Jul 2010) New Revision: 1454 Url: http://nuiton.org/repositories/revision/buix/1454 Log: Utilisation de mavenpom4labs 2.2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-01 12:30:09 UTC (rev 1453) +++ trunk/pom.xml 2010-07-01 13:15:32 UTC (rev 1454) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.2</version> + <version>2.2.2.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1453 - trunk
by tchemit＠users.nuiton.org July 1, 2010

July 1, 2010

Author: tchemit Date: 2010-07-01 14:30:09 +0200 (Thu, 01 Jul 2010) New Revision: 1453 Url: http://nuiton.org/repositories/revision/buix/1453 Log: Utilisation de mavenpom4redmine 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 06:35:15 UTC (rev 1452) +++ trunk/pom.xml 2010-07-01 12:30:09 UTC (rev 1453) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2.1</version> + <version>2.2.2</version> </parent> <artifactId>buix</artifactId>

1 0

r1452 - trunk
by tchemit＠users.nuiton.org June 27, 2010

June 27, 2010

Author: tchemit Date: 2010-06-27 08:35:15 +0200 (Sun, 27 Jun 2010) New Revision: 1452 Url: http://nuiton.org/repositories/revision/buix/1452 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 18:55:07 UTC (rev 1451) +++ trunk/pom.xml 2010-06-27 06:35:15 UTC (rev 1452) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1451 - trunk
by tchemit＠users.nuiton.org June 19, 2010

June 19, 2010

Author: tchemit Date: 2010-06-19 20:55:07 +0200 (Sat, 19 Jun 2010) New Revision: 1451 Url: http://nuiton.org/repositories/revision/buix/1451 Log: Utilisation de mavenpom4redmine 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 10:27:18 UTC (rev 1450) +++ trunk/pom.xml 2010-06-19 18:55:07 UTC (rev 1451) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1.5</version> + <version>2.2</version> </parent> <artifactId>buix</artifactId>

1 0

r1450 - trunk
by tchemit＠users.nuiton.org June 2, 2010

June 2, 2010

Author: tchemit Date: 2010-06-02 12:27:18 +0200 (Wed, 02 Jun 2010) New Revision: 1450 Url: http://nuiton.org/repositories/revision/buix/1450 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-09 12:33:45 UTC (rev 1449) +++ trunk/pom.xml 2010-06-02 10:27:18 UTC (rev 1450) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>buix</artifactId>

1 0

r1449 - trunk
by tchemit＠users.nuiton.org May 9, 2010

May 9, 2010

Author: tchemit Date: 2010-05-09 14:33:45 +0200 (Sun, 09 May 2010) New Revision: 1449 Url: http://nuiton.org/repositories/revision/buix/1449 Log: Utilisation de mavenpom4redmine 2.1.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-29 05:43:27 UTC (rev 1448) +++ trunk/pom.xml 2010-05-09 12:33:45 UTC (rev 1449) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1.3</version> + <version>2.1.4</version> </parent> <artifactId>buix</artifactId>

1 0

r1448 - trunk
by tchemit＠users.nuiton.org April 29, 2010

April 29, 2010

Author: tchemit Date: 2010-04-29 07:43:27 +0200 (Thu, 29 Apr 2010) New Revision: 1448 Log: Utilisation de mavenpom4redmine 2.1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-20 13:05:50 UTC (rev 1447) +++ trunk/pom.xml 2010-04-29 05:43:27 UTC (rev 1448) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1.2</version> + <version>2.1.3</version> </parent> <artifactId>buix</artifactId>

1 0

r1447 - trunk
by tchemit＠users.nuiton.org April 20, 2010

April 20, 2010

Author: tchemit Date: 2010-04-20 15:05:50 +0200 (Tue, 20 Apr 2010) New Revision: 1447 Log: Utilisation de mavenpom4redmine 2.1.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-16 18:11:02 UTC (rev 1446) +++ trunk/pom.xml 2010-04-20 13:05:50 UTC (rev 1447) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1.1</version> + <version>2.1.2</version> </parent> <artifactId>buix</artifactId>

1 0

r1446 - trunk
by tchemit＠users.nuiton.org April 16, 2010

April 16, 2010

Author: tchemit Date: 2010-04-16 20:11:02 +0200 (Fri, 16 Apr 2010) New Revision: 1446 Log: Utilisation de mavenpom4redmine 2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-12 12:14:10 UTC (rev 1445) +++ trunk/pom.xml 2010-04-16 18:11:02 UTC (rev 1446) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.1</version> + <version>2.1.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1445 - trunk
by tchemit＠users.nuiton.org April 12, 2010

April 12, 2010

Author: tchemit Date: 2010-04-12 14:14:10 +0200 (Mon, 12 Apr 2010) New Revision: 1445 Log: Utilisation de mavenpom4redmine 2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-09 23:29:38 UTC (rev 1444) +++ trunk/pom.xml 2010-04-12 12:14:10 UTC (rev 1445) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.7</version> + <version>2.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1444 - in trunk: . src/main/java/org/codelutin/buix src/main/java/org/codelutin/buix/layoutinfo src/main/resources src/site src/site/resources src/site/rst src/test/java/org/codelutin/buix
by tchemit＠users.nuiton.org April 9, 2010

April 9, 2010

Author: tchemit Date: 2010-04-10 01:29:38 +0200 (Sat, 10 Apr 2010) New Revision: 1444 Log: add svn:keywords on files Modified: trunk/.cvsignore trunk/LICENSE.txt trunk/TODO trunk/buix.sh trunk/lutincheckstyle.xml trunk/lutinheader.txt trunk/lutinproject.xml trunk/maven.doc.txt trunk/maven.xml trunk/pom.xml trunk/project.properties trunk/project.xml trunk/src/main/java/org/codelutin/buix/ActivateEventListItem.java trunk/src/main/java/org/codelutin/buix/ActivateEventListModel.java trunk/src/main/java/org/codelutin/buix/BeanEventListItem.java trunk/src/main/java/org/codelutin/buix/BeanEventListModel.java trunk/src/main/java/org/codelutin/buix/BeanLayoutPropertiesColumnModel.java trunk/src/main/java/org/codelutin/buix/BeanLayoutPropertiesTableModel.java trunk/src/main/java/org/codelutin/buix/BeanPropertiesColumnModel.java trunk/src/main/java/org/codelutin/buix/BeanPropertiesTableModel.java trunk/src/main/java/org/codelutin/buix/BeanSelectionPropertiesTableModel.java trunk/src/main/java/org/codelutin/buix/Buix.java trunk/src/main/java/org/codelutin/buix/BuixException.java trunk/src/main/java/org/codelutin/buix/BuixGlassPane.java trunk/src/main/java/org/codelutin/buix/BuixPreferences.java trunk/src/main/java/org/codelutin/buix/BuixPropertySheetPanel.java trunk/src/main/java/org/codelutin/buix/BuixSelectionEvent.java trunk/src/main/java/org/codelutin/buix/BuixSelectionListener.java trunk/src/main/java/org/codelutin/buix/BuixSelectionModel.java trunk/src/main/java/org/codelutin/buix/BuixTreeSelectionControler.java trunk/src/main/java/org/codelutin/buix/BuixUI.java trunk/src/main/java/org/codelutin/buix/BuixUICallback.java trunk/src/main/java/org/codelutin/buix/BuixXMLEncoder.java trunk/src/main/java/org/codelutin/buix/ComponentWalkerCallback.java trunk/src/main/java/org/codelutin/buix/EditorManager.java trunk/src/main/java/org/codelutin/buix/LayoutButton.java trunk/src/main/java/org/codelutin/buix/LayoutTreeNode.java trunk/src/main/java/org/codelutin/buix/PropertiesSelectionManager.java trunk/src/main/java/org/codelutin/buix/PropertiesSelectionManagerEvent.java trunk/src/main/java/org/codelutin/buix/PropertiesSelectionManagerListener.java trunk/src/main/java/org/codelutin/buix/SelectionWidgetButton.java trunk/src/main/java/org/codelutin/buix/ShelfButton.java trunk/src/main/java/org/codelutin/buix/ShelfTreeCellRenderer.java trunk/src/main/java/org/codelutin/buix/ShelfTreeModel.java trunk/src/main/java/org/codelutin/buix/ShelfTreeNode.java trunk/src/main/java/org/codelutin/buix/SwingTreeNode.java trunk/src/main/java/org/codelutin/buix/UIModelWriter.java trunk/src/main/java/org/codelutin/buix/WidgetButton.java trunk/src/main/java/org/codelutin/buix/WidgetManager.java trunk/src/main/java/org/codelutin/buix/WidgetManagerEvent.java trunk/src/main/java/org/codelutin/buix/WidgetManagerListener.java trunk/src/main/java/org/codelutin/buix/WidgetResource.java trunk/src/main/java/org/codelutin/buix/WidgetResources.java trunk/src/main/java/org/codelutin/buix/WidgetShelves.java trunk/src/main/java/org/codelutin/buix/layoutinfo/AbstractLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/BorderLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/BorderLayoutPlacePropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/BoxLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/BoxLayoutXAxisPropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/BoxLayoutYAxisPropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/DefaultLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/FlowLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/FlowLayoutPositionPropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/GridBagLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/GridBagLayoutPropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/GridLayoutCellXPropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/GridLayoutCellYPropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/layoutinfo/GridLayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/LayoutInfo.java trunk/src/main/java/org/codelutin/buix/layoutinfo/LayoutIntrospector.java trunk/src/main/java/org/codelutin/buix/layoutinfo/PropertyChildDescriptor.java trunk/src/main/java/org/codelutin/buix/package.html trunk/src/main/resources/default-layouts.xml trunk/src/main/resources/editor.properties trunk/src/main/resources/jcbcompletion-widgets.xml trunk/src/main/resources/jgoodies-widgets.xml trunk/src/main/resources/swing-widgets.xml trunk/src/site/resources/buixLogo.png trunk/src/site/rst/analyze-guide.rst trunk/src/site/rst/bilanExport.rst trunk/src/site/rst/loading-guide.rst trunk/src/site/rst/newConcept.rst trunk/src/site/rst/user-guide.rst trunk/src/site/rst/xmlencoder.rst trunk/src/site/site.xml trunk/src/test/java/org/codelutin/buix/AbstractTestCase.java trunk/src/test/java/org/codelutin/buix/AppTest.java trunk/src/test/java/org/codelutin/buix/NaughtyTest.java Property changes on: trunk/.cvsignore ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/TODO ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/buix.sh ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/lutincheckstyle.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/lutinheader.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/lutinproject.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/maven.doc.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/maven.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/project.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ActivateEventListItem.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ActivateEventListModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanEventListItem.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanEventListModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanLayoutPropertiesColumnModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanLayoutPropertiesTableModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanPropertiesColumnModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanPropertiesTableModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BeanSelectionPropertiesTableModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/Buix.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixGlassPane.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixPreferences.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixPropertySheetPanel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixSelectionEvent.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixSelectionListener.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixSelectionModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixTreeSelectionControler.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixUI.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixUICallback.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/BuixXMLEncoder.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ComponentWalkerCallback.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/EditorManager.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/LayoutButton.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/LayoutTreeNode.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/PropertiesSelectionManager.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/PropertiesSelectionManagerEvent.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/PropertiesSelectionManagerListener.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/SelectionWidgetButton.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ShelfButton.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ShelfTreeCellRenderer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ShelfTreeModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/ShelfTreeNode.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/SwingTreeNode.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/UIModelWriter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetButton.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetManager.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetManagerEvent.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetManagerListener.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetResource.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetResources.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/WidgetShelves.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/AbstractLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/BorderLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/BorderLayoutPlacePropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/BoxLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/BoxLayoutXAxisPropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/BoxLayoutYAxisPropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/DefaultLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/FlowLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/FlowLayoutPositionPropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/GridBagLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/GridBagLayoutPropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/GridLayoutCellXPropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/GridLayoutCellYPropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/GridLayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/LayoutInfo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/LayoutIntrospector.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/layoutinfo/PropertyChildDescriptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/codelutin/buix/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/resources/default-layouts.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/resources/editor.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/resources/jcbcompletion-widgets.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/resources/jgoodies-widgets.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/main/resources/swing-widgets.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/resources/buixLogo.png ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/analyze-guide.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/bilanExport.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/loading-guide.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/newConcept.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/user-guide.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/xmlencoder.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/site/site.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/test/java/org/codelutin/buix/AbstractTestCase.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/test/java/org/codelutin/buix/AppTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/src/test/java/org/codelutin/buix/NaughtyTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author

1 0

r1443 - trunk
by tchemit＠users.nuiton.org March 27, 2010

March 27, 2010

Author: tchemit Date: 2010-03-27 21:03:22 +0100 (Sat, 27 Mar 2010) New Revision: 1443 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 20:13:42 UTC (rev 1442) +++ trunk/pom.xml 2010-03-27 20:03:22 UTC (rev 1443) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <artifactId>buix</artifactId>

1 0

r1442 - trunk
by tchemit＠users.nuiton.org March 12, 2010

March 12, 2010

Author: tchemit Date: 2010-03-12 21:13:42 +0100 (Fri, 12 Mar 2010) New Revision: 1442 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-21 10:26:00 UTC (rev 1441) +++ trunk/pom.xml 2010-03-12 20:13:42 UTC (rev 1442) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>buix</artifactId>

1 0

r1441 - trunk
by tchemit＠users.nuiton.org Feb. 21, 2010

Feb. 21, 2010

Author: tchemit Date: 2010-02-21 11:26:00 +0100 (Sun, 21 Feb 2010) New Revision: 1441 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 21:06:35 UTC (rev 1440) +++ trunk/pom.xml 2010-02-21 10:26:00 UTC (rev 1441) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.4</version> + <version>2.0.5</version> </parent> <artifactId>buix</artifactId>

1 0

r1440 - trunk
by tchemit＠users.nuiton.org Jan. 26, 2010

Jan. 26, 2010

Author: tchemit Date: 2010-01-26 22:06:35 +0100 (Tue, 26 Jan 2010) New Revision: 1440 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-24 23:35:03 UTC (rev 1439) +++ trunk/pom.xml 2010-01-26 21:06:35 UTC (rev 1440) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <artifactId>buix</artifactId>

1 0

r1439 - trunk
by tchemit＠users.nuiton.org Jan. 24, 2010

Jan. 24, 2010

Author: tchemit Date: 2010-01-25 00:35:03 +0100 (Mon, 25 Jan 2010) New Revision: 1439 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 17:33:15 UTC (rev 1438) +++ trunk/pom.xml 2010-01-24 23:35:03 UTC (rev 1439) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <artifactId>buix</artifactId>

1 0

r1438 - trunk
by tchemit＠users.nuiton.org Jan. 19, 2010

Jan. 19, 2010

Author: tchemit Date: 2010-01-19 18:33:15 +0100 (Tue, 19 Jan 2010) New Revision: 1438 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-17 20:13:58 UTC (rev 1437) +++ trunk/pom.xml 2010-01-19 17:33:15 UTC (rev 1438) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </parent> <artifactId>buix</artifactId>

1 0

r1437 - trunk
by tchemit＠users.nuiton.org Jan. 17, 2010

Jan. 17, 2010

Author: tchemit Date: 2010-01-17 21:13:58 +0100 (Sun, 17 Jan 2010) New Revision: 1437 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-03 14:40:50 UTC (rev 1436) +++ trunk/pom.xml 2010-01-17 20:13:58 UTC (rev 1437) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>2.0.1</version> </parent> <artifactId>buix</artifactId>

1 0

r1436 - in trunk: . src/site src/site/resources
by bpoussin＠users.nuiton.org Dec. 3, 2009

Dec. 3, 2009

Author: bpoussin Date: 2009-12-03 15:40:50 +0100 (Thu, 03 Dec 2009) New Revision: 1436 Added: trunk/src/site/resources/ trunk/src/site/resources/buixLogo.png Removed: trunk/logo.jpg Log: ajout du logo dans le site Deleted: trunk/logo.jpg =================================================================== --- trunk/logo.jpg 2009-12-03 14:39:17 UTC (rev 1435) +++ trunk/logo.jpg 2009-12-03 14:40:50 UTC (rev 1436) @@ -1,14 +0,0 @@ -��JFIFHH��4Copyright Code Lutin 2002 -http://www.codelutin.com��C - - $.' ",#(7),01444'9=82<.342��C - -2!!22222222222222222222222222222222222222222222222222��?H"��F�vY:� -�:b�ř�7�tk�[��_cY o ��Y#?�NUٰI��DR6-��" !"$��R��>��][T�q�x��F#ǨS�%,�h@�|�wd��a!8se^*&i��pR�&J�<`s��/��W�;W*��qN�r�K[z> -��)d��U~˝�Θ��.js5�Y��O��!1��?��^ -�/��j��<I@kOU_��!1AQ��?�i6��/fKn�i��4��;�Eb#��, !1AQ"#�23BRbqr��?�]��On�l"�j��L;?��L�}0,ψ��óߓԺ�0��_��a*��5��κ�x�~OR��~�y�U鴥*�y��@Ü��;��{�S)��R�V�m�/��DS�2R5�|�Bȸ�(��N�K�KWQ�,t��U��J��zy�g��r�Q�oJ�\��O��#!1A Q�aq��?!�c��`��D�W��o�y@�mw��,�]��8��c0��/x8��P�g�z5qb�m)�d�>Џ�LI�]��C�&��+g�AP=��u��a u�]��1g��T+v"ֳT��a�̷(k�*dwJ�x��Py`��(j��~O�Grv/38�j��Θ��s�cK�1/��!A1��?ŉ��.�WC(S+w��Ev�g7�n��!�o��O��!1AQa��?��(ƅ�Dy�Y��v�3r٤i�� -Z>@�X��$!1AQa q��?�r��]-F*r��E��@PLB�y9�!2�K��!k��taO/>�� ӷd_ɾ�^w�]�/u��/k�h�oZy\jː}��- -�r -�Q�G��r��=��.��%y�"\�j��E^j�,2��k��I�Ӳ��K �/T��7])�YZP`��c�n��N�� ^`��ޢ�R�� -B~.rf�^��%�vEҲ�w58��(�I0�8��8�%$�B�۶�`I��#L�4O�P �D��_�/l�P�C�A��z� -��'�}h�AN �`�AXx�� \ No newline at end of file Copied: trunk/src/site/resources/buixLogo.png (from rev 1433, trunk/logo.jpg) =================================================================== --- trunk/src/site/resources/buixLogo.png (rev 0) +++ trunk/src/site/resources/buixLogo.png 2009-12-03 14:40:50 UTC (rev 1436) @@ -0,0 +1,14 @@ +��JFIFHH��4Copyright Code Lutin 2002 +http://www.codelutin.com��C + + $.' ",#(7),01444'9=82<.342��C + +2!!22222222222222222222222222222222222222222222222222��?H"��F�vY:� +�:b�ř�7�tk�[��_cY o ��Y#?�NUٰI��DR6-��" !"$��R��>��][T�q�x��F#ǨS�%,�h@�|�wd��a!8se^*&i��pR�&J�<`s��/��W�;W*��qN�r�K[z> +��)d��U~˝�Θ��.js5�Y��O��!1��?��^ +�/��j��<I@kOU_��!1AQ��?�i6��/fKn�i��4��;�Eb#��, !1AQ"#�23BRbqr��?�]��On�l"�j��L;?��L�}0,ψ��óߓԺ�0��_��a*��5��κ�x�~OR��~�y�U鴥*�y��@Ü��;��{�S)��R�V�m�/��DS�2R5�|�Bȸ�(��N�K�KWQ�,t��U��J��zy�g��r�Q�oJ�\��O��#!1A Q�aq��?!�c��`��D�W��o�y@�mw��,�]��8��c0��/x8��P�g�z5qb�m)�d�>Џ�LI�]��C�&��+g�AP=��u��a u�]��1g��T+v"ֳT��a�̷(k�*dwJ�x��Py`��(j��~O�Grv/38�j��Θ��s�cK�1/��!A1��?ŉ��.�WC(S+w��Ev�g7�n��!�o��O��!1AQa��?��(ƅ�Dy�Y��v�3r٤i�� +Z>@�X��$!1AQa q��?�r��]-F*r��E��@PLB�y9�!2�K��!k��taO/>�� ӷd_ɾ�^w�]�/u��/k�h�oZy\jː}��- +�r +�Q�G��r��=��.��%y�"\�j��E^j�,2��k��I�Ӳ��K �/T��7])�YZP`��c�n��N�� ^`��ޢ�R�� +B~.rf�^��%�vEҲ�w58��(�I0�8��8�%$�B�۶�`I��#L�4O�P �D��_�/l�P�C�A��z� +��'�}h�AN �`�AXx�� \ No newline at end of file

2 1

r1435 - in trunk: . src src/site
by bpoussin＠users.nuiton.org Dec. 3, 2009

Dec. 3, 2009

Author: bpoussin Date: 2009-12-03 15:39:17 +0100 (Thu, 03 Dec 2009) New Revision: 1435 Added: trunk/src/site/ trunk/src/site/rst/ trunk/src/site/site.xml Removed: trunk/doc/ trunk/xdocs/ Log: ajout du site a la maven2 Added: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml (rev 0) +++ trunk/src/site/site.xml 2009-12-03 14:39:17 UTC (rev 1435) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>buixLogo.png</src> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> + + <logo href="http://jrst.labs.libre-entreprise.org/jrst" name="JRst" + img="images/jrst-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + + </poweredBy> + + <body> + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html" /> + <item name="Guide utilisateur" href="user-guide.html" /> + </menu> + + <menu name="Développeur"> + <item name="Guide de conception" href="analyze-guide.html" /> + <item name="Chargement Bean" href="loading-guide.html" /> + <item name="Problemes Encoder" href="bilanExport.html" /> + </menu> + + <menu ref="reports"/> + +  + + </body> +</project>

1 0

r1434 - in trunk: . src src/main src/test src/test/java
by bpoussin＠users.nuiton.org Dec. 3, 2009

Dec. 3, 2009

Author: bpoussin Date: 2009-12-03 15:28:24 +0100 (Thu, 03 Dec 2009) New Revision: 1434 Added: trunk/src/main/ trunk/src/main/java/ trunk/src/main/resources/ trunk/src/test/java/ trunk/src/test/java/org/ Removed: trunk/src/java/ trunk/src/resources/ trunk/src/test/org/ Modified: trunk/pom.xml Log: change directory layout to maven layout change pom to compile project Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-15 15:12:10 UTC (rev 1433) +++ trunk/pom.xml 2009-12-03 14:28:24 UTC (rev 1434) @@ -6,9 +6,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>lutinlib</groupId> - <artifactId>lutinproject</artifactId> - <version>2.2</version> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.1.0</version> </parent> <artifactId>buix</artifactId> @@ -60,6 +60,12 @@ </distributionManagement> <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency>  <dependency> <groupId>lutinlib</groupId>

1 0

r1433 - trunk
by tchemit＠users.nuiton.org Aug. 15, 2009

Aug. 15, 2009

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 Aug. 4, 2009

Aug. 4, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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 July 31, 2009

July 31, 2009

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

r1513 - in trunk/jaxx-runtime-swing-widget/src/main: java/jaxx/runtime/swing/editor/config java/jaxx/runtime/swing/editor/config/model resources/i18n
by tchemit＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: tchemit Date: 2009-07-31 00:28:43 +0200 (Fri, 31 Jul 2009) New Revision: 1513 Modified: trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-en_GB.properties trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties Log: improve quit action (always use the action of quit button, begin of ui to quit config editor when config was saved at least one, to be continued...) Modified: trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java =================================================================== --- trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java 2009-07-30 22:27:02 UTC (rev 1512) +++ trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIBuilder.java 2009-07-30 22:28:43 UTC (rev 1513) @@ -19,9 +19,11 @@ package jaxx.runtime.swing.editor.config; import java.awt.Frame; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.List; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.JButton; @@ -70,9 +72,32 @@ @Override public void actionPerformed(ActionEvent e) { - if (canQuitCategory(ui)) { - ui.getParentContainer(JDialog.class).dispose(); + if (!canQuitCategory(ui)) { + return; } + + if (model.isSaved() && !model.isStandalone()) { + StringBuilder buffer = new StringBuilder(); + // on doit verifier si des options sauvees necessite + // un redemarrage de l'application + for (CategoryModel cat : model) { + List<OptionModel> savedOptions = cat.getSavedOptions(); + if (!savedOptions.isEmpty()) { + buffer.append("\n").append(_("config.category.saved", _(cat.getCategory()))).append("\n"); + for (OptionModel option : savedOptions) { + buffer.append("\n- ").append(option.getKey()); + } + } + + } +// askUser(ui, +// _("config.title.will.reload.application"), buffer.toString(), +// JOptionPane.INFORMATION_MESSAGE, +// new Object[]{ +// _("config.choice.ok")}, +// 0); + } + ui.getParentContainer(Window.class).dispose(); } }; String tip = quitButton.getToolTipText(); @@ -113,17 +138,18 @@ f.setIconImage(ui.getIconImage()); } // pour savoir si l'ui est autonome - configUI.putClientProperty("standalone", ui == null); + configUI.getModel().setStandalone(ui == null); f.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); f.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - - if (canQuitCategory(configUI)) { - e.getWindow().dispose(); - } + ActionEvent myEvent = new ActionEvent(e.getSource(), 1, "quit"); + configUI.getQuit().getAction().actionPerformed(myEvent); +// if (canQuitCategory(configUI)) { +// e.getWindow().dispose(); +// } } }); f.setUndecorated(undecorated); Modified: trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java =================================================================== --- trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2009-07-30 22:27:02 UTC (rev 1512) +++ trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2009-07-30 22:28:43 UTC (rev 1513) @@ -131,6 +131,16 @@ return result; } + public List<OptionModel> getSavedOptions() { + List<OptionModel> result = new ArrayList<OptionModel>(); + for (OptionModel option : this) { + if (option.isSaved()) { + result.add(option); + } + } + return result; + } + public void firePropertyChange(String propertyName, Object oldValue, Object newValue) { pcs.firePropertyChange(propertyName, oldValue, newValue); } Modified: trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java 2009-07-30 22:27:02 UTC (rev 1512) +++ trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java 2009-07-30 22:28:43 UTC (rev 1513) @@ -45,6 +45,22 @@ protected final ApplicationConfig config; /** la cateogrie en cours d'utilisation */ protected CategoryModel categoryModel; + /** + * un drapeau pour savoir si la configuration a été modifiée au moins une + * fois. + * + * On utilise ce drapeau lors de la sortie pour verifier s'il faut ou non + * redemarer l'application (si non en mode standalone) + */ + protected boolean saved; + /** + * un drapeau pour savoir si l'ui de configuration a été lancée en mode + * standalone ou pas. + * + * Si pas lancée en mode standalone, et si la confi a été sauvé on vérifie + * s'il ne faut pas relancer l'application. + */ + protected boolean standalone; /** suport of modification */ protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); @@ -105,6 +121,22 @@ firePropertyChange(CATEGORY_MODEL_PROPERTY_NAME, old, categoryModel); } + public boolean isSaved() { + return saved; + } + + public void setSaved(boolean saved) { + this.saved = saved; + } + + public boolean isStandalone() { + return standalone; + } + + public void setStandalone(boolean standalone) { + this.standalone = standalone; + } + public void saveModified() { // compute transients keys (to never be saved) List<String> transients = new ArrayList<String>(); @@ -115,6 +147,8 @@ //TODO TC-20090245 : should try to seek for a mutator, since // mutator could have extra code to be done when modify an option config.setOption(option.getKey(), value == null ? null : value.toString()); + // l'option a été sauvegardée, on la marque + option.setSaved(true); // this is the new original value option.initValue(value); } @@ -122,6 +156,7 @@ transients.add(option.getKey()); } } + setSaved(true); // save config config.saveForUser(transients.toArray(new String[transients.size()])); // notify data has changed Modified: trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java =================================================================== --- trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2009-07-30 22:27:02 UTC (rev 1512) +++ trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2009-07-30 22:28:43 UTC (rev 1513) @@ -27,9 +27,15 @@ */ public class OptionModel implements OptionDef { + /** la definition de l'option ( venant de la config) */ protected final OptionDef def; + /** un drapeau pour savoir si l'option est valide (n'est pas utilisé actuellement) */ protected boolean valid = true; + /** un drapeau pour savoir si l'option a été sauvée */ + protected boolean saved = false; + /** la valeur non modifié de l'option */ protected Object originalValue; + /** la valeur actuelle de l'option (peut être la valeur orignal si non modifée)*/ protected Object value; protected OptionModel(OptionDef def, Object value) { @@ -91,6 +97,14 @@ this.valid = valid; } + public boolean isSaved() { + return saved; + } + + public void setSaved(boolean saved) { + this.saved = saved; + } + public void initValue(Object originalValue) { this.originalValue = originalValue; this.value = originalValue; Modified: trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-en_GB.properties =================================================================== --- trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-en_GB.properties 2009-07-30 22:27:02 UTC (rev 1512) +++ trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-en_GB.properties 2009-07-30 22:28:43 UTC (rev 1513) @@ -10,9 +10,11 @@ config.action.reset.tip=Cancel the modifications for the category config.action.save=Save config.action.save.tip=Save the modifications for the category +config.category.saved=The category '%1$s' was modified \: config.choice.cancel=Cancel config.choice.continue=Continue config.choice.doNotSave=Do not save +config.choice.ok=Ok config.choice.save=Save config.defaultValue=Default value config.defaultValue.tip=Default value of the option @@ -30,6 +32,7 @@ config.option.modified=Value is modified < original value \: '%1$s' - new value \: '%2$s' > config.title=Preferences config.title.need.confirm=A confirmation is required +config.title.will.reload.application=The application need to be restarted config.unmodifiable=Can not be modified config.unvalid=Option is not valid \! (previous value \: %1$s, required type \: %2$s) config.value=Value Modified: trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties =================================================================== --- trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties 2009-07-30 22:27:02 UTC (rev 1512) +++ trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties 2009-07-30 22:28:43 UTC (rev 1513) @@ -10,9 +10,11 @@ config.action.reset.tip=Annuler les modifications de cette cat\u00E9gorie config.action.save=Enregistrer config.action.save.tip=Sauver les modifications de cette cat\u00E9gorie +config.category.saved=La cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E9e \: config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer +config.choice.ok=Ok config.choice.save=Enregistrer config.defaultValue=Valeur par d\u00E9faut config.defaultValue.tip=Valeur par d\u00E9faut de l'option @@ -31,6 +33,7 @@ config.option.valid=Valeur non valide config.title=Pr\u00E9f\u00E9rences config.title.need.confirm=Une confirmation de votre part est requise... +config.title.will.reload.application=L'application doit \u00EAtre red\u00E9marrer... config.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) config.value=Valeur

1 0

r1512 - trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: tchemit Date: 2009-07-31 00:27:02 +0200 (Fri, 31 Jul 2009) New Revision: 1512 Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java Log: add exlude steps in generic model Modified: trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java =================================================================== --- trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2009-07-27 20:27:58 UTC (rev 1511) +++ trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2009-07-30 22:27:02 UTC (rev 1512) @@ -2,6 +2,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.List; /** * Un modèle de wizard. @@ -30,7 +31,9 @@ /** * Toutes les étapes à passer */ - protected java.util.List<E> steps; + protected List<E> steps; + /** les etapes a exclure */ + protected List<E> excludeSteps; /** * L'étape courante */ @@ -169,6 +172,9 @@ this.valueAdjusting = valueAdjusting; } + public void setExcludeSteps(List<E> excludeSteps) { + this.excludeSteps = excludeSteps; + } public boolean validate(E s) { return step != null; }

1 0

r1544 - trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 17:00:19 +0200 (Thu, 30 Jul 2009) New Revision: 1544 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.guix Log: update the example files with the new feature 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-30 14:59:58 UTC (rev 1543) +++ trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/Controller.java 2009-07-30 15:00:19 UTC (rev 1544) @@ -1,3 +1,21 @@ +/** + * *##% guix-test-swing + * 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.demo; public class Controller { @@ -2,6 +20,28 @@ + private java.lang.String text = "controller"; + private int num = 0; + public Controller() { System.out.println("Dude, it's bloody raining"); } + public void test() { + + } + + public java.lang.String getText() { + return text; + } + + public void setText(java.lang.String text) { + this.text = text; + } + + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } } 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-30 14:59:58 UTC (rev 1543) +++ trunk/guix-test-swing/src/main/java/org/nuiton/guix/demo/GuixDemo.guix 2009-07-30 15:00:19 UTC (rev 1544) @@ -41,7 +41,9 @@ } ]]></script> - <java.util.ArrayList id="controller" /> + <java.util.ArrayList id="list" /> + <org.nuiton.guix.demo.Controller id="c1" text="c1" /> + <org.nuiton.guix.demo.Controller id="c2" num="10" /> <MenuBar border="new javax.swing.border.BevelBorder(javax.swing.border.BevelBorder.RAISED)"> <Menu constructor='"menu 1"'> <MenuItem id="item1" text="item1" /> @@ -89,9 +91,14 @@ </Row> <Row> <Cell columns="3"> - <GuixDemo3 id="bt34" text="bt34" /> + <Label text="{c1.getText()} : {c1.getNum()}" /> </Cell> - </Row> + </Row> + <Row> + <Cell columns="3"> + <Label text="{c2.getText()} : {c2.getNum()}" /> + </Cell> + </Row> <Row> <Cell columns="2"> <Label id="label3" text="color" foreground="java.awt.Color.YELLOW" />

1 0

r1543 - trunk/maven-guix-plugin/src/main/java/org/nuiton/guix
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 16:59:58 +0200 (Thu, 30 Jul 2009) New Revision: 1543 Modified: trunk/maven-guix-plugin/src/main/java/org/nuiton/guix/GuixMojo.java Log: add the source directory 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-30 14:59:37 UTC (rev 1542) +++ trunk/maven-guix-plugin/src/main/java/org/nuiton/guix/GuixMojo.java 2009-07-30 14:59:58 UTC (rev 1543) @@ -107,6 +107,7 @@ GuixLauncher gcl = new GuixLauncher(guixFiles.toArray( new File[guixFiles.size()]), targetDirectory, rootPackage, + new File(project.getBasedir(), "src/main/java"), guixFilesDir, mainClass, generatorClass, launcherName); boolean result = gcl.compile(); if (result) {

1 0

r1542 - in trunk/guix-test-gwt/src/main/java/org/nuiton/guix: client demo
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 16:59:37 +0200 (Thu, 30 Jul 2009) New Revision: 1542 Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/Controller.java Modified: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.guix Log: update the example files with the new feature Added: trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/Controller.java =================================================================== --- trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/Controller.java (rev 0) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/client/Controller.java 2009-07-30 14:59:37 UTC (rev 1542) @@ -0,0 +1,48 @@ +/** + * *##% guix-test-swing + * 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.client; + +public class Controller { + + private java.lang.String text = "controller"; + private int num = 0; + + public Controller() { + System.out.println("Dude, it's bloody raining"); + } + + public void test() { + } + + public java.lang.String getText() { + return text; + } + + public void setText(java.lang.String text) { + this.text = text; + } + + public int getNum() { + return num; + } + + public void setNum(int num) { + this.num = num; + } +} Modified: 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-30 14:59:12 UTC (rev 1541) +++ trunk/guix-test-gwt/src/main/java/org/nuiton/guix/demo/GuixDemo.guix 2009-07-30 14:59:37 UTC (rev 1542) @@ -46,6 +46,9 @@ } ]]></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' /> @@ -59,6 +62,7 @@ </Menu> </Menu> </MenuBar> + <java.util.ArrayList id="list" /> <TabPanel size='800px","400px'> <Table id="table1" name="Table"> <Row> @@ -67,7 +71,7 @@ <TextField id="textfield" text='test' enabled="{gd2.getButton().down && gd22.button.isSelected()}" onFocus='{System.out.println("dude !")}'/> </Cell> <Cell> - <Label id="label" text="{textfield.getText()}" styleClass="bold" /> + <Label id="label" visible="{textfield.enabled}" text="{textfield.getText()}" styleClass="bold" /> </Cell> <Cell rows='3'> <Label id="label2" text="color" style="color: yellow" /> @@ -75,7 +79,7 @@ </Row> <Row insets="0,0,0,0"> <Cell columns="3"> - <GuixDemo3 id="bt3" text="bt3" onClick='{System.out.println("beau gosse")}'/> + <GuixDemo3 id="bt3" text="bt3" onClick='{System.out.println("beau gosse");list.add("test" + list.size())}'/> </Cell> </Row> <Row insets="0,0,0,0"> @@ -88,12 +92,17 @@ </Row> <Row> <Cell columns="3"> - <GuixDemo3 id="bt34" text="bt34" /> + <Label text="{c1.getText()} : {c1.getNum()}" /> </Cell> - </Row> + </Row> + <Row> + <Cell columns="3"> + <Label text="{c2.getText()} : {c2.getNum()}" /> + </Cell> + </Row> <Row> <Cell columns="2"> - <Label id="label3" text="color" style="color: yellow" /> + <Label id="label3" text="list size : {list.size()}" style="color: yellow" /> </Cell> </Row> </Table>

1 0

r1541 - in trunk/guix-compiler-swing/src: main/java/org/nuiton/guix/generator test/java/org/nuiton/guix/generator
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 16:59:12 +0200 (Thu, 30 Jul 2009) New Revision: 1541 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/SwingGenerator.java trunk/guix-compiler-swing/src/test/java/org/nuiton/guix/generator/SwingGeneratorTest.java Log: Add the acceptation for tags that represents classes defined in the src directory 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-30 14:59:00 UTC (rev 1540) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java 2009-07-30 14:59:12 UTC (rev 1541) @@ -20,6 +20,10 @@ //~--- non-JDK imports -------------------------------------------------------- import java.beans.IntrospectionException; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStreamReader; +import java.io.Reader; import org.nuiton.guix.tags.swing.MenuBarHandler; ; import org.nuiton.guix.model.GuixModelObject; @@ -62,6 +66,8 @@ /** Bindings to generate */ Map<String,Map<String, String>> bindings2Generate = new HashMap<String,Map<String, String>>(); + SwingGenerator swingGenerator; + /** * Constructor * @@ -80,6 +86,10 @@ script = sh.decomposeScript(gmo.getClassDescriptor().getScript()); } + public void setSwingGenerator(SwingGenerator swingGenerator) { + this.swingGenerator = swingGenerator; + } + @Override public JavaFile generate() { super.addImports(gmo); @@ -331,92 +341,101 @@ } //if the class hasn't been found if (clazz == null) { - File f = new File(gmo.getClassDescriptor().toString().replace('.', File.separatorChar)); - if(f.exists()) { - + File f = new File(swingGenerator.getSrcDir(), gmo.getClassDescriptor().toString().replace('.', File.separatorChar) + ".java"); + try { + Reader isr = new InputStreamReader(new FileInputStream(f)); + JavaFile jFile = JavaFileParser.parseJavaFile(gmo.getClassDescriptor().toString(), isr); + jf.addField(new JavaField(Modifier.PRIVATE, gmo.getClassDescriptor().toString(), gmo.getId(), gmo.getJavadoc()), true); + StringBuffer creationMethod = new StringBuffer(); + String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); + creationMethod.append(gmo.getId()).append(" = new ").append(gmo.getClassDescriptor().toString()).append("(").append(gmo.getConstructor() != null ? gmo.getConstructor() : "").append(");\n"); + componentsCreation.append("create").append(capitalizedId).append("();\n"); + processAttributes(jFile, gmo, creationMethod); } - else { + catch (FileNotFoundException eee) { + log.error(eee); throw new ClassNotFoundException(); } } - - //if gmo has a TagHandler, add a field to the JavaFile with this TagHandler (used for the databinding generation) - if(gmo.getClassDescriptor().getPackageName() == null - && th != null && th.getClassToGenerate() != null) { - jf.addField(new JavaField(Modifier.PRIVATE, - clazz.getName(), - gmo.getId(), gmo.getJavadoc(), th), - true); - } - //if gmo is the root ModelObject, it equals "this" - else if(gmo.getId() == null) { - jf.addField(new JavaField(Modifier.PRIVATE, - (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Abstract" : gmo.getClassDescriptor().toString(), - gmo.getClassDescriptor().getName().toLowerCase(), "this", gmo.getJavadoc(), th), - true); - } else { - jf.addField(new JavaField(Modifier.PRIVATE, - (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Abstract" : gmo.getClassDescriptor().toString(), - gmo.getId(), gmo.getJavadoc(), th), - true); - } + //if gmo has a TagHandler, add a field to the JavaFile with this TagHandler (used for the databinding generation) + if(gmo.getClassDescriptor().getPackageName() == null + && th != null && th.getClassToGenerate() != null) { + jf.addField(new JavaField(Modifier.PRIVATE, + clazz.getName(), + gmo.getId(), gmo.getJavadoc(), th), + true); + } + //if gmo is the root ModelObject, it equals "this" + else if(gmo.getId() == null) { + jf.addField(new JavaField(Modifier.PRIVATE, + (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Abstract" : gmo.getClassDescriptor().toString(), + gmo.getClassDescriptor().getName().toLowerCase(), "this", gmo.getJavadoc(), th), + true); + } + else { + jf.addField(new JavaField(Modifier.PRIVATE, + (classes != null && classes.contains(gmo.getClassDescriptor().toString())) ? gmo.getClassDescriptor().toString() + "Abstract" : gmo.getClassDescriptor().toString(), + gmo.getId(), gmo.getJavadoc(), th), + true); + } - //if gmo does not represents the first tag - if (gmo.getParent() != null) { - //id with the first letter capitalized - String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); - StringBuffer creationMethod = new StringBuffer(); - creationMethod.append(gmo.getId()).append(" = new ").append(classes.contains(gmo.getClassDescriptor().toString()) ? gmo.getClassDescriptor().toString() + "Impl" : clazz.getName()).append("(").append(gmo.getConstructor() != null ? gmo.getConstructor() : "").append(");\n"); - componentsCreation.append("create").append(capitalizedId).append("();\n"); + //if gmo does not represents the first tag + if (gmo.getParent() != null) { + //id with the first letter capitalized + String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); + StringBuffer creationMethod = new StringBuffer(); + creationMethod.append(gmo.getId()).append(" = new ").append(classes.contains(gmo.getClassDescriptor().toString()) ? gmo.getClassDescriptor().toString() + "Impl" : clazz.getName()).append("(").append(gmo.getConstructor() != null ? gmo.getConstructor() : "").append(");\n"); + componentsCreation.append("create").append(capitalizedId).append("();\n"); - //FIXME - if (gmo.getStyleSheets() != null) { - styleSheets.addAll(gmo.getStyleSheets()); - } - - constraint = processAttributes(clazz, gmo, creationMethod, null, seh, null, th); + //FIXME + if (gmo.getStyleSheets() != null) { + styleSheets.addAll(gmo.getStyleSheets()); + } - //if gmo is the child of a cell - if (!((gmo.getParent().getClassDescriptor().getPackageName() == null || gmo.getParent().getClassDescriptor().getPackageName().equals("org.nuiton.guix.tags.swing")) && gmo.getParent().getClassDescriptor().getName().equalsIgnoreCase("Cell"))) { - //if gmo represents a JMenuBar - if (gmo.getClassDescriptor().toString().equals("javax.swing.JMenuBar")) { - //the method to add a JMenuBar is not add but setJMenuBar - componentsTree.append(gmo.getParent().getId() == null ? "this" : gmo.getParent().getId()).append(".setJMenuBar(").append(gmo.getId()).append(");\n"); - } - else { - //add the component to its parent - if(java.awt.Component.class.isAssignableFrom(clazz)) { - componentsTree.append(gmo.getParent().getId() == null ? "this" : gmo.getParent().getId()).append(".add(").append(gmo.getId()); - //with a constraint if it is not null - if (constraint != null) { - componentsTree.append(",").append(constraint); + constraint = processAttributes(clazz, gmo, creationMethod, null, seh, null, th); + + //if gmo is the child of a cell + if (!((gmo.getParent().getClassDescriptor().getPackageName() == null || gmo.getParent().getClassDescriptor().getPackageName().equals("org.nuiton.guix.tags.swing")) && gmo.getParent().getClassDescriptor().getName().equalsIgnoreCase("Cell"))) { + //if gmo represents a JMenuBar + if (gmo.getClassDescriptor().toString().equals("javax.swing.JMenuBar")) { + //the method to add a JMenuBar is not add but setJMenuBar + componentsTree.append(gmo.getParent().getId() == null ? "this" : gmo.getParent().getId()).append(".setJMenuBar(").append(gmo.getId()).append(");\n"); + } + else { + //add the component to its parent + if(java.awt.Component.class.isAssignableFrom(clazz)) { + componentsTree.append(gmo.getParent().getId() == null ? "this" : gmo.getParent().getId()).append(".add(").append(gmo.getId()); + //with a constraint if it is not null + if (constraint != null) { + componentsTree.append(",").append(constraint); + } + componentsTree.append(");\n"); } - componentsTree.append(");\n"); } } - } - } - //if gmo represents the first tag - else { - boolean layoutDefined = false; - //set superclass and interface - if(th != null) { - jf.setSuperClass(th.getClassToGenerate().getName()); } + //if gmo represents the first tag else { - jf.setSuperClass(gmo.getClassDescriptor().getSuperClass().getPackageName() + "." + gmo.getClassDescriptor().getSuperClass().getName()); - } - jf.addInterface(gmo.getClassDescriptor().getName()); + boolean layoutDefined = false; + //set superclass and interface + if(th != null) { + jf.setSuperClass(th.getClassToGenerate().getName()); + } + else { + jf.setSuperClass(gmo.getClassDescriptor().getSuperClass().getPackageName() + "." + gmo.getClassDescriptor().getSuperClass().getName()); + } + jf.addInterface(gmo.getClassDescriptor().getName()); - //FIXME - if (gmo.getStyleSheets() != null) { - styleSheets.addAll(gmo.getStyleSheets()); + //FIXME + if (gmo.getStyleSheets() != null) { + styleSheets.addAll(gmo.getStyleSheets()); + } + + constraint = processAttributes(clazz, gmo, null, componentsTree, seh, layoutDefined, th); } - - constraint = processAttributes(clazz, gmo, null, componentsTree, seh, layoutDefined, th); } //browse the children of gmo for (GuixModelObject child : gmo.getChildren()) { @@ -483,7 +502,7 @@ m++; } //if yes - if(m < methods.length) { + if(m < methods.length) { //if the attribute binds the value of another component attribute if (binding != null) { if(!bindings2Generate.containsKey(gmo.getId())) { @@ -491,14 +510,17 @@ } bindings2Generate.get(gmo.getId()).put(attr.getName(), binding); } - else { //checks if the parameter of the setter is a String + else { + //checks if the parameter of the setter is a String addQuote = methods[m].getParameterTypes()[0].equals(String.class); //generates the code to set the attribute to object - if(creationMethod != null) + if(creationMethod != null) { creationMethod.append(gmo.getId()).append(".set").append(capitalizedAttribute).append("(").append(addQuote ? "\"" : "").append(attr.getValue()).append(addQuote ? "\"" : "").append(");\n"); + } //generates the code to set the attribute of the class - if(componentsTree != null) + if(componentsTree != null) { componentsTree.append("this.set").append(capitalizedAttribute).append("(").append(addQuote ? "\"" : "").append(attr.getValue()).append(addQuote ? "\"" : "").append(");\n"); + } //if the attribute name is layout if (layoutDefined != null && attr.getName().equals("layout")) { layoutDefined = true; @@ -536,6 +558,57 @@ } /** + * + * @param jFile + * @param gmo + * @param creationMethod + */ + private void processAttributes(JavaFile jFile, GuixModelObject gmo, StringBuffer creationMethod) { + //processCSSAttributes(gmo, seh, clazz); + //browses the attributes + for (AttributeDescriptor attr : gmo.getAttributeDescriptors()) { + boolean addQuote = false; + //the attribute name with the first letter capitalized + String capitalizedAttribute = (attr.getName().length() > 0) ? Character.toUpperCase(attr.getName().charAt(0)) + attr.getName().substring(1) : attr.getName(); + + JavaMethod method = null; + for(JavaMethod m : jFile.getMethods()) { + if(m.getName().equals("set" + capitalizedAttribute)) { + method = m; + break; + } + } + + if(method != null) { + String binding = BindingUtils.processDataBindings(attr.getValue()); + if(binding != null) { + if(!bindings2Generate.containsKey(gmo.getId())) { + bindings2Generate.put(gmo.getId(), new HashMap<String, String>()); + } + bindings2Generate.get(gmo.getId()).put(attr.getName(), binding); + } + else { + //checks if the parameter of the setter is a String + addQuote = method.getArguments()[0].getType().equals(String.class.getName()); + //generates the code to set the attribute to object + creationMethod.append(gmo.getId()).append(".set").append(capitalizedAttribute).append("(").append(addQuote ? "\"" : "").append(attr.getValue()).append(addQuote ? "\"" : "").append(");\n"); + } + } + else if(log.isErrorEnabled()) { + log.error(attr.getName() + " cannot be set."); + } + } + //if gmo does not represents the first tag + if(gmo.getId() != null && creationMethod != null) { + //id with the first letter capitalized + String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); + + //add to the file the creation method for this object + jf.addMethod(new JavaMethod(Modifier.PRIVATE, "void", "create" + capitalizedId, null, null, creationMethod.toString(), gmo.getId() + " creation")); + } + } + + /** * Transform the css attributes into AttributeDescriptors * * @param gmo the GuixModelObject which has got the css attributes Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java =================================================================== --- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java 2009-07-30 14:59:00 UTC (rev 1540) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java 2009-07-30 14:59:12 UTC (rev 1541) @@ -52,9 +52,13 @@ public JavaFile generate() { try { String gmoClassName = gmo.getClassDescriptor().getName(); - File out = new File(destDir, gmoClassName + ".java"); - File outAbstract = new File(destDir, gmoClassName + "Abstract.java"); - File outImpl = new File(destDir, gmoClassName + "Impl.java"); + File outDir = new File(destDir, gmo.getClassDescriptor().getPackageName().replace('.', File.separatorChar)); + if(!outDir.exists()) { + outDir.mkdirs(); + } + 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 { @@ -73,6 +77,7 @@ } SwingInterfaceGenerator sing = new SwingInterfaceGenerator(gmo, classes); SwingAbstractClassGenerator sacg = new SwingAbstractClassGenerator(gmo, classes); + sacg.setSwingGenerator(this); SwingImplementationGenerator simg = new SwingImplementationGenerator(gmo, classes); sing.generate(); @@ -84,7 +89,7 @@ if (mainClass) { SwingMainClassGenerator smcg = new SwingMainClassGenerator(gmo); - File outMain = new File(destDir, launcherName + ".java"); + File outMain = new File(outDir, launcherName + ".java"); smcg.generate(outMain); } @@ -298,134 +303,145 @@ removeMethod = "removePropertyChangeListener"; } } - else { - listener = PropertyChangeListener.class; - addMethod = "addPropertyChangeListener"; - removeMethod = "removePropertyChangeListener"; + try { + nextClazz = Class.forName(returnType); + if(listener == null && nextClazz.isAssignableFrom(java.awt.Container.class)) { + listener = PropertyChangeListener.class; + addMethod = "addPropertyChangeListener"; + removeMethod = "removePropertyChangeListener"; + } } - - //starts to generate the code - dbCreation.append("if("); - dbDeletion.append("if("); - if(alreadyChecked != null && !alreadyChecked.isEmpty()) { - //add not null parent condition - for(int j = 0 ; j < alreadyChecked.size() ; j++) { - dbCreation.append(alreadyChecked.get(0)); - dbDeletion.append(alreadyChecked.get(0)); - for(int k = 1 ; k <= j ; k++) { - dbCreation.append(".").append(alreadyChecked.get(k)); - dbDeletion.append(".").append(alreadyChecked.get(k)); + catch (ClassNotFoundException eee) { + for(JavaFile javaFile : generatedFiles.values()) { + if(returnType.equals(javaFile.getPackageName() + "." + javaFile.getClassName())) { + nextFile = javaFile; + break; } - dbCreation.append(" != null && "); - dbDeletion.append(" != null && "); } + try { + Class c = Class.forName(nextFile.getSuperClass()); + if(listener == null && c.isAssignableFrom(java.awt.Container.class)) { + listener = PropertyChangeListener.class; + addMethod = "addPropertyChangeListener"; + removeMethod = "removePropertyChangeListener"; + } + } + catch(ClassNotFoundException eeee) { + } + catch(NullPointerException eeee) { + } + } + if(listener != null) { + //starts to generate the code + dbCreation.append("if("); + dbDeletion.append("if("); + if(alreadyChecked != null && !alreadyChecked.isEmpty()) { + //add not null parent condition + for(int j = 0 ; j < alreadyChecked.size() ; j++) { + dbCreation.append(alreadyChecked.get(0)); + dbDeletion.append(alreadyChecked.get(0)); + for(int k = 1 ; k <= j ; k++) { + dbCreation.append(".").append(alreadyChecked.get(k)); + dbDeletion.append(".").append(alreadyChecked.get(k)); + } + dbCreation.append(" != null && "); + dbDeletion.append(" != null && "); + } - if(binding.length > alreadyChecked.size() + 1) { + if(binding.length > alreadyChecked.size() + 1) { + for(int j = 0 ; j < alreadyChecked.size() ; j++) { + dbCreation.append(alreadyChecked.get(j)).append("."); + dbDeletion.append(alreadyChecked.get(j)).append("."); + } + dbCreation.append(getter).append(" != null"); + dbDeletion.append(getter).append(" != null"); + } + else { + dbCreation.delete(dbCreation.length() - 4, dbCreation.length()); + dbDeletion.delete(dbDeletion.length() - 4, dbDeletion.length()); + } + } + else { + dbCreation.append(getter).append(" != null"); + dbDeletion.append(getter).append(" != null"); + } + dbCreation.append(") {\n"); + dbDeletion.append(") {\n"); + + if(alreadyChecked != null) { for(int j = 0 ; j < alreadyChecked.size() ; j++) { dbCreation.append(alreadyChecked.get(j)).append("."); dbDeletion.append(alreadyChecked.get(j)).append("."); } - dbCreation.append(getter).append(" != null"); - dbDeletion.append(getter).append(" != null"); } + if(model != null) { + dbCreation.append("get").append(Character.toUpperCase(model.charAt(0))) + .append(model.substring(1)).append("()"); + dbDeletion.append("get").append(Character.toUpperCase(model.charAt(0))) + .append(model.substring(1)).append("()"); + } else { - dbCreation.delete(dbCreation.length() - 4, dbCreation.length()); - dbDeletion.delete(dbDeletion.length() - 4, dbDeletion.length()); + dbCreation.append(getter); + dbDeletion.append(getter); } - } - else { - dbCreation.append(getter).append(" != null"); - dbDeletion.append(getter).append(" != null"); - } - dbCreation.append(") {\n"); - dbDeletion.append(") {\n"); + // dbCreation.append(".").append(addMethod).append("((") + // .append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(") + // .append(listener.getName()).append(".class,this,\"onChangeFrom") + // .append(methodToInvoke).append("\"));\n}\n"); + // dbDeletion.append(".").append(removeMethod).append("((") + // .append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(") + // .append(listener.getName()).append(".class,this,\"onChangeFrom") + // .append(methodToInvoke).append("\"));\n}\n"); - if(alreadyChecked != null) { - for(int j = 0 ; j < alreadyChecked.size() ; j++) { - dbCreation.append(alreadyChecked.get(j)).append("."); - dbDeletion.append(alreadyChecked.get(j)).append("."); + dbCreation.append(".").append(addMethod).append("(new ").append(listener.getName()).append("() {\n"); + dbDeletion.append(".").append(removeMethod).append("(new ").append(listener.getName()).append("() {\n"); + for(Method m : listener.getMethods()) { + StringBuffer sb = new StringBuffer(); + for(Annotation a : m.getDeclaredAnnotations()) { + dbCreation.append(a.toString()).append("\n"); + } + //add the method that handles the event + sb.append("public ") + .append(m.getReturnType().getCanonicalName()) + .append(" ") + .append(m.getName()) + .append("("); + for(int n = 0 ; n < m.getParameterTypes().length ; n++) { + sb.append(m.getParameterTypes()[n].getCanonicalName()) + .append(" arg") + .append(n) + .append(", "); + } + sb.delete(sb.length() - 2, sb.length()) + .append(")") + .append(" {\n") + .append("onChangeFrom").append(methodToInvoke) + .append("();\n}\n"); + dbCreation.append(sb); + dbDeletion.append(sb); } - } - if(model != null) { - dbCreation.append("get").append(Character.toUpperCase(model.charAt(0))) - .append(model.substring(1)).append("()"); - dbDeletion.append("get").append(Character.toUpperCase(model.charAt(0))) - .append(model.substring(1)).append("()"); - } - else { - dbCreation.append(getter); - dbDeletion.append(getter); - } -// dbCreation.append(".").append(addMethod).append("((") -// .append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(") -// .append(listener.getName()).append(".class,this,\"onChangeFrom") -// .append(methodToInvoke).append("\"));\n}\n"); -// dbDeletion.append(".").append(removeMethod).append("((") -// .append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(") -// .append(listener.getName()).append(".class,this,\"onChangeFrom") -// .append(methodToInvoke).append("\"));\n}\n"); - - dbCreation.append(".").append(addMethod).append("(new ").append(listener.getName()).append("() {\n"); - dbDeletion.append(".").append(removeMethod).append("(new ").append(listener.getName()).append("() {\n"); - for(Method m : listener.getMethods()) { - StringBuffer sb = new StringBuffer(); - for(Annotation a : m.getDeclaredAnnotations()) { - dbCreation.append(a.toString()).append("\n"); + dbCreation.append("});\n}\n"); + dbDeletion.append("});\n}\n"); + + if(alreadyChecked == null){ + alreadyChecked = new ArrayList<String>(); } - //add the method that handles the event - sb.append("public ") - .append(m.getReturnType().getCanonicalName()) - .append(" ") - .append(m.getName()) - .append("("); - for(int n = 0 ; n < m.getParameterTypes().length ; n++) { - sb.append(m.getParameterTypes()[n].getCanonicalName()) - .append(" arg") - .append(n) - .append(", "); - } - sb.delete(sb.length() - 2, sb.length()) - .append(")") - .append(" {\n") - .append("onChangeFrom").append(methodToInvoke) - .append("();\n}\n"); - dbCreation.append(sb); - dbDeletion.append(sb); - } - dbCreation.append("});\n}\n"); - dbDeletion.append("});\n}\n"); - - try { - nextClazz = Class.forName(returnType); - } - catch (ClassNotFoundException eee) { - for(JavaFile javaFile : generatedFiles.values()) { - if(returnType.equals(javaFile.getPackageName() + "." + javaFile.getClassName())) { - nextFile = javaFile; - break; + alreadyChecked.add(getter); + try { + //if it is not the last element of the binding + if(i + 1 < binding.length) { + result.addAll(generateBindings(dbCreation, dbDeletion, th, nextFile, nextClazz, binding, i+1, alreadyChecked, methodToInvoke, generatedFiles)); } + if(listener != null && !result.contains(listener)) { + result.add(listener); + } } - } - if(alreadyChecked == null){ - alreadyChecked = new ArrayList<String>(); - } - alreadyChecked.add(getter); - try { - //if it is not the last element of the binding - if(i + 1 < binding.length) { - result.addAll(generateBindings(dbCreation, dbDeletion, th, nextFile, nextClazz, binding, i+1, alreadyChecked, methodToInvoke, generatedFiles)); - } - if(listener == null) { - log.error("Unable to find the right listener"); + catch(NullPointerException eee) { + log.error(i); + eee.printStackTrace(); return null; } - if(!result.contains(listener)) { - result.add(listener); - } } - catch(NullPointerException eee) { - return null; - } } else if(log.isErrorEnabled()) { log.error("unable to bind " + binding[i]); Modified: trunk/guix-compiler-swing/src/test/java/org/nuiton/guix/generator/SwingGeneratorTest.java =================================================================== --- trunk/guix-compiler-swing/src/test/java/org/nuiton/guix/generator/SwingGeneratorTest.java 2009-07-30 14:59:00 UTC (rev 1540) +++ trunk/guix-compiler-swing/src/test/java/org/nuiton/guix/generator/SwingGeneratorTest.java 2009-07-30 14:59:12 UTC (rev 1541) @@ -59,9 +59,7 @@ //tests without TagHandlers List<Class> l = sg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, JToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); Assert.assertNotNull(l); - Assert.assertEquals(l.size(), 1); - Assert.assertNotNull(l.get(0)); - Assert.assertEquals(l.get(0), PropertyChangeListener.class); + Assert.assertEquals(l.size(), 0); //tests a successful generation with a method as a binding l = sg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, JToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); Assert.assertNotNull(l); @@ -76,16 +74,14 @@ Assert.assertEquals(l.get(0), ChangeListener.class); //tests with a javafile parameter not null - //tests if the result is null without the taghandler associated to the field + //tests if the result is empty without the taghandler associated to the field JavaFile jf = new JavaFile(); jf.addField(new JavaField(Modifier.PRIVATE, "javax.swing.JToggleButton", "button", null)); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "javax.swing.JToggleButton", "getButton", null, null, "", null)); l = sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); Assert.assertNotNull(l); - Assert.assertEquals(l.size(), 1); - Assert.assertNotNull(l.get(0)); - Assert.assertEquals(l.get(0), PropertyChangeListener.class); - + Assert.assertEquals(l.size(), 0); + //tests a successful generation with a method as a binding jf = new JavaFile(); jf.addField(new JavaField(Modifier.PRIVATE, "javax.swing.JToggleButton", "button", null, new ToggleButtonHandler())); @@ -107,22 +103,36 @@ Assert.assertEquals(l.get(1), PropertyChangeListener.class); //tests with a javafile parameter not null with an attribute whose type is another generated file - //tests if the result is null without the taghandler associated to the field + //tests if the result is empty without the taghandler associated to the field jf = new JavaFile(); jf.addField(new JavaField(Modifier.PRIVATE, "test.Test", "test", null)); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "test.Test", "getTest", null, null, "", null)); JavaFile jf2 = new JavaFile(Modifier.PUBLIC, 0, "test", "Test", null, null); jf2.addField(new JavaField(Modifier.PRIVATE, "javax.swing.JToggleButton", "button", null)); jf2.addMethod(new JavaMethod(Modifier.PUBLIC, "javax.swing.JToggleButton", "getButton", null, null, "", null)); - Assert.assertNull(sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + l = sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); //test without jf2 in the map of generators with JavaFile jf2 = new JavaFile(Modifier.PUBLIC, 0, "test", "Test", null, null); jf2.addField(new JavaField(Modifier.PRIVATE, "javax.swing.JToggleButton", "button", null, new ToggleButtonHandler())); jf2.addMethod(new JavaMethod(Modifier.PUBLIC, "javax.swing.JToggleButton", "getButton", null, null, "", null)); - Assert.assertNull(sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + l = sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + Map<GuixGenerator,JavaFile> map = new HashMap<GuixGenerator, JavaFile>(); map.put(sg, jf2); + //tests an unsuccessful binding generation with a method as a binding because the superclass of j2 is not assignable from java.awt.Container + l = sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isSelected()"}, 0, null, "", map); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); //tests a successful generation with a method as a binding + jf2 = new JavaFile(Modifier.PUBLIC, 0, "test", "Test", "java.awt.Container", null); + jf2.addField(new JavaField(Modifier.PRIVATE, "javax.swing.JToggleButton", "button", null, new ToggleButtonHandler())); + jf2.addMethod(new JavaMethod(Modifier.PUBLIC, "javax.swing.JToggleButton", "getButton", null, null, "", null)); + map = new HashMap<GuixGenerator, JavaFile>(); + map.put(sg, jf2); l = sg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isSelected()"}, 0, null, "", map); Assert.assertNotNull(l); Assert.assertEquals(l.size(), 2);

1 0

r1540 - in trunk/guix-compiler-gwt/src: main/java/org/nuiton/guix/generator test/java/org/nuiton/guix/generator
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 16:59:00 +0200 (Thu, 30 Jul 2009) New Revision: 1540 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/GwtGenerator.java trunk/guix-compiler-gwt/src/test/java/org/nuiton/guix/generator/GwtGeneratorTest.java Log: Add the acceptation for tags that represents classes defined in the src directory 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-30 14:58:40 UTC (rev 1539) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java 2009-07-30 14:59:00 UTC (rev 1540) @@ -22,6 +22,13 @@ import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.TabPanel; import java.beans.IntrospectionException; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; import org.nuiton.guix.model.GuixModelObject; import java.lang.reflect.Modifier; @@ -59,6 +66,8 @@ /** Bindings to generate */ Map<String,Map<String, String>> bindings2Generate = new HashMap<String,Map<String, String>>(); + GwtGenerator gwtGenerator; + /** * Constructor * @@ -77,6 +86,10 @@ script = sh.decomposeScript(gmo.getClassDescriptor().getScript()); } + public void setGwtGenerator(GwtGenerator gwtGenerator) { + this.gwtGenerator = gwtGenerator; + } + @Override public JavaFile generate() { super.addImports(gmo); @@ -348,70 +361,106 @@ } } } + //if the class hasn't been found if (clazz == null) { - throw new ClassNotFoundException(); - } + File f = new File(gwtGenerator.getSrcDir(), gmo.getClassDescriptor().toString().replace('.', File.separatorChar) + ".java"); + try { + FileInputStream fis = new FileInputStream(f); + Reader isr = new InputStreamReader(fis); + JavaFile jFile = JavaFileParser.parseJavaFile(gmo.getClassDescriptor().toString(), isr); + fis.close(); +// fis = new FileInputStream(f); +// File dirDest = new File(gwtGenerator.getDestDir(), gmo.getClassDescriptor().getPackageName().replace('.', File.separatorChar)); +// if(!dirDest.exists()) { +// dirDest.mkdirs(); +// } +// File fDest = new File(dirDest, gmo.getClassDescriptor().getName() + ".java"); +// //fDest.createNewFile(); +// FileOutputStream fos = new FileOutputStream(fDest); +// // segment size : 0.5Mo +// byte buffer[] = new byte[512*1024]; +// int read; +// while((read = fis.read(buffer)) != -1) { +// fos.write(buffer, 0, read); +// } +// fis.close(); +// fos.close(); - //if gmo has a TagHandler, add a field to the JavaFile with this TagHandler (used for the databinding generation) - if (gmo.getClassDescriptor().getPackageName() == null - && TagManager.getGuixClassHandler(gmo.getClassDescriptor().getName()) != null) { - jf.addField(new JavaField(Modifier.FINAL | Modifier.PRIVATE, - clazz.getName(), gmo.getId(), - " new " + clazz.getSimpleName() + "(" + - ((gmo.getConstructor() != null) ? gmo.getConstructor() : "") + ")", gmo.getJavadoc(), th), - false); + jf.addField(new JavaField(Modifier.PRIVATE, gmo.getClassDescriptor().toString(), gmo.getId(), gmo.getJavadoc()), true); + StringBuffer creationMethod = new StringBuffer(); + String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); + creationMethod.append(gmo.getId()).append(" = new ").append(gmo.getClassDescriptor().toString()).append("(").append(gmo.getConstructor() != null ? gmo.getConstructor() : "").append(");\n"); + componentsCreation.append("create").append(capitalizedId).append("();\n"); + processAttributes(jFile, gmo, creationMethod); + } + catch(IOException eee) { + log.error(eee); + throw new ClassNotFoundException(); + } } - //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(), - 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()) + "(" + - ((gmo.getConstructor() != null) ? gmo.getConstructor() : "") + ")", gmo.getJavadoc(), th), - false); - } - //if gmo is not the root ModelObject - if (gmo.getParent() != null) { - String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); - StringBuffer creationMethod = new StringBuffer(); - componentsCreation.append("create").append(capitalizedId).append("();\n"); - //if gmo is the child of a cell - if (gmo.getParent().getClassDescriptor().getPackageName() != null || !gmo.getParent().getClassDescriptor().getName().equalsIgnoreCase("Cell")) { - //if gmo herits from widget - if(com.google.gwt.user.client.ui.Widget.class.isAssignableFrom(clazz)) { - componentsTree.append(gmo.getParent().getId() == null ? "this" : gmo.getParent().getId()).append(".add(").append(gmo.getId()); - if(tabName != null) { - componentsTree.append(",").append(tabName); + //if gmo has a TagHandler, add a field to the JavaFile with this TagHandler (used for the databinding generation) + if (gmo.getClassDescriptor().getPackageName() == null + && TagManager.getGuixClassHandler(gmo.getClassDescriptor().getName()) != null) { + jf.addField(new JavaField(Modifier.FINAL | Modifier.PRIVATE, + clazz.getName(), gmo.getId(), + " new " + clazz.getSimpleName() + "(" + + ((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(), + 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()) + "(" + + ((gmo.getConstructor() != null) ? gmo.getConstructor() : "") + ")", gmo.getJavadoc(), th), + false); + } + //if gmo is not the root ModelObject + if (gmo.getParent() != null) { + String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); + StringBuffer creationMethod = new StringBuffer(); + + componentsCreation.append("create").append(capitalizedId).append("();\n"); + //if gmo is the child of a cell + if (gmo.getParent().getClassDescriptor().getPackageName() != null || !gmo.getParent().getClassDescriptor().getName().equalsIgnoreCase("Cell")) { + //if gmo herits from widget + if(com.google.gwt.user.client.ui.Widget.class.isAssignableFrom(clazz)) { + componentsTree.append(gmo.getParent().getId() == null ? "this" : gmo.getParent().getId()).append(".add(").append(gmo.getId()); + if(tabName != null) { + componentsTree.append(",").append(tabName); + } + componentsTree.append(");\n"); } - componentsTree.append(");\n"); } - } - processAttributes(clazz, gmo, creationMethod, null, geh, th); + processAttributes(clazz, gmo, creationMethod, null, geh, th); - } - else { - processAttributes(clazz, gmo, null, componentsTree, geh, th); - //set superclass and interface - if(th != null) { - jf.setSuperClass(th.getClassToGenerate().getName()); } else { - jf.setSuperClass(gmo.getClassDescriptor().getSuperClass().getPackageName() + "." + gmo.getClassDescriptor().getSuperClass().getName()); + processAttributes(clazz, gmo, null, componentsTree, geh, th); + //set superclass and interface + if(th != null) { + jf.setSuperClass(th.getClassToGenerate().getName()); + } + else { + jf.setSuperClass(gmo.getClassDescriptor().getSuperClass().getPackageName() + "." + gmo.getClassDescriptor().getSuperClass().getName()); + } + jf.addInterface(gmo.getClassDescriptor().getName()); } - jf.addInterface(gmo.getClassDescriptor().getName()); + for (GuixModelObject child : gmo.getChildren()) { + Map<Method, String> methodBodies = browseModelObjects(child); + componentsCreation.append(methodBodies.get(Method.COMPONENTS_CREATION)); + componentsTree.append(methodBodies.get(Method.COMPONENTS_TREE)); + bindings.append(methodBodies.get(Method.DATABINDING_INIT)); + } } - for (GuixModelObject child : gmo.getChildren()) { - Map<Method, String> methodBodies = browseModelObjects(child); - componentsCreation.append(methodBodies.get(Method.COMPONENTS_CREATION)); - componentsTree.append(methodBodies.get(Method.COMPONENTS_TREE)); - bindings.append(methodBodies.get(Method.DATABINDING_INIT)); - } } Map<Method, String> result = new HashMap<Method, String>(); result.put(Method.COMPONENTS_CREATION, componentsCreation.toString()); @@ -499,12 +548,62 @@ //generates the code for the events creationMethod.append(geh.generate(gmo.getId())); //add to the file the creation method for this object - jf.addMethod( - new JavaMethod(Modifier.PRIVATE, "void", "create" + capitalizedId, null, null, creationMethod.toString(), gmo.getId() + " creation")); + jf.addMethod(new JavaMethod(Modifier.PRIVATE, "void", "create" + capitalizedId, null, null, creationMethod.toString(), gmo.getId() + " creation")); } } /** + * + * @param jFile + * @param gmo + * @param creationMethod + */ + private void processAttributes(JavaFile jFile, GuixModelObject gmo, StringBuffer creationMethod) { + //processCSSAttributes(gmo, seh, clazz); + //browses the attributes + for (AttributeDescriptor attr : gmo.getAttributeDescriptors()) { + boolean addQuote = false; + //the attribute name with the first letter capitalized + String capitalizedAttribute = (attr.getName().length() > 0) ? Character.toUpperCase(attr.getName().charAt(0)) + attr.getName().substring(1) : attr.getName(); + + JavaMethod method = null; + for(JavaMethod m : jFile.getMethods()) { + if(m.getName().equals("set" + capitalizedAttribute)) { + method = m; + break; + } + } + + if(method != null) { + String binding = BindingUtils.processDataBindings(attr.getValue()); + if(binding != null) { + if(!bindings2Generate.containsKey(gmo.getId())) { + bindings2Generate.put(gmo.getId(), new HashMap<String, String>()); + } + bindings2Generate.get(gmo.getId()).put(attr.getName(), binding); + } + else { + //checks if the parameter of the setter is a String + addQuote = method.getArguments()[0].getType().equals(String.class.getName()); + //generates the code to set the attribute to object + creationMethod.append(gmo.getId()).append(".set").append(capitalizedAttribute).append("(").append(addQuote ? "\"" : "").append(attr.getValue()).append(addQuote ? "\"" : "").append(");\n"); + } + } + else if(log.isErrorEnabled()) { + log.error(attr.getName() + " cannot be set."); + } + } + //if gmo does not represents the first tag + if(gmo.getId() != null && creationMethod != null) { + //id with the first letter capitalized + String capitalizedId = (gmo.getId().length() > 0) ? Character.toUpperCase(gmo.getId().charAt(0)) + gmo.getId().substring(1) : gmo.getId(); + + //add to the file the creation method for this object + jf.addMethod(new JavaMethod(Modifier.PRIVATE, "void", "create" + capitalizedId, null, null, creationMethod.toString(), gmo.getId() + " creation")); + } + } + + /** * Browse the MenuBar children and generate the code * @param gmo the GuixModelObject representing the MenuBar * @return A map containing the creation, initialization and bindings methods 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-30 14:58:40 UTC (rev 1539) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java 2009-07-30 14:59:00 UTC (rev 1540) @@ -47,17 +47,23 @@ /** Maps the different generators with the file to save the generated JavaFile */ Map<GwtJavaFileGenerator, File> generators = new HashMap<GwtJavaFileGenerator, File>(); + List<String> modules = new ArrayList<String>(); + @Override public JavaFile generate() { try { String gmoClassName = gmo.getClassDescriptor().getName(); - File outDir = new File(destDir, "client"); + File outDir = new File(destDir, gmo.getClassDescriptor().getPackageName().replace('.', File.separatorChar)); if (!outDir.exists()) { - outDir.mkdir(); + outDir.mkdirs(); } - File out = new File(outDir, gmoClassName + ".java"); - File outAbstract = new File(outDir, gmoClassName + "Abstract.java"); - File outImpl = new File(outDir, gmoClassName + "Impl.java"); + 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"); if (lastModification > out.lastModified()) { try { @@ -76,16 +82,17 @@ } GwtInterfaceGenerator ging = new GwtInterfaceGenerator(gmo, classes); GwtAbstractClassGenerator gacg = new GwtAbstractClassGenerator(gmo, classes); + gacg.setGwtGenerator(this); GwtImplementationGenerator gimg = new GwtImplementationGenerator(gmo, classes); if (mainClass) { gimg.addMainMethod(); GwtConfigGenerator gcg = new GwtConfigGenerator(gmo, getCSSFiles()); GwtHtmlGenerator ghg = new GwtHtmlGenerator(gmo, launcherName); - File outConfigMain = new File(destDir, launcherName.substring(launcherName.lastIndexOf('.') + 1) + ".gwt.xml"); - File publicDir = new File(destDir, "public"); + File outConfigMain = new File(outDir, launcherName.substring(launcherName.lastIndexOf('.') + 1) + ".gwt.xml"); + File publicDir = new File(outDir, "public"); if (!publicDir.exists()) { - publicDir.mkdir(); + publicDir.mkdirs(); } File outHtmlMain = new File(publicDir, launcherName.substring(launcherName.lastIndexOf('.') + 1) + ".html"); gcg.generate(outConfigMain); @@ -166,7 +173,7 @@ String[] binding, int i, List<String> alreadyChecked, String methodToInvoke, Map<GuixGenerator, JavaFile> generatedFiles) { if(dbCreation == null || dbDeletion == null || binding == null || (jf == null && clazz ==null) || methodToInvoke == null || generatedFiles == null || i < 0) { - return null; + return new ArrayList(); } //does the attribute or method to bind exists ? @@ -311,86 +318,86 @@ } else { log.error("Impossible binding for the " + (realMethodName != null ? "method '" : "attribute '") + realAttributename + "' of the class '" + prevTh.getClassToGenerate().getName() + "'"); - return null; } + if(listener != null) { + //starts to generate the code + dbCreation.append("if("); + dbDeletion.append("if("); + if (alreadyChecked != null && !alreadyChecked.isEmpty()) { + //add not null parent condition + for (int j = 0; j < alreadyChecked.size(); j++) { + dbCreation.append(alreadyChecked.get(0)); + dbDeletion.append(alreadyChecked.get(0)); + for (int k = 1; k <= j; k++) { + dbCreation.append(".").append(alreadyChecked.get(k)); + dbDeletion.append(".").append(alreadyChecked.get(k)); + } + dbCreation.append(" != null && "); + dbDeletion.append(" != null && "); + } - //starts to generate the code - dbCreation.append("if("); - dbDeletion.append("if("); - if (alreadyChecked != null && !alreadyChecked.isEmpty()) { - //add not null parent condition - for (int j = 0; j < alreadyChecked.size(); j++) { - dbCreation.append(alreadyChecked.get(0)); - dbDeletion.append(alreadyChecked.get(0)); - for (int k = 1; k <= j; k++) { - dbCreation.append(".").append(alreadyChecked.get(k)); - dbDeletion.append(".").append(alreadyChecked.get(k)); + if (binding.length > alreadyChecked.size() + 1) { + for (int j = 0; j < alreadyChecked.size(); j++) { + dbCreation.append(alreadyChecked.get(j)).append("."); + dbDeletion.append(alreadyChecked.get(j)).append("."); + } + dbCreation.append(getter).append(" != null"); + dbDeletion.append(getter).append(" != null"); } - dbCreation.append(" != null && "); - dbDeletion.append(" != null && "); + else { + dbCreation.delete(dbCreation.length() - 4, dbCreation.length()); + dbDeletion.delete(dbDeletion.length() - 4, dbDeletion.length()); + } } + else { + dbCreation.append(getter).append(" != null"); + dbDeletion.append(getter).append(" != null"); + } + dbCreation.append(") {\n"); + dbDeletion.append(") {\n"); - if (binding.length > alreadyChecked.size() + 1) { + if (alreadyChecked != null) { for (int j = 0; j < alreadyChecked.size(); j++) { dbCreation.append(alreadyChecked.get(j)).append("."); dbDeletion.append(alreadyChecked.get(j)).append("."); } - dbCreation.append(getter).append(" != null"); - dbDeletion.append(getter).append(" != null"); } - else { - dbCreation.delete(dbCreation.length() - 4, dbCreation.length()); - dbDeletion.delete(dbDeletion.length() - 4, dbDeletion.length()); + if (model != null) { + dbCreation.append("get").append(Character.toUpperCase(model.charAt(0))).append(model.substring(1)).append("()").append("."); + dbDeletion.append("get").append(Character.toUpperCase(model.charAt(0))).append(model.substring(1)).append("()").append("."); } - } - else { - dbCreation.append(getter).append(" != null"); - dbDeletion.append(getter).append(" != null"); - } - dbCreation.append(") {\n"); - dbDeletion.append(") {\n"); - - if (alreadyChecked != null) { - for (int j = 0; j < alreadyChecked.size(); j++) { - dbCreation.append(alreadyChecked.get(j)).append("."); - dbDeletion.append(alreadyChecked.get(j)).append("."); + // dbCreation.append(addMethod).append("((").append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(").append(listener.getName()).append(".class,this,\"onChangeFrom").append(methodToInvoke).append("\"));\n}\n"); + // dbDeletion.append(removeMethod).append("((").append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(").append(listener.getName()).append(".class,this,\"onChangeFrom").append(methodToInvoke).append("\"));\n}\n"); + dbCreation.append(addMethod).append("(new ").append(listener.getName()).append("() {\n"); + dbDeletion.append(removeMethod).append("(new ").append(listener.getName()).append("() {\n"); + for(Method m : listener.getMethods()) { + StringBuffer sb = new StringBuffer(); + for(Annotation a : m.getDeclaredAnnotations()) { + dbCreation.append(a.toString()).append("\n"); + } + //add the method that handles the event + sb.append("public ") + .append(m.getReturnType().getCanonicalName()) + .append(" ") + .append(m.getName()) + .append("("); + for(int n = 0 ; n < m.getParameterTypes().length ; n++) { + sb.append(m.getParameterTypes()[n].getCanonicalName()) + .append(" arg") + .append(n) + .append(", "); + } + sb.delete(sb.length() - 2, sb.length()) + .append(")") + .append(" {\n") + .append("onChangeFrom").append(methodToInvoke) + .append("();\n}\n"); + dbCreation.append(sb); + dbDeletion.append(sb); } + dbCreation.append("});\n}\n"); + dbDeletion.append("});\n}\n"); } - if (model != null) { - dbCreation.append("get").append(Character.toUpperCase(model.charAt(0))).append(model.substring(1)).append("()").append("."); - dbDeletion.append("get").append(Character.toUpperCase(model.charAt(0))).append(model.substring(1)).append("()").append("."); - } -// dbCreation.append(addMethod).append("((").append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(").append(listener.getName()).append(".class,this,\"onChangeFrom").append(methodToInvoke).append("\"));\n}\n"); -// dbDeletion.append(removeMethod).append("((").append(listener.getName()).append(") org.nuiton.guix.runtime.Util.getEventListener(").append(listener.getName()).append(".class,this,\"onChangeFrom").append(methodToInvoke).append("\"));\n}\n"); - dbCreation.append(addMethod).append("(new ").append(listener.getName()).append("() {\n"); - dbDeletion.append(removeMethod).append("(new ").append(listener.getName()).append("() {\n"); - for(Method m : listener.getMethods()) { - StringBuffer sb = new StringBuffer(); - for(Annotation a : m.getDeclaredAnnotations()) { - dbCreation.append(a.toString()).append("\n"); - } - //add the method that handles the event - sb.append("public ") - .append(m.getReturnType().getCanonicalName()) - .append(" ") - .append(m.getName()) - .append("("); - for(int n = 0 ; n < m.getParameterTypes().length ; n++) { - sb.append(m.getParameterTypes()[n].getCanonicalName()) - .append(" arg") - .append(n) - .append(", "); - } - sb.delete(sb.length() - 2, sb.length()) - .append(")") - .append(" {\n") - .append("onChangeFrom").append(methodToInvoke) - .append("();\n}\n"); - dbCreation.append(sb); - dbDeletion.append(sb); - } - dbCreation.append("});\n}\n"); - dbDeletion.append("});\n}\n"); } try { Modified: trunk/guix-compiler-gwt/src/test/java/org/nuiton/guix/generator/GwtGeneratorTest.java =================================================================== --- trunk/guix-compiler-gwt/src/test/java/org/nuiton/guix/generator/GwtGeneratorTest.java 2009-07-30 14:58:40 UTC (rev 1539) +++ trunk/guix-compiler-gwt/src/test/java/org/nuiton/guix/generator/GwtGeneratorTest.java 2009-07-30 14:59:00 UTC (rev 1540) @@ -23,6 +23,7 @@ import com.google.gwt.user.client.ui.ToggleButton; import java.lang.reflect.Modifier; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.junit.Test; import org.nuiton.guix.generator.GwtGenerator; @@ -51,57 +52,81 @@ GwtGuixInitializer.initialize(); GwtGenerator gg = new GwtGenerator(); //tests the not null condition for the parameters that needs to be not null - Assert.assertNull(gg.generateBindings(null, new StringBuffer(), null, null, Class.class, new String[0], 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertNull(gg.generateBindings(new StringBuffer(), null, null, null, Class.class, new String[0], 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, null, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], -1, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], -1, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], 0, null, null, new HashMap<GuixGenerator, JavaFile>())); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], 0, null, "", null)); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, null, new String[0], 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + List<Class> l = gg.generateBindings(null, new StringBuffer(), null, null, Class.class, new String[0], 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), null, null, null, Class.class, new String[0], 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, null, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], -1, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], -1, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], 0, null, null, new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, Class.class, new String[0], 0, null, "", null); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, null, new String[0], 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); //tests with a class parameter not null //tests if a null listener as result returns null - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNull(l); //tests a successful generation with a method as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests a successful generation with an attribute as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests a successful generation with a method with the generic name as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"isSelected()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests a successful generation with an attribute with the generic name as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"selected"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"selected"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"selected"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"selected"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), new ToggleButtonHandler(), null, ToggleButton.class, new String[]{"selected"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests with a javafile parameter not null //tests if the result is null without the taghandler associated to the field JavaFile jf = new JavaFile(); jf.addField(new JavaField(Modifier.PRIVATE, "com.google.gwt.user.client.ui.ToggleButton", "button", null)); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "com.google.gwt.user.client.ui.ToggleButton", "getButton", null, null, "", null)); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNull(l); //tests a successful generation with a method as a binding jf = new JavaFile(); jf.addField(new JavaField(Modifier.PRIVATE, "com.google.gwt.user.client.ui.ToggleButton", "button", null, new ToggleButtonHandler())); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "com.google.gwt.user.client.ui.ToggleButton", "getButton", null, null, "", null)); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getButton()", "isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests a successful generation with an attribute as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"button","down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"button","down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"button","down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"button","down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"button","down"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests with a javafile parameter not null with an attribute whose type is another generated file //tests if the result is null without the taghandler associated to the field @@ -111,24 +136,30 @@ JavaFile jf2 = new JavaFile(Modifier.PUBLIC, JavaFile.CLASS, "test", "Test", null, null); jf2.addField(new JavaField(Modifier.PRIVATE, "com.google.gwt.user.client.ui.ToggleButton", "button", null)); jf2.addMethod(new JavaMethod(Modifier.PUBLIC, "com.google.gwt.user.client.ui.ToggleButton", "getButton", null, null, "", null)); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); //test without jf2 in the map of generators with JavaFile jf2 = new JavaFile(Modifier.PUBLIC, JavaFile.CLASS, "test", "Test", null, null); jf2.addField(new JavaField(Modifier.PRIVATE, "com.google.gwt.user.client.ui.ToggleButton", "button", null, new ToggleButtonHandler())); jf2.addMethod(new JavaMethod(Modifier.PUBLIC, "com.google.gwt.user.client.ui.ToggleButton", "getButton", null, null, "", null)); - Assert.assertNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>())); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()","isDown()"}, 0, null, "", new HashMap<GuixGenerator, JavaFile>()); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(), 0); Map<GuixGenerator,JavaFile> map = new HashMap<GuixGenerator, JavaFile>(); map.put(gg, jf2); //tests a successful generation with a method as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isDown()"}, 0, null, "", map)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isDown()"}, 0, null, "", map).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isDown()"}, 0, null, "", map).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isDown()"}, 0, null, "", map).get(0),ClickListener.class); + l =gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"getTest()","getButton()", "isDown()"}, 0, null, "", map); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); //tests a successful generation with an attribute as a binding - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"test","button","down"}, 0, null, "", map)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"test","button","down"}, 0, null, "", map).size(),1); - Assert.assertNotNull(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"test","button","down"}, 0, null, "", map).get(0)); - Assert.assertEquals(gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"test","button","down"}, 0, null, "", map).get(0),ClickListener.class); + l = gg.generateBindings(new StringBuffer(), new StringBuffer(), null, jf, null, new String[]{"test","button","down"}, 0, null, "", map); + Assert.assertNotNull(l); + Assert.assertEquals(l.size(),1); + Assert.assertNotNull(l.get(0)); + Assert.assertEquals(l.get(0),ClickListener.class); } }

1 0

r1539 - in trunk/guix-compiler/src: main/java/org/nuiton/guix main/java/org/nuiton/guix/generator test/java/org/nuiton/guix test/java/org/nuiton/guix/compiler
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 16:58:40 +0200 (Thu, 30 Jul 2009) New Revision: 1539 Added: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/Generator.java trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/GuixGenerator.java trunk/guix-compiler/src/test/java/org/nuiton/guix/GuixLauncherTest.java trunk/guix-compiler/src/test/java/org/nuiton/guix/compiler/GuixCompilerTest.java Log: Add the acceptation for tags that represents classes defined in the src directory 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-30 14:57:24 UTC (rev 1538) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/GuixLauncher.java 2009-07-30 14:58:40 UTC (rev 1539) @@ -22,7 +22,6 @@ import java.io.File; import java.io.PrintWriter; import java.io.StringReader; -import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; @@ -71,6 +70,8 @@ private List<File> compiledFiles = new ArrayList<File>(); /** Maps the generator with the generated JavaFile */ private Map<GuixGenerator, JavaFile> generatedFiles = new HashMap<GuixGenerator, JavaFile>(); + /** Source directory of the project */ + private File srcDirectory; /** Directory where to save the generated files */ private File targetDirectory; /** Root package */ @@ -93,10 +94,11 @@ * @param generatorClass class of the generator * @param launcherName name of the class that will launch the application */ - public GuixLauncher(File[] files, File targetDirectory, String rootPackage, + public GuixLauncher(File[] files, File targetDirectory, String rootPackage, File srcDir, File baseDir, String mainClass, Class<? extends GuixGenerator> generatorClass, String launcherName) { // Set up a simple configuration that logs on the console. this.files = files; + this.srcDirectory = srcDir; this.targetDirectory = targetDirectory; this.rootPackage = rootPackage != null ? rootPackage : ""; if (files != null) { @@ -127,7 +129,6 @@ * <code>false</code> otherwise */ public synchronized boolean compile() { - File destDir = targetDirectory; if (files != null) { if (log.isInfoEnabled()) { log.info("Start compiling"); @@ -154,24 +155,19 @@ if (targetDirectory != null) { int dotPos = className.lastIndexOf("."); if (dotPos != -1) { - destDir = new File(targetDirectory, className.substring(0, dotPos).replace('.', File.separatorChar)); classPackage = className.substring(0, dotPos); } else { - destDir = new File(targetDirectory, className); - classPackage = className; + classPackage = ""; } - if (!destDir.exists() && !destDir.mkdirs()) { - if (log.isWarnEnabled()) { - log.warn("couldn't create directory " + destDir); - } - continue; - } } else { - destDir = file.getParentFile(); - classPackage = destDir.getAbsolutePath().replace(File.separatorChar, '.'); + targetDirectory = file.getParentFile(); + classPackage = targetDirectory.getAbsolutePath().replace(File.separatorChar, '.'); } + if(!targetDirectory.exists()) { + targetDirectory.mkdirs(); + } //compile the file GuixCompiler compiler = new GuixCompiler(file, this, classPackage); GuixModelObject rootModelObject = compiler.compile(); @@ -224,7 +220,8 @@ try { //init generator GuixGenerator gen = (GuixGenerator) generatorClass.newInstance(); - gen.setDestDir(destDir); + gen.setSrcDir(srcDirectory); + gen.setDestDir(targetDirectory); gen.setGmo(mo); gen.setLastModification(rootModelObjects.get(mo)); gen.setMainClass((mo.getClassDescriptor().getPackageName() + "." + mo.getClassDescriptor().getName()).equals(mainClass)); Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/Generator.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/Generator.java 2009-07-30 14:57:24 UTC (rev 1538) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/Generator.java 2009-07-30 14:58:40 UTC (rev 1539) @@ -33,6 +33,10 @@ public JavaFile generate(); + public File getSrcDir(); + + public void setSrcDir(File srcDir); + public File getDestDir(); public void setDestDir(File destDir); Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/GuixGenerator.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/GuixGenerator.java 2009-07-30 14:57:24 UTC (rev 1538) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/GuixGenerator.java 2009-07-30 14:58:40 UTC (rev 1539) @@ -36,6 +36,8 @@ /** GuixModelObject which represents the class to generate */ protected GuixModelObject gmo = null; + /** Source directory */ + protected File srcDir = null; /** Destination directory of the generated file */ protected File destDir = null; /** True if the class to generate is teh main class of the application */ @@ -60,6 +62,14 @@ */ public abstract JavaFile generate(); + public File getSrcDir() { + return srcDir; + } + + public void setSrcDir(File srcDir) { + this.srcDir = srcDir; + } + public File getDestDir() { return destDir; } Added: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java (rev 0) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFileParser.java 2009-07-30 14:58:40 UTC (rev 1539) @@ -0,0 +1,214 @@ +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; +import org.nuiton.guix.parser.SimpleNode; +import org.nuiton.guix.tags.TagManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.Reader; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + +// TODO: need to unify this implementation with the parsing in ScriptManager +public class JavaFileParser { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(JavaFileParser.class); + + private String className; + private String packageName = null; + private String superclassName = "java.lang.Object"; + private List<JavaMethod> methods = new ArrayList<JavaMethod>(); + private List<JavaField> fields = new ArrayList<JavaField>(); + + + public static JavaFile parseJavaFile(String displayName, Reader src) throws ClassNotFoundException { + // has some limitations -- it reports all members as public, leaves getDeclaredMethod and getDeclaredField + // undefined, and doesn't report interfaces. It's safe to leave those the way they are for now, because + // Guix doesn't look at any of those for non-Guix classes. + JavaFileParser parser = new JavaFileParser(); + if (log.isDebugEnabled()) { + log.debug("starting parsing : " + displayName); + } + try { + parser.doParse(displayName, src); + } catch (Exception e) { + log.error(e.getMessage()); + throw new RuntimeException(e); + } + JavaFile jf = new JavaFile(Modifier.PUBLIC, JavaFile.CLASS, parser.packageName, + parser.className, parser.superclassName, new ArrayList<String>(), null); + for(JavaMethod jm : parser.methods) { + if(Modifier.isPublic(jm.getModifiers())) { + jf.addMethod(jm); + } + } + for(JavaField jfi : parser.fields) { + if(Modifier.isPublic(jfi.getModifiers())) { + jf.addField(jfi); + } + } + + Class superclass = Class.forName(parser.superclassName); + for(Method m : superclass.getMethods()) { + JavaArgument[] jas = new JavaArgument[m.getParameterTypes().length]; + for(int i = 0 ; i < m.getParameterTypes().length ; i++) { + jas[i] = new JavaArgument(m.getParameterTypes()[i].getName(), "arg" + i); + } + String[] exceptions = new String[m.getExceptionTypes().length]; + for(int i = 0 ; i < m.getExceptionTypes().length ; i++) { + exceptions[i] = m.getExceptionTypes()[i].getName(); + } + jf.addMethod(new JavaMethod(m.getModifiers(), m.getReturnType().getName(), m.getName(), jas, exceptions, "", null)); + } + for(Field f : superclass.getFields()) { + jf.addField(new JavaField(f.getModifiers(), f.getType().getName(), f.getName(), null)); + } + + for (Class i : superclass.getInterfaces()) { + jf.getInterfaces().add(i.getName()); + } + + return jf; + } + + private void doParse(String displayName, Reader src) { + try { + JavaParser p = new JavaParser(src); + p.CompilationUnit(); + SimpleNode node = p.popNode(); + if (node != null) { + scanCompilationUnit(node); + return; + } + throw new CompilerException("Internal error: null node parsing Java file from " + src); + } + catch (ParseException e) { + throw new CompilerException("Error parsing Java source code " + displayName + ": " + e.getMessage()); + } + } + + + private void scanCompilationUnit(SimpleNode node) { + for (int i = 0; i < node.jjtGetNumChildren(); i++) { + SimpleNode child = node.getChild(i); + int nodeType = child.getId(); + if (nodeType == JavaParserTreeConstants.JJTPACKAGEDECLARATION) { + packageName = child.getChild(1).getText().trim(); + } else + if (nodeType == JavaParserTreeConstants.JJTIMPORTDECLARATION) { + String text = child.getText().trim(); + if (text.startsWith("import")) { + text = text.substring("import".length()).trim(); + } + if (text.endsWith(";")) { + text = text.substring(0, text.length() - 1); + } + } else if (nodeType == JavaParserTreeConstants.JJTTYPEDECLARATION) { + scanCompilationUnit(child); + } else + if (nodeType == JavaParserTreeConstants.JJTCLASSORINTERFACEDECLARATION) { + scanClass(child); + } + } + } + + + // scans the main ClassOrInterfaceDeclaration + private void scanClass(SimpleNode node) { + boolean isInterface = node.firstToken.image.equals("interface"); + className = node.firstToken.next.image; + if (packageName != null) + className = packageName + "." + className; + for (int i = 0; i < node.jjtGetNumChildren(); i++) { + SimpleNode child = node.getChild(i); + int nodeType = child.getId(); + if (nodeType == JavaParserTreeConstants.JJTEXTENDSLIST) { + if (!isInterface) { + assert child.jjtGetNumChildren() == 1 : "expected ExtendsList to have exactly one child for a non-interface class"; + String rawName = child.getChild(0).getText().trim(); + superclassName = TagManager.resolveClassName(rawName); + if (superclassName == null) { + throw new CompilerException("Could not find class: " + rawName); + } + } + } else + if (nodeType == JavaParserTreeConstants.JJTCLASSORINTERFACEBODY) { + scanClassNode(child); + } + } + } + + + // scans class body nodes + private void scanClassNode(SimpleNode node) { + int nodeType = node.getId(); + if (nodeType == JavaParserTreeConstants.JJTMETHODDECLARATION) { + String returnType = null; + String name = null; + List<JavaArgument> parameterTypes = new ArrayList<JavaArgument>(); + //List<String> parameterNames = new ArrayList<String>(); + for (int i = 0; i < node.jjtGetNumChildren(); i++) { + SimpleNode child = node.getChild(i); + int type = child.getId(); + if (type == JavaParserTreeConstants.JJTRESULTTYPE) + returnType = TagManager.resolveClassName(child.getText().trim()); + else if (type == JavaParserTreeConstants.JJTMETHODDECLARATOR) { + name = child.firstToken.image.trim(); + SimpleNode formalParameters = child.getChild(0); + assert formalParameters.getId() == JavaParserTreeConstants.JJTFORMALPARAMETERS; + for (int j = 0; j < formalParameters.jjtGetNumChildren(); j++) + { + SimpleNode parameter = formalParameters.getChild(j); + String rawParameterType = parameter.getChild(1).getText().trim().replaceAll("\\.\\.\\.", "[]"); + String parameterType = TagManager.resolveClassName(rawParameterType); + if (parameterType == null) { + throw new CompilerException("could not find class '" + rawParameterType + "'"); + } + parameterTypes.add(new JavaArgument(parameterType, "arg" + j)); + //parameterNames.add(parameter.getChild(2).getText().trim()); + } + } + } + methods.add(new JavaMethod(Modifier.PUBLIC, returnType, name, parameterTypes.toArray(new JavaArgument[parameterTypes.size()]), null, "", null)); // TODO: determine the actual modifiers + } else + if (nodeType == JavaParserTreeConstants.JJTCLASSORINTERFACEDECLARATION) { + // TODO: handle inner classes + } else + if (nodeType == JavaParserTreeConstants.JJTCONSTRUCTORDECLARATION) { + // TODO: handle constructors + } else if (nodeType == JavaParserTreeConstants.JJTFIELDDECLARATION) { + String text = node.getText(); + String declaration = text; + int equals = text.indexOf("="); + if (equals != -1) { + declaration = declaration.substring(0, equals); + } + declaration = declaration.trim(); + String[] declarationTokens = declaration.split("\\s"); + //boolean isFinal = Arrays.asList(declarationTokens).contains("final"); + //boolean isStatic = Arrays.asList(declarationTokens).contains("static"); + String name = declarationTokens[declarationTokens.length - 1]; + if (name.endsWith(";")) { + name = name.substring(0, name.length() - 1).trim(); + } + String className = declarationTokens[declarationTokens.length - 2]; + String type = TagManager.resolveClassName(className); + fields.add(new JavaField(Modifier.PUBLIC, type, name, null)); // TODO: determine the actual modifiers + } else { + for (int i = 0; i < node.jjtGetNumChildren(); i++) { + SimpleNode child = node.getChild(i); + scanClassNode(child); + } + } + } +} 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-30 14:57:24 UTC (rev 1538) +++ trunk/guix-compiler/src/test/java/org/nuiton/guix/GuixLauncherTest.java 2009-07-30 14:58:40 UTC (rev 1539) @@ -41,7 +41,7 @@ public void compileTest() { GuixInitializer.initialize(); - GuixLauncher gl = new GuixLauncher(null,null,null,null,null,null,null); + GuixLauncher gl = new GuixLauncher(null,null,null,null,null,null,null,null); assertTrue(gl.files == null || gl.classNames.length == gl.files.length); assertTrue(gl.compile()); assertTrue(gl.files == null || gl.rootModelObjects.size() == gl.files.length); @@ -50,7 +50,7 @@ File f2 = new File(f.getAbsolutePath()); File dir = new File("target/test"); File dir2 = new File(dir.getAbsolutePath()); - gl = new GuixLauncher(new File[]{f2},dir2,"org.nuiton.guix",f2.getParentFile(), null,null,null); + 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.compile()); } @@ -60,7 +60,7 @@ */ @Test public void registerClassDescriptorTest() { - GuixLauncher gl = new GuixLauncher(null,null,null,null,null,null,null); + GuixLauncher gl = new GuixLauncher(null,null,null,null,null,null,null,null); assertNull(gl.registerClassDescriptor(null)); assertNull(gl.registerClassDescriptor(new ClassDescriptor(null, null))); Modified: trunk/guix-compiler/src/test/java/org/nuiton/guix/compiler/GuixCompilerTest.java =================================================================== --- trunk/guix-compiler/src/test/java/org/nuiton/guix/compiler/GuixCompilerTest.java 2009-07-30 14:57:24 UTC (rev 1538) +++ trunk/guix-compiler/src/test/java/org/nuiton/guix/compiler/GuixCompilerTest.java 2009-07-30 14:58:40 UTC (rev 1539) @@ -36,7 +36,7 @@ File f = new File("src/test/test.guix"); File f2 = new File(f.getAbsolutePath()); GuixLauncher gl = new GuixLauncher(new File[]{f2}, null, - "org.nuiton.guix",f2.getParentFile(),null,null,null); + "org.nuiton.guix",null,f2.getParentFile(),null,null,null); GuixCompiler gc = new GuixCompiler(null, null,null); assertNull(gc.compile());

1 0

r1538 - trunk
by kmorin＠users.labs.libre-entreprise.org July 30, 2009

July 30, 2009

Author: kmorin Date: 2009-07-30 16:57:24 +0200 (Thu, 30 Jul 2009) New Revision: 1538 Modified: trunk/pom.xml Log: removed the runtime modules Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-07-28 14:51:19 UTC (rev 1537) +++ trunk/pom.xml 2009-07-30 14:57:24 UTC (rev 1538) @@ -19,11 +19,11 @@ <module>guix-compiler</module> <module>guix-compiler-swing</module> <module>guix-compiler-gwt</module> - <module>guix-runtime-swing</module> - <module>guix-runtime-gwt</module> <module>maven-guix-plugin</module> <module>guix-test-swing</module> - <module>guix-test-gwt</module> + <module>guix-test-gwt</module> + + </modules>

1 0

r1537 - trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler
by kmorin＠users.labs.libre-entreprise.org July 28, 2009

July 28, 2009

Author: kmorin Date: 2009-07-28 16:51:19 +0200 (Tue, 28 Jul 2009) New Revision: 1537 Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java Log: Replaced the $ symbol by the _ symbol for the autogenerated fields 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-28 10:38:42 UTC (rev 1536) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/compiler/GuixCompiler.java 2009-07-28 14:51:19 UTC (rev 1537) @@ -301,7 +301,7 @@ String id = ((xpp.getAttributeValue("", "id") != null) ? xpp.getAttributeValue("", "id") - : "$" + tagName + index++); + : "_" + tagName + index++); // create the GuixModelObject representing the tag GuixModelObject mo = new GuixModelObject(id, xpp.getAttributeValue("", "constructor"),

1 0