JBoss Tools SVN: r12083 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-11-26 11:48:15 -0500 (Wed, 26 Nov 2008)
New Revision: 12083
Modified:
trunk/seam/docs/reference/en/modules/seam_preferences.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-495 - Project Preferences section is updated;
Modified: trunk/seam/docs/reference/en/modules/seam_preferences.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/seam_preferences.xml 2008-11-26 16:28:54 UTC (rev 12082)
+++ trunk/seam/docs/reference/en/modules/seam_preferences.xml 2008-11-26 16:48:15 UTC (rev 12083)
@@ -20,7 +20,7 @@
<para>Seam preferences can be set using the Seam preference page. Click on
<emphasis><property>Window > Preferences > JBoss Tools > Web >
- Seam</property>.</emphasis></para>
+ Seam</property>.</emphasis></para>
<para>On this page you can manage the Seam Runtime. Use the appropriate buttons to
<property>Add</property> more runtimes or to <property>Remove</property> those that
@@ -37,7 +37,7 @@
<para>Clicking on <property>Edit</property> button you get the form where you can change the
path of Seam runtime home folder, modify name and version. Press
- <property>Finish</property> to apply the changes.</para>
+ <property>Finish</property> to apply the changes.</para>
<figure>
<title>Edit Seam Runtime</title>
@@ -59,7 +59,7 @@
problems. For example, if you want to ignore the case when component name is
duplicated expand the <property>Components</property> node and select
<property>Ignore</property> next to <property>Duplicate component
- name</property>. After that you won't see the error.</para>
+ name</property>. After that you won't see the error.</para>
<figure>
@@ -95,7 +95,7 @@
<title>Note:</title>
<para>You can open the same page by right clicking on the needed project in Package
Explorer, then <emphasis><property>Properties > Seam
- Validator</property>.</emphasis></para>
+ Validator</property>.</emphasis></para>
</note>
<figure>
@@ -121,9 +121,6 @@
that you are not restricted with a specific project structure. You can use the Seam
wizards (New Action, Form, Entity, etc.) on Maven, command line seam-gen or your own
project structure. </para>
- <para>Moreover you are not required to use the Seam New Project wizard to benefit from Seam
- artifact wizards. You can just enable Seam on your existing project and configure the
- folders as you want.</para>
<figure>
<title>Properties for Seam Project</title>
@@ -133,13 +130,33 @@
</imageobject>
</mediaobject>
</figure>
+
+ <tip>
+ <title>Tip:</title>
+ <para>The wizard doesn't allow the renaming of the artifacts listed in the Seam
+ Settings. It's possible to do in the <property>Package Explorer</property>.
+ See <link linkend="renaming_projects_folders">Renaming the Projects and
+ Folders</link>.</para>
+ </tip>
+
+ <para>Also notice, you are not required to use the <property>New Seam Project wizard</property>
+ to benefit from Seam artifact wizards. You can just enable Seam on your existing project
+ by checking <property>Seam Support</property> and targeting to Seam Runtime, and then
+ configure the folders as you want.</para>
+ <figure>
+ <title>Properties for Seam Project</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/seam_preferences/seam_preferences2_2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<tip>
<title>Tip:</title>
- <para>The wizard doesn't allow the renaming of the artifacts listed in the Seam Settings.
- It's possible to do in the <property>Package Explorer</property>. See <link
- linkend="renaming_projects_folders">Renaming the Projects and
- Folders</link>.</para>
+ <para>On the figure above fields for configuring Seam artifacts are dimmed because Seam
+ Runtime is not selected.</para>
</tip>
<para>In Seam Wizards (New Action, Form, Entity, Conversation, Generate Entities) you can
16 years, 1 month
JBoss Tools SVN: r12082 - trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-26 11:28:54 -0500 (Wed, 26 Nov 2008)
New Revision: 12082
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
Log:
JBIDE-3284
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2008-11-26 16:28:33 UTC (rev 12081)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2008-11-26 16:28:54 UTC (rev 12082)
@@ -118,7 +118,7 @@
);
static IFormData ESB_BUS_LIST_DEFINITION = new FormData(
- "Bus list", //$NON-NLS-1$
+ "Channel list", //$NON-NLS-1$
ModelFormLayoutData.EMPTY_DESCRIPTION,
new FormAttributeData[]{new FormAttributeData(ESBConstants.ATTR_BUS_ID, 100)},
BUSES_101,
16 years, 1 month
JBoss Tools SVN: r12081 - in trunk/esb/plugins/org.jboss.tools.esb.core/resources: meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-11-26 11:28:33 -0500 (Wed, 26 Nov 2008)
New Revision: 12081
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
Log:
JBIDE-3284
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2008-11-26 16:11:45 UTC (rev 12080)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2008-11-26 16:28:33 UTC (rev 12081)
@@ -5,7 +5,7 @@
ESB.CreateTarget.menu=Add Target...
ESB.CreateTag.menu=Add Tag...
ESB.AddAction.menu=Generic Action...
-ESB.AddBus.menu=Add Bus...
+ESB.AddBus.menu=Add Channel...
ESB.AddFilter.menu=Add Filter...
ESB.AddListener.menu=Listener...
ESB.AddScheduledListener.menu=Scheduled Listener...
@@ -17,7 +17,7 @@
ESB.AddHibernateListener.menu=Hibernate Listener...
ESB.AddJBRListener.menu=JBR Listener...
ESB.AddGroovyListener.menu=Groovy Listener...
-ESB.AddBusProvider.menu=Bus Provider...
+ESB.AddBusProvider.menu=Channel Provider...
ESB.AddJBRProvider.menu=JBR Provider...
ESB.AddScheduleProvider.menu=Schedule Provider...
ESB.AddJMSProvider.menu=JMS Provider...
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2008-11-26 16:11:45 UTC (rev 12080)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2008-11-26 16:28:33 UTC (rev 12081)
@@ -13,9 +13,9 @@
#Providers List
-ESBProviders101_AddBusProvider_0.WindowTitle=Add Bus Provider
+ESBProviders101_AddBusProvider_0.WindowTitle=Add Channel Provider
ESBProviders101_AddBusProvider_0.Title=ESB Provider
-ESBProviders101_AddBusProvider_1.WindowTitle=Add Bus Provider
+ESBProviders101_AddBusProvider_1.WindowTitle=Add Channel Provider
ESBProviders101_AddBusProvider_1.Title=ESB Channel
ESBProviders101_AddJBRProvider_0.WindowTitle=Add JBR Provider
@@ -74,18 +74,18 @@
ESBBusProvider101_AddProperty.WindowTitle=Add Property
ESBBusProvider101_AddProperty.Title=ESB Property
-ESBBusProvider101_AddBus.WindowTitle=Add Bus
-ESBBusProvider101_AddBus.Title=ESB Bus
+ESBBusProvider101_AddBus.WindowTitle=Add Channel
+ESBBusProvider101_AddBus.Title=ESB Channel
-ESBBusProvider101_Properties.Title=ESB Bus Provider
+ESBBusProvider101_Properties.Title=ESB Channel Provider
#JBR Provider
ESBJBRProvider101_AddProperty.WindowTitle=Add Property
ESBJBRProvider101_AddProperty.Title=ESB Property
-ESBJBRProvider101_AddBus.WindowTitle=Add JBR Bus
-ESBJBRProvider101_AddBus.Title=ESB JBR Bus
+ESBJBRProvider101_AddBus.WindowTitle=Add JBR Channel
+ESBJBRProvider101_AddBus.Title=ESB JBR Channel
ESBJBRProvider101_Properties.Title=ESB JBR Provider
@@ -107,8 +107,8 @@
ESBJMSProvider101_AddProperty.WindowTitle=Add Property
ESBJMSProvider101_AddProperty.Title=ESB Property
-ESBJMSProvider101_AddBus.WindowTitle=Add JMS Bus
-ESBJMSProvider101_AddBus.Title=ESB JMS Bus
+ESBJMSProvider101_AddBus.WindowTitle=Add JMS Channel
+ESBJMSProvider101_AddBus.Title=ESB JMS Channel
ESBJMSProvider101_Properties.Title=ESB JMS Provider
@@ -117,8 +117,8 @@
ESBHibernateProvider101_AddProperty.WindowTitle=Add Property
ESBHibernateProvider101_AddProperty.Title=ESB Property
-ESBHibernateProvider101_AddBus.WindowTitle=Add Hibernate Bus
-ESBHibernateProvider101_AddBus.Title=ESB Hibernate Bus
+ESBHibernateProvider101_AddBus.WindowTitle=Add Hibernate Channel
+ESBHibernateProvider101_AddBus.Title=ESB Hibernate Channel
ESBHibernateProvider101_Properties.Title=ESB Hibernate Provider
@@ -127,8 +127,8 @@
ESBJCAProvider101_AddProperty.WindowTitle=Add Property
ESBJCAProvider101_AddProperty.Title=ESB Property
-ESBJCAProvider101_AddBus.WindowTitle=Add JMS Bus
-ESBJCAProvider101_AddBus.Title=ESB JMS Bus
+ESBJCAProvider101_AddBus.WindowTitle=Add JMS Channel
+ESBJCAProvider101_AddBus.Title=ESB JMS Channel
ESBJCAProvider101_Properties.Title=ESB JCA Provider
@@ -137,8 +137,8 @@
ESBSQLProvider101_AddProperty.WindowTitle=Add Property
ESBSQLProvider101_AddProperty.Title=ESB Property
-ESBSQLProvider101_AddBus.WindowTitle=Add SQL Bus
-ESBSQLProvider101_AddBus.Title=ESB SQL Bus
+ESBSQLProvider101_AddBus.WindowTitle=Add SQL Channel
+ESBSQLProvider101_AddBus.Title=ESB SQL Channel
ESBSQLProvider101_Properties.Title=ESB SQL Provider
@@ -147,8 +147,8 @@
ESBFTPProvider101_AddProperty.WindowTitle=Add Property
ESBFTPProvider101_AddProperty.Title=ESB Property
-ESBFTPProvider101_AddBus.WindowTitle=Add FTP Bus
-ESBFTPProvider101_AddBus.Title=ESB FTP Bus
+ESBFTPProvider101_AddBus.WindowTitle=Add FTP Channel
+ESBFTPProvider101_AddBus.Title=ESB FTP Channel
ESBFTPProvider101_Properties.Title=ESB FTP Provider
@@ -157,8 +157,8 @@
ESBFSProvider101_AddProperty.WindowTitle=Add Property
ESBFSProvider101_AddProperty.Title=ESB Property
-ESBFSProvider101_AddBus.WindowTitle=Add FS Bus
-ESBFSProvider101_AddBus.Title=ESB FS Bus
+ESBFSProvider101_AddBus.WindowTitle=Add FS Channel
+ESBFSProvider101_AddBus.Title=ESB FS Channel
ESBFSProvider101_Properties.Title=ESB FS Provider
@@ -167,14 +167,14 @@
ESBBus_AddProperty.WindowTitle=Add Property
ESBBus_AddProperty.Title=ESB Property
-ESBBus_Properties.Title=ESB Bus
+ESBBus_Properties.Title=ESB Channel
#JBR Bus
ESBJBRBus101_AddProperty.WindowTitle=Add Property
ESBJBRBus101_AddProperty.Title=ESB Property
-ESBJBRBus101_Properties.Title=ESB JBR Bus
+ESBJBRBus101_Properties.Title=ESB JBR Channel
#Cron Schedule
@@ -195,7 +195,7 @@
ESBJMSBus101_AddProperty.WindowTitle=Add Property
ESBJMSBus101_AddProperty.Title=ESB Property
-ESBJMSBus101_Properties.Title=ESB JMS Bus
+ESBJMSBus101_Properties.Title=ESB JMS Channel
#JMS Message Filter
@@ -209,7 +209,7 @@
ESBHibernateBus101_AddFilter.WindowTitle=Add Hibernate Message Filter
ESBHibernateBus101_AddFilter.Title=ESB Hibernate Message Filter
-ESBHibernateBus101_Properties.Title=ESB Hibernate Bus
+ESBHibernateBus101_Properties.Title=ESB Hibernate Channel
#Hibernate Message Filter
@@ -220,7 +220,7 @@
ESBSQLBus101_AddProperty.WindowTitle=Add Property
ESBSQLBus101_AddProperty.Title=ESB Property
-ESBSQLBus101_Properties.Title=ESB SQL Bus
+ESBSQLBus101_Properties.Title=ESB SQL Channel
#SQL Message Filter
@@ -231,7 +231,7 @@
ESBFTPBus101_AddProperty.WindowTitle=Add Property
ESBFTPBus101_AddProperty.Title=ESB Property
-ESBFTPBus101_Properties.Title=ESB FTP Bus
+ESBFTPBus101_Properties.Title=ESB FTP Channel
#FTP Message Filter
@@ -242,7 +242,7 @@
ESBFSBus101_AddProperty.WindowTitle=Add Property
ESBFSBus101_AddProperty.Title=ESB Property
-ESBFSBus101_Properties.Title=ESB FS Bus
+ESBFSBus101_Properties.Title=ESB FS Channel
#FS Message Filter
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-11-26 16:11:45 UTC (rev 12080)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-11-26 16:28:33 UTC (rev 12081)
@@ -264,7 +264,7 @@
</ICONS>
</XEntityRenderer>
<XModelAttributes>
- <XModelAttribute default="bus provider" loader="ElementType" name="element type">
+ <XModelAttribute default="channel provider" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
@@ -1615,7 +1615,7 @@
kind="list" name="CreateActions">
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
PROPERTIES="validator.add=true;support=org.jboss.tools.esb.core.model.handlers.AddProviderSupport;busEntity=ESBBus"
- displayName="Bus Provider..." kind="action" name="AddBusProvider">
+ displayName="Channel Provider..." kind="action" name="AddBusProvider">
<EntityData EntityName="ESBBusProvider101">
<AttributeData AttributeName="name"/>
</EntityData>
@@ -2255,6 +2255,19 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity name="FileESB101_EditorActionList">
+ <XChildrenEntities/>
+ <XEntityRenderer/>
+ <XModelAttributes/>
+ <XActionItem kind="list">
+ <XActionItem displayName="New" group="1" kind="list" name="CreateActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XEntityExtension name="FileFolder">
<XChildrenEntities>
<XChildEntity name="FileESB101"/>
16 years, 1 month
JBoss Tools SVN: r12080 - trunk/vpe/plugins/org.jboss.tools.vpe.html/templates.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-26 11:11:45 -0500 (Wed, 26 Nov 2008)
New Revision: 12080
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3249,https://jira.jboss.org/jira...
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-11-26 15:49:25 UTC (rev 12079)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-11-26 16:11:45 UTC (rev 12080)
@@ -1420,7 +1420,7 @@
<vpe:tag name="object" case-sensitive="no">
<vpe:template children="yes" modify="no">
<vpe:copy
- attrs="align,classid,code,codebase,codetype,data,height,hspace,type,vspace,width" />
+ attrs="align,classid,code,codebase,codetype,data,height,hspace,type,vspace,width,class,id,dir" />
<vpe:drop container="yes">
<vpe:container-child tag-name="param" />
<vpe:container-child tag-name="object" />
16 years, 1 month
JBoss Tools SVN: r12079 - in trunk/vpe/tests/org.jboss.tools.vpe.html.test: resources/htmlTest/WebContent/pages/components/core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-26 10:49:25 -0500 (Wed, 26 Nov 2008)
New Revision: 12079
Added:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/area.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/param.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/noembed.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/map.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2854
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/area.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/area.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/area.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,14 @@
+<html>
+<head></head>
+
+<body>
+<h1>area</h1>
+
+<img src="/img/image.jpeg" usemap="#map">
+
+<map name="map" id="map" dir="ltr" class="mapClass" style="color:red;" >
+ <area id="area" href="/">
+</map>
+
+</body>
+</html>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/map.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/map.html 2008-11-26 15:48:33 UTC (rev 12078)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/map.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -2,7 +2,7 @@
<head></head>
<body>
-<h1>map,area</h1>
+<h1>map</h1>
<img src="/img/image.jpeg" usemap="#map">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html 2008-11-26 15:48:33 UTC (rev 12078)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -3,7 +3,7 @@
<body>
-<h1>object,param</h1>
+<h1>object</h1>
<object id="object" classid="someClass" width="500" height="200" align="top"
border="10" class="objectClass" dir="ltr" id="object"
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/param.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/param.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/param.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,15 @@
+<html>
+<head></head>
+
+<body>
+
+<h1>param</h1>
+
+<object id="object" classid="someClass" width="500" height="200" align="top"
+ border="10" class="objectClass" dir="ltr" id="object"
+ style="color: red;" vspace="10">
+ <param id="param" name="someParam" value="5">
+</object>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,17 @@
+<html>
+<head>
+</head>
+
+<body>
+
+<basefont id ="basefont" face="Arial, Helvetica, sans-serif" size="4" color="red">
+
+<h1>basefont</h1>
+
+
+
+text
+
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/basefont.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,8 @@
+<tests>
+ <test id="basefont">
+ <BASEFONT ID="basefont" FACE="Arial, Helvetica, sans-serif"
+ SIZE="4" COLOR="red" STYLE="-moz-user-modify: read-write;" />
+ <BR VPE:PSEUDO-ELEMENT="yes"
+ STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,14 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>bdo</h1>
+
+<bdo id="bdo" dir="rtl">some text</bdo>
+
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bdo.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="bdo">
+ <BDO DIR="rtl" STYLE="-moz-user-modify: read-write;" >
+ <SPAN>
+ some text
+ </SPAN>
+ </BDO>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,17 @@
+<html>
+<head>
+<bgsound id="bgsound" dir="rtl">
+some text
+</bdo>
+</head>
+
+<body>
+
+
+<h1>bgsound</h1>
+
+
+
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/bgsound.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="bgsound">
+ <IMG SRC="/bgsound.gif" STYLE="-moz-user-modify: read-only;" />
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,13 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>center</h1>
+
+<center id="center">text</center>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/center.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="center">
+ <CENTER STYLE="-moz-user-modify: read-write;" ID="center" >
+<SPAN>
+text
+</SPAN>
+</CENTER>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,13 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>embed</h1>
+
+<embed id="embed" src="someSrc" pluginspage="http://www.macromedia.com/go/getflashplayer"/>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/embed.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,7 @@
+<tests>
+ <test id="embed">
+ <EMBED SRC="someSrc" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer"
+ STYLE="-moz-user-modify: read-only;" >
+ </EMBED>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,13 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>font</h1>
+
+<font id="font" size="5" color="red" face="Arial">some text</font>text</p>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/font.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,10 @@
+<tests>
+ <test id="font">
+ <FONT SIZE="5" FACE="Arial" COLOR="red" ID="font"
+ STYLE="-moz-user-modify: read-write;" >
+ <SPAN>
+ some text
+ </SPAN>
+ </FONT>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,12 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>font</h1>
+
+<marquee id="marquee" style="color:red;" > Lorem ipsum dolor sit amet... </marquee>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/marquee.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="marquee">
+ <MARQUEE STYLE="-moz-user-modify: read-only;" >
+ <SPAN>
+ Lorem ipsum dolor sit amet...
+ </SPAN>
+ </MARQUEE>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,15 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>nobr</h1>
+
+<nobr id="nobr"> text</nobr>
+text
+</p>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/nobr.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="nobr">
+ <NOBR ID="nobr" STYLE="-moz-user-modify: read-only;" >
+ <SPAN>
+ text
+ </SPAN>
+ </NOBR>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/noembed.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/noembed.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/noembed.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,14 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>noembed</h1>
+
+<embed id="embed" src="someSrc" pluginspage="http://www.macromedia.com/go/getflashplayer"/>
+<noembed id="noembed">someText</noembed>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,15 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>wbr</h1>
+
+<nobr id="nobr"> text<wbr id="wbr" /> </nobr>
+text
+</p>
+
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/wbr.html.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,6 @@
+<tests>
+ <test id="wbr">
+ <WBR STYLE="-moz-user-modify: read-only;" ID="wbr" >
+ </WBR>
+ </test>
+</tests>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,32 @@
+<html>
+<head>
+</head>
+
+<body>
+
+
+<h1>xmp</h1>
+<xmp id="xmp">
+ while (<>) {
+ $org=$_;
+ s/\\["']//g;
+ s/\/\/[^:].*//;
+ s/\/\*.*\*\///g;
+ if ($comment == 1) {
+ if (s/.*\*\///) {
+ $comment = 0;
+ }
+ else {
+ next;
+ }
+ }
+ if (s/\/\*.*//) {
+ $comment = 1;
+ }
+ if (/^\s*#/) {
+ next;
+ }
+ }
+</xmp>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml 2008-11-26 15:49:25 UTC (rev 12079)
@@ -0,0 +1,49 @@
+<tests>
+ <test id="xmp">
+ <XMP ID="xmp" STYLE="-moz-user-modify: read-only;" >
+<SPAN><BR _MOZ_DIRTY=""/>
+
+while (<>) {<BR _MOZ_DIRTY=""/>
+
+$org=$_;<BR _MOZ_DIRTY=""/>
+
+s/\\["']//g;<BR _MOZ_DIRTY=""/>
+
+s/\/\/[^:].*//;<BR _MOZ_DIRTY=""/>
+
+s/\/\*.*\*\///g;<BR _MOZ_DIRTY=""/>
+
+if ($comment == 1) {<BR _MOZ_DIRTY=""/>
+
+if (s/.*\*\///) {<BR _MOZ_DIRTY=""/>
+
+$comment = 0;<BR _MOZ_DIRTY=""/>
+
+}<BR _MOZ_DIRTY=""/>
+
+else {<BR _MOZ_DIRTY=""/>
+
+next;<BR _MOZ_DIRTY=""/>
+
+}<BR _MOZ_DIRTY=""/>
+
+}<BR _MOZ_DIRTY=""/>
+
+if (s/\/\*.*//) {<BR _MOZ_DIRTY=""/>
+
+$comment = 1;<BR _MOZ_DIRTY=""/>
+
+}<BR _MOZ_DIRTY=""/>
+
+if (/^\s*#/) {<BR _MOZ_DIRTY=""/>
+
+next;<BR _MOZ_DIRTY=""/>
+
+}<BR _MOZ_DIRTY=""/>
+
+}<BR _MOZ_DIRTY=""/>
+
+</SPAN>
+</XMP>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2008-11-26 15:48:33 UTC (rev 12078)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlComponentContentTest.java 2008-11-26 15:49:25 UTC (rev 12079)
@@ -73,6 +73,10 @@
public void testAddress() throws Throwable {
performContentTest("components/core/address.html"); //$NON-NLS-1$
}
+
+ public void testArea() throws Throwable {
+ performInvisibleTagTest("components/core/area.html","area"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
public void testBody() throws Throwable {
performContentTest("components/core/body.html"); //$NON-NLS-1$
@@ -125,6 +129,10 @@
public void testObject() throws Throwable {
performContentTest("components/core/object.html"); //$NON-NLS-1$
}
+
+ public void testParam() throws Throwable {
+ performInvisibleTagTest("components/core/param.html","param"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
public void testStyle() throws Throwable {
fail("it is necessary to add body of the test"); //$NON-NLS-1$
@@ -358,6 +366,55 @@
performContentTest("components/text/var.html"); //$NON-NLS-1$
}
+
+ /*
+ * test for other html tags
+ */
+
+ public void testBaseFont() throws Throwable {
+ performContentTest("components/other/basefont.html"); //$NON-NLS-1$
+ }
+
+ public void testBdo() throws Throwable {
+ performContentTest("components/other/bdo.html"); //$NON-NLS-1$
+ }
+
+ public void testBgsound() throws Throwable {
+ performContentTest("components/other/bgsound.html"); //$NON-NLS-1$
+ }
+
+ public void testCenter() throws Throwable {
+ performContentTest("components/other/center.html"); //$NON-NLS-1$
+ }
+
+ public void testEmbed() throws Throwable {
+ performContentTest("components/other/embed.html"); //$NON-NLS-1$
+ }
+
+ public void testFont() throws Throwable {
+ performContentTest("components/other/font.html"); //$NON-NLS-1$
+ }
+
+ public void testMarquee() throws Throwable {
+ performContentTest("components/other/marquee.html"); //$NON-NLS-1$
+ }
+
+ public void testNobr() throws Throwable {
+ performContentTest("components/other/nobr.html"); //$NON-NLS-1$
+ }
+
+ public void testNoembed() throws Throwable {
+ performInvisibleTagTest("components/other/noembed.html", "noembed"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public void testWbr() throws Throwable {
+ performContentTest("components/other/wbr.html"); //$NON-NLS-1$
+ }
+
+ public void testXmp() throws Throwable {
+ performContentTest("components/other/xmp.xhtml"); //$NON-NLS-1$
+ }
+
protected String getTestProjectName() {
return HtmlAllTests.IMPORT_PROJECT_NAME;
}
16 years, 1 month
JBoss Tools SVN: r12078 - in trunk/vpe/plugins: org.jboss.tools.vpe.html/templates and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-26 10:48:33 -0500 (Wed, 26 Nov 2008)
New Revision: 12078
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefaultPseudoContentCreator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3249,https://jira.jboss.org/jira...
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefaultPseudoContentCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefaultPseudoContentCreator.java 2008-11-26 15:35:59 UTC (rev 12077)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefaultPseudoContentCreator.java 2008-11-26 15:48:33 UTC (rev 12078)
@@ -33,6 +33,7 @@
withoutPseudoContentSet.add("td"); //$NON-NLS-1$
withoutPseudoContentSet.add("br"); //$NON-NLS-1$
withoutPseudoContentSet.add("nobr"); //$NON-NLS-1$
+ withoutPseudoContentSet.add("xmp"); //$NON-NLS-1$
withoutPseudoContentSet.add("input"); //$NON-NLS-1$
withoutPseudoContentSet.add("textarea"); //$NON-NLS-1$
withoutPseudoContentSet.add("select"); //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-11-26 15:35:59 UTC (rev 12077)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-11-26 15:48:33 UTC (rev 12078)
@@ -1402,7 +1402,9 @@
</vpe:tag>
<vpe:tag name="nobr" case-sensitive="no">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="yes" modify="no" >
+ <vpe:copy />
+ </vpe:template>
</vpe:tag>
<vpe:tag name="noframes" case-sensitive="no">
@@ -1422,9 +1424,17 @@
<vpe:drop container="yes">
<vpe:container-child tag-name="param" />
<vpe:container-child tag-name="object" />
+ <vpe:container-child tag-name="embed" />
</vpe:drop>
</vpe:template>
-</vpe:tag>
+ </vpe:tag>
+
+ <vpe:tag name="embed" case-sensitive="no">
+ <vpe:template children="yes" modify="no">
+ <vpe:copy
+ attrs="align,height,hidden,hspace,pluginspage,src,type,vspace,width" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="ol" case-sensitive="no">
<vpe:template children="yes" modify="no">
@@ -2125,4 +2135,28 @@
class="org.jboss.tools.vpe.html.template.HtmlTextTemplate">
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="marquee" case-sensitive="no">
+ <vpe:template children="yes" modify="no">
+ <vpe:copy
+ attrs="behavior,bgcolor,direction,height,hspace,loop,scrollamount,scrolldelay,truespeed,vspace,width" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="noembed" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="wbr" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ <vpe:copy />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="xmp" case-sensitive="no">
+ <vpe:template children="yes" modify="no">
+ <vpe:copy />
+ </vpe:template>
+ </vpe:tag>
</vpe:templates>
\ No newline at end of file
16 years, 1 month
JBoss Tools SVN: r12077 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-26 10:35:59 -0500 (Wed, 26 Nov 2008)
New Revision: 12077
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
JBIDE-3209
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-26 14:16:34 UTC (rev 12076)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-26 15:35:59 UTC (rev 12077)
@@ -597,6 +597,10 @@
element.setAttribute(VpeStyleUtil.PARAMETR_BACKGROND,
backgroundValue);
}
+ //fix for jbide-3209
+ if(element.hasAttribute(HTML.ATTR_DIR)) {
+ element.removeAttribute(HTML.ATTR_DIR);
+ }
}
protected void addChildren(VpeTemplate containerTemplate,
16 years, 1 month
JBoss Tools SVN: r12075 - trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-11-26 08:53:43 -0500 (Wed, 26 Nov 2008)
New Revision: 12075
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
Log:
JBIDE-3198 Creation of New Hibernate Configuration file happens without encoding.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
===================================================================
(Binary files differ)
16 years, 1 month
JBoss Tools SVN: r12074 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: outline/cssdialog and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: izhukov
Date: 2008-11-26 08:40:20 -0500 (Wed, 26 Nov 2008)
New Revision: 12074
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java
Log:
CSS dialog opened via context menu loads selected CSS style class
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2008-11-26 12:25:06 UTC (rev 12073)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2008-11-26 13:40:20 UTC (rev 12074)
@@ -45,6 +45,7 @@
public static String CSS_STYLE_CLASS_EDITOR_HEADER_TITLE;
public static String CSS_STYLE_CLASS_EDITOR_DESCRIPTION;
public static String CSS_STYLE_CLASS_EDITOR_TITLE;
+ public static String CSS_STYLE_EDITOR_TITLE;
public static String CSS_EMPTY_FILE_PATH_MESSAGE;
public static String CSS_EMPTY_STYLE_CLASS_MESSAGE;
public static String CSS_SAVE_DIALOG_TITLE;
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2008-11-26 12:25:06 UTC (rev 12073)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2008-11-26 13:40:20 UTC (rev 12074)
@@ -5,6 +5,7 @@
CSS_STYLE_CLASS_EDITOR_HEADER_TITLE=CSS Style Class Editor
CSS_STYLE_CLASS_EDITOR_DESCRIPTION=Create New CSS Class
CSS_STYLE_CLASS_EDITOR_TITLE=CSS Class
+CSS_STYLE_EDITOR_TITLE=CSS Style
CSS_EMPTY_FILE_PATH_MESSAGE=Choose any CSS file
CSS_EMPTY_STYLE_CLASS_MESSAGE=Style class is empty
CSS_SAVE_DIALOG_TITLE=Save CSS file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-11-26 12:25:06 UTC (rev 12073)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-11-26 13:40:20 UTC (rev 12074)
@@ -40,7 +40,6 @@
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -159,8 +158,8 @@
// within this file where cursor is located
if (currentFile == null) {
currentFile = Util.getActiveCssFile();
- currentClassStyle = Util.getActivePageCSSSelectorIfAny();
}
+ currentClassStyle = Util.getActivePageCSSSelectorIfAny();
}
/**
@@ -229,8 +228,6 @@
/* ============================================= */
Composite downSplitPane = getCompositeElement(split);
- Color veryLightGray = new Color(null, 127, 127, 127);
- downSplitPane.setForeground(veryLightGray);
Composite classComposite = new Composite(downSplitPane, SWT.BORDER);
GridData gridData = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java 2008-11-26 12:25:06 UTC (rev 12073)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java 2008-11-26 13:40:20 UTC (rev 12074)
@@ -16,11 +16,17 @@
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.common.model.ui.widgets.Split;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants;
@@ -33,13 +39,16 @@
*
* @author Dzmitry Sakovich (dsakovich(a)exadel.com)
*/
-public class CSSStyleDialog extends Dialog {
+public class CSSStyleDialog extends Dialog implements MouseListener, FocusListener {
final static int MIN_HEIGHT_FOR_BROWSER = 60;
private String previewBrowserValue = Constants.TEXT_FOR_PREVIEW;
+ private Composite browserContainer = null;
private Browser browser = null;
+ private Text textBrowser = null;
+
private StyleComposite styleComposite = null;
private StyleAttributes styleAttributes = null;
private String oldStyle;
@@ -65,30 +74,58 @@
*/
@Override
protected Control createDialogArea(final Composite parent) {
- final Composite composite = (Composite) super.createDialogArea(parent);
+ final Composite composite = (Composite) super.createDialogArea(parent);
+ Split split = new Split(composite, SWT.VERTICAL);
+
GridLayout layout = new GridLayout();
layout.numColumns = 1;
- browser = new Browser(composite, SWT.BORDER);
-
composite.setLayout(layout);
+ // initialize browser container
+ browserContainer = getCompositeElement(split);
+ createBrowserComponent();
+
styleAttributes.addChangeStyleListener(new ChangeStyleListener() {
public void styleChanged(ChangeStyleEvent event) {
browser.setText(getTextForBrowser());
}
});
- styleComposite = new StyleComposite(composite, styleAttributes, oldStyle);
+ styleComposite = new StyleComposite(split, styleAttributes, oldStyle);
- GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
- gridData.minimumHeight = MIN_HEIGHT_FOR_BROWSER;
- browser.setLayoutData(gridData);
- browser.setText(getTextForBrowser());
+ split.setWeights(new int[]{15, 85});
+ split.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, true));
return composite;
}
/**
+ * Create container that take up 2 cells and contains fontSizeCombo and extFontSizeCombo elements.
+ */
+ private Composite getCompositeElement(Composite parent) {
+ GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
+ GridLayout gridLayoutTmp = new GridLayout();
+ gridLayoutTmp.marginHeight = 0;
+ gridLayoutTmp.marginWidth = 0;
+ Composite classComposite = new Composite(parent, SWT.FILL);
+ classComposite.setLayout(gridLayoutTmp);
+ classComposite.setLayoutData(gridData);
+
+ return classComposite;
+ }
+
+ /**
+ * Method is used to create browser component to display preview html.
+ */
+ private void createBrowserComponent() {
+ GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
+ browser = new Browser(browserContainer, SWT.BORDER | SWT.MOZILLA);
+ browser.setText(getTextForBrowser());
+ browser.addMouseListener(this);
+ browser.setLayoutData(gridData);
+ }
+
+ /**
* Method is used to build html body that is appropriate to browse.
*
* @return String html text representation
@@ -113,7 +150,7 @@
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText(JstUIMessages.CSS_STYLE_CLASS_EDITOR_TITLE);
+ newShell.setText(JstUIMessages.CSS_STYLE_EDITOR_TITLE);
}
/**
@@ -132,4 +169,55 @@
protected IDialogSettings getDialogBoundsSettings() {
return JspEditorPlugin.getDefault().getDialogSettings();
}
+
+ /**
+ * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
+ */
+ public void mouseDoubleClick(MouseEvent e) {
+ if (e.widget == browser) {
+ browser.removeMouseListener(this);
+ browser.dispose();
+ // create Text area component instead of HTML Browser
+ GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
+ textBrowser = new Text(browserContainer, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+ textBrowser.setText(previewBrowserValue);
+ textBrowser.addFocusListener(this);
+ textBrowser.setLayoutData(gridData);
+ textBrowser.setEditable(true);
+ textBrowser.setFocus();
+ }
+ browserContainer.layout();
+ }
+
+ /**
+ * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
+ */
+ public void focusLost(FocusEvent e) {
+ if (e.widget == textBrowser) {
+ previewBrowserValue = textBrowser.getText();
+ textBrowser.removeFocusListener(this);
+ textBrowser.dispose();
+ // create Browse component instead of text area
+ createBrowserComponent();
+ }
+ browserContainer.layout();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
+ */
+ public void mouseDown(MouseEvent e) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
+ */
+ public void mouseUp(MouseEvent e) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
+ */
+ public void focusGained(FocusEvent e) {
+ }
}
16 years, 1 month