JBoss Tools SVN: r15558 - in trunk: as/docs/reference/en/modules and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: chukhutsina
Date: 2009-05-27 09:55:17 -0400 (Wed, 27 May 2009)
New Revision: 15558
Modified:
trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_7.png
trunk/as/docs/reference/en/modules/runtimes_servers.xml
trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_15.png
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-732 -According to the new features of JBoss AS profile docs were updated. </p>
</body></html>
Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_7.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/modules/runtimes_servers.xml
===================================================================
--- trunk/as/docs/reference/en/modules/runtimes_servers.xml 2009-05-27 12:44:53 UTC (rev 15557)
+++ trunk/as/docs/reference/en/modules/runtimes_servers.xml 2009-05-27 13:55:17 UTC (rev 15558)
@@ -160,17 +160,22 @@
wizard allows to create only a new configuration instead.</para>
</entry>
</row>
-
+
<row>
<entry>
+ <para>Directory</para>
+ </entry>
+ <entry>
+ <para>The path to a directory where the configurations are installed.</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
<para>Configuration</para>
</entry>
<entry>
<para>The list of configurations (all, default, minimal) that is updated as soon as
- you browse to a valid runtime installation folder. After the runtime is created
- the configuration becomes an unchanging property of that runtime. To compile
- against a different configuration's jars, you will need to create a new runtime
- from that configuration.</para>
+ you browse to a valid runtime installation folder.</para>
</entry>
</row>
@@ -181,14 +186,74 @@
<para>As a result of having each runtime represent a specific configuration rather than the
server installation as a whole, it is very likely you'll create several different
runtimes to test each of your configurations. It becomes important to ensure your runtimes,
- and later your servers, are given descriptive names that help you remember which is
+ and later your servers, are given descriptive names that help you to remember which is
which.</para>
<para>Press <emphasis>
<property>Finish</property>
- </emphasis> to see your new runtime in the list.</para>
+ </emphasis> to see your new runtime in the list.</para>
+ <note>
+ <title>Note:</title>
+ <para>If you edit the configuration of a runtime, the changes don't affect the settings of the servers that currently use the runtime.
+ To apply the changes to them also,you should double right click the server, <emphasis>
+ <property>Overview>Runtime Environment</property> </emphasis>
+ ,make sure that necessary configuration is chosen,click <emphasis><property>Finish</property> </emphasis> and then <emphasis><property>Save</property></emphasis> button.</para>
+ </note>
</section>
-
+ <section id="CopyRuntime">
+ <title>Copying the existing runtime configuration</title>
+ <para>While installing a new runtime you can copy the configuration from the existing one.
+ To do this you should perform all the steps in the <link linkend="InstNewRuntime">previous</link> section except pressing <emphasis>
+ <property>Finish</property></emphasis>
+ in the New Server Runtime Environment menu .
+ </para>
+ <para>Make sure that you browse to a valid runtime folder and can see the list of configurations (all, default, minimal) in the Configuration section .
+ Then choose necessary Configuration from the list and click <emphasis>
+ <property>Copy</property></emphasis>.The next dialog should appear.
+ </para>
+ <figure>
+ <title>Copy the existing configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/runtimes_servers/runtimes_servers_4a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>Change the name Click on <emphasis>
+ <property>Browse</property></emphasis> and select your configuration location or leave as it's if you want it to be located together with other runtime configurations.
+ </para>
+ <figure>
+ <title>Copy the existing configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/runtimes_servers/runtimes_servers_4b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Click<emphasis>
+ <property> Ok </property></emphasis>and you should see the next wizard with the just added copied configuration.
+
+ </para>
+ <figure>
+ <title>Runtime with copied configuration</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/runtimes_servers/runtimes_servers_4c.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para> Press <emphasis>
+ <property>Finish</property>
+ </emphasis> and you will see your new runtime in the list.
+ </para>
+ <para>You can also change a configuration of existing runtime to a copied one in the same way from the <emphasis>
+ <property> Window > Preferences </property></emphasis>
+ menu <emphasis>
+ <property>Server > Runtime Environments </property></emphasis>
+ and clicking <emphasis>
+ <property>Edit</property></emphasis>.
+ </para>
</section>
<section>
@@ -227,7 +292,7 @@
runtime that matches your needs just press the <emphasis>
<property>Add...</property>
</emphasis> link nearby to bring up the wizard for creating a new runtime (see the <link
- linkend="add_runtime_figure">previous section</link>). To configure the already installed
+ linkend="add_runtime_figure">Installing a New Runtime section</link>). To configure the already installed
runtimes you should go to server preferences that you can easily do by pressing the <emphasis>
<property>Configure runtime environments...</property></emphasis> link.</para>
@@ -268,7 +333,7 @@
<para>We hope, this guide helped you to get started with the JBoss Tools server manager. Besides, for additional information you are welcome on <ulink
url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para>
</section>
-
+ </section>
</section>
</chapter>
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/manage/manage_15.png
===================================================================
(Binary files differ)
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15557 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-05-27 08:44:53 -0400 (Wed, 27 May 2009)
New Revision: 15557
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
getProposals() method is fixed: Yet another NullPointerException.
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 2009-05-27 12:33:53 UTC (rev 15556)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-05-27 12:44:53 UTC (rev 15557)
@@ -44,7 +44,7 @@
ITagLibrary[] libs = context.getLibraries();
for (int i = 0; libs != null && i < libs.length; i++) {
TextProposal[] libProposals = libs[i].getProposals(query, context);
- for (int j = 0; j < libProposals.length; j++) {
+ for (int j = 0; libProposals != null && j < libProposals.length; j++) {
proposals.add(libProposals[i]);
}
}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15556 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-05-27 08:33:53 -0400 (Wed, 27 May 2009)
New Revision: 15556
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4383 - fix for - "Open Source File" doesn't open right source file for class properties which are in the base class
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-05-27 11:05:13 UTC (rev 15555)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-05-27 12:33:53 UTC (rev 15556)
@@ -99,11 +99,13 @@
IJavaProject[] projs = ProjectUtils.findJavaProjects(consoleConfig);
String remainder = null;
IType type = null;
+ IJavaProject proj = null;
if (fullyQualifiedName.indexOf("$") > 0) { //$NON-NLS-1$
remainder = fullyQualifiedName.substring(fullyQualifiedName.indexOf("$") + 1); //$NON-NLS-1$
fullyQualifiedName = fullyQualifiedName.substring(0, fullyQualifiedName.indexOf("$")); //$NON-NLS-1$
for (int i = 0; i < projs.length && type == null; i++) {
- type = projs[i].findType(fullyQualifiedName);
+ proj = projs[i];
+ type = proj.findType(fullyQualifiedName);
}
while ( remainder.indexOf("$") > 0 ){ //$NON-NLS-1$
String subtype = remainder.substring(0, fullyQualifiedName.indexOf("$")); //$NON-NLS-1$
@@ -113,22 +115,45 @@
type = type.getType(remainder);
} else {
for (int i = 0; i < projs.length && type == null; i++) {
- type = projs[i].findType(fullyQualifiedName);
+ proj = projs[i];
+ type = proj.findType(fullyQualifiedName);
}
}
-
+ IJavaElement jElement = null;
+ if (selection instanceof Property){
+ final String selectionName =((Property)selection).getName();
+ final IType typeSave = type;
+ while (true) {
+ jElement = type.getField(selectionName);
+ if (jElement != null && jElement.exists()) {
+ break;
+ }
+ String parentClassName = ProjectUtils.getParentTypename(proj, type.getFullyQualifiedName());
+ if (parentClassName == null) {
+ break;
+ }
+ type = proj.findType(parentClassName);
+ for (int i = 0; i < projs.length && type == null; i++) {
+ proj = projs[i];
+ type = proj.findType(fullyQualifiedName);
+ }
+ if (type == null) {
+ break;
+ }
+ };
+ // do not find element - restore type
+ if (jElement == null || !jElement.exists()) {
+ type = typeSave;
+ }
+ }
+ if (jElement == null) {
+ jElement = type;
+ }
IEditorPart editorPart = JavaUI.openInEditor(type);
if (editorPart instanceof JavaEditor) {
- IJavaElement jElement = null;
- if (selection instanceof Property){
- jElement = type.getField(((Property)selection).getName());
- } else {
- jElement = type;
- }
- JavaEditor jEditor = (JavaEditor) editorPart;
+ JavaEditor jEditor = (JavaEditor)editorPart;
selectionToEditor(jElement, jEditor);
}
-
if (editorPart == null) {
String out = NLS.bind(HibernateConsoleMessages.OpenSourceAction_source_file_for_class_not_found, fullyQualifiedName);
throw new FileNotFoundException(out);
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15555 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components: panelMenu and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-05-27 07:05:13 -0400 (Wed, 27 May 2009)
New Revision: 15555
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu/JBIDE3740.xhtml.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4345 Minor. RichFacesAllTests are fixed: tags <BR _MOZ_DIRTY="" TYPE="_moz" /> are removed from the tests.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-05-27 11:03:52 UTC (rev 15554)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/columns.xhtml.xml 2009-05-27 11:05:13 UTC (rev 15555)
@@ -26,8 +26,6 @@
<SPAN CLASS="vpe-text">
Cars Available
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
</TR>
<TR CLASS="dr-table-subheader rich-table-subheader">
@@ -41,7 +39,6 @@
<IMG
SRC="/.*resources/column/sortable.gif/"
STYLE="vertical-align: middle;" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
@@ -58,8 +55,6 @@
<SPAN STYLE="font-style: italic;">
#{model[ind].price}$
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
</TR>
</TABLE>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu/JBIDE3740.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu/JBIDE3740.xhtml.xml 2009-05-27 11:03:52 UTC (rev 15554)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/panelMenu/JBIDE3740.xhtml.xml 2009-05-27 11:05:13 UTC (rev 15555)
@@ -26,20 +26,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -54,20 +54,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -82,27 +82,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -115,14 +115,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -140,11 +140,11 @@
should be applied for
rich:panelMenuGroup inside rich:panelMenuGroup as for items
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -170,20 +170,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -198,20 +198,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -226,27 +226,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -259,14 +259,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -283,12 +283,10 @@
<SPAN CLASS="vpe-text">
isn't applied correctly
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
</TR>
<TR STYLE="-moz-user-modify: read-write;">
@@ -315,20 +313,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -343,20 +341,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -371,27 +369,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -404,14 +402,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -436,11 +434,11 @@
<SPAN CLASS="vpe-text">
interaction (it's incorrect, too)
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -468,19 +466,19 @@
<TD>
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
>
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD>
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -495,19 +493,19 @@
<TD>
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
>
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD>
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -522,26 +520,26 @@
<TD>
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
>
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD>
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -554,14 +552,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -591,11 +589,11 @@
change disabled style of a component. Names of groups become black
color again.
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -621,20 +619,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -649,20 +647,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -677,27 +675,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -710,14 +708,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -732,11 +730,11 @@
should work only for rich:panelMenuGroup
inside rich:panelMenuGroup
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -764,20 +762,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -792,20 +790,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -820,27 +818,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -853,14 +851,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -890,11 +888,11 @@
<SPAN CLASS="vpe-text">
interaction
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -925,19 +923,19 @@
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/grid.gif/"
CLASS="rich-pmenu-item-icon rich-pmenu-top-item-icon" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-item-label rich-pmenu-top-item-label">
Item 0.0
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="" CLASS="dr-pmenu-nowrap">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuItem/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -952,20 +950,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -980,20 +978,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1008,27 +1006,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -1041,14 +1039,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -1113,11 +1111,11 @@
doesn't
work correctly, it mustn't be applied for topItems.
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1148,18 +1146,18 @@
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/chevron.gif/"
/>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;" >
Item 0.0
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="" >
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuItem/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1174,19 +1172,19 @@
<TD>
<IMG
SRC="/.*ve/unresolved_image.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
>
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD>
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1201,20 +1199,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1229,27 +1227,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -1262,14 +1260,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -1283,11 +1281,11 @@
<SPAN CLASS="vpe-text">
doesn't work.
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1319,18 +1317,18 @@
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/chevron.gif/"
/>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;" >
Item 0.0
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="" >
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuItem/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1345,19 +1343,19 @@
<TD>
<IMG
SRC="/.*ve/unresolved_image.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
>
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD>
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1372,20 +1370,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1400,27 +1398,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -1433,14 +1431,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -1455,11 +1453,11 @@
isn't applied correctly for top
groups
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1490,18 +1488,18 @@
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/chevron.gif/"
/>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;" >
Item 0.0
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="" >
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuItem/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1516,18 +1514,18 @@
<TD>
<IMG
SRC="/.*ve/unresolved_image.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;">
Group 1
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD>
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1542,20 +1540,20 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 2
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
@@ -1570,27 +1568,27 @@
CLASS="rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon">
<IMG
SRC="/.*resources/panelMenuGroup/chevronDown.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="width: 100%;"
CLASS="rich-pmenu-top-group-self-label">
Group 3
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD
CLASS="rich-pmenu-top-group-self-icon">
<IMG WIDTH="16" VSPACE="0" HSPACE="0" HEIGHT="16"
SRC="/.*resources/panelMenuGroup/spacer.gif/" />
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TABLE>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD CLASS="cols">
@@ -1603,14 +1601,14 @@
</DIV>
</DIV>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
</TBODY>
</TABLE>
</FORM>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
<TD STYLE="-moz-user-modify: read-write;">
@@ -1625,11 +1623,11 @@
isn't applied correctly for top
groups
</SPAN>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</LI>
</UL>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
+
</TD>
</TR>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15554 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration: editors/uitls and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-27 07:03:52 -0400 (Wed, 27 May 2009)
New Revision: 15554
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextContentProposal.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextProposalProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java
Log:
JBIDE-4232
Add BindTo bean ID into the BeanID Ref context for the content assist
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -47,9 +47,9 @@
*/
@Override
protected boolean isBeanIDRefFieldFeature(EAttribute attribute) {
- if (attribute == FreemarkerPackage.eINSTANCE.getBindTo_Id()) {
- return true;
- }
+// if (attribute == FreemarkerPackage.eINSTANCE.getBindTo_Id()) {
+// return true;
+// }
return super.isBeanIDRefFieldFeature(attribute);
}
}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextContentProposal.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextContentProposal.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextContentProposal.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -89,16 +89,16 @@
public String getLabel() {
String name = "";
if(type == BINDINGS){
- name = "Java Object";
+ name = "Bean";
}
if(type == PROPERTIES){
name = "Value Binding";
}
if(type == WIRTINGS){
- name = "Wiring";
+ name = "Bean Binding";
}
if(type == EXPRESSIONS){
- name = "Expression";
+ name = "Expression Binding";
}
if(name.length() != 0 && content != null){
return content + " - ( " + name + " )";
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextProposalProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextProposalProvider.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/BindingsContextProposalProvider.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -33,12 +33,20 @@
private List<BindingsType> bindingsList = null;
- private List<String> bindingsIDList = null;
+ private List<String> bindingsIDList = new ArrayList<String>();
public BindingsContextProposalProvider(SmooksResourceListType listType, Text textControl) {
this.textControl = textControl;
bindingsList = SmooksUIUtils.getBeanIdList(listType);
- bindingsIDList = SmooksUIUtils.getBeanIdStringList(listType);
+ if(bindingsList != null){
+ for (Iterator<?> iterator = bindingsList.iterator(); iterator.hasNext();) {
+ BindingsType bindings = (BindingsType) iterator.next();
+ String beanId = bindings.getBeanId();
+ if(beanId != null){
+ bindingsIDList.add(beanId);
+ }
+ }
+ }
}
/*
@@ -49,9 +57,6 @@
* .lang.String, int)
*/
public IContentProposal[] getProposals(String contents, int position) {
- if (contents.length() == 2) {
- System.out.println();
- }
if (bindingsList == null || bindingsList.isEmpty()) {
return new IContentProposal[] {};
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -115,14 +115,17 @@
import org.jboss.tools.smooks.configuration.editors.javabean.JavaMethodsSelectionDialog;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaPropertiesSelectionDialog;
import org.jboss.tools.smooks.core.SmooksCoreActivator;
+import org.jboss.tools.smooks.model.freemarker.BindTo;
+import org.jboss.tools.smooks.model.freemarker.Freemarker;
+import org.jboss.tools.smooks.model.freemarker.Use;
import org.jboss.tools.smooks.model.graphics.ext.DocumentRoot;
import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
import org.jboss.tools.smooks.model.graphics.ext.util.SmooksGraphicsExtResourceFactoryImpl;
import org.jboss.tools.smooks.model.javabean.BindingsType;
-import org.jboss.tools.smooks.model.javabean.provider.Javabean1EditPlugin;
import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig;
import org.jboss.tools.smooks.model.smooks.ConditionType;
import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+import org.jboss.tools.smooks.model.xsl.Xsl;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
@@ -167,8 +170,37 @@
String beanId = ((BindingsType) abstractResourceConfig).getBeanId();
if (beanId == null)
continue;
- beanIdList.add(beanId);
+ if (!beanIdList.contains(beanId))
+ beanIdList.add(beanId);
}
+ if (abstractResourceConfig instanceof Freemarker) {
+ Use use = ((Freemarker) abstractResourceConfig).getUse();
+ if (use != null) {
+ BindTo bindTo = use.getBindTo();
+ if (bindTo != null) {
+ String beanId = ((BindTo) bindTo).getId();
+ if (beanId == null)
+ continue;
+ if (!beanIdList.contains(beanId))
+ beanIdList.add(beanId);
+ }
+ }
+
+ }
+ if (abstractResourceConfig instanceof Xsl) {
+ org.jboss.tools.smooks.model.xsl.Use use = ((Xsl) abstractResourceConfig).getUse();
+ if (use != null) {
+ org.jboss.tools.smooks.model.xsl.BindTo bindTo = use.getBindTo();
+ if (bindTo != null) {
+ String beanId = ((org.jboss.tools.smooks.model.xsl.BindTo) bindTo).getId();
+ if (beanId == null)
+ continue;
+ if (!beanIdList.contains(beanId))
+ beanIdList.add(beanId);
+ }
+ }
+
+ }
}
return beanIdList;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -46,9 +46,9 @@
*/
@Override
protected boolean isBeanIDRefFieldFeature(EAttribute attribute) {
- if (attribute == XslPackage.eINSTANCE.getBindTo_Id()) {
- return true;
- }
+// if (attribute == XslPackage.eINSTANCE.getBindTo_Id()) {
+// return true;
+// }
return super.isBeanIDRefFieldFeature(attribute);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/DuplicatedBeanIDValidator.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -18,8 +18,11 @@
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.jboss.tools.smooks.model.freemarker.BindTo;
+import org.jboss.tools.smooks.model.freemarker.FreemarkerPackage;
import org.jboss.tools.smooks.model.javabean.BindingsType;
import org.jboss.tools.smooks.model.javabean.JavabeanPackage;
+import org.jboss.tools.smooks.model.xsl.XslPackage;
/**
* @author Dart (dpeng(a)redhat.com)
@@ -39,7 +42,7 @@
@Override
public List<Diagnostic> validate(Collection<?> selectedObjects, EditingDomain editingDomain) {
beanIdList.clear();
- findDuplicatedBeanId(selectedObjects);
+ findDuplicatedBeanId(selectedObjects , new ArrayList<String>());
if(beanIdList.isEmpty()){
return null;
}
@@ -66,14 +69,29 @@
}
continue;
}
+ if (object instanceof BindTo) {
+ String beanId = ((BindTo) object).getId();
+ if(isDuplicateBeanId(beanId)){
+ list.add(newWaringDiagnostic("Duplicated beanId : " + beanId, object,
+ FreemarkerPackage.Literals.BIND_TO__ID));
+ }
+ continue;
+ }
+ if (object instanceof org.jboss.tools.smooks.model.xsl.BindTo) {
+ String beanId = ((org.jboss.tools.smooks.model.xsl.BindTo) object).getId();
+ if(isDuplicateBeanId(beanId)){
+ list.add(newWaringDiagnostic("Duplicated beanId : " + beanId, object,
+ XslPackage.Literals.BIND_TO__ID));
+ }
+ continue;
+ }
if (object instanceof EObject) {
validateModel(((EObject) object).eContents() , list);
}
}
}
- protected void findDuplicatedBeanId(Collection<?> selectedObjects) {
- List<String> idlist = new ArrayList<String>();
+ protected void findDuplicatedBeanId(Collection<?> selectedObjects , List<String> idlist) {
for (Iterator<?> iterator = selectedObjects.iterator(); iterator.hasNext();) {
Object object = (Object) iterator.next();
if (object instanceof BindingsType) {
@@ -90,8 +108,36 @@
}
continue;
}
+ if(object instanceof BindTo){
+ String beanId = ((BindTo) object).getId();
+ if (beanId != null) {
+ beanId = beanId.trim();
+ }
+ if (idlist.contains(beanId)) {
+ if (!beanIdList.contains(beanId)) {
+ beanIdList.add(beanId);
+ }
+ } else {
+ idlist.add(beanId);
+ }
+ continue;
+ }
+ if(object instanceof org.jboss.tools.smooks.model.xsl.BindTo){
+ String beanId = ((org.jboss.tools.smooks.model.xsl.BindTo) object).getId();
+ if (beanId != null) {
+ beanId = beanId.trim();
+ }
+ if (idlist.contains(beanId)) {
+ if (!beanIdList.contains(beanId)) {
+ beanIdList.add(beanId);
+ }
+ } else {
+ idlist.add(beanId);
+ }
+ continue;
+ }
if (object instanceof EObject) {
- findDuplicatedBeanId(((EObject) object).eContents());
+ findDuplicatedBeanId(((EObject) object).eContents(),idlist);
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java 2009-05-27 10:53:38 UTC (rev 15553)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/wizards/SmooksConfigurationFileNewWizard.java 2009-05-27 11:03:52 UTC (rev 15554)
@@ -183,9 +183,9 @@
if (SmooksConstants.VERSION_1_1.equals(version)) {
contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //$NON-NLS-1$
+ "<smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.1.xsd\">\n"//$NON-NLS-1$
- + " <resource-config selector=\"global-parameters\">\n"//$NON-NLS-1$
+ + " <params>\n"//$NON-NLS-1$
+ " <param name=\"stream.filter.type\">SAX</param>\n"//$NON-NLS-1$
- + " </resource-config>\n"//$NON-NLS-1$
+ + " </params>\n"//$NON-NLS-1$
+ "</smooks-resource-list>"; //$NON-NLS-1$
}
return new ByteArrayInputStream(contents.getBytes());
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15553 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-05-27 06:53:38 -0400 (Wed, 27 May 2009)
New Revision: 15553
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4363 - fix for - "Open Source File" breaks when there are no project associated with a console configuration
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -64,7 +64,7 @@
TreePath path = paths[i];
ConsoleConfiguration consoleConfig = (ConsoleConfiguration)(path.getSegment(0));
try {
- run(path, consoleConfig);
+ run(consoleConfig, path);
} catch (JavaModelException e) {
HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenMappingAction_cannot_find_mapping_file, e);
} catch (PartInitException e) {
@@ -83,7 +83,8 @@
* @throws JavaModelException
* @throws FileNotFoundException
*/
- public static IEditorPart run(TreePath path, ConsoleConfiguration consoleConfig) throws PartInitException, JavaModelException, FileNotFoundException {
+ public static IEditorPart run(ConsoleConfiguration consoleConfig, TreePath path)
+ throws PartInitException, JavaModelException, FileNotFoundException {
boolean isPropertySel = (path.getLastSegment().getClass() == Property.class);
if (isPropertySel) {
Property propertySel = (Property)path.getLastSegment();
@@ -92,21 +93,21 @@
|| (RootClass.class.isAssignableFrom(persClass.getClass())
&& persClass.getClass() != RootClass.class)) {
Property parentProp = (Property)path.getParentPath().getLastSegment();
- return run(propertySel, parentProp, consoleConfig);
+ return run(consoleConfig, propertySel, parentProp);
}
}
- return run(path.getLastSegment(), consoleConfig);
+ return run(consoleConfig, path.getLastSegment());
}
/**
- * @param selection
* @param consoleConfig
+ * @param selection
* @throws JavaModelException
* @throws PartInitException
* @throws PresistanceClassNotFoundException
* @throws FileNotFoundException
*/
- public static IEditorPart run(Object selection, ConsoleConfiguration consoleConfig) throws PartInitException, JavaModelException, FileNotFoundException {
+ public static IEditorPart run(ConsoleConfiguration consoleConfig, Object selection) throws PartInitException, JavaModelException, FileNotFoundException {
IEditorPart editorPart = null;
IFile file = null;
if (selection instanceof Property) {
@@ -140,9 +141,7 @@
if (rootClass != null){
if (OpenMappingUtils.hasConfigXMLMappingClassAnnotation(consoleConfig, rootClass)) {
String fullyQualifiedName = rootClass.getClassName();
- // TODO: get rid of this - JBIDE-4363
- IJavaProject proj = ProjectUtils.findJavaProject(consoleConfig);
- editorPart = OpenSourceAction.run(selection, proj, fullyQualifiedName);
+ editorPart = OpenSourceAction.run(consoleConfig, selection, fullyQualifiedName);
}
}
else {
@@ -154,15 +153,16 @@
}
/**
+ * @param consoleConfig
* @param compositeProperty
* @param parentProperty
- * @param consoleConfig
* @throws JavaModelException
* @throws PartInitException
* @throws FileNotFoundException
* @throws BadLocationException
*/
- public static IEditorPart run(Property compositeProperty, Property parentProperty, ConsoleConfiguration consoleConfig) throws PartInitException, JavaModelException, FileNotFoundException{
+ public static IEditorPart run(ConsoleConfiguration consoleConfig, Property compositeProperty, Property parentProperty)
+ throws PartInitException, JavaModelException, FileNotFoundException {
PersistentClass rootClass = parentProperty.getPersistentClass();
IFile file = OpenMappingUtils.searchFileToOpen(consoleConfig, rootClass);
IEditorPart editorPart = null;
@@ -173,9 +173,7 @@
if (editorPart == null && parentProperty.isComposite()) {
if (OpenMappingUtils.hasConfigXMLMappingClassAnnotation(consoleConfig, rootClass)) {
String fullyQualifiedName =((Component)parentProperty.getValue()).getComponentClassName();
- // TODO: get rid of this - JBIDE-4363
- IJavaProject proj = ProjectUtils.findJavaProject(consoleConfig);
- editorPart = OpenSourceAction.run(compositeProperty, proj, fullyQualifiedName);
+ editorPart = OpenSourceAction.run(consoleConfig, compositeProperty, fullyQualifiedName);
}
}
if (editorPart == null) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -51,56 +51,60 @@
public void run() {
IStructuredSelection sel = getStructuredSelection();
- if (sel instanceof TreeSelection){
- for (int i = 0; i < ((TreeSelection)sel).getPaths().length; i++) {
- TreePath path = ((TreeSelection)sel).getPaths()[i];
- Object lastSegment = path.getLastSegment();
- PersistentClass persClass = getPersistentClass(lastSegment);
- ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(path.getSegment(0));
- IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration);
+ if (!(sel instanceof TreeSelection)) {
+ return;
+ }
+ TreePath[] paths = ((TreeSelection)sel).getPaths();
+ for (int i = 0; i < paths.length; i++) {
+ TreePath path = paths[i];
+ Object lastSegment = path.getLastSegment();
+ PersistentClass persClass = getPersistentClass(lastSegment);
+ ConsoleConfiguration consoleConfig = (ConsoleConfiguration)(path.getSegment(0));
- String fullyQualifiedName = null;
- if (lastSegment instanceof Property){
- Object prevSegment = path.getParentPath().getLastSegment();
- if (prevSegment instanceof Property
- && ((Property)prevSegment).isComposite()){
- fullyQualifiedName =((Component)((Property) prevSegment).getValue()).getComponentClassName();
- }
+ String fullyQualifiedName = null;
+ if (lastSegment instanceof Property){
+ Object prevSegment = path.getParentPath().getLastSegment();
+ if (prevSegment instanceof Property
+ && ((Property)prevSegment).isComposite()){
+ fullyQualifiedName =((Component)((Property) prevSegment).getValue()).getComponentClassName();
}
- if (fullyQualifiedName == null && persClass != null){
- fullyQualifiedName = persClass.getClassName();
- }
+ }
+ if (fullyQualifiedName == null && persClass != null){
+ fullyQualifiedName = persClass.getClassName();
+ }
- try {
- run(lastSegment, proj, fullyQualifiedName);
- } catch (JavaModelException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenSourceAction_cannot_find_source_file, e);
- } catch (PartInitException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenSourceAction_cannot_open_source_file, e);
- } catch (FileNotFoundException e) {
- HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenSourceAction_cannot_find_source_file, e);
- }
+ try {
+ run(consoleConfig, lastSegment, fullyQualifiedName);
+ } catch (JavaModelException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenSourceAction_cannot_find_source_file, e);
+ } catch (PartInitException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenSourceAction_cannot_open_source_file, e);
+ } catch (FileNotFoundException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMessages.OpenSourceAction_cannot_find_source_file, e);
}
}
}
/**
+ * @param consoleConfig
* @param selection
- * @param proj
* @param fullyQualifiedName
* @throws JavaModelException
* @throws PartInitException
* @throws FileNotFoundException
*/
- public static IEditorPart run(Object selection, IJavaProject proj,
+ public static IEditorPart run(ConsoleConfiguration consoleConfig, Object selection,
String fullyQualifiedName) throws JavaModelException, PartInitException, FileNotFoundException {
if (fullyQualifiedName == null) return null;
+ IJavaProject[] projs = ProjectUtils.findJavaProjects(consoleConfig);
String remainder = null;
IType type = null;
if (fullyQualifiedName.indexOf("$") > 0) { //$NON-NLS-1$
remainder = fullyQualifiedName.substring(fullyQualifiedName.indexOf("$") + 1); //$NON-NLS-1$
fullyQualifiedName = fullyQualifiedName.substring(0, fullyQualifiedName.indexOf("$")); //$NON-NLS-1$
- type = proj.findType(fullyQualifiedName);
+ for (int i = 0; i < projs.length && type == null; i++) {
+ type = projs[i].findType(fullyQualifiedName);
+ }
while ( remainder.indexOf("$") > 0 ){ //$NON-NLS-1$
String subtype = remainder.substring(0, fullyQualifiedName.indexOf("$")); //$NON-NLS-1$
type = type.getType(subtype);
@@ -108,7 +112,9 @@
}
type = type.getType(remainder);
} else {
- type = proj.findType(fullyQualifiedName);
+ for (int i = 0; i < projs.length && type == null; i++) {
+ type = projs[i].findType(fullyQualifiedName);
+ }
}
IEditorPart editorPart = JavaUI.openInEditor(type);
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -183,10 +183,10 @@
TreePath[] paths = ((TreeSelection)selection).getPaths();
TreePath path = paths[0];
Object last = path.getLastSegment();
- ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(path.getSegment(0));
+ ConsoleConfiguration consoleConfig = (ConsoleConfiguration)(path.getSegment(0));
if (last instanceof PersistentClass || last.getClass() == Property.class){
try {
- OpenMappingAction.run(path, consoleConfiguration);
+ OpenMappingAction.run(consoleConfig, path);
} catch (PartInitException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("Can't find mapping file.", e); //$NON-NLS-1$
} catch (JavaModelException e) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -43,9 +43,7 @@
public void run() {
ObjectEditorInput objectEditorInput = (ObjectEditorInput)((VisualEditor)getWorkbenchPart()).getEditorInput();
- ConsoleConfiguration consoleConfiguration = objectEditorInput.getConfiguration();
- //java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile();
- //IJavaProject proj = objectEditorInput.getJavaProject();
+ ConsoleConfiguration consoleConfig = objectEditorInput.getConfiguration();
VisualEditor part = (VisualEditor)getWorkbenchPart();
Set selectedElements = part.getSelectedElements();
@@ -58,7 +56,7 @@
Property compositSel = ((Property)selection);
Property parentProperty = ((SpecialRootClass)((Property)selection).getPersistentClass()).getProperty();
try {
- org.hibernate.eclipse.console.actions.OpenMappingAction.run(compositSel, parentProperty, consoleConfiguration);
+ org.hibernate.eclipse.console.actions.OpenMappingAction.run(consoleConfig, compositSel, parentProperty);
} catch (PartInitException e) {
HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenMappingAction_canot_find_or_open_mapping_file, e);
} catch (JavaModelException e) {
@@ -72,7 +70,7 @@
selection = ((SpecialRootClass)selection).getProperty();
}
try {
- org.hibernate.eclipse.console.actions.OpenMappingAction.run(selection, consoleConfiguration);
+ org.hibernate.eclipse.console.actions.OpenMappingAction.run(consoleConfig, selection);
} catch (PartInitException e) {
HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenMappingAction_open_mapping_file, e);
} catch (JavaModelException e) {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -6,7 +6,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
@@ -35,8 +34,7 @@
public void run() {
ObjectEditorInput objectEditorInput = (ObjectEditorInput)((VisualEditor)getWorkbenchPart()).getEditorInput();
- ConsoleConfiguration consoleConfiguration = objectEditorInput.getConfiguration();
- IJavaProject proj = objectEditorInput.getJavaProject();
+ ConsoleConfiguration consoleConfig = objectEditorInput.getConfiguration();
VisualEditor part = (VisualEditor)getWorkbenchPart();
Set selectedElements = part.getSelectedElements();
@@ -58,7 +56,7 @@
fullyQualifiedName = fullyQualifiedName.substring(0, fullyQualifiedName.indexOf("$"));
}*/
try {
- new org.hibernate.eclipse.console.actions.OpenSourceAction().run(selection, proj, fullyQualifiedName);
+ new org.hibernate.eclipse.console.actions.OpenSourceAction().run(consoleConfig, selection, fullyQualifiedName);
} catch (PartInitException e) {
HibernateConsolePlugin.getDefault().logErrorMessage(UIVEditorMessages.OpenSourceAction_canot_open_source_file, e);
} catch (JavaModelException e) {
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -85,7 +85,7 @@
IEditorPart editor = null;
Throwable ex = null;
try {
- editor = OpenMappingAction.run(compositeProperty, parentProperty, consCFG);
+ editor = OpenMappingAction.run(consCFG, compositeProperty, parentProperty);
boolean highlighted = ProjectUtil.checkHighlighting(editor);
if (!highlighted) {
String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_highlighted_region_for_property_is_empty_package,
@@ -118,7 +118,7 @@
IEditorPart editor = null;
Throwable ex = null;
try {
- editor = OpenMappingAction.run(selection, consCFG);
+ editor = OpenMappingAction.run(consCFG, selection);
boolean highlighted = ProjectUtil.checkHighlighting(editor);
if (!highlighted) {
String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_highlighted_region_for_is_empty_package,
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2009-05-27 10:23:40 UTC (rev 15552)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2009-05-27 10:53:38 UTC (rev 15553)
@@ -91,8 +91,7 @@
IEditorPart editor = null;
Throwable ex = null;
try {
- editor = OpenSourceAction.run(selection, MappingTestProject.getTestProject().getIJavaProject(),
- fullyQualifiedName);
+ editor = OpenSourceAction.run(consCFG, selection, fullyQualifiedName);
boolean highlighted = ProjectUtil.checkHighlighting(editor);
if (!highlighted) {
String out = NLS.bind(ConsoleTestMessages.OpenSourceFileTest_highlighted_region_for_is_empty, selection);
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15552 - in trunk/jst/plugins: org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2009-05-27 06:23:40 -0400 (Wed, 27 May 2009)
New Revision: 15552
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java
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.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4370
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-05-27 09:40:38 UTC (rev 15551)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/AbstractCSSDialog.java 2009-05-27 10:23:40 UTC (rev 15552)
@@ -186,7 +186,7 @@
} else {
setPreviewContent(text);
}
-
+
browser.setText(generateBrowserPage());
previewText.setVisible(false);
browser.setVisible(true);
@@ -209,11 +209,11 @@
}
protected void handleStatusChanged(IStatus newStatus) {
- if (newStatus.isOK() && !status.isOK())
+ if (newStatus.isOK() && !status.isOK()) {
setErrorMessage(null);
- else if (newStatus.getSeverity() == IStatus.ERROR)
+ } else if (newStatus.getSeverity() == IStatus.ERROR) {
setErrorMessage(newStatus.getMessage());
-
+ }
if (newStatus.getSeverity() != status.getSeverity()) {
getButton(OK).setEnabled(newStatus.isOK());
}
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 2009-05-27 09:40:38 UTC (rev 15551)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-05-27 10:23:40 UTC (rev 15552)
@@ -307,6 +307,7 @@
cssModel.setFile(file);
cssModel.reinit();
preview.reinit(cssModel);
+ getStyleComposite().clearStyleComposite();
updateControlPane();
}
@@ -360,4 +361,17 @@
applyButton.setEnabled(false);
}
+
+ protected Button getApplyButton() {
+ return applyButton;
+ }
+
+ protected Button getAddNewClassButton() {
+ return addNewClassButton;
+ }
+
+ protected Combo getClassCombo() {
+ return classCombo;
+ }
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2009-05-27 09:40:38 UTC (rev 15551)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2009-05-27 10:23:40 UTC (rev 15552)
@@ -189,6 +189,7 @@
selection) {
protected void handleStatusChanged(
IStatus newStatus) {
+
if (newStatus.isOK()
&& !getStatus().isOK()) {
NewCSSClassWizardPage.this
@@ -201,6 +202,26 @@
canFinish = false;
}
+ if (newStatus.getSeverity() != getStatus()
+ .getSeverity()) {
+ if (!getApplyButton().isDisposed()) {
+ getApplyButton().setEnabled(
+ newStatus.isOK());
+ }
+ if (!getClassCombo().isDisposed()) {
+ getClassCombo().setEnabled(
+ newStatus.isOK());
+ }
+ if (!getAddNewClassButton()
+ .isDisposed()) {
+ getAddNewClassButton()
+ .setEnabled(newStatus
+ .isOK());
+ }
+ }
+ if (getContainer() != null) {
+ getContainer().updateButtons();
+ }
setStatus(newStatus);
};
};
@@ -220,7 +241,6 @@
setControl(container);
}
-
}
}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15551 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/provider and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-05-27 05:40:38 -0400 (Wed, 27 May 2009)
New Revision: 15551
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/provider/BindToItemProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/provider/BindToItemProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java
Log:
JBIDE-4232
Modify some treeitem text
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-27 09:04:09 UTC (rev 15550)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-05-27 09:40:38 UTC (rev 15551)
@@ -96,7 +96,7 @@
_UI_SetOffType_type = Set Off
_UI_SetOnType_type = Set On
_UI_SmooksResourceListType_type = Resource List
-_UI_BindTo_id_feature = Id
+_UI_BindTo_id_feature = Bean Id
_UI_DocumentRoot_freemarker_feature = Freemarker
_UI_Freemarker_template_feature = Template
_UI_Freemarker_use_feature = Use
@@ -180,11 +180,11 @@
_UI_InlineDirective_replace_literal = replace
_UI_InlineDirective_insertbefore_literal = insertbefore
_UI_InlineDirective_insertafter_literal = insertafter
-_UI_BindingsType_type = Java Object
+_UI_BindingsType_type = Bean
_UI_DecodeParamType_type = Decode Param
-_UI_ExpressionType_type = Expression
+_UI_ExpressionType_type = Expression Binding
_UI_ValueType_type = Value Binding
-_UI_WiringType_type = Wiring
+_UI_WiringType_type = Bean Binding
_UI_BindingsType_group_feature = Group
_UI_BindingsType_value_feature = Value
_UI_BindingsType_wiring_feature = Wiring
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/provider/BindToItemProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/provider/BindToItemProvider.java 2009-05-27 09:04:09 UTC (rev 15550)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/provider/BindToItemProvider.java 2009-05-27 09:40:38 UTC (rev 15551)
@@ -111,7 +111,7 @@
String label = ((BindTo)object).getId();
return label == null || label.length() == 0 ?
getString("_UI_BindTo_type") :
- getString("_UI_BindTo_type") + " " + label;
+ getString("_UI_BindTo_type") + " (" + label+")";
}
/**
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/provider/BindToItemProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/provider/BindToItemProvider.java 2009-05-27 09:04:09 UTC (rev 15550)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/xsl/provider/BindToItemProvider.java 2009-05-27 09:40:38 UTC (rev 15551)
@@ -111,7 +111,7 @@
String label = ((BindTo)object).getId();
return label == null || label.length() == 0 ?
getString("_UI_BindTo_type") :
- getString("_UI_BindTo_type") + " " + label;
+ getString("_UI_BindTo_type") + " (" + label + ")";
}
/**
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-27 09:04:09 UTC (rev 15550)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/freemarker/BindToUICreator.java 2009-05-27 09:40:38 UTC (rev 15551)
@@ -42,4 +42,14 @@
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.PropertyUICreator#isBeanIDRefFieldFeature(org.eclipse.emf.ecore.EAttribute)
+ */
+ @Override
+ protected boolean isBeanIDRefFieldFeature(EAttribute attribute) {
+ if (attribute == FreemarkerPackage.eINSTANCE.getBindTo_Id()) {
+ return true;
+ }
+ return super.isBeanIDRefFieldFeature(attribute);
+ }
}
\ No newline at end of file
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-27 09:04:09 UTC (rev 15550)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xsl/BindToUICreator.java 2009-05-27 09:40:38 UTC (rev 15551)
@@ -41,4 +41,17 @@
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor);
}
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.PropertyUICreator#isBeanIDRefFieldFeature(org.eclipse.emf.ecore.EAttribute)
+ */
+ @Override
+ protected boolean isBeanIDRefFieldFeature(EAttribute attribute) {
+ if (attribute == XslPackage.eINSTANCE.getBindTo_Id()) {
+ return true;
+ }
+ return super.isBeanIDRefFieldFeature(attribute);
+ }
+
+
+
}
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15550 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/templates.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-05-27 05:04:09 -0400 (Wed, 27 May 2009)
New Revision: 15550
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/templates/insert.xhtml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4373, JUnits for openOn mechanism were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/templates/insert.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/templates/insert.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r15549 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-05-27 05:02:30 -0400 (Wed, 27 May 2009)
New Revision: 15549
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/a4j-include.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/c-import.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/import.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-directive-include-relative.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include-relative.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/s-decorate.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-decorate.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-define.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-include-relative.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4373, JUnits for openOn mechanism were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/a4j-include.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/a4j-include.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/c-import.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/c-import.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/import.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/import.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/import.html 2009-05-27 09:02:30 UTC (rev 15549)
@@ -0,0 +1,9 @@
+<html>
+<body>
+<ol>
+<li> first </li>
+<li> second </li>
+<li> third </li>
+</ol>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/import.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-directive-include-relative.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-directive-include-relative.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-directive-include-relative.jsp 2009-05-27 09:02:30 UTC (rev 15549)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+ <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" />
+ <![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
+ <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]>
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>jsp:directive.include test with relative path</title>
+ </head>
+ <body>
+ <h1>jsp:directive.include test with relative path</h1>
+ <jsp:directive.include file="./jsp-include.jsp"/>
+ </body>
+ </html>
+</jsp:root>
+
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-directive-include-relative.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include-relative.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include-relative.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include-relative.jsp 2009-05-27 09:02:30 UTC (rev 15549)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0">
+ <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8" />
+ <![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
+ <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">]]>
+ <html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>jsp:include test with relative path</title>
+ </head>
+ <body>
+ <h1>jsp:include test with relative path</h1>
+ <jsp:include page="./jsp-include.jsp"/>
+ </body>
+ </html>
+</jsp:root>
+
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include-relative.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include.jsp 2009-05-27 09:02:30 UTC (rev 15549)
@@ -0,0 +1,6 @@
+<div>
+jsp-include
+<jsp:expression>
+ new java.util.Date()
+</jsp:expression>
+</div>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/jsp-include.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/s-decorate.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/s-decorate.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-decorate.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-decorate.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-define.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-define.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-include-relative.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/customFaceletsTestProject/WebContent/pages/ui-include-relative.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2009-05-27 08:13:55 UTC (rev 15548)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4373Test.java 2009-05-27 09:02:30 UTC (rev 15549)
@@ -79,6 +79,8 @@
}
/**
+ * Test openOn mechanism for VpeDefineContainerTemplate
+ * in facelets' ui:composition template (VpeCompositionTemplate).
*
* @throws CoreException
*/
@@ -91,4 +93,129 @@
IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
assertEquals("facelets.taglib.xml file should be opened","common.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
}
+
+ /**
+ * Test openOn mechanism for VpeDefineContainerTemplate
+ * in facelets' ui:decorate template (VpeDecorateTemplate).
+ *
+ * @throws CoreException
+ */
+ public void testOpenOnForUiDecorate() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "ui-decorate.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 11, 33);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("/templates/insert.xhtml file should be opened","insert.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeDefineContainerTemplate
+ * in facelets' ui:define template (VpeDefineTemplate).
+ *
+ * @throws CoreException
+ */
+ public void testOpenOnForUiDefine() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "ui-define.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 6, 40);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("/templates/insert.xhtml file should be opened","insert.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeDefineContainerTemplate
+ * in JSTL's c:import template (JstlImportTemplate).
+ *
+ * @throws CoreException
+ */
+ public void _testOpenOnForCImport() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "c-import.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 12, 25);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("import.html file should be opened","import.html", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeDefineContainerTemplate
+ * in Seam's s:decorate template (SeamDecorateTemplate).
+ *
+ * @throws CoreException
+ */
+ public void testOpenOnForSDecorate() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "s-decorate.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 11, 33);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("/templates/insert.xhtml file should be opened","insert.xhtml", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeIncludeTemplate in ajax4jsf a4j:include.
+ *
+ * @throws CoreException
+ */
+ public void testOpenOnForA4JInclude() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "a4j-include.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 15, 55);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("/pages/import.html file should be opened","import.html", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeIncludeTemplate in facelets' ui:include.
+ *
+ * @throws CoreException
+ */
+ public void testOpenOnForUiInclude() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "ui-include-relative.xhtml"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 13, 27);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("/pages/import.html file should be opened","import.html", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeIncludeTemplate in jsp's jsp:directive.include.
+ *
+ * @throws CoreException
+ */
+ public void _testOpenOnForJspDirectiveInclude() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "jsp-directive-include-relative.jsp"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 13, 46);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("jsp-include.jsp file should be opened","jsp-include.jsp", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * Test openOn mechanism for VpeIncludeTemplate in jsp's jsp:include.
+ *
+ * @throws CoreException
+ */
+ public void _testOpenOnForJspInclude() throws CoreException {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_CUSTOM_FACELETS_PROJECT, "jsp-include-relative.jsp"); //$NON-NLS-1$
+ int position = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 13, 36);
+ Node sourceNode = SelectionUtil.getNodeBySourcePosition(vpeController.getSourceEditor(), position);
+ nsIDOMNode domNode = vpeController.getDomMapping().getNearVisualNode(sourceNode);
+ vpeController.getSourceBuilder().openOn(domNode);
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertEquals("jsp-include.jsp file should be opened","jsp-include.jsp", activeEditor.getEditorInput().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
}
14 years, 11 months
- 1
- 0