[jbosstools-commits] JBoss Tools SVN: r24016 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 5 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Aug 10 04:55:11 EDT 2010
Author: mareshkau
Date: 2010-08-10 04:55:09 -0400 (Tue, 10 Aug 2010)
New Revision: 24016
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/images/xstudio/editors/xmldoc.gif
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6600
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -16,6 +16,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBIDE5818;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.DnD_JBIDE5042_JBIDE6229_Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.DocBookTemplatesTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.ExceptionInVPEComments_JBIDE5143;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.FacetProcessingTest;
@@ -125,6 +126,7 @@
TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$
// $JUnit-BEGIN$
+ suite.addTestSuite(DocBookTemplatesTest.class);
suite.addTestSuite(DnD_JBIDE5042_JBIDE6229_Test.class);
suite.addTestSuite(UnclosedELExpressionTest.class);
suite.addTestSuite(TestContextPathResolution.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/DocBookTemplatesTest.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -0,0 +1,48 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * Junit test class for https://jira.jboss.org/browse/JBIDE-6600
+ * @author mareshkau
+ *
+ */
+public class DocBookTemplatesTest extends ComponentContentTest{
+
+ private static String VPE_EDITOR_ID=VpeTest.EDITOR_ID;
+
+ private static String DOC_BOOK_EDITOR_ID="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor";
+
+ private String activeEditorID;
+ public DocBookTemplatesTest(String name) {
+ super(name);
+ }
+
+ public void testCheckHtmlTitle() throws Throwable {
+ setActiveEditorID(VPE_EDITOR_ID);
+ performInvisibleTagTest("JBIDE/6600/jbide6600.html","title");
+ }
+
+ public void testCheckDocBookTitle() throws Throwable {
+ setActiveEditorID(DOC_BOOK_EDITOR_ID);
+ performContentTest("JBIDE/6600/jbide6600.xml");
+ }
+
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+
+ private void setActiveEditorID(String editorID){
+ this.activeEditorID = editorID;
+ }
+
+ protected String getEditorID(){
+ return this.activeEditorID;
+ }
+}
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/images/xstudio/editors/xmldoc.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/images/xstudio/editors/xmldoc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2010-08-10 08:55:09 UTC (rev 24016)
@@ -2,6 +2,7 @@
jsp.page.name=JSP Syntax Colors
editors.jsp.name=JBoss Tools JSP Editor
editors.html.name=JBoss Tools HTML Editor
+editors.docbook.name=JBoss Tools Docbook Editor
JSP_Occurrences.name= JSP Occurrences
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-08-10 08:55:09 UTC (rev 24016)
@@ -208,6 +208,15 @@
<contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
<contentTypeBinding contentTypeId="jsf.facelet"/>
</editor>
+ <editor
+ class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
+ contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
+ extensions="xml"
+ icon="$nl$/images/xstudio/editors/xmldoc.gif"
+ id="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"
+ name="%editors.docbook.name">
+ <contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
+ </editor>
</extension>
<extension point="org.eclipse.ui.editorActions">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -255,6 +255,11 @@
private Map<String,VpeTemplateSet> caseSensitiveTags = new HashMap<String,VpeTemplateSet>();
private Map<String,VpeTemplateSet> ignoreSensitiveTags = new HashMap<String,VpeTemplateSet>();
+ //added by Maksim Areshkau, docbook tags stored separately, because name duality
+ private Map<String,VpeTemplateSet> docbookTags = new HashMap<String,VpeTemplateSet>();
+
+ private static final String ATTR_DOCBOOK_NAME = "docbook";
+
private VpeTemplate defTemplate;
private VpeTemplateListener[] templateListeners = new VpeTemplateListener[0];
private VpeTemplateFileList templateFileList = new VpeTemplateFileList();
@@ -287,6 +292,8 @@
* Property which indicates that with this tag will be added default formats
*/
public static final String ATTR_USE_DEFAULT_FORMATS = "use-default-formats"; //$NON-NLS-1$
+
+ private static final String DOCBOOKEDITORID="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor";
/*
* Added by Max Areshkau(mareshkau at exadel.com)
*/
@@ -337,7 +344,17 @@
if (name == null) {
return null;
}
- VpeTemplateSet set = caseSensitiveTags.get(name);
+ //added by Maksim Areshkau, as fix for docbook templates
+ //see JBIDE-6600
+ VpeTemplateSet set=null;
+ if(DOCBOOKEDITORID.equals(pageContext.getEditPart().getSite().getId())){
+ set = docbookTags.get(name);
+ if (set != null) {
+ return set.getTemplate(pageContext, sourceNode, dependencySet);
+ }
+ }
+
+ set = caseSensitiveTags.get(name);
if (set != null) {
return set.getTemplate(pageContext, sourceNode, dependencySet);
}
@@ -480,9 +497,12 @@
private void setTagElement(Element tagElement,IConfigurationElement confElement) {
String name = tagElement.getAttribute(ATTR_TAG_NAME);
if (name.length() > 0) {
+ boolean docbookTemplate = ATTR_VALUE_YES.equalsIgnoreCase(tagElement.getAttribute(VpeTemplateManager.ATTR_DOCBOOK_NAME));
boolean caseSensitive = !ATTR_VALUE_NO.equals(tagElement.getAttribute(ATTR_TAG_CASE_SENSITIVE));
Map<String,VpeTemplateSet> tags;
- if (caseSensitive) {
+ if(docbookTemplate){
+ tags = docbookTags;
+ }else if (caseSensitive) {
tags = caseSensitiveTags;
} else {
name = name.toLowerCase();
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-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-docbook.xml 2010-08-10 08:55:09 UTC (rev 24016)
@@ -3,126 +3,126 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/-->
- <vpe:tag name="chapter" case-sensitive="yes">
+ <vpe:tag name="chapter" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="section" case-sensitive="yes">
+ <vpe:tag name="section" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="sect1" case-sensitive="yes">
+ <vpe:tag name="sect1" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="sect2" case-sensitive="yes">
+ <vpe:tag name="sect2" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="title" case-sensitive="yes">
+ <vpe:tag name="title" case-sensitive="yes" docbook="yes">
<vpe:template children="no" modify="yes">
<h1>
<vpe:value expr="{tagtext()}" />
</h1>
</vpe:template>
</vpe:tag>
- <vpe:tag name="para" case-sensitive="yes">
+ <vpe:tag name="para" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<p />
</vpe:template>
</vpe:tag>
- <vpe:tag name="itemizedlist" case-sensitive="yes">
+ <vpe:tag name="itemizedlist" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<ul />
</vpe:template>
</vpe:tag>
- <vpe:tag name="listitem" case-sensitive="yes">
+ <vpe:tag name="listitem" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<li />
</vpe:template>
</vpe:tag>
- <vpe:tag name="ulink" case-sensitive="yes">
+ <vpe:tag name="ulink" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<a href="{@url}" />
</vpe:template>
</vpe:tag>
- <vpe:tag name="programlisting" case-sensitive="yes">
+ <vpe:tag name="programlisting" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<pre />
</vpe:template>
</vpe:tag>
- <vpe:tag name="emphasis" case-sensitive="yes">
+ <vpe:tag name="emphasis" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<em />
</vpe:template>
</vpe:tag>
- <vpe:tag name="tgroup" case-sensitive="yes">
+ <vpe:tag name="tgroup" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<table border="1px" />
</vpe:template>
</vpe:tag>
- <vpe:tag name="row" case-sensitive="yes">
+ <vpe:tag name="row" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<tr />
</vpe:template>
</vpe:tag>
- <vpe:tag name="entry" case-sensitive="yes">
+ <vpe:tag name="entry" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<td />
</vpe:template>
</vpe:tag>
- <vpe:tag name="property" case-sensitive="yes">
+ <vpe:tag name="property" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<i />
</vpe:template>
</vpe:tag>
- <vpe:tag name="imagedata" case-sensitive="yes">
+ <vpe:tag name="imagedata" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<img src="{src(@fileref)}" />
</vpe:template>
</vpe:tag>
- <vpe:tag name="mediaobject" case-sensitive="yes">
+ <vpe:tag name="mediaobject" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="imageobject" case-sensitive="yes">
+ <vpe:tag name="imageobject" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="figure" case-sensitive="yes">
+ <vpe:tag name="figure" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<div />
</vpe:template>
</vpe:tag>
- <vpe:tag name="orderedlist" case-sensitive="yes">
+ <vpe:tag name="orderedlist" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" modify="yes">
<ol />
</vpe:template>
</vpe:tag>
- <vpe:tag case-sensitive="yes" name="chapterinfo">
+ <vpe:tag case-sensitive="yes" name="chapterinfo" docbook="yes">
<vpe:template children="yes" modify="yes">
<vpe:any display="none" icon="no" value="{name()}" />
</vpe:template>
</vpe:tag>
- <vpe:tag case-sensitive="yes" name="note">
+ <vpe:tag case-sensitive="yes" name="note" docbook="yes">
<vpe:template children="yes" modify="yes">
<vpe:any background-color="yellow" border="blue" icon="no" />
</vpe:template>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/vpe-templates-xinclude.xml 2010-08-10 08:55:09 UTC (rev 24016)
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" />
- <vpe:tag name="xi:include" case-sensitive="yes">
+ <vpe:tag name="xi:include" case-sensitive="yes" docbook="yes">
<vpe:template children="yes" file="{@href}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/>
</vpe:tag>
</vpe:templates>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -77,7 +77,7 @@
*/
assertNotNull("Could not find component file '"+elementPagePath+"'", elementPageFile); //$NON-NLS-1$ //$NON-NLS-2$
- IEditorPart editor = WorkbenchUtils.openEditor(elementPageFile,EDITOR_ID);
+ IEditorPart editor = WorkbenchUtils.openEditor(elementPageFile,getEditorID());
assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$
VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor);
/*
@@ -189,7 +189,7 @@
TestUtil.waitForJobs();
IEditorPart editor = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
+ getEditorID(), true);
assertNotNull("Editor should be opened.", editor); //$NON-NLS-1$
TestUtil.waitForJobs();
/*
@@ -262,7 +262,7 @@
IEditorPart editor = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
+ getEditorID(), true);
assertNotNull(editor);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-08-10 06:37:49 UTC (rev 24015)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-08-10 08:55:09 UTC (rev 24016)
@@ -22,7 +22,6 @@
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
@@ -31,7 +30,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.internal.reconcile.StructuredRegionProcessor;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
@@ -229,7 +227,7 @@
IEditorPart editor = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
+ getEditorID(), true);
// here we wait for inintialization VPE controller
TestUtil.getVpeController((JSPMultiPageEditor) editor);
@@ -264,7 +262,7 @@
// get editor
JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI
.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, EDITOR_ID, true);
+ .openEditor(input, getEditorID(), true);
assertNotNull(part);
return part;
@@ -437,4 +435,8 @@
return (nsIDOMElement) nodeMapping.getVisualNode();
}
+
+ protected String getEditorID(){
+ return EDITOR_ID;
+ }
}
More information about the jbosstools-commits
mailing list