Author: tchemit Date: 2009-01-24 21:04:10 +0000 (Sat, 24 Jan 2009) New Revision: 1186 Modified: jaxx/trunk/maven-jaxx-plugin/changelog.txt jaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1750Test.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerValidatorTest.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx Log: - introduce a flag useUIManagerForIcon to retreave icons from UIManager - clean mojo getter and setter (not used here) Modified: jaxx/trunk/maven-jaxx-plugin/changelog.txt =================================================================== --- jaxx/trunk/maven-jaxx-plugin/changelog.txt 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/changelog.txt 2009-01-24 21:04:10 UTC (rev 1186) @@ -1,4 +1,6 @@ 1.1 chemit 200901?? + * 20090124 [chemit] - introduce a flag useUIManagerForIcon to retreave icons from UIManager + - clean mojo getter and setter (not used here) * 20090123 [chemit] - add tests for icon improvment * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) - rename i18n bundles according artifactId Modified: jaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/main/java/org/codelutin/jaxx/JaxxGeneratorMojo.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -53,6 +53,7 @@ * @goal generate * @phase process-sources * @requiresDependencyResolution compile + * @requiresProject */ public class JaxxGeneratorMojo extends AbstractMojo { @@ -229,6 +230,12 @@ * @see jaxx.runtime.validator.BeanValidator#DEFAULT_UI_CLASS */ protected String defaultErrorUIFQN; + /** + * a flag to use UIManager to retreave icons. + * + * @parameter expression="${jaxx.useUIManagerForIcon}" default-value="false" + */ + protected boolean useUIManagerForIcon; protected String[] files; @@ -348,11 +355,10 @@ result.setJaxxContextImplementorClass(jaxxContextImplementorClass); result.setExtraImports(extraImports); result.setDefaultErrorUI(defaultErrorUIClass); + result.setUseUIManagerForIcon(useUIManagerForIcon); if (cl != null) { result.setClassLoader(cl); } - - return result; } @@ -460,7 +466,7 @@ } loader = new URLClassLoader(lUrls.toArray(new URL[lUrls.size()]), getClass().getClassLoader()); } - if (isVerbose()) { + if (verbose) { for (URL entry : loader.getURLs()) { log.info("classpath : " + entry); } @@ -517,123 +523,4 @@ } } - public File getOutJava() { - return outJava; - } - - public void setOutJava(File outJava) { - this.outJava = outJava; - } - - public File getOutResource() { - return outResource; - } - - public void setOutResource(File outResource) { - this.outResource = outResource; - } - - public File getOutClass() { - return outClass; - } - - public void setOutClass(File outClass) { - this.outClass = outClass; - } - - public boolean isVerbose() { - return verbose; - } - - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - public File getSrc() { - return src; - } - - public void setSrc(File src) { - this.src = src; - } - - public boolean isOptimize() { - return optimize; - } - - public void setOptimize(boolean optimize) { - this.optimize = optimize; - } - - public String getJavaOpts() { - return javaOpts; - } - - public void setJavaOpts(String javaOpts) { - this.javaOpts = javaOpts; - } - - public String[] getIncludes() { - return includes; - } - - public void setIncludes(String[] includes) { - this.includes = includes; - } - - public String[] getFiles() { - return files; - } - - public void setFiles(String[] files) { - this.files = files; - } - - public boolean isForce() { - return force; - } - - public void setForce(boolean force) { - this.force = force; - } - - public boolean isI18nable() { - return i18nable; - } - - public void setI18nable(boolean i18nable) { - this.i18nable = i18nable; - } - - public MirroredFileUpdater getUpdater() { - return updater; - } - - public String getJaxxContextImplementorClass() { - return jaxxContextImplementorClass; - } - - public void setJaxxContextImplementorClass(String jaxxContextImplementorClass) { - this.jaxxContextImplementorClass = jaxxContextImplementorClass; - } - - public String[] getBeanInfoSearchPath() { - return beanInfoSearchPath; - } - - public void setBeanInfoSearchPath(String[] beanInfoSearchPath) { - this.beanInfoSearchPath = beanInfoSearchPath; - } - - public String getCompilerFQN() { - return compilerFQN; - } - - public void setCompilerFQN(String compilerFQN) { - this.compilerFQN = compilerFQN; - } - - public Class<? extends JAXXCompiler> getCompilerClass() { - return compilerClass; - } } \ No newline at end of file Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1722Test.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -5,6 +5,8 @@ public void testBug_1722() throws Exception { mojo.execute(); - assertEquals(2, mojo.getFiles().length); + assertNumberJaxxFiles(2); } + + } Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1750Test.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1750Test.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1750Test.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -11,7 +11,7 @@ public void testBug_1750() throws Exception { mojo.execute(); - assertEquals(1, mojo.getFiles().length); + assertNumberJaxxFiles(1); JAXXCompiler compiler = JAXXCompilerLaunchor.get().getJAXXCompiler("testcases.bug_1750.ComboBox"); assertNotNull(compiler); Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/Bug1751Test.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -5,10 +5,10 @@ public void testBug_1751() throws Exception { mojo.execute(); - assertEquals(3, mojo.getFiles().length); + assertNumberJaxxFiles(3); - checkPattern(mojo, "implements java.io.Serializable", true, mojo.getFiles()); - checkPattern(mojo, "label.setText(_(\"test\"))", true, mojo.getFiles()); + checkPattern(mojo, "implements java.io.Serializable", true); + checkPattern(mojo, "label.setText(_(\"test\"))", true); } } \ No newline at end of file Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerTest.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -15,28 +15,38 @@ public void testInnerClasses() throws Exception { mojo.execute(); - assertEquals(1, mojo.getFiles().length); + assertNumberJaxxFiles(1); } public void testIcon() throws Exception { mojo.execute(); - assertEquals(1, mojo.getFiles().length); + checkPattern(mojo, ".createImageIcon(\"myIcon.png\")", true); + checkPattern(mojo, ".createActionIcon(\"myActionIcon.png\")", true); + checkPattern(mojo, ".getUIManagerIcon(\"myIcon.png\")", false); + checkPattern(mojo, ".getUIManagerActionIcon(\"myActionIcon.png\")", false); + assertNumberJaxxFiles(1); + mojo.useUIManagerForIcon = true; + mojo.execute(); + checkPattern(mojo, ".createImageIcon(\"myIcon.png\")", false); + checkPattern(mojo, ".createActionIcon(\"myActionIcon.png\")", false); + checkPattern(mojo, ".getUIManagerIcon(\"myIcon.png\")", true); + checkPattern(mojo, ".getUIManagerActionIcon(\"myActionIcon.png\")", true); } public void testSpecialSubclassing() throws Exception { mojo.execute(); - assertEquals(7, mojo.getFiles().length); + assertNumberJaxxFiles(7); } public void testCSSTests() throws Exception { mojo.execute(); - assertEquals(7, mojo.getFiles().length); + assertNumberJaxxFiles(7); } public void testWithLog() throws Exception { mojo.execute(); - String[] files = mojo.getFiles(); - assertEquals(2, files.length); + String[] files = mojo.files; + assertNumberJaxxFiles(2); String withLogFile; String withnoLogFile; @@ -58,19 +68,18 @@ public void testNoLog() throws Exception { mojo.execute(); - String[] files = mojo.getFiles(); - assertEquals(2, files.length); - checkPattern(mojo, "Log log = LogFactory.getLog(", false, files); - checkPattern(mojo, "import org.apache.commons.logging.Log;", false, files); - checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", false, files); + assertNumberJaxxFiles(2); + checkPattern(mojo, "Log log = LogFactory.getLog(", false); + checkPattern(mojo, "import org.apache.commons.logging.Log;", false); + checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", false); } @SuppressWarnings({"unchecked"}) public void testErrors() throws Exception { // init mojo to get alls files to treate mojo.init(); - String[] files = mojo.getFiles(); - assertEquals(34, mojo.getFiles().length); + + assertNumberJaxxFiles(34); mojo.setLog(new SystemStreamLog() { @Override public boolean isErrorEnabled() { @@ -99,9 +108,9 @@ fieldErrorCount.setAccessible(true); // execute mjo on each jaxx file to produce the error - for (String file : files) { + for (String file : mojo.files) { getLog().info("test bad file " + file); - mojo.setFiles(new String[]{file}); + mojo.files = new String[]{file}; try { mojo.doAction(); // should never pass @@ -123,11 +132,11 @@ public void testInitializers() throws Exception { mojo.execute(); - assertEquals(1, mojo.getFiles().length); + assertNumberJaxxFiles(1); } public void testErrorJaxxContextImplementorClass() throws Exception { - mojo.setJaxxContextImplementorClass(null); + mojo.jaxxContextImplementorClass = null; try { mojo.init(); fail(); @@ -135,7 +144,7 @@ assertTrue(true); } - mojo.setJaxxContextImplementorClass(String.class.getName()); + mojo.jaxxContextImplementorClass = String.class.getName(); try { mojo.init(); fail(); @@ -143,7 +152,7 @@ assertTrue(true); } - mojo.setJaxxContextImplementorClass(JAXXContext.class.getName()); + mojo.jaxxContextImplementorClass = JAXXContext.class.getName(); try { mojo.init(); fail(); @@ -151,7 +160,7 @@ assertTrue(true); } - mojo.setJaxxContextImplementorClass(DefaultJAXXContext.class.getName()); + mojo.jaxxContextImplementorClass = DefaultJAXXContext.class.getName(); mojo.init(); assertTrue(true); @@ -159,40 +168,39 @@ public void testScript() throws Exception { mojo.execute(); - assertEquals(1, mojo.getFiles().length); + assertNumberJaxxFiles(1); } public void testOverridingDataBindings() throws Exception { mojo.execute(); - assertEquals(3, mojo.getFiles().length); + assertNumberJaxxFiles(3); } public void testClassReferences() throws Exception { mojo.execute(); - assertEquals(6, mojo.getFiles().length); + assertNumberJaxxFiles(6); } public void testForce() throws Exception { // first round, with force option so will generate theonly JButton.jaxx file mojo.execute(); - String[] files = mojo.getFiles(); - assertEquals(1, files.length); + String[] files = mojo.files; + assertNumberJaxxFiles(1); - File srcFile = new File(mojo.getSrc(), files[0]); + File srcFile = new File(mojo.src, files[0]); - File dstFile = mojo.getUpdater().getMirrorFile(srcFile); + File dstFile = mojo.updater.getMirrorFile(srcFile); long oldTime = dstFile.lastModified(); // second round, no force so will not the file - mojo.setForce(false); + mojo.force = false; mojo.execute(); - files = mojo.getFiles(); - assertEquals(0, files.length); + assertNumberJaxxFiles(0); Thread.sleep(1000); - assertEquals(oldTime, mojo.getUpdater().getMirrorFile(srcFile).lastModified()); + assertEquals(oldTime, mojo.updater.getMirrorFile(srcFile).lastModified()); // three round : modify a source with no force option if (!srcFile.setLastModified(System.currentTimeMillis())) { @@ -200,16 +208,13 @@ } mojo.execute(); - files = mojo.getFiles(); - assertEquals(1, files.length); + assertNumberJaxxFiles(1); + assertTrue(mojo.updater.getMirrorFile(srcFile).lastModified() > oldTime); - assertTrue(mojo.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); - // last round, reforce file generation for an no modify source - mojo.setForce(true); + mojo.force = true; mojo.execute(); - files = mojo.getFiles(); - assertEquals(1, files.length); - assertTrue(mojo.getUpdater().getMirrorFile(srcFile).lastModified() > oldTime); + assertNumberJaxxFiles(1); + assertTrue(mojo.updater.getMirrorFile(srcFile).lastModified() > oldTime); } } \ No newline at end of file Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerValidatorTest.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerValidatorTest.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/CompilerValidatorTest.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -11,7 +11,7 @@ public void testValidatorOk() throws Exception { mojo.execute(); - assertEquals(2, mojo.getFiles().length); + assertNumberJaxxFiles(2); } @@ -19,8 +19,8 @@ public void testValidatorErrors() throws Exception { // init mojo to get alls files to treate mojo.init(); - String[] files = mojo.getFiles(); - assertEquals(19, mojo.getFiles().length); + String[] files = mojo.files; + assertNumberJaxxFiles(19); mojo.setLog(new SystemStreamLog() { @Override public boolean isErrorEnabled() { @@ -51,7 +51,7 @@ // execute mjo on each jaxx file to produce the error for (String file : files) { getLog().info("test bad file " + file); - mojo.setFiles(new String[]{file}); + mojo.files = new String[]{file}; try { mojo.doAction(); // should never pass Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -3,36 +3,36 @@ public class I18nTest extends JaxxBaseTest { public void testI18nText() throws Exception { - mojo.setI18nable(false); + mojo.i18nable = false; mojo.execute(); - checkPattern(mojo, "testId.setText(_(\"test.text\"));", false, mojo.getFiles()); + checkPattern(mojo, "testId.setText(_(\"test.text\"));", false); - mojo.setI18nable(true); + mojo.i18nable = true; mojo.execute(); - checkPattern(mojo, "testId.setText(_(\"test.text\"));", true, mojo.getFiles()); - checkPattern(mojo, "\"_(\\\"test.text\\\")\"", false, mojo.getFiles()); + checkPattern(mojo, "testId.setText(_(\"test.text\"));", true); + checkPattern(mojo, "\"_(\\\"test.text\\\")\"", false); } public void testI18nTitle() throws Exception { - mojo.setI18nable(false); + mojo.i18nable = false; mojo.execute(); - checkPattern(mojo, "testId.setTitle(_(\"test.title\"));", false, mojo.getFiles()); + checkPattern(mojo, "testId.setTitle(_(\"test.title\"));", false); - mojo.setI18nable(true); + mojo.i18nable = true; mojo.execute(); - checkPattern(mojo, "testId.setTitle(_(\"test.title\"));", true, mojo.getFiles()); - checkPattern(mojo, "\"_(\\\"test.title\\\")\"", false, mojo.getFiles()); + checkPattern(mojo, "testId.setTitle(_(\"test.title\"));", true); + checkPattern(mojo, "\"_(\\\"test.title\\\")\"", false); } public void testI18nToolTipText() throws Exception { - mojo.setI18nable(false); + mojo.i18nable = false; mojo.execute(); - checkPattern(mojo, "testId.setToolTipText(_(\"test.toolTipText\"));", false, mojo.getFiles()); + checkPattern(mojo, "testId.setToolTipText(_(\"test.toolTipText\"));", false); - mojo.setI18nable(true); + mojo.i18nable = true; mojo.execute(); - checkPattern(mojo, "testId.setToolTipText(_(\"test.toolTipText\"));", true, mojo.getFiles()); - checkPattern(mojo, "\"_(\\\"test.toolTipText\\\")\"", false, mojo.getFiles()); + checkPattern(mojo, "testId.setToolTipText(_(\"test.toolTipText\"));", true); + checkPattern(mojo, "\"_(\\\"test.toolTipText\\\")\"", false); } Modified: jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/JaxxBaseTest.java 2009-01-24 21:04:10 UTC (rev 1186) @@ -31,8 +31,8 @@ getLog().info(getName()); pomFile = getPomFile(); mojo = (JaxxGeneratorMojo) lookupMojo("generate", pomFile); - mojo.setJaxxContextImplementorClass(DefaultJAXXContext.class.getName()); - mojo.setCompilerFQN(jaxx.compiler.SwingCompiler.class.getName()); + mojo.jaxxContextImplementorClass = DefaultJAXXContext.class.getName(); + mojo.compilerFQN = jaxx.compiler.SwingCompiler.class.getName(); assertNotNull(mojo); } @@ -52,10 +52,13 @@ } protected void checkPattern(JaxxGeneratorMojo mojo, String pattern, boolean required, String... files) throws IOException { + if (files.length == 0) { + files = mojo.files; + } for (String file : files) { // check we have a the required/forbidden pattern - File f = new File(mojo.getOutJava(), file.substring(0, file.length() - 4) + "java"); - if (mojo.isVerbose()) { + File f = new File(mojo.outJava, file.substring(0, file.length() - 4) + "java"); + if (mojo.verbose) { getLog().info("check generated file " + f); } @@ -73,4 +76,8 @@ } return log; } + + protected void assertNumberJaxxFiles(int expectedNbFiles) { + assertEquals(expectedNbFiles, mojo.files.length); + } } Modified: jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx =================================================================== --- jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx 2009-01-24 20:59:24 UTC (rev 1185) +++ jaxx/trunk/maven-jaxx-plugin/src/test/resources/testcases/icon/Test1.jaxx 2009-01-24 21:04:10 UTC (rev 1186) @@ -1,4 +1,4 @@ <JPanel> - <JLabel actionIcon='myIcon.png'/> <JLabel icon='myIcon.png'/> + <JLabel actionIcon='myActionIcon.png'/> </JPanel>