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;