Author: tchemit Date: 2008-10-09 11:08:39 +0000 (Thu, 09 Oct 2008) New Revision: 892 Added: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java Log: fix bug sur i18n et les JTabbedPaneHandler Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java 2008-10-08 16:01:29 UTC (rev 891) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTabbedPaneHandler.java 2008-10-09 11:08:39 UTC (rev 892) @@ -7,6 +7,7 @@ import jaxx.CompilerException; import jaxx.compiler.CompiledObject; import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.I18nHelper; import jaxx.reflect.ClassDescriptor; import jaxx.reflect.ClassDescriptorLoader; import jaxx.runtime.swing.TabInfo; @@ -56,12 +57,28 @@ String title = tabInfo.getTitle(); if (title != null) { - appendAdditionCode(getId() + ".setTitleAt(" + tabIndex + ", " + TypeManager.getJavaCode(title) + ");"); + if (I18nHelper.isI18nAttribute("title")) { + if (!title.startsWith("_(\"")) { + // we did not have the invocation code, add it + title = I18nHelper.addI18nInvocation(getId(),"title", TypeManager.getJavaCode(title),compiler); + } + } else { + title = TypeManager.getJavaCode(title); + } + appendAdditionCode(getId() + ".setTitleAt(" + tabIndex + ", " + title + ");"); } String toolTipText = tabInfo.getToolTipText(); if (toolTipText != null) { - appendAdditionCode(getId() + ".setToolTipTextAt(" + tabIndex + ", " + TypeManager.getJavaCode(toolTipText) + ");"); + if (I18nHelper.isI18nAttribute("toolTipText")) { + if (!toolTipText.startsWith("_(\"")) { + // we did not have the invocation code, add it + toolTipText = I18nHelper.addI18nInvocation(getId(),"toolTipText", TypeManager.getJavaCode(toolTipText),compiler); + } + } else { + toolTipText = TypeManager.getJavaCode(toolTipText); + } + appendAdditionCode(getId() + ".setToolTipTextAt(" + tabIndex + ", " + toolTipText + ");"); } boolean enabled = tabInfo.isEnabled(); Modified: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-08 16:01:29 UTC (rev 891) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/org/codelutin/jaxx/I18nTest.java 2008-10-09 11:08:39 UTC (rev 892) @@ -31,18 +31,21 @@ public void testI18nText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setText(_(\"test.text\"));", true); + checkPattern("\"_(\\\"test.text\\\")\"", false); } @CompileConfig(packageName = "i18n.title", verbose = false, i18nable = true) public void testI18nTitle() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setTitle(_(\"test.title\"));", true); + checkPattern("\"_(\\\"test.title\\\")\"", false); } @CompileConfig(packageName = "i18n.tooltiptext", verbose = false, i18nable = true) public void testI18nToolTipText() throws MojoExecutionException, MojoFailureException, IOException { goal.execute(); checkPattern("testId.setToolTipText(_(\"test.toolTipText\"));", true); + checkPattern("\"_(\\\"test.toolTipText\\\")\"", false); } protected void checkPattern(String pattern, boolean required) throws IOException { @@ -54,7 +57,9 @@ assertTrue("generated file " + f + " was not found...", f.exists()); String content = FileUtil.readAsString(f); - assertEquals("could not find the pattern : " + pattern + " in file " + f, required, content.contains(pattern)); + + String errorMessage = required ? "could not find the pattern : " : "should not have found pattern :"; + assertEquals(errorMessage + pattern + " in file " + f, required, content.contains(pattern)); } } Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx 2008-10-09 11:08:39 UTC (rev 892) @@ -0,0 +1,5 @@ +<JTabbedPane> + <tab id="testId" title='test.title'> + <JLabel text='testLabel'/> + </tab> +</JTabbedPane> \ No newline at end of file Property changes on: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/title/JTabbedPane2.jaxx ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx (from rev 884, lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane2.jaxx) =================================================================== --- lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx (rev 0) +++ lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx 2008-10-09 11:08:39 UTC (rev 892) @@ -0,0 +1,5 @@ +<JTabbedPane> + <tab id="testId" toolTipText='test.toolTipText'> + <JLabel text='yo'/> + </tab> +</JTabbedPane> \ No newline at end of file Property changes on: lutinjaxx/trunk/maven-jaxx-plugin/src/test/java/testcases/i18n/tooltiptext/JTabbedPane3.jaxx ___________________________________________________________________ Name: svn:mergeinfo +