JBoss Tools SVN: r25521 - trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-06 09:13:01 -0400 (Wed, 06 Oct 2010)
New Revision: 25521
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookXrefTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java
Log:
Fixed compilation errors.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookXrefTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookXrefTemplate.java 2010-10-06 13:05:44 UTC (rev 25520)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookXrefTemplate.java 2010-10-06 13:13:01 UTC (rev 25521)
@@ -37,7 +37,6 @@
private static final String XREF_WITH_PARAM = OPEN_TAG
+ "xref linkend=\"{0}\"/>"; //$NON-NLS-1$
- @Override
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java 2010-10-06 13:05:44 UTC (rev 25520)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java 2010-10-06 13:13:01 UTC (rev 25521)
@@ -36,7 +36,6 @@
private static final String BACKGROUND_COLOR = "rgb(236, 243, 255)"; //$NON-NLS-1$
private static final String BORDER = "1px solid black"; //$NON-NLS-1$
- @Override
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
13 years, 8 months
JBoss Tools SVN: r25520 - in trunk/vpe: plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-10-06 09:05:44 -0400 (Wed, 06 Oct 2010)
New Revision: 25520
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookCautionTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookImportantTemplate.java
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java
Log:
create classes for displaying docbook elements <caution> and <important> in vpe (https://jira.jboss.org/browse/JBIDE-7242)
Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookCautionTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookCautionTemplate.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookCautionTemplate.java 2010-10-06 13:05:44 UTC (rev 25520)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.docbook.template;
+
+import org.jboss.tools.vpe.docbook.template.util.Docbook;
+
+/**
+ * Class for <caution>
+ *
+ * @author Denis Vinnichek (dvinnichek)
+ */
+public class DocbookCautionTemplate extends ElementWithGeneratedOutputTemplate {
+
+ @Override
+ protected String getGeneratedText() {
+ return Docbook.ELEMENT_CAUTION.toUpperCase();
+ }
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookCautionTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookImportantTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookImportantTemplate.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookImportantTemplate.java 2010-10-06 13:05:44 UTC (rev 25520)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.docbook.template;
+
+import org.jboss.tools.vpe.docbook.template.util.Docbook;
+
+/**
+ * Class for <important>
+ *
+ * @author Denis Vinnichek (dvinnichek)
+ */
+public class DocbookImportantTemplate extends ElementWithGeneratedOutputTemplate {
+
+ @Override
+ protected String getGeneratedText() {
+ return Docbook.ELEMENT_IMPORTANT.toUpperCase();
+ }
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookImportantTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java 2010-10-06 12:26:21 UTC (rev 25519)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java 2010-10-06 13:05:44 UTC (rev 25520)
@@ -25,4 +25,6 @@
public static final String ELEMENT_TIP = "tip"; //$NON-NLS-1$
public static final String ELEMENT_NOTE = "note"; //$NON-NLS-1$
public static final String ELEMENT_WARNING = "warning"; //$NON-NLS-1$
+ public static final String ELEMENT_CAUTION = "caution"; //$NON-NLS-1$
+ public static final String ELEMENT_IMPORTANT = "important"; //$NON-NLS-1$
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-10-06 12:26:21 UTC (rev 25519)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-10-06 13:05:44 UTC (rev 25520)
@@ -615,11 +615,8 @@
</vpe:template>
</vpe:tag>
<vpe:tag name="important" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div id="{@id}" style="background-color: #ECF3FF; border: 1px solid black;">
- <h2><vpe:value expr="Important" /></h2>
- </div>
- </vpe:template>
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.vpe.docbook.template.DocbookImportantTemplate"/>
</vpe:tag>
<vpe:tag name="warning" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes"
@@ -966,9 +963,8 @@
</vpe:template>
</vpe:tag>
<vpe:tag name="caution" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div id="{@id}"/>
- </vpe:template>
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.vpe.docbook.template.DocbookCautionTemplate"/>
</vpe:tag>
<vpe:tag name="citation" case-sensitive="yes" docbook="yes">
<vpe:template children="no" modify="yes">
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml 2010-10-06 13:05:44 UTC (rev 25520)
@@ -0,0 +1,9 @@
+<!DOCTYPE caution PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<caution id="caution01">
+ <title>No User Servicable Parts Inside</title>
+ <para> Breaking this seal voids all warranties. </para>
+</caution>
+<caution id="caution02">
+ <para> Breaking this seal voids all warranties. </para>
+</caution>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml.xml 2010-10-06 13:05:44 UTC (rev 25520)
@@ -0,0 +1,29 @@
+<tests>
+ <test id="caution01">
+ <DIV ID="caution01" STYLE="border: 1px solid black; background-color: rgb(236, 243, 255);">
+ <H1>
+ <SPAN>
+ No User Servicable Parts Inside
+ </SPAN>
+ </H1>
+ <P>
+ <SPAN>
+ Breaking this seal voids all warranties.
+ </SPAN>
+ </P>
+ </DIV>
+ </test>
+ <test id="caution02">
+ <DIV ID="caution02"
+ STYLE="border: 1px solid black; background-color: rgb(236, 243, 255);">
+ <H1>
+ CAUTION
+ </H1>
+ <P>
+ <SPAN>
+ Breaking this seal voids all warranties.
+ </SPAN>
+ </P>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/caution/caution.xml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml 2010-10-06 13:05:44 UTC (rev 25520)
@@ -0,0 +1,13 @@
+<!DOCTYPE important PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<important id="important01">
+ <title>Title</title>
+ <para>
+ No user-servicable parts inside. Breaking this seal voids all warranties.
+ </para>
+</important>
+<important id="important02">
+ <para>
+ No user-servicable parts inside. Breaking this seal voids all warranties.
+ </para>
+</important>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml.xml 2010-10-06 13:05:44 UTC (rev 25520)
@@ -0,0 +1,29 @@
+<tests>
+ <test id="important01">
+ <DIV ID="important01" STYLE="border: 1px solid black; background-color: rgb(236, 243, 255);">
+ <H1>
+ <SPAN>
+ Title
+ </SPAN>
+ </H1>
+ <P>
+ <SPAN>
+ No user-servicable parts inside. Breaking this seal voids all warranties.
+ </SPAN>
+ </P>
+ </DIV>
+ </test>
+ <test id="important02">
+ <DIV ID="important02"
+ STYLE="border: 1px solid black; background-color: rgb(236, 243, 255);">
+ <H1>
+ IMPORTANT
+ </H1>
+ <P>
+ <SPAN>
+ No user-servicable parts inside. Breaking this seal voids all warranties.
+ </SPAN>
+ </P>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/important/important.xml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2010-10-06 12:26:21 UTC (rev 25519)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2010-10-06 13:05:44 UTC (rev 25520)
@@ -52,6 +52,14 @@
performContentTest("components/warning/warning.xml"); //$NON-NLS-1$
}
+ public void testCaution() throws Throwable {
+ performContentTest("components/caution/caution.xml"); //$NON-NLS-1$
+ }
+
+ public void testImportant() throws Throwable {
+ performContentTest("components/important/important.xml"); //$NON-NLS-1$
+ }
+
@Override
protected String getTestProjectName() {
return DocbookAllTests.IMPORT_PROJECT_NAME;
13 years, 8 months
JBoss Tools SVN: r25519 - in trunk/vpe: plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-10-06 08:26:21 -0400 (Wed, 06 Oct 2010)
New Revision: 25519
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookWarningTemplate.java
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookNoteTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTipTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java
Log:
create classes for displaying docbook element <warning> in vpe (https://jira.jboss.org/browse/JBIDE-7242)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookNoteTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookNoteTemplate.java 2010-10-06 12:13:50 UTC (rev 25518)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookNoteTemplate.java 2010-10-06 12:26:21 UTC (rev 25519)
@@ -21,7 +21,7 @@
public class DocbookNoteTemplate extends ElementWithGeneratedOutputTemplate {
@Override
- public String getGeneratedText() {
+ protected String getGeneratedText() {
return Docbook.ELEMENT_NOTE.toUpperCase();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTipTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTipTemplate.java 2010-10-06 12:13:50 UTC (rev 25518)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookTipTemplate.java 2010-10-06 12:26:21 UTC (rev 25519)
@@ -21,7 +21,7 @@
public class DocbookTipTemplate extends ElementWithGeneratedOutputTemplate {
@Override
- public String getGeneratedText() {
+ protected String getGeneratedText() {
return Docbook.ELEMENT_TIP.toUpperCase();
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookWarningTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookWarningTemplate.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookWarningTemplate.java 2010-10-06 12:26:21 UTC (rev 25519)
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.docbook.template;
+
+import org.jboss.tools.vpe.docbook.template.util.Docbook;
+
+/**
+ * Class for <warning>
+ *
+ * @author Denis Vinnichek (dvinnichek)
+ */
+public class DocbookWarningTemplate extends ElementWithGeneratedOutputTemplate {
+
+ private static final String BORDER = "1px solid red"; //$NON-NLS-1$
+
+ @Override
+ protected String getGeneratedText() {
+ return Docbook.ELEMENT_WARNING.toUpperCase();
+ }
+
+ @Override
+ protected String getBorder() {
+ return BORDER;
+ }
+
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookWarningTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java 2010-10-06 12:13:50 UTC (rev 25518)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/ElementWithGeneratedOutputTemplate.java 2010-10-06 12:26:21 UTC (rev 25519)
@@ -46,8 +46,8 @@
nsIDOMCSSStyleDeclaration style = VpeStyleUtil.getStyle(div);
style.setProperty(HTML.STYLE_PARAMETER_BACKGROUND_COLOR,
- BACKGROUND_COLOR, HTML.STYLE_PRIORITY_DEFAULT);
- style.setProperty(HTML.STYLE_PARAMETER_BORDER, BORDER,
+ getBackgroundColor(), HTML.STYLE_PRIORITY_DEFAULT);
+ style.setProperty(HTML.STYLE_PARAMETER_BORDER, getBorder(),
HTML.STYLE_PRIORITY_DEFAULT);
NodeList titleElements = sourceElement
@@ -61,5 +61,13 @@
return new VpeCreationData(div);
}
- public abstract String getGeneratedText();
+ protected abstract String getGeneratedText();
+
+ protected String getBackgroundColor() {
+ return BACKGROUND_COLOR;
+ }
+
+ protected String getBorder() {
+ return BORDER;
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java 2010-10-06 12:13:50 UTC (rev 25518)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/util/Docbook.java 2010-10-06 12:26:21 UTC (rev 25519)
@@ -24,4 +24,5 @@
public static final String ELEMENT_TITLE = "title"; //$NON-NLS-1$
public static final String ELEMENT_TIP = "tip"; //$NON-NLS-1$
public static final String ELEMENT_NOTE = "note"; //$NON-NLS-1$
+ public static final String ELEMENT_WARNING = "warning"; //$NON-NLS-1$
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-10-06 12:13:50 UTC (rev 25518)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-10-06 12:26:21 UTC (rev 25519)
@@ -622,11 +622,8 @@
</vpe:template>
</vpe:tag>
<vpe:tag name="warning" case-sensitive="yes" docbook="yes">
- <vpe:template children="yes" modify="yes">
- <div id="{@id}" style="background-color: #ECF3FF; border: 1px solid red;">
- <h2><vpe:value expr="Warning" /></h2>
- </div>
- </vpe:template>
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.vpe.docbook.template.DocbookWarningTemplate" />
</vpe:tag>
<vpe:tag name="exceptionname" case-sensitive="yes" docbook="yes">
<vpe:template children="no" modify="yes">
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml 2010-10-06 12:26:21 UTC (rev 25519)
@@ -0,0 +1,13 @@
+<!DOCTYPE warning PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<warning id="warning01">
+ <para>
+ Striking your thumb with a hammer may cause severe pain and discomfort.
+ </para>
+</warning>
+<warning id="warning02">
+ <title>Title</title>
+ <para>
+ Striking your thumb with a hammer may cause severe pain and discomfort.
+ </para>
+</warning>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml.xml 2010-10-06 12:26:21 UTC (rev 25519)
@@ -0,0 +1,26 @@
+<tests>
+ <test id="warning01">
+ <DIV ID="warning01" STYLE="border: 1px solid red; background-color: rgb(236, 243, 255);">
+ <H1>WARNING</H1>
+ <P>
+ <SPAN>
+ Striking your thumb with a hammer may cause severe pain and discomfort.
+ </SPAN>
+ </P>
+ </DIV>
+ </test>
+ <test id="warning02">
+ <DIV ID="warning02" STYLE="border: 1px solid red; background-color: rgb(236, 243, 255);">
+ <H1>
+ <SPAN>
+ Title
+ </SPAN>
+ </H1>
+ <P>
+ <SPAN>
+ Striking your thumb with a hammer may cause severe pain and discomfort.
+ </SPAN>
+ </P>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/resources/DocbookTest/WebContent/pages/components/warning/warning.xml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2010-10-06 12:13:50 UTC (rev 25518)
+++ trunk/vpe/tests/org.jboss.tools.vpe.docbook.test/src/org/jboss/tools/vpe/docbook/test/DocbookComponentContentTest.java 2010-10-06 12:26:21 UTC (rev 25519)
@@ -48,6 +48,10 @@
performContentTest("components/tip/tip.xml"); //$NON-NLS-1$
}
+ public void testWarning() throws Throwable {
+ performContentTest("components/warning/warning.xml"); //$NON-NLS-1$
+ }
+
@Override
protected String getTestProjectName() {
return DocbookAllTests.IMPORT_PROJECT_NAME;
13 years, 8 months
JBoss Tools SVN: r25518 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-06 08:13:50 -0400 (Wed, 06 Oct 2010)
New Revision: 25518
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7264
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2010-10-06 12:06:59 UTC (rev 25517)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReference.java 2010-10-06 12:13:50 UTC (rev 25518)
@@ -134,6 +134,14 @@
return source;
}
+ public int getStartPossitionOfFirstEL() {
+ ELExpression[] els = getEl();
+ if(els.length>0) {
+ return startPosition + els[0].getStartPosition();
+ }
+ return startPosition;
+ }
+
/**
* @return the el
*/
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06 12:06:59 UTC (rev 25517)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06 12:13:50 UTC (rev 25518)
@@ -578,8 +578,7 @@
if(is.size()==1) {
elReference.setLineNumber(document.getLineOfOffset(elReference.getStartPossitionOfFirstEL()) + 1);
}
- }
- else {
+ } else {
elReference.setLineNumber(document.getLineOfOffset(offset) + 1);
}
} catch (BadLocationException e) {
13 years, 8 months
JBoss Tools SVN: r25517 - in trunk/documentation/whatsnew: seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-10-06 08:06:59 -0400 (Wed, 06 Oct 2010)
New Revision: 25517
Modified:
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta1.html
Log:
JBIDE-7124 Create New and Noteworthy for 3.2.0.Beta1
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2010-10-06 11:59:26 UTC (rev 25516)
+++ trunk/documentation/whatsnew/index.html 2010-10-06 12:06:59 UTC (rev 25517)
@@ -31,7 +31,7 @@
<p><a href="vpe/vpe-news-3.2.0.Beta1.html">Visual Page Editor</a></p>
<p><a href="cdi/cdi-news-3.2.0.Beta1.html">CDI (JSR-299) Tools</a></p>
<p><a href="seam/seam-news-3.2.0.Beta1.html">Seam Tools</a></p>
- <p><a href="bpel/bpel-news-1.1.0.Beta1.html">BPEL Tools</a></p>
+ <p><a href="bpel/bpel-news-1.1.0.beta1.html">BPEL Tools</a></p>
<p><a href="esb/esb-news-1.4.0.Beta1.html">ESB Tools</a></p>
<p><a href="ws/ws-news-1.2.0.Beta1.html">JBoss Web service Tools</a></p>
<p><a href="gwt/gwt-news-1.0.0.Beta1.html">GWT Integration</a></p>
Modified: trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta1.html 2010-10-06 11:59:26 UTC (rev 25516)
+++ trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta1.html 2010-10-06 12:06:59 UTC (rev 25517)
@@ -12,7 +12,7 @@
<h1>Seam tools 3.2.0.Beta1 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../bpel/bpel-news-1.1.0.Beta1.html">BPEL Tools ></a></p>
+ href="../bpel/bpel-news-1.1.0.beta1.html">BPEL Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
13 years, 8 months
JBoss Tools SVN: r25516 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-06 07:59:26 -0400 (Wed, 06 Oct 2010)
New Revision: 25516
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7264
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06 11:55:08 UTC (rev 25515)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06 11:59:26 UTC (rev 25516)
@@ -574,9 +574,14 @@
elReference.setLength(text.length());
elReference.setStartPosition(offset);
try {
- if(is.size()==1) {
- elReference.setLineNumber(document.getLineOfOffset(elReference.getStartPossitionOfFirstEL()) + 1);
+ if(Node.TEXT_NODE == node.getNodeType()) {
+ if(is.size()==1) {
+ elReference.setLineNumber(document.getLineOfOffset(elReference.getStartPossitionOfFirstEL()) + 1);
+ }
}
+ else {
+ elReference.setLineNumber(document.getLineOfOffset(offset) + 1);
+ }
} catch (BadLocationException e) {
WebKbPlugin.getDefault().logError(e);
}
13 years, 8 months
JBoss Tools SVN: r25515 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-06 07:55:08 -0400 (Wed, 06 Oct 2010)
New Revision: 25515
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7264
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06 11:51:20 UTC (rev 25514)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2010-10-06 11:55:08 UTC (rev 25515)
@@ -574,7 +574,9 @@
elReference.setLength(text.length());
elReference.setStartPosition(offset);
try {
- elReference.setLineNumber(document.getLineOfOffset(offset) + 1);
+ if(is.size()==1) {
+ elReference.setLineNumber(document.getLineOfOffset(elReference.getStartPossitionOfFirstEL()) + 1);
+ }
} catch (BadLocationException e) {
WebKbPlugin.getDefault().logError(e);
}
13 years, 8 months
JBoss Tools SVN: r25514 - in trunk/documentation/whatsnew: as and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-10-06 07:51:20 -0400 (Wed, 06 Oct 2010)
New Revision: 25514
Modified:
trunk/documentation/whatsnew/as/as-news-3.2.0.Beta1.html
trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html
trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html
trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta1.html
trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta1.html
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta1.html
trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.Beta1.html
trunk/documentation/whatsnew/upload.sh
trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta1.html
trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html
trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html
Log:
JBIDE-7124 Create New and Noteworthy for 3.2.0.Beta1
Modified: trunk/documentation/whatsnew/as/as-news-3.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.2.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/as/as-news-3.2.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -35,9 +35,9 @@
</p>
<p></p>
<p><small>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7121">remote UI launch</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-6900">remote start / stop </a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7065">deployment scanner for RSE</a><br/>
+ Jira <a href="https://jira.jboss.org/jira/browse/JBIDE-7121">1</a>,
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6900">2</a>,
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7065">3</a><br/>
</small></p>
</td>
</tr>
@@ -57,8 +57,8 @@
It is a simpler poller which does not require JMX to be installed and running,
and is now the default poller for all newly-created servers.</p>
<p></p>
- <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-6973">Web Poller Creation</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7118">Default to Web Poller</a></small></p>
+ <p>Jira <small><a href="https://jira.jboss.org/jira/browse/JBIDE-6973">1</a>,
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7118">2</a></small></p>
</td>
</tr>
Modified: trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html
===================================================================
--- trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -11,7 +11,7 @@
<body>
<h1>JBoss Eclipse BPEL Editor 1.1.0.beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.4.0.M2.html">ESB Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.4.0.Beta1.html">ESB Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
Modified: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -11,7 +11,7 @@
<body>
<h1>ESB tools 1.4.0.Beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../maven/maven-news-3.2.0.M2.html">Maven Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../ws/ws-news-1.2.0.Beta1.html">Webservice Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -11,7 +11,7 @@
<body>
<h1>GWT Integration 1.0.0.Beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../teiid/teiid-news-7.1.0.M2.html">Teiid Designer ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../teiid/teiid-news-7.1.0.Beta1.html">Teiid Designer ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
@@ -23,7 +23,9 @@
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>GWT Designer Support</b></td>
<td valign="top">
- <p>You can now edit your GWT pages with the Google GWT Designer. All you have to do is install the GWT Designer. Any project we create with our WTP facet is ready to be edited with this great WYSIWYG editor.</p>
+ <p>You can now edit your GWT pages with the Google GWT
+ Designer. All you have to do is install the GWT
+ Designer from Google and any project you create with our GWT facet is ready to be edited with this great WYSIWYG editor.</p>
<p><img src="../images/invoke-gwt-designer.jpg" /></p>
<p><img src="../images/gwt-designer-in-action.jpg" /></p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7092">Related Jira</a></small></p>
Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -11,7 +11,7 @@
<body>
<h1>Hibernate tools 3.4.0.Beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.2.0.M2.html">JST Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.2.0.Beta1.html">JST Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
@@ -28,7 +28,8 @@
<td valign="top">
<p>Console Configuration now uses schema and catalog specified for JPA project as if they were in hibernate.properties file.
User can set the schema/catalog name at project creation wizard or at project properties page.
- Note schema and catalog in hibernate.properties file will overwrite the properties specified for the project.</p>
+ Note schema and catalog in hibernate.properties or explicit
+ properties file will still overwrite the properties specified for the project.</p>
<p><img src="images/overwrite_schema_catalog.png"/></p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-6988">Related jira</a></p>
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/index.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -20,6 +20,25 @@
</td>
</tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.2.0.Beta1</b>
+ <td valign="top">
+ <p><a href="usage/usage-news-3.2.0.Beta1.html">Usage Plugin</a></p>
+ <p><a href="as/as-news-3.2.0.Beta1.html">JBoss AS Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.4.0.Beta1.html">Hibernate Tools</a></p>
+ <p><a href="jst/jst-news-3.2.0.Beta1.html">JST/JSF Tools</a></p>
+ <p><a href="vpe/vpe-news-3.2.0.Beta1.html">Visual Page Editor</a></p>
+ <p><a href="cdi/cdi-news-3.2.0.Beta1.html">CDI (JSR-299) Tools</a></p>
+ <p><a href="seam/seam-news-3.2.0.Beta1.html">Seam Tools</a></p>
+ <p><a href="bpel/bpel-news-1.1.0.Beta1.html">BPEL Tools</a></p>
+ <p><a href="esb/esb-news-1.4.0.Beta1.html">ESB Tools</a></p>
+ <p><a href="ws/ws-news-1.2.0.Beta1.html">JBoss Web service Tools</a></p>
+ <p><a href="gwt/gwt-news-1.0.0.Beta1.html">GWT Integration</a></p>
+ <p><a href="teiid/teiid-news-7.1.0.Beta1.html">Teiid Tools</a></p>
+ </td>
+ </tr>
+
<tr>
<td valign="top" align="left">
<p align="right"><b>3.2.0.M2</b>
Modified: trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -27,7 +27,7 @@
<p><b>MyFaces 2.0 components</b></p>
</td>
<td valign="top">
- <p>MyFaces 2.0 doesn't contain facelets tag libraries for JSH HTML & Core components.
+ <p>MyFaces 2.0 doesn't contain facelets tag libraries for JSF HTML & Core components.
myfaces-metadata.xml is used istead.<br/>
myfaces-metadata.xml is now supported and code completion for JSF components bundled with MyFaces 2.0 is available.</p>
<p><small><a
@@ -46,7 +46,7 @@
<p><b>Facet names for <f:facet name=""></b></p>
</td>
<td valign="top">
- <p>Content completion for faset@name attribute based on parent JSF tag metadata is available.</p>
+ <p>Content completion for facet@name attribute based on parent JSF tag metadata is available.</p>
<img src="images/3.2.0.Beta1/facetNames.gif"/>
<p><small><a
href="https://jira.jboss.org/browse/JBIDE-3875">Related Jira</a></small></p>
Modified: trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/teiid/teiid-news-7.1.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -10,7 +10,7 @@
</head>
<body>
<h1>Teiid Designer 7.1.0 Beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../modeshape/modeshape-news-7.1.0.M2.html">Modeshape ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a></p>
<p>Last revised September 24, 2010</p>
<p><b>Teiid Designer</b> is a graphical data modeling tool that enables rapid definition, integration, management and testing of data services without
programming using the <b>Teiid</b> runtime engine.</p>
Modified: trunk/documentation/whatsnew/upload.sh
===================================================================
--- trunk/documentation/whatsnew/upload.sh 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/upload.sh 2010-10-06 11:51:20 UTC (rev 25514)
@@ -1 +1 @@
-rsync -i -c -e ssh -C --exclude-from '.rsyncexclude' -avz . tools@filemgmt.jboss.org:/docs_htdocs/tools/whatsnew/
+rsync -i -I -c -P -e ssh -C --exclude-from '.rsyncexclude' -avz . tools@filemgmt.jboss.org:/docs_htdocs/tools/whatsnew/
Modified: trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -12,7 +12,7 @@
<p align="right">
<a href="../index.html">< Main Index</a> <a
-href="../as/as-news-3.2.0.M2.html">AS Tools</a></p>
+href="../as/as-news-3.2.0.Beta1.html">AS Tools</a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
@@ -27,30 +27,39 @@
<p>We fixed some minor bugs and improved in the following areas:</p>
<p>
- Usage Reporting now reports the JBoss Tools version. We use the version of the usage reporting plugin for this purpose.
- The version is added to the URL
+ Usage Reporting now reports the Usage plugin
+ version allowing us to track the spread/usage
+ of nightly, development vs stable builds.
+ The version is added to the landing page URL.
</p>
<p><img src="../images/reports-jboss-tools-version.png"></img></p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7041">Related Jira</a></small></p>
<p>
- Usage Reporting may now be disabled for tests: <strong>-Dusage_reporting_enabled=false</strong>
+ Usage Reporting may now be disabled via a
+ system property:
+ <strong>-Dusage_reporting_enabled=false</strong>
+ (useful for tests or other headless runs)
</p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-6953">Related Jira</a></small></p>
<p>
- Usage Reporting now reports the JDK that's being used.
+ Usage Reporting now reports the JDK that's
+ being used in the Flash Version field.
</p>
<p><img src="../images/reports-jdk-version.png"></img></p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7034">Related Jira</a></small></p>
<p>
- Usage Reporting may now be globally disabled with a properties file on our servers.
+ Usage Reporting may now be globally disabled
+ with a properties file on our servers, aka a
+ Kill-switch for the tracking.
</p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-6880">Related Jira</a></small></p>
<p>
- Usage Reporting did not report AS and other JBoss Tools components that did not have a proper package naming ("org.jboss.tools.XXX")
+ Usage Reporting did not report AS and other
+ JBoss Tools components that did not have the default package naming ("org.jboss.tools.XXX")
</p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7082">Related Jira</a></small></p>
</td>
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -25,8 +25,8 @@
</tr>
<tr>
- <td valign="top" align="left"><b>Selection Bar Menu Movement</b></td>
- <td valign="top">Selection Bar could be managed via Eclipse toolbar or 'Navigate' menu.
+ <td valign="top" align="left"><b>Selection Bar Menu Location</b></td>
+ <td valign="top">Selection Bar is now available via Eclipse toolbar or 'Navigate' menu.
In addition Selection Bar is now available on systems for which XulRunner is not supported yet.
<p><img src="images/3.2.0.Beta1/selection-bar-controls.png" alt="Selection Bar Controls" />
</p>
Modified: trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html 2010-10-06 11:12:49 UTC (rev 25513)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html 2010-10-06 11:51:20 UTC (rev 25514)
@@ -11,7 +11,8 @@
<body>
<h1>WS tools 3.2.0 Beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../deltacloud/deltacloud-news-0.0.1.M2.html">Deltacloud Development Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a
+href="../gwt/gwt-news-1.0.0.Beta1.html">Google Web Toolkit ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
13 years, 8 months
JBoss Tools SVN: r25513 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-06 07:12:49 -0400 (Wed, 06 Oct 2010)
New Revision: 25513
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/FaceletsKbModelTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
Log:
https://jira.jboss.org/browse/JBIDE-7261 fixed code assist for <ui:...> tags
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/FaceletsKbModelTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/FaceletsKbModelTest.java 2010-10-06 11:00:54 UTC (rev 25512)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/FaceletsKbModelTest.java 2010-10-06 11:12:49 UTC (rev 25513)
@@ -169,7 +169,7 @@
query.setUri("http://jboss.com/products/seam/pdf");
query.setValue("ori");
- TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context);
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context, true);
for (TextProposal proposal : proposals) {
if("orientation".equals(proposal.getReplacementString())) {
return;
@@ -193,7 +193,7 @@
query.setUri("http://jboss.com/products/seam/mail");
query.setValue("pre");
- TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context);
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context, true);
for (TextProposal proposal : proposals) {
if("precedence".equals(proposal.getReplacementString())) {
return;
@@ -203,6 +203,48 @@
}
/**
+ * https://jira.jboss.org/browse/JBIDE-7261
+ */
+ public void testFacelets() {
+ IFile file = testProject.getFile("WebContent/pages/inputUserName.xhtml");
+
+ ELContext context = PageContextFactory.createPageContext(file);
+ KbQuery query = new KbQuery();
+ query.setMask(true);
+ query.setOffset(310);
+ query.setType(Type.TAG_NAME);
+ query.setParentTags(new String[]{"html"});
+ query.setPrefix("ui");
+ query.setUri("http://java.sun.com/jsf/facelets");
+ query.setValue("ui:comp");
+
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context, true);
+ boolean found = false;
+ for (TextProposal proposal : proposals) {
+ if(proposal.getReplacementString().startsWith("<ui:composition")) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Can't find <ui:composition> proposal.", found);
+
+ query.setOffset(322);
+ query.setType(Type.ATTRIBUTE_NAME);
+ query.setParentTags(new String[]{"html", "ui:composition"});
+ query.setPrefix("ui");
+ query.setUri("http://java.sun.com/jsf/facelets");
+ query.setValue("temp");
+
+ proposals = PageProcessor.getInstance().getProposals(query, context, true);
+ for (TextProposal proposal : proposals) {
+ if("template".equals(proposal.getReplacementString())) {
+ return;
+ }
+ }
+ fail("Can't find <ui:composition template=\"> proposal.");
+ }
+
+ /**
* https://jira.jboss.org/jira/browse/JBIDE-3875
*/
public void testFacetNames() {
@@ -219,7 +261,7 @@
query.setParent("name");
query.setStringQuery("h");
- TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context);
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context, true);
for (TextProposal proposal : proposals) {
if("header".equals(proposal.getReplacementString())) {
return;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2010-10-06 11:00:54 UTC (rev 25512)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2010-10-06 11:12:49 UTC (rev 25513)
@@ -64,13 +64,18 @@
private List<TextProposal> excludeExtendedComponents(List<TextProposal> proposals) {
Map<String, Set<TextProposal>> runtimeComponentMap = new HashMap<String, Set<TextProposal>>();
Map<String, TextProposal> customComponentMap = new HashMap<String, TextProposal>();
+ Set<TextProposal> customNotExtendedComponents = new HashSet<TextProposal>();
for (TextProposal proposal : proposals) {
Object source = proposal.getSource();
if(source instanceof IComponent) {
IComponent component = (IComponent)source;
String name = component.getTagLib().getURI() + ":" + component.getName(); //$NON-NLS-1$
- if(source instanceof ICustomTagLibComponent) {
- customComponentMap.put(name, proposal);
+ if(component instanceof ICustomTagLibComponent) {
+ if(component.isExtended()) {
+ customComponentMap.put(name, proposal);
+ } else {
+ customNotExtendedComponents.add(proposal);
+ }
} else {
Set<TextProposal> textProposals = runtimeComponentMap.get(name);
if(textProposals==null) {
@@ -91,6 +96,9 @@
proposals.addAll(runtimeComponentMap.get(name));
}
}
+ if(!customNotExtendedComponents.isEmpty()) {
+ proposals.addAll(customNotExtendedComponents);
+ }
}
return proposals;
}
13 years, 8 months
JBoss Tools SVN: r25512 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-06 07:00:54 -0400 (Wed, 06 Oct 2010)
New Revision: 25512
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java
Log:
JBIDE-6398
https://jira.jboss.org/browse/JBIDE-6398
Correction to previous changes concerning new parameter int lineNumber in addError method
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java 2010-10-06 10:04:15 UTC (rev 25511)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java 2010-10-06 11:00:54 UTC (rev 25512)
@@ -39,6 +39,16 @@
return marker;
}
+ @Override
+ public IMarker addError(String message, String preferenceKey,
+ String[] messageArguments, int lineNumber, int length, int offset,
+ IResource target) {
+ IMarker marker = super.addError(message, preferenceKey, messageArguments, lineNumber, length, offset,
+ target);
+ validatorSupport.add(marker);
+ return marker;
+ }
+
public boolean isMessageCreated(String template, Object[] parameters) {
return validatorSupport.isMessageCreated(template,parameters);
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java 2010-10-06 10:04:15 UTC (rev 25511)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java 2010-10-06 11:00:54 UTC (rev 25512)
@@ -37,6 +37,17 @@
return marker;
}
+ @Override
+ public IMarker addError(String message, String preferenceKey,
+ String[] messageArguments, int lineNumber, int length, int offset,
+ IResource target) {
+
+ IMarker marker = super.addError(message, preferenceKey, messageArguments, lineNumber, length, offset,
+ target);
+ validatorSupport.add(marker);
+ return marker;
+ }
+
public boolean isMessageCreated(String template, Object[] parameters) {
return validatorSupport.isMessageCreated(template,parameters);
}
13 years, 8 months