JBoss Tools SVN: r13552 - branches/jbosstools-3.0.0.CR2/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-09 19:29:00 -0500 (Mon, 09 Feb 2009)
New Revision: 13552
Modified:
branches/jbosstools-3.0.0.CR2/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
Log:
code cleanup
Modified: branches/jbosstools-3.0.0.CR2/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
===================================================================
--- branches/jbosstools-3.0.0.CR2/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2009-02-09 21:50:49 UTC (rev 13551)
+++ branches/jbosstools-3.0.0.CR2/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2009-02-10 00:29:00 UTC (rev 13552)
@@ -59,8 +59,7 @@
}
public boolean isRelevant(IFile f) {
- if(f.getName().endsWith(".jar")) return true; //$NON-NLS-1$
- return false;
+ return f.getName().endsWith(".jar"); //$NON-NLS-1$
}
public boolean isLikelyComponentSource(IFile f) {
15 years, 2 months
JBoss Tools SVN: r13551 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-09 16:50:49 -0500 (Mon, 09 Feb 2009)
New Revision: 13551
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3500 re move system.out form code
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java 2009-02-09 21:38:23 UTC (rev 13550)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java 2009-02-09 21:50:49 UTC (rev 13551)
@@ -23,7 +23,6 @@
*/
public void testFacesConfigEditorIsOpened() {
IEditorPart facesConfigEditor = WorkbenchUtils.openEditor("/TestWizards/WebContent/WEB-INF/faces-config.xml");
- System.out.println(facesConfigEditor.getClass().getName());
assertTrue(facesConfigEditor instanceof EditorPartWrapper);
EditorPartWrapper facesConfigEditorWrap = (EditorPartWrapper)facesConfigEditor;
assertTrue(facesConfigEditorWrap.getEditor() instanceof FacesConfigEditor);
15 years, 2 months
JBoss Tools SVN: r13550 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-09 16:38:23 -0500 (Mon, 09 Feb 2009)
New Revision: 13550
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestWizardsProject.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFUiAllTests.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/FavoritesClassController.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/VRuleTipFactory.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
workspace/dgolovin/org.jboss.tools.project.examples.rf.demo/rf-demo-projects.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3500 enable JSF UI Tests in build
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -167,6 +167,8 @@
return true;
}
+ // FIXME Size of string buffer should be set to size of file by default
+ // to avoid StringBuffer extension on each append
public static String readStream(InputStream is) {
StringBuffer sb = new StringBuffer("");
try {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultRedirectHandler.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -71,7 +71,7 @@
public XEntityData[] getEntityData(XModelObject object) {
XAction a = getTrueAction(object);
- return (a == null) ? null : a.getEntityData(getTrueSource(object));
+ return (a == null) ? new XEntityData[0] : a.getEntityData(getTrueSource(object));
}
public void executeHandler(XModelObject object, Properties p) throws XModelException {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/jst/web/tld/TLDToPaletteHelper.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -79,9 +79,8 @@
// String info = TLDUtil.getTagDescription(tag);
StringBuffer sb = new StringBuffer();
sb.append("<b>Syntax:</b><br><code>");
- if (empty) sb.append("<" + name + " />"); else sb.append("<" + name + "></code><br><code></" + name + ">");
- sb.append("</code><br>");
- sb.append("<b>Attributes:</b><br><code>");
+ if (empty) sb.append("<").append(name).append(" />"); else sb.append("<").append(name).append("></code><br><code></").append(name).append(">");
+ sb.append("</code><br><b>Attributes:</b><br><code>");
int k = 0;
XModelObject[] as = tag.getChildren();
for (int i = 0; i < as.length; i++) {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/FavoritesClassController.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/FavoritesClassController.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/jdt/FavoritesClassController.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -49,7 +49,7 @@
StringBuffer buffer = new StringBuffer();
Iterator i = list.iterator();
while (i.hasNext()) {
- buffer.append((String)i.next()+",");
+ buffer.append((String)i.next()).append(",");
}
return buffer.toString();
}
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/VRuleTipFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/VRuleTipFactory.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/VRuleTipFactory.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -19,7 +19,7 @@
VResultTemplate[] ts = f.getTemplates();
if(ts == null) return null;
StringBuffer sb = new StringBuffer();
- sb.append("<html><body>" + rule.getDescription() + "<br>");
+ sb.append("<html><body>").append(rule.getDescription()).append("<br>");
for (int i = 0; i < ts.length; i++) {
int si = ts[i].getSignificance();
sb.append(" ");
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2009-02-09 21:38:23 UTC (rev 13550)
@@ -14,5 +14,7 @@
org.jboss.tools.jsf.ui;bundle-version="2.0.0",
org.jboss.tools.jst.web.ui;bundle-version="2.0.0",
org.jboss.tools.jst.jsp;bundle-version="2.0.0",
- org.jboss.tools.common.model.ui;bundle-version="2.0.0"
+ org.jboss.tools.common.model.ui;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1"
Bundle-Localization: plugin
+Bundle-ClassPath: jsf-ui-test.jar
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/build.properties 2009-02-09 21:38:23 UTC (rev 13550)
@@ -1,5 +1,6 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.properties
+ plugin.properties,\
+ jsf-ui-test.jar,\
+ projects/
+source.jsf-ui-test.jar = src/
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FasesConfigEditorTest.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -2,15 +2,35 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.ui.IEditorPart;
+import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
+import org.jboss.tools.jsf.ui.editor.FacesConfigEditor;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
public class FasesConfigEditorTest extends TestCase {
+ IProject testWizards = null;
+
+ @Override
+ protected void setUp() throws Exception {
+ testWizards = new TestWizardsProject().importProject();
+ }
+
/**
* Opens faces config editor on imported project and checks
* that it is opened and have three tabs in it
*/
public void testFacesConfigEditorIsOpened() {
- // assert editor is opened
- // assert it is FacesConfigEditor instance
- fail("Not implemented yet");
+ IEditorPart facesConfigEditor = WorkbenchUtils.openEditor("/TestWizards/WebContent/WEB-INF/faces-config.xml");
+ System.out.println(facesConfigEditor.getClass().getName());
+ assertTrue(facesConfigEditor instanceof EditorPartWrapper);
+ EditorPartWrapper facesConfigEditorWrap = (EditorPartWrapper)facesConfigEditor;
+ assertTrue(facesConfigEditorWrap.getEditor() instanceof FacesConfigEditor);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ WorkbenchUtils.closeAllEditors();
+ }
}
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFUiAllTests.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFUiAllTests.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.jsf.ui.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class JSFUiAllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("JSF UI tests");
-
- suite.addTestSuite(CssClassNewWizardTest.class);
- suite.addTestSuite(CssFileNewWizardTest.class);
- suite.addTestSuite(FacesConfigNewWizardTest.class);
- suite.addTestSuite(FasesConfigEditorTest.class);
- suite.addTestSuite(HtmlFileNewWizardTest.class);
- suite.addTestSuite(JsFileNewWizardTest.class);
- suite.addTestSuite(JspFileNewWizardTest.class);
- suite.addTestSuite(PropertiesNewWizardTest.class);
- suite.addTestSuite(XhtmlFileNewWizardTest.class);
-
- return suite;
- }
-}
\ No newline at end of file
Copied: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java (from rev 13549, trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSFUiAllTests.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.jsf.ui.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class JsfUiAllTests {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("JSF UI tests");
+
+ suite.addTestSuite(CssClassNewWizardTest.class);
+ suite.addTestSuite(CssFileNewWizardTest.class);
+ suite.addTestSuite(FacesConfigNewWizardTest.class);
+ suite.addTestSuite(FasesConfigEditorTest.class);
+ suite.addTestSuite(HtmlFileNewWizardTest.class);
+ suite.addTestSuite(JsFileNewWizardTest.class);
+ suite.addTestSuite(JspFileNewWizardTest.class);
+ suite.addTestSuite(PropertiesNewWizardTest.class);
+ suite.addTestSuite(XhtmlFileNewWizardTest.class);
+
+ return new TestWizardsProject(suite);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestWizardsProject.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestWizardsProject.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestWizardsProject.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -0,0 +1,32 @@
+package org.jboss.tools.jsf.ui.test;
+
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+public class TestWizardsProject extends ProjectImportTestSetup {
+
+ public static final String NAME = "TestWizards";
+ public static final String BUNDLE_NAME = "org.jboss.tools.jsf.ui.test";
+ public static final String PATH = "/projects/TestWizards";
+
+ public TestWizardsProject(Test test) {
+ super(test, BUNDLE_NAME, PATH, NAME);
+ }
+
+ public TestWizardsProject() {
+ super(null, BUNDLE_NAME, PATH, NAME);
+ }
+
+ @Override
+ public IProject importProject() throws Exception {
+ IProject testWizards = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember(NAME);
+
+ if(testWizards==null) {
+ testWizards = super.importProject();
+ }
+ return testWizards;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TestWizardsProject.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -24,7 +24,7 @@
public abstract class WizardTest extends TestCase {
protected String id;
protected IProject project;
-
+ protected boolean projectRemovalRequired = false;
protected WizardDialog dialog;
public WizardTest(String id){
@@ -35,38 +35,9 @@
protected void setUp() throws Exception {
super.setUp();
- project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("TestWizards");
- if(project == null) {
- ProjectImportTestSetup setup = new ProjectImportTestSetup(
- this,
- "org.jboss.tools.jsf.ui.test",
- "projects/TestWizards",
- "TestWizards");
- project = setup.importProject();
- }
- this.project = project.getProject();
- JobUtils.waitForIdle();
+ project = new TestWizardsProject().importProject();
+
}
-
- @Override
- protected void tearDown() throws Exception {
- if(dialog != null)
- dialog.close();
-
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- try {
- JobUtils.waitForIdle();
- if(project != null){
- project.close(new NullProgressMonitor());
- project.delete(true, new NullProgressMonitor());
- project = null;
- JobUtils.waitForIdle();
- }
- } finally {
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- }
-
- }
public void wizardIsCreated() {
IWizard wizard = WorkbenchUtils.findWizardByDefId(id);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -23,4 +23,4 @@
public void testXhtmlFileNewWizardValidation2() {
validateFolderAndName();
}
-}
+}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-09 21:38:23 UTC (rev 13550)
@@ -38,8 +38,6 @@
suite.addTestSuite(SeamFacetInstallDelegateTest.class);
suite.addTest(SeamValidatorsAllTests.suite());
suite.addTest(SeamRefactoringAllTests.suite());
-
- // Seam 2 tests can't run on hudson for now ;(
suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
return suite;
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2009-02-09 18:45:54 UTC (rev 13549)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2009-02-09 21:38:23 UTC (rev 13550)
@@ -419,4 +419,10 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.jsf.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
Modified: workspace/dgolovin/org.jboss.tools.project.examples.rf.demo/rf-demo-projects.xml
===================================================================
--- workspace/dgolovin/org.jboss.tools.project.examples.rf.demo/rf-demo-projects.xml 2009-02-09 18:45:54 UTC (rev 13549)
+++ workspace/dgolovin/org.jboss.tools.project.examples.rf.demo/rf-demo-projects.xml 2009-02-09 21:38:23 UTC (rev 13550)
@@ -1,5 +1,4 @@
<projects>
-
<project>
<category>RichFaces</category>
<name>RichFaces 3.2.2.SP1 Demo Application for JBoss AS 4.2.X</name>
15 years, 2 months
JBoss Tools SVN: r13549 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-02-09 13:45:54 -0500 (Mon, 09 Feb 2009)
New Revision: 13549
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java
Log:
JBIDE-3603 - change "class.toString()" to consts with more descriptive names
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java 2009-02-09 15:26:52 UTC (rev 13548)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterSettingsTab.java 2009-02-09 18:45:54 UTC (rev 13549)
@@ -99,6 +99,11 @@
import org.hibernate.eclipse.console.wizards.UpDownListComposite;
public class ExporterSettingsTab extends AbstractLaunchConfigurationTab {
+
+ public static final String EXPORTERS_PROPERTIES_COLUMN_PROPERTY_WIDTH = "hibernateCodeGenerationConfigurations.exporters.properties.column.property.Width"; //$NON-NLS-1$
+
+ public static final String EXPORTERS_PROPERTIES_COLUMN_VALUE_WIDTH = "hibernateCodeGenerationConfigurations.exporters.properties.column.value.Width"; //$NON-NLS-1$
+
private Button enableEJB3annotations;
private Button enableJDK5;
@@ -865,9 +870,8 @@
Tree tree = (Tree)control;
TreeColumn[] columns = tree.getColumns();
IPreferenceStore preferenceStore = HibernateConsolePlugin.getDefault().getPreferenceStore();
- String tmpName = ExporterSettingsTab.class.toString();
- int colWidth_0 = preferenceStore.getInt(tmpName + "col_0"); //$NON-NLS-1$
- int colWidth_1 = preferenceStore.getInt(tmpName + "col_1"); //$NON-NLS-1$
+ int colWidth_0 = preferenceStore.getInt(EXPORTERS_PROPERTIES_COLUMN_PROPERTY_WIDTH);
+ int colWidth_1 = preferenceStore.getInt(EXPORTERS_PROPERTIES_COLUMN_VALUE_WIDTH);
if (colWidth_0 > 0 && colWidth_1 > 0) {
columns[0].setWidth(colWidth_0);
columns[1].setWidth(colWidth_1);
@@ -897,9 +901,8 @@
Tree tree = (Tree)control;
IPreferenceStore preferenceStore = HibernateConsolePlugin.getDefault().getPreferenceStore();
TreeColumn[] columns = tree.getColumns();
- String tmpName = ExporterSettingsTab.class.toString();
- preferenceStore.setValue(tmpName + "col_0", columns[0].getWidth()); //$NON-NLS-1$
- preferenceStore.setValue(tmpName + "col_1", columns[1].getWidth()); //$NON-NLS-1$
+ preferenceStore.setValue(EXPORTERS_PROPERTIES_COLUMN_PROPERTY_WIDTH, columns[0].getWidth());
+ preferenceStore.setValue(EXPORTERS_PROPERTIES_COLUMN_VALUE_WIDTH, columns[1].getWidth());
}
}
15 years, 2 months
JBoss Tools SVN: r13548 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: scanner/lib and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-09 10:26:52 -0500 (Mon, 09 Feb 2009)
New Revision: 13548
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
Log:
JBIDE-3729
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-09 15:26:04 UTC (rev 13547)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-09 15:26:52 UTC (rev 13548)
@@ -36,6 +36,7 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamComponentDeclaration;
@@ -327,7 +328,7 @@
IPath[] ps = sourcePaths2.keySet().toArray(new IPath[0]);
for (int i = 0; i < ps.length; i++) {
IPath pth = ps[i];
- if(p.getSourcePath().isPrefixOf(pth) || (p.isPathLoaded(pth) && !pth.toString().endsWith(".jar"))) {
+ if(p.getSourcePath().isPrefixOf(pth) || (p.isPathLoaded(pth) && !EclipseResourceUtil.isJar(pth.toString()))) {
pathRemoved(pth);
}
}
@@ -776,7 +777,7 @@
if(ns.length == 0 && components.length == 0 && factories.length == 0 && ds.getImports().size() == 0) {
pathRemoved(source);
- if(source.toString().endsWith(".jar")) {
+ if(EclipseResourceUtil.isJar(source.toString())) {
if(!sourcePaths.contains(source)) sourcePaths.add(source);
sourcePaths2.put(source, ds);
}
@@ -945,7 +946,7 @@
*/
public void registerComponentsInDependentProjects(LoadedDeclarations ds, IPath source) throws CloneNotSupportedException {
if(usedBy.size() == 0) return;
- if(source.toString().endsWith(".jar")) return; //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(source.toString())) return;
for (SeamProject p : usedBy) {
p.resolve();
@@ -1060,7 +1061,7 @@
public void firePathRemovedToDependentProjects(IPath source) {
if(usedBy.size() == 0) return;
- if(source.toString().endsWith(".jar")) return; //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(source.toString())) return;
for (SeamProject p : usedBy) {
p.resolve();
@@ -1576,7 +1577,7 @@
for (ISeamComponent c : components.allComponentsSet) {
for (ISeamComponentDeclaration d : c.getAllDeclarations()) {
IPath p = d.getSourcePath();
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -1589,7 +1590,7 @@
Set<ISeamNamespace> s = namespaces.namespacesByURI.get(uri);
for (ISeamNamespace n : s) {
IPath p = n.getSourcePath();
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -1600,7 +1601,7 @@
}
for (ISeamFactory f : factories.allFactories) {
IPath p = f.getSourcePath();
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -1610,7 +1611,7 @@
}
for (String s: imports.keySet()) {
IPath p = new Path(s);
- if(p == null || p.toString().endsWith(".jar")) continue; //$NON-NLS-1$
+ if(p == null || EclipseResourceUtil.isJar(p.toString())) continue;
LoadedDeclarations ds = map.get(p);
if(ds == null) {
ds = new LoadedDeclarations();
@@ -2083,5 +2084,5 @@
return byPath.get(p);
}
}
-
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2009-02-09 15:26:04 UTC (rev 13547)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2009-02-09 15:26:52 UTC (rev 13548)
@@ -120,7 +120,7 @@
for (int i = 0; i < paths.size(); i++) {
String path = paths.get(i);
- if(!path.endsWith(".jar")) continue; //$NON-NLS-1$
+ if(!EclipseResourceUtil.isJar(path)) continue;
String fileName = new File(path).getName();
if(SYSTEM_JAR_SET.contains(fileName)) continue;
String jsname = "lib-" + fileName; //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2009-02-09 15:26:04 UTC (rev 13547)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/LibraryScanner.java 2009-02-09 15:26:52 UTC (rev 13548)
@@ -59,7 +59,7 @@
}
public boolean isRelevant(IFile f) {
- if(f.getName().endsWith(".jar")) return true; //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(f.getName())) return true;
return false;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2009-02-09 15:26:04 UTC (rev 13547)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/xml/XMLScanner.java 2009-02-09 15:26:52 UTC (rev 13548)
@@ -314,7 +314,7 @@
}
public static String getImpliedClassName(XModelObject c, IPath path) {
- if(path.toString().endsWith(".jar")) { //$NON-NLS-1$
+ if(EclipseResourceUtil.isJar(path.toString())) {
String suffix = ".component"; //$NON-NLS-1$
String cn = c.getAttributeValue("name"); //$NON-NLS-1$
if(cn.endsWith(suffix)) cn = cn.substring(0, cn.length() - suffix.length());
15 years, 2 months
JBoss Tools SVN: r13547 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-09 10:26:04 -0500 (Mon, 09 Feb 2009)
New Revision: 13547
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-3729
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2009-02-09 15:17:02 UTC (rev 13546)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2009-02-09 15:26:04 UTC (rev 13547)
@@ -191,7 +191,7 @@
for (int i = 0; i < paths.size(); i++) {
String path = paths.get(i);
- if(!path.endsWith(".jar")) continue; //$NON-NLS-1$
+ if(!EclipseResourceUtil.isJar(path)) continue;
String fileName = new File(path).getName();
if(SYSTEM_JAR_SET.contains(fileName)) continue;
String jsname = "lib-" + fileName; //$NON-NLS-1$
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2009-02-09 15:17:02 UTC (rev 13546)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2009-02-09 15:26:04 UTC (rev 13547)
@@ -67,7 +67,9 @@
try {
int ind = location.indexOf(":/");
if (ind != 1 && ind != -1) {
- File f = File.createTempFile("efs_", ".jar");
+ int extI = location.lastIndexOf('.');
+ String ext = extI >= 0 ? location.substring(extI) : ".jar";
+ File f = File.createTempFile("efs_", ext);
f.deleteOnExit();
InputStream i = new java.net.URL(location).openConnection().getInputStream();
FileOutputStream o = new FileOutputStream(f);
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-02-09 15:17:02 UTC (rev 13546)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-02-09 15:26:04 UTC (rev 13547)
@@ -110,7 +110,7 @@
}
fs = fso.getChildren("FileSystemJar");
String location = path == null ? null : path.toString().replace('\\', '/');
- if(location != null && location.toLowerCase().endsWith(".jar")) {
+ if(location != null && isJar(location)) {
for (int i = 0; i < fs.length; i++) {
JarSystemImpl jar = (JarSystemImpl)fs[i];
String jl = jar.getLocation();
@@ -356,7 +356,7 @@
}
private static boolean isJar(IResource resource) {
- return (resource instanceof IFile && resource.getName().endsWith(".jar"));
+ return (resource instanceof IFile && isJar(resource.getName()));
}
private static void validateJarSystem(XModelObject fs, IResource resource) {
@@ -899,4 +899,10 @@
return null;
}
+ public static boolean isJar(String path) {
+ if(path == null) return false;
+ path = path.toLowerCase();
+ return path.endsWith(".jar") || path.endsWith(".zip");
+ }
+
}
15 years, 2 months
JBoss Tools SVN: r13546 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-02-09 10:17:02 -0500 (Mon, 09 Feb 2009)
New Revision: 13546
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3599
ConsoleConfiguration after generation entities must require rebuild.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2009-02-09 14:56:01 UTC (rev 13545)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2009-02-09 15:17:02 UTC (rev 13546)
@@ -57,7 +57,7 @@
*/
public class SeamGenerateEnitiesWizard extends SeamBaseWizard implements INewWizard {
- IWizardPage page1 = new SeamGenerateEnitiesWizardPage();
+ SeamGenerateEnitiesWizardPage page1 = new SeamGenerateEnitiesWizardPage();
IWizardPage page2 = new SeamGenerateEntitiesTablesWizardPage();
public void createPageControls(Composite pageContainer) {
@@ -373,7 +373,7 @@
public boolean performFinish() {
boolean result = super.performFinish();
if (result){
- String ccName = ((SeamGenerateEnitiesWizardPage) page1).getConsoleCongigurationName();
+ String ccName = page1.getConsoleCongigurationName();
ConsoleConfiguration config = KnownConfigurations.getInstance().find(ccName);
//fix for JBIDE-3599
if (config != null) config.reset();
15 years, 2 months
JBoss Tools SVN: r13545 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-02-09 09:56:01 -0500 (Mon, 09 Feb 2009)
New Revision: 13545
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-883
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-02-09 13:14:06 UTC (rev 13544)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-02-09 14:56:01 UTC (rev 13545)
@@ -16,122 +16,122 @@
import org.mozilla.interfaces.nsIDOMKeyEvent;
public class TextUtil {
- private final static String SOURCE_BREAK = "\r\n";
- private final static String VISUAL_BREAK = "\n";
+ private final static String SOURCE_BREAK = "\r\n"; //$NON-NLS-1$
+ private final static String VISUAL_BREAK = "\n"; //$NON-NLS-1$
private final static char SOURCE_SPACE = ' ';
private final static char VISUAL_SPACE = 160;
private final static int CHR_ESC_START = '&';
private final static int CHR_ESC_STOP = ';';
- private final static String SPCHARS = "\f\n\r\t\u0020\u2028\u2029";
- private final static Map textSet = new HashMap();
+ private final static String SPCHARS = "\f\n\r\t\u0020\u2028\u2029"; //$NON-NLS-1$
+ private final static Map<Character,String> textSet = new HashMap<Character,String>();
static{
- textSet.put(new Character('"'), """);
- textSet.put(new Character('&'),"&");
- textSet.put(new Character('<'),"<");
- textSet.put(new Character('>'),">");
+ textSet.put(new Character('"'), """); //$NON-NLS-1$
+ textSet.put(new Character('&'),"&"); //$NON-NLS-1$
+ textSet.put(new Character('<'),"<"); //$NON-NLS-1$
+ textSet.put(new Character('>'),">"); //$NON-NLS-1$
// textSet.put(new Character(' ')," ");
- textSet.put(new Character('\u00A1'),"¡");
- textSet.put(new Character('\u00A2'),"¢");
- textSet.put(new Character('\u00A3'),"£");
- textSet.put(new Character('\u00A4'),"¤");
- textSet.put(new Character('\u00A5'),"¥");
- textSet.put(new Character('\u00A6'),"¦");
- textSet.put(new Character('\u00A7'),"§");
- textSet.put(new Character('\u00A8'),"¨");
- textSet.put(new Character('\u00A9'),"©");
- textSet.put(new Character('\u00AA'),"ª");
- textSet.put(new Character('\u00AB'),"«");
- textSet.put(new Character('\u00AC'),"¬");
+ textSet.put(new Character('\u00A1'),"¡"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A2'),"¢"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A3'),"£"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A4'),"¤"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A5'),"¥"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A6'),"¦"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A7'),"§"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A8'),"¨"); //$NON-NLS-1$
+ textSet.put(new Character('\u00A9'),"©"); //$NON-NLS-1$
+ textSet.put(new Character('\u00AA'),"ª"); //$NON-NLS-1$
+ textSet.put(new Character('\u00AB'),"«"); //$NON-NLS-1$
+ textSet.put(new Character('\u00AC'),"¬"); //$NON-NLS-1$
//textSet.put(new Character('\u00AD'),"­");
- textSet.put(new Character('\u00AE'),"®");
- textSet.put(new Character('\u00AF'),"¯");
- textSet.put(new Character('\u00B0'),"°");
- textSet.put(new Character('\u00B1'),"±");
- textSet.put(new Character('\u00B2'),"²");
- textSet.put(new Character('\u00B3'),"³");
- textSet.put(new Character('\u00B4'),"´");
- textSet.put(new Character('\u00B5'),"µ");
- textSet.put(new Character('\u00B6'),"¶");
- textSet.put(new Character('\u00B7'),"·");
- textSet.put(new Character('\u00B8'),"¸");
- textSet.put(new Character('\u00B9'),"¹");
- textSet.put(new Character('\u00BA'),"º");
- textSet.put(new Character('\u00BB'),"»");
- textSet.put(new Character('\u00BC'),"¼");
- textSet.put(new Character('\u00BD'),"½");
- textSet.put(new Character('\u00BE'),"¾");
- textSet.put(new Character('\u00BF'),"¿");
- textSet.put(new Character('\u00C0'),"À");
- textSet.put(new Character('\u00E0'),"à");
- textSet.put(new Character('\u00C1'),"Á");
- textSet.put(new Character('\u00E1'),"á");
- textSet.put(new Character('\u00C2'),"Â");
- textSet.put(new Character('\u00E2'),"â");
- textSet.put(new Character('\u00C3'),"Ã");
- textSet.put(new Character('\u00E3'),"ã");
- textSet.put(new Character('\u00C4'),"Ä");
- textSet.put(new Character('\u00E4'),"ä");
- textSet.put(new Character('\u00C5'),"Å");
- textSet.put(new Character('\u00E5'),"å");
- textSet.put(new Character('\u00C6'),"Æ");
- textSet.put(new Character('\u00E6'),"æ");
- textSet.put(new Character('\u00C7'),"Ç");
- textSet.put(new Character('\u00E7'),"ç");
- textSet.put(new Character('\u00C8'),"È");
- textSet.put(new Character('\u00E8'),"è");
- textSet.put(new Character('\u00C9'),"É");
- textSet.put(new Character('\u00E9'),"é");
- textSet.put(new Character('\u00CA'),"Ê");
- textSet.put(new Character('\u00EA'),"ê");
- textSet.put(new Character('\u00CB'),"Ë");
- textSet.put(new Character('\u00EB'),"ë");
- textSet.put(new Character('\u00CC'),"Ì");
- textSet.put(new Character('\u00EC'),"ì");
- textSet.put(new Character('\u00CD'),"Í");
- textSet.put(new Character('\u00ED'),"í");
- textSet.put(new Character('\u00CE'),"Î");
- textSet.put(new Character('\u00EE'),"î");
- textSet.put(new Character('\u00CF'),"Ï");
- textSet.put(new Character('\u00EF'),"ï");
- textSet.put(new Character('\u00D0'),"Ð");
- textSet.put(new Character('\u00F0'),"ð");
- textSet.put(new Character('\u00D1'),"Ñ");
- textSet.put(new Character('\u00F1'),"ñ");
- textSet.put(new Character('\u00D2'),"Ò");
- textSet.put(new Character('\u00F2'),"ò");
- textSet.put(new Character('\u00D3'),"Ó");
- textSet.put(new Character('\u00F3'),"ó");
- textSet.put(new Character('\u00D4'),"Ô");
- textSet.put(new Character('\u00F4'),"ô");
- textSet.put(new Character('\u00D5'),"Õ");
- textSet.put(new Character('\u00F5'),"õ");
- textSet.put(new Character('\u00D6'),"Ö");
- textSet.put(new Character('\u00F6'),"ö");
- textSet.put(new Character('\u00D7'),"×");
- textSet.put(new Character('\u00F7'),"÷");
- textSet.put(new Character('\u00D8'),"Ø");
- textSet.put(new Character('\u00F8'),"ø");
- textSet.put(new Character('\u00D9'),"Ù");
- textSet.put(new Character('\u00F9'),"ù");
- textSet.put(new Character('\u00DA'),"Ú");
- textSet.put(new Character('\u00FA'),"ú");
- textSet.put(new Character('\u00DB'),"Û");
- textSet.put(new Character('\u00FB'),"û");
- textSet.put(new Character('\u00DC'),"Ü");
- textSet.put(new Character('\u00FC'),"ü");
- textSet.put(new Character('\u00DD'),"Ý");
- textSet.put(new Character('\u00FD'),"ý");
- textSet.put(new Character('\u00DE'),"Þ");
- textSet.put(new Character('\u00FE'),"þ");
- textSet.put(new Character('\u00DF'),"ß");
- textSet.put(new Character('\u00FF'),"ÿ");
- textSet.put(new Character('\u2013'),"–");
- textSet.put(new Character('\u2014'),"—");
- textSet.put(new Character('\u2018'),"‘");
- textSet.put(new Character('\u2019'),"’");
- textSet.put(new Character('\u201C'),"“");
- textSet.put(new Character('\u201D'),"”");
- textSet.put(new Character('\u20AC'),"€");
+ textSet.put(new Character('\u00AE'),"®"); //$NON-NLS-1$
+ textSet.put(new Character('\u00AF'),"¯"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B0'),"°"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B1'),"±"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B2'),"²"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B3'),"³"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B4'),"´"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B5'),"µ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B6'),"¶"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B7'),"·"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B8'),"¸"); //$NON-NLS-1$
+ textSet.put(new Character('\u00B9'),"¹"); //$NON-NLS-1$
+ textSet.put(new Character('\u00BA'),"º"); //$NON-NLS-1$
+ textSet.put(new Character('\u00BB'),"»"); //$NON-NLS-1$
+ textSet.put(new Character('\u00BC'),"¼"); //$NON-NLS-1$
+ textSet.put(new Character('\u00BD'),"½"); //$NON-NLS-1$
+ textSet.put(new Character('\u00BE'),"¾"); //$NON-NLS-1$
+ textSet.put(new Character('\u00BF'),"¿"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C0'),"À"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E0'),"à"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C1'),"Á"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E1'),"á"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C2'),"Â"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E2'),"â"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C3'),"Ã"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E3'),"ã"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C4'),"Ä"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E4'),"ä"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C5'),"Å"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E5'),"å"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C6'),"Æ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E6'),"æ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C7'),"Ç"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E7'),"ç"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C8'),"È"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E8'),"è"); //$NON-NLS-1$
+ textSet.put(new Character('\u00C9'),"É"); //$NON-NLS-1$
+ textSet.put(new Character('\u00E9'),"é"); //$NON-NLS-1$
+ textSet.put(new Character('\u00CA'),"Ê"); //$NON-NLS-1$
+ textSet.put(new Character('\u00EA'),"ê"); //$NON-NLS-1$
+ textSet.put(new Character('\u00CB'),"Ë"); //$NON-NLS-1$
+ textSet.put(new Character('\u00EB'),"ë"); //$NON-NLS-1$
+ textSet.put(new Character('\u00CC'),"Ì"); //$NON-NLS-1$
+ textSet.put(new Character('\u00EC'),"ì"); //$NON-NLS-1$
+ textSet.put(new Character('\u00CD'),"Í"); //$NON-NLS-1$
+ textSet.put(new Character('\u00ED'),"í"); //$NON-NLS-1$
+ textSet.put(new Character('\u00CE'),"Î"); //$NON-NLS-1$
+ textSet.put(new Character('\u00EE'),"î"); //$NON-NLS-1$
+ textSet.put(new Character('\u00CF'),"Ï"); //$NON-NLS-1$
+ textSet.put(new Character('\u00EF'),"ï"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D0'),"Ð"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F0'),"ð"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D1'),"Ñ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F1'),"ñ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D2'),"Ò"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F2'),"ò"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D3'),"Ó"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F3'),"ó"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D4'),"Ô"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F4'),"ô"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D5'),"Õ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F5'),"õ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D6'),"Ö"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F6'),"ö"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D7'),"×"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F7'),"÷"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D8'),"Ø"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F8'),"ø"); //$NON-NLS-1$
+ textSet.put(new Character('\u00D9'),"Ù"); //$NON-NLS-1$
+ textSet.put(new Character('\u00F9'),"ù"); //$NON-NLS-1$
+ textSet.put(new Character('\u00DA'),"Ú"); //$NON-NLS-1$
+ textSet.put(new Character('\u00FA'),"ú"); //$NON-NLS-1$
+ textSet.put(new Character('\u00DB'),"Û"); //$NON-NLS-1$
+ textSet.put(new Character('\u00FB'),"û"); //$NON-NLS-1$
+ textSet.put(new Character('\u00DC'),"Ü"); //$NON-NLS-1$
+ textSet.put(new Character('\u00FC'),"ü"); //$NON-NLS-1$
+ textSet.put(new Character('\u00DD'),"Ý"); //$NON-NLS-1$
+ textSet.put(new Character('\u00FD'),"ý"); //$NON-NLS-1$
+ textSet.put(new Character('\u00DE'),"Þ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00FE'),"þ"); //$NON-NLS-1$
+ textSet.put(new Character('\u00DF'),"ß"); //$NON-NLS-1$
+ textSet.put(new Character('\u00FF'),"ÿ"); //$NON-NLS-1$
+ textSet.put(new Character('\u2013'),"–"); //$NON-NLS-1$
+ textSet.put(new Character('\u2014'),"—"); //$NON-NLS-1$
+ textSet.put(new Character('\u2018'),"‘"); //$NON-NLS-1$
+ textSet.put(new Character('\u2019'),"’"); //$NON-NLS-1$
+ textSet.put(new Character('\u201C'),"“"); //$NON-NLS-1$
+ textSet.put(new Character('\u201D'),"”"); //$NON-NLS-1$
+ textSet.put(new Character('\u20AC'),"€"); //$NON-NLS-1$
}
public static boolean containsKey(char key){
@@ -185,7 +185,7 @@
String value = (String)textSet.get(ch);
char sourceChar = sourceText.charAt(sourceIndex);
if(value != null){
- if(sourceChar != ch.charValue() || (ch.charValue() == '&' && sourceText.indexOf("&",sourceIndex) >= 0)){
+ if(sourceChar != ch.charValue() || (ch.charValue() == '&' && sourceText.indexOf("&",sourceIndex) >= 0)){ //$NON-NLS-1$
if(visualIndex == visualPosition) return true;
sourceIndex += value.length()-1;
}
@@ -301,8 +301,8 @@
int start1 = s1.length()-delta;
if(position < sourceText.length()){
while(position > sourcePosition){
- int ampersandPosition = s1.lastIndexOf("&");
- int semicolonPosition = s1.lastIndexOf(";");
+ int ampersandPosition = s1.lastIndexOf("&"); //$NON-NLS-1$
+ int semicolonPosition = s1.lastIndexOf(";"); //$NON-NLS-1$
if(ampersandPosition > 0 && semicolonPosition > 0 && ampersandPosition < semicolonPosition && (semicolonPosition+1) > sourcePosition){
String value = s1.substring(ampersandPosition, semicolonPosition+1);
if(textSet.containsValue(value))
@@ -325,7 +325,7 @@
String[] strings = (String[]) textSet.values().toArray(new String[]{});
for(int i=0;i<strings.length;i++){
- s1 = s1.replaceAll(strings[i]," ");
+ s1 = s1.replaceAll(strings[i]," "); //$NON-NLS-1$
}
s1 = visualText(s1);
return sourcePosition-(startLength - s1.length())-(start1-start2);
15 years, 2 months
JBoss Tools SVN: r13544 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-02-09 08:14:06 -0500 (Mon, 09 Feb 2009)
New Revision: 13544
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3599
ConsoleConfiguration after generation entities must require rebuild.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2009-02-09 13:10:30 UTC (rev 13543)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2009-02-09 13:14:06 UTC (rev 13544)
@@ -36,6 +36,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.PlatformUI;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
import org.jboss.tools.jst.web.WebUtils;
import org.jboss.tools.seam.core.ISeamProject;
@@ -366,4 +368,18 @@
}
return seamRt;
}
+
+ @Override
+ public boolean performFinish() {
+ boolean result = super.performFinish();
+ if (result){
+ String ccName = ((SeamGenerateEnitiesWizardPage) page1).getConsoleCongigurationName();
+ ConsoleConfiguration config = KnownConfigurations.getInstance().find(ccName);
+ //fix for JBIDE-3599
+ if (config != null) config.reset();
+ }
+ return result;
+ }
+
+
}
\ No newline at end of file
15 years, 2 months
JBoss Tools SVN: r13543 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: izhukov
Date: 2009-02-09 08:10:30 -0500 (Mon, 09 Feb 2009)
New Revision: 13543
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFLogTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/log.xhtml.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/log.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
JBIDE-3707 fixed
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFLogTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFLogTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFLogTemplate.java 2009-02-09 13:10:30 UTC (rev 13543)
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.jsf.vpe.ajax4jsf.template;
+
+
+import java.util.List;
+
+import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
+import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Template for the <a4j:log> component.
+ *
+ * @author Igor Zhukov
+ */
+public class Ajax4JSFLogTemplate extends VpeAbstractTemplate {
+
+ /** DEFAULT_DIV_SIZE */
+ private final static String DEFAULT_WIDTH = "800px"; //$NON-NLS-1$
+ private final static String DEFAULT_HEIGHT = "600px"; //$NON-NLS-1$
+ private final static String DEFAULT_OVERFLOW = "auto"; //$NON-NLS-1$
+
+ private final static String CLEAR_BUTTON = "Clear"; //$NON-NLS-1$
+
+ /**
+ * The Constructor.
+ */
+ public Ajax4JSFLogTemplate() {
+ super();
+ }
+
+ /**
+ * Creates a node of the visual tree on the node of the source tree.
+ *
+ * @param pageContext
+ * Contains the information on edited page.
+ * @param sourceNode
+ * The current node of the source tree.
+ * @param visualDocument
+ * The document of the visual tree.
+ * @return The information on the created node of the visual tree.
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
+ // cast to Element
+ Element sourceElement = (Element) sourceNode;
+
+ nsIDOMElement divElement = visualDocument.createElement(HTML.TAG_DIV);
+
+ String style = sourceElement.getAttribute(HTML.ATTR_STYLE);
+ // set STYLE attributes
+ // check 'overflow' attribute
+ String parameterValue = VpeStyleUtil.getParameterFromStyleAttribute(style, HTML.STYLE_PARAMETER_OVERFLOW);
+ if (parameterValue == null || parameterValue.equals(Constants.EMPTY)) {
+ parameterValue = ComponentUtil.getAttribute(sourceElement, HTML.STYLE_PARAMETER_OVERFLOW, DEFAULT_OVERFLOW);
+ style = VpeStyleUtil.setParameterInStyle(style, HTML.STYLE_PARAMETER_OVERFLOW, parameterValue);
+ }
+ // check 'width' attribute
+ parameterValue = VpeStyleUtil.getParameterFromStyleAttribute(style, HTML.ATTR_WIDTH);
+ if (parameterValue == null || parameterValue.equals(Constants.EMPTY)) {
+ parameterValue = ComponentUtil.getAttribute(sourceElement, HTML.ATTR_WIDTH, DEFAULT_WIDTH);
+ style = VpeStyleUtil.setParameterInStyle(style, HTML.ATTR_WIDTH, parameterValue);
+ }
+ // check 'height' attribute
+ parameterValue = VpeStyleUtil.getParameterFromStyleAttribute(style, HTML.ATTR_HEIGHT);
+ if (parameterValue == null || parameterValue.equals(Constants.EMPTY)) {
+ parameterValue = ComponentUtil.getAttribute(sourceElement, HTML.ATTR_HEIGHT, DEFAULT_HEIGHT);
+ style = VpeStyleUtil.setParameterInStyle(style, HTML.ATTR_HEIGHT, parameterValue);
+ }
+ divElement.setAttribute(HTML.ATTR_STYLE, style);
+
+ // set CLASS attribute
+ String styleClass = ComponentUtil.getAttribute(sourceElement, RichFaces.ATTR_STYLE_CLASS);
+ if (!Constants.EMPTY.equals(styleClass)) {
+ divElement.setAttribute(HTML.ATTR_CLASS, styleClass);
+ }
+
+ // create 'Clear' button
+ nsIDOMElement clearButton = visualDocument.createElement(HTML.TAG_BUTTON);
+ clearButton.appendChild(visualDocument.createTextNode(CLEAR_BUTTON));
+ clearButton.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_BUTTON);
+
+ divElement.appendChild(clearButton);
+
+ // ================================================================================
+ // Check if template component has children elements
+ // ================================================================================
+ List<Node> list = ComponentUtil.getChildren(sourceElement, true);
+ VpeCreationData creationData = null;
+ if (list != null && list.size() > 0) {
+ nsIDOMElement rootDiv = visualDocument.createElement(HTML.TAG_DIV);
+
+ // this element is used to contains template children
+ nsIDOMElement childDiv = visualDocument.createElement(HTML.TAG_DIV);
+
+ rootDiv.appendChild(childDiv);
+ rootDiv.appendChild(divElement);
+
+ // Create return variable contains template
+ creationData = new VpeCreationData(rootDiv);
+ VpeChildrenInfo divInfo = new VpeChildrenInfo(childDiv);
+ creationData.addChildrenInfo(divInfo);
+ for (Node child : list) {
+ divInfo.addSourceChild(child);
+ }
+ } else {
+ creationData = new VpeCreationData(divElement);
+ }
+
+ return creationData;
+ }
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2009-02-09 13:04:32 UTC (rev 13542)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2009-02-09 13:10:30 UTC (rev 13543)
@@ -225,8 +225,10 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="a4j:log" case-sensitive="yes">
- <vpe:template children="no" modify="no" >
+ <vpe:tag name="a4j:log" case-sensitive="yes">
+ <vpe:template children="yes" modify="no"
+ class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFLogTemplate">
+ <vpe:pseudoContent defaultText="no" />
</vpe:template>
</vpe:tag>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/log.xhtml
===================================================================
(Binary files differ)
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/log.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/log.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/log.xhtml.xml 2009-02-09 13:10:30 UTC (rev 13543)
@@ -0,0 +1,43 @@
+<tests>
+ <test id="log">
+ <DIV STYLE="overflow: auto; width: 800px; height: 600px;">
+ <BUTTON TYPE="button">Clear</BUTTON>
+ </DIV>
+ </test>
+ <test id="compliteLog">
+ <DIV>
+ <DIV>
+ <SPAN STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ f:verbatim
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Over Text For loadStyle
+ </SPAN>
+ </DIV>
+ <DIV STYLE="overflow: auto; color: red; background-color: red; width: 400px; height: 100px;"
+ CLASS="myClass">
+ <BUTTON TYPE="button">Clear</BUTTON>
+ </DIV>
+ </DIV>
+ </test>
+ <test id="compliteLog2">
+ <DIV>
+ <DIV>
+ <SPAN STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ f:verbatim
+ </SPAN>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ Over Text For loadStyle
+ </SPAN>
+ </DIV>
+ <DIV STYLE="overflow: auto; color: red; background-color: red; width: 350px; height: 250px;"
+ CLASS="myClass">
+ <BUTTON TYPE="button">Clear</BUTTON>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2009-02-09 13:04:32 UTC (rev 13542)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2009-02-09 13:10:30 UTC (rev 13543)
@@ -70,7 +70,7 @@
}
public void testLog() throws Throwable {
- performInvisibleTagTest("components/log.xhtml", "log"); //$NON-NLS-1$ //$NON-NLS-2$
+ performContentTest("components/log.xhtml"); //$NON-NLS-1$
}
public void testMediaOutput() throws Throwable {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2009-02-09 13:04:32 UTC (rev 13542)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2009-02-09 13:10:30 UTC (rev 13543)
@@ -141,6 +141,7 @@
public static final String STYLE_PARAMETER_MAX_HEIGHT = "max-height"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_ZINDEX = "z-index"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_CLEAR = "clear"; //$NON-NLS-1$
+ public static final String STYLE_PARAMETER_OVERFLOW = "overflow"; //$NON-NLS-1$
public static final String STYLE_PARAMETER_TABLE_LAYOUT = "table-layout"; //$NON-NLS-1$
public static final String STYLE_VALUE_FIXED = "fixed"; //$NON-NLS-1$
public static final String STYLE_VALUE_MIDDLE = "middle"; //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2009-02-09 13:04:32 UTC (rev 13542)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2009-02-09 13:10:30 UTC (rev 13543)
@@ -189,6 +189,41 @@
return null;
}
+ /**
+ * This method is used to get parameter value from <code>style</code> attribute.
+ * For instance, in case of style="width:65px; color:red" for parameter <code>color</code>
+ * method should return <code>red</code> string value.
+ *
+ * @param styleAttr the style attribute value
+ * @param parameter the name of parameter of style attribute
+ * @return the parameter value
+ */
+ public static String getParameterFromStyleAttribute(String style, String parameter) {
+ if (style == null || EMPTY_STRING.equals(style)) {
+ return null;
+ }
+ int parameterPosition = style.indexOf(parameter);
+ if (parameterPosition >= 0) {
+ int valuePosition = style.indexOf(COLON_STRING, parameterPosition);
+ if (valuePosition >= 0) {
+ int endPosition = style.indexOf(SEMICOLON_STRING, valuePosition);
+ if (endPosition >= 0) {
+ style = style.substring(valuePosition + 1, endPosition).trim();
+ endPosition = style.indexOf(PX_STRING, valuePosition);
+ if (endPosition >= 0) {
+ return style.substring(valuePosition + 1, endPosition).trim();
+ }
+ return style;
+ } else {
+ // last parameter ends without closing semicolon symbol
+ return style.substring(valuePosition + 1).trim();
+ }
+ }
+ }
+
+ return null;
+ }
+
// sets value of parameter described in sizeAttribute, for example
// "style.width"
public static void setSizeInStyle(Element sourceElement,
15 years, 2 months