Author: tchemit Date: 2008-12-18 10:05:15 +0000 (Thu, 18 Dec 2008) New Revision: 1089 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java Log: improve generation of methods (for the moment does not rename methods from css, to be done...) Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 09:41:18 UTC (rev 1088) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JavaMethod.java 2008-12-18 10:05:15 UTC (rev 1089) @@ -289,10 +289,11 @@ }, otherPublic(Modifier.PUBLIC, "/*---------------------------------------------------------------------------------*/\n" + - "/*-- other public methods ---------------------------------------------------------*/\n" + + "/*-- public mutator methods -------------------------------------------------------*/\n" + "/*---------------------------------------------------------------------------------*/") { - public boolean accept(JavaMethod method) { - return (method.name.startsWith("set")); + @Override + public boolean accept(int mod) { + return super.accept(mod) && !Modifier.isStatic(mod); } }, @@ -330,14 +331,6 @@ privates(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + "/*-- Private methods --------------------------------------------------------------*/\n" + "/*---------------------------------------------------------------------------------*/") { - }, - others(Modifier.PRIVATE, "/*---------------------------------------------------------------------------------*/\n" + - "/*-- Other methods ----------------------------------------------------------------*/\n" + - "/*---------------------------------------------------------------------------------*/") { - @Override - public boolean accept(int mod) { - return true; - } }; private final String header; Modified: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java 2008-12-18 09:41:18 UTC (rev 1088) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/JavaMethodTest.java 2008-12-18 10:05:15 UTC (rev 1089) @@ -24,7 +24,7 @@ constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PUBLIC); - Assert.assertEquals(7, constants.size()); + Assert.assertEquals(8, constants.size()); Assert.assertTrue(constants.contains(MethodOrder.constructors)); Assert.assertTrue(constants.contains(MethodOrder.JAXXObject)); Assert.assertTrue(constants.contains(MethodOrder.JAXXContext)); @@ -32,6 +32,7 @@ Assert.assertTrue(constants.contains(MethodOrder.events)); Assert.assertTrue(constants.contains(MethodOrder.publicGetters)); Assert.assertTrue(constants.contains(MethodOrder.publicSetters)); + Assert.assertTrue(constants.contains(MethodOrder.otherPublic)); constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PROTECTED); @@ -40,11 +41,12 @@ Assert.assertTrue(constants.contains(MethodOrder.protecteds)); Assert.assertTrue(constants.contains(MethodOrder.createMethod)); + constants = JavaMethod.getMethodOrderScope(allConstants, Modifier.PRIVATE); Assert.assertEquals(3, constants.size()); Assert.assertTrue(constants.contains(MethodOrder.createMethod)); Assert.assertTrue(constants.contains(MethodOrder.packageLocal)); - Assert.assertTrue(constants.contains(MethodOrder.privates)); + Assert.assertTrue(constants.contains(MethodOrder.privates)); } }