March 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r14331 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2009-03-25 15:25:01 -0400 (Wed, 25 Mar 2009) New Revision: 14331 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java Log: JBIDE-4084 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-03-25 16:55:32 UTC (rev 14330) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-03-25 19:25:01 UTC (rev 14331) @@ -375,6 +375,9 @@ }); if (dlg.open() == Window.OK) { + if (classNameStatus.matches(IStatus.ERROR)) + classNameStatus = new Status(IStatus.OK, notUsed, 0, + JstUIMessages.CSS_STYLE_CLASS_EDITOR_DESCRIPTION, null); addNewStyleClass(dlg.getValue().trim()); } }

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14330 - in trunk/documentation/guides/GettingStartedGuide: en/images/project_examples and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2009-03-25 12:55:32 -0400 (Wed, 25 Mar 2009) New Revision: 14330 Modified: trunk/documentation/guides/GettingStartedGuide/en/images/project_examples/pr_example_1.png trunk/documentation/guides/GettingStartedGuide/en/images/project_examples/pr_example_2.png trunk/documentation/guides/GettingStartedGuide/en/images/project_examples/pr_example_5.png trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml trunk/documentation/guides/GettingStartedGuide/pom.xml Log: https://jira.jboss.org/jira/browse/JBDS-678 screens area retaken Modified: trunk/documentation/guides/GettingStartedGuide/en/images/project_examples/pr_example_1.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en/images/project_examples/pr_example_2.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en/images/project_examples/pr_example_5.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml 2009-03-25 16:20:08 UTC (rev 14329) +++ trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml 2009-03-25 16:55:32 UTC (rev 14330) @@ -40,7 +40,7 @@ </figure> <itemizedlist> - <listitem><para>Now in the New Project Example dialog you can select a project you would like to explore</para> + <listitem><para>Now in the New Project Example dialog you can select a project you would like to explore and a site to download it from</para> <para>Project Examples Wizard provides a filter field to more easily locate the project examples you want, so you can type in the project you would like to explore in the field.</para></listitem> </itemizedlist> Modified: trunk/documentation/guides/GettingStartedGuide/pom.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/pom.xml 2009-03-25 16:20:08 UTC (rev 14329) +++ trunk/documentation/guides/GettingStartedGuide/pom.xml 2009-03-25 16:55:32 UTC (rev 14330) @@ -90,11 +90,11 @@ </cssResource> <formats> - <format> +  <format> <formatName>html</formatName> <stylesheetResource>${xsl-chunked}</stylesheetResource>

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14329 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2009-03-25 12:20:08 -0400 (Wed, 25 Mar 2009) New Revision: 14329 Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/ComponentsHyperlink.java Log: added error message when link was not opened Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/ComponentsHyperlink.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/ComponentsHyperlink.java 2009-03-25 14:45:11 UTC (rev 14328) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/ComponentsHyperlink.java 2009-03-25 16:20:08 UTC (rev 14329) @@ -20,6 +20,7 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; +import org.eclipse.ui.IEditorPart; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; @@ -71,8 +72,13 @@ private void doDroolsRuleHyperlink(IRegion region) { IFile file = findDroolsRuleFile(); + + IEditorPart part = null; if (file != null) - openFileInEditor(file); + part = openFileInEditor(file); + + if (part == null) + openFileFailed(); } private IFile findDroolsRuleFile(){ @@ -94,8 +100,12 @@ private void doBpmDefinitionHyperlink(IRegion region) { IFile file = findDefinitionFile(); + IEditorPart part = null; if (file != null) - openFileInEditor(file); + part = openFileInEditor(file); + + if (part == null) + openFileFailed(); } private IFile findDefinitionFile(){

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14328 - trunk/as/docs/reference/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-03-25 10:45:11 -0400 (Wed, 25 Mar 2009) New Revision: 14328 Modified: trunk/as/docs/reference/en/modules/perspective.xml Log: https://jira.jboss.org/jira/browse/JBDS-674 - updating the "Server Editor" section; Modified: trunk/as/docs/reference/en/modules/perspective.xml =================================================================== --- trunk/as/docs/reference/en/modules/perspective.xml 2009-03-25 14:44:17 UTC (rev 14327) +++ trunk/as/docs/reference/en/modules/perspective.xml 2009-03-25 14:45:11 UTC (rev 14328) @@ -249,8 +249,8 @@ <para>Publish</para> </entry> <entry> - <para>The action for synchronizing the publish information between the - server and workspace</para> + <para>The action for synchronizing the publish information between + the server and workspace</para> </entry> </row> @@ -704,9 +704,9 @@ <tip> <title>Tip:</title> <para>On the figure you can see that a username/password is available in the UI when - configuring the server. If you get a SecurityException when trying to launch - the server, it is most likely because your server is protected and hence you - need to fill the username/password fields with appropriate values.</para> + configuring the server. If you get a SecurityException when trying to launch the + server, it is most likely because your server is protected and hence you need to + fill the username/password fields with appropriate values.</para> </tip> <para>It should be pointed out that our server adapter by default tries to automatically @@ -754,7 +754,8 @@ modify the server's launch configuration. It's just after clicking <emphasis> <property>Open launch configuration</property> </emphasis> link. In the open window there are the tabs for setting command line - arguments and other things that are relevant to launching the server.</para> + arguments, classpaths and other things that are relevant to launching the + server.</para> <figure> <title>Launch Configuration Properties</title> @@ -772,18 +773,46 @@ <note> <title>Note:</title> - <para>The Launch Configurations for JBoss Servers are enough strict in enforcing the - configured values in the server in order to avoid inconsistencies between - server's and their configured runtime.</para> + <para>Please note, that the Launch Configurations for JBoss Servers are enough + strict in enforcing the configured values in the server in order to avoid + inconsistencies between server's and their configured runtime.</para> - <para>For example, if you change the launch configuration program arguments to <emphasis>"-c - myConfig"</emphasis> but do not change the targeted runtime configuration, then your program - arguments will be ignored. The server runtime "wins" so to speak. This ensures - consistency and if you change the location of the runtime, your launch - configurations will automatically pick that up.</para> - - <para>Values are not controlled by the server and its runtime setup will be passed on unaltered.</para> + <para>For example, if you change the launch configuration program arguments to + <emphasis>"-c myConfig"</emphasis> but do not change the + targeted runtime configuration, then your program arguments will be ignored. The + server runtime "wins" so to speak. This ensures consistency + and if you change the location of the runtime, your launch configurations will + automatically pick that up.</para> + + <para>Values are not controlled by the server and its runtime setup will be passed + on unaltered.</para> </note> + + <para>Until 3.0.0.GA release of <property>JBoss Tools</property>, the servers classpath was readonly, but that caused + problems for users wanting to add their own jars in the startup classpath. That is + relevant if you need to patch the server, add a custom charset or other tweaks that + require early access to the classpath.</para> + + <para>Now all servers have a custom 'server runtime classpath + container', which is there by default and point to the default jars in + JBoss. You can now adjust the classpath. Then just make sure this container is there + if you want the classpath to be picked up.</para> + + <figure> + <title>Server Classpaths</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/perspective/server_classpaths.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>If for some reason you have a launch configuration without this container, <emphasis> + <property>Restore + Default Entries</property></emphasis> should add it properly. Also, <emphasis> + <property>Restore + Default Entries</property></emphasis> will also remove any + extra entries you added yourself.</para> </section> <section> @@ -997,8 +1026,8 @@ pattern. As you type in either of these fields, the preview viewer should update itself with which files are matched.</para> - <para>You can create a Fileset with flattening or without it. Look at the - difference on the figure below.</para> + <para>You can create a Fileset with flattening or without it. Look at the difference + on the figure below.</para> <figure> <title>The FileSet with flattening and without it</title>

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14327 - trunk/as/docs/reference/en/images/perspective.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-03-25 10:44:17 -0400 (Wed, 25 Mar 2009) New Revision: 14327 Added: trunk/as/docs/reference/en/images/perspective/server_classpaths.png Log: https://jira.jboss.org/jira/browse/JBDS-674 - adding a new image; Added: trunk/as/docs/reference/en/images/perspective/server_classpaths.png =================================================================== (Binary files differ) Property changes on: trunk/as/docs/reference/en/images/perspective/server_classpaths.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14326 - in trunk/jsf/plugins: org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-03-25 09:45:30 -0400 (Wed, 25 Mar 2009) New Revision: 14326 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlUrlTemplate.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/util/Jstl.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/templates/vpe-templates-jstl.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3548, jstl core temlates were added. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2009-03-25 13:34:50 UTC (rev 14325) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/META-INF/MANIFEST.MF 2009-03-25 13:45:30 UTC (rev 14326) @@ -14,6 +14,7 @@ org.eclipse.core.resources, org.jboss.tools.jst.jsp, org.mozilla.xpcom -Export-Package: org.jboss.tools.jsf.vpe.facelets +Export-Package: org.jboss.tools.jsf.vpe.facelets, + org.jboss.tools.jsf.vpe.facelets.template Bundle-Version: 2.1.0 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2009-03-25 13:34:50 UTC (rev 14325) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/src/org/jboss/tools/jsf/vpe/facelets/template/VpeDefineContainerTemplate.java 2009-03-25 13:45:30 UTC (rev 14326) @@ -55,40 +55,54 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { String fileName = ((Element)sourceNode).getAttribute(Facelets.ATTR_TEMPLATE); - if (fileName != null && fileName.trim().length() > 0) { - IFile file = VpeCreatorUtil.getFile(fileName, pageContext); - if (file != null) { - if (!pageContext.getVisualBuilder().isFileInIncludeStack(file)) { - registerDefine(pageContext, sourceNode); - Document document = pageContext.getVisualBuilder().getIncludeDocuments().get(file); - if (document == null) { - document = VpeCreatorUtil.getDocumentForRead(file); - if (document != null) - pageContext.getVisualBuilder().getIncludeDocuments().put(file, document); - } - //Document document = VpeCreatorUtil.getDocumentForRead(file, pageContext); - if (document != null) { - VpeCreationData creationData = createInclude(document, - visualDocument); - creationData.setData(new TemplateFileInfo(file)); - pageContext.getVisualBuilder().pushIncludeStack( - new VpeIncludeInfo((Element) sourceNode, file, - document)); - //we should add only real nodem, sourceNode can be a proxy - //so - if(sourceNode.getFirstChild()!=null) { - defineContainer.add(sourceNode.getFirstChild().getParentNode()); - } - return creationData; - } - } - } + VpeCreationData creationData = createTemplate(fileName, pageContext, sourceNode, visualDocument); + if (null != creationData) { + return creationData; } - VpeCreationData creationData = createStub(fileName, (Element)sourceNode, visualDocument); + creationData = createStub(fileName, (Element)sourceNode, visualDocument); creationData.setData(null); return creationData; } + public VpeCreationData createTemplate(String fileName, VpePageContext pageContext, + Node sourceNode, nsIDOMDocument visualDocument) { + if (fileName != null && fileName.trim().length() > 0) { + IFile file = VpeCreatorUtil.getFile(fileName, pageContext); + if (file != null) { + if (!pageContext.getVisualBuilder().isFileInIncludeStack(file)) { + registerDefine(pageContext, sourceNode); + Document document = pageContext.getVisualBuilder() + .getIncludeDocuments().get(file); + if (document == null) { + document = VpeCreatorUtil.getDocumentForRead(file); + if (document != null) + pageContext.getVisualBuilder() + .getIncludeDocuments().put(file, document); + } + // Document document = + // VpeCreatorUtil.getDocumentForRead(file, pageContext); + if (document != null) { + VpeCreationData creationData = createInclude(document, + visualDocument); + creationData.setData(new TemplateFileInfo(file)); + pageContext.getVisualBuilder().pushIncludeStack( + new VpeIncludeInfo((Element) sourceNode, file, + document)); + // we should add only real nodem, sourceNode can be a + // proxy + // so + if (sourceNode.getFirstChild() != null) { + defineContainer.add(sourceNode.getFirstChild() + .getParentNode()); + } + return creationData; + } + } + } + } + return null; + } + private String replacePattern(String origStr, String target, String replacement) { StringBuilder sb = new StringBuilder(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2009-03-25 13:34:50 UTC (rev 14325) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/META-INF/MANIFEST.MF 2009-03-25 13:45:30 UTC (rev 14326) @@ -15,7 +15,8 @@ org.eclipse.jst.jsp.core, org.eclipse.wst.html.core, org.jboss.tools.vpe.html, - org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0" + org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0", + org.jboss.tools.jsf.vpe.facelets;bundle-version="2.1.0" Eclipse-LazyStart: true Export-Package: org.jboss.tools.jsf.vpe.jstl.template Bundle-Localization: plugin Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java 2009-03-25 13:45:30 UTC (rev 14326) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jstl.template; + +import org.jboss.tools.jsf.vpe.facelets.template.VpeDecorateTemplate; +import org.jboss.tools.jsf.vpe.jstl.template.util.Jstl; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.mozilla.interfaces.nsIDOMDocument; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class JstlImportTemplate extends VpeDecorateTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + String fileName = ((Element)sourceNode).getAttribute(Jstl.ATTR_URL); + VpeCreationData creationData = createTemplate(fileName, pageContext, sourceNode, visualDocument); + if (null != creationData) { + return creationData; + } + creationData = createStub(fileName, (Element)sourceNode, visualDocument); + creationData.setData(null); + return creationData; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlImportTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlUrlTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlUrlTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlUrlTemplate.java 2009-03-25 13:45:30 UTC (rev 14326) @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.jstl.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMText; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * Class for c:url template + * + * @author dmaliarevich + * + */ +public class JstlUrlTemplate extends VpeAbstractTemplate { + + public JstlUrlTemplate() { + super(); + } + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element sourceElement = (Element) sourceNode; + String value = sourceElement.getAttribute(HTML.ATTR_VALUE); + nsIDOMElement span = VisualDomUtil.createBorderlessContainer(visualDocument); + nsIDOMText urlText = visualDocument.createTextNode(value); + span.appendChild(urlText); + VpeCreationData creationData = new VpeCreationData(span); + + return creationData; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/JstlUrlTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/util/Jstl.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/util/Jstl.java 2009-03-25 13:34:50 UTC (rev 14325) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/src/org/jboss/tools/jsf/vpe/jstl/template/util/Jstl.java 2009-03-25 13:45:30 UTC (rev 14326) @@ -29,4 +29,6 @@ public static final String ATTR_ADD_CONTROL_LABEL = "addControlLabel"; //$NON-NLS-1$ public static final String TAG_OUT = "out"; //$NON-NLS-1$ + + public static final String ATTR_URL = "url"; //$NON-NLS-1$ } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/templates/vpe-templates-jstl.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/templates/vpe-templates-jstl.xml 2009-03-25 13:34:50 UTC (rev 14325) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/templates/vpe-templates-jstl.xml 2009-03-25 13:45:30 UTC (rev 14326) @@ -2,8 +2,79 @@ <vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <vpe:template-taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" /> <vpe:template-taglib uri="http://java.sun.com/jstl/core" prefix="c" /> + <vpe:tag name="c:catch" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:choose" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:when" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:otherwise" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:if" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:import" case-sensitive="yes"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.jstl.template.JstlImportTemplate"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:forEach" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:forTokens" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="c:param" case-sensitive="yes"> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + <vpe:tag name="c:redirect" case-sensitive="yes"> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + <vpe:tag name="c:remove" case-sensitive="yes"> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + <vpe:tag name="c:set" case-sensitive="yes"> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + <vpe:tag name="c:url" case-sensitive="yes"> + <vpe:template children="yes" modify="yes" + class="org.jboss.tools.jsf.vpe.jstl.template.JstlUrlTemplate"> + </vpe:template> + </vpe:tag> + <vpe:tag name="c:out" case-sensitive="yes"> <vpe:template children="no" modify="no" class="org.jboss.tools.jsf.vpe.jstl.template.JstlOutTemplate"> @@ -11,9 +82,10 @@ </vpe:textFormatting> </vpe:template> </vpe:tag> - -  + +  </vpe:templates> \ No newline at end of file

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14325 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2009-03-25 09:34:50 -0400 (Wed, 25 Mar 2009) New Revision: 14325 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4019 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2009-03-25 12:18:47 UTC (rev 14324) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2009-03-25 13:34:50 UTC (rev 14325) @@ -36,6 +36,7 @@ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <axis path="*/[http://java.sun.com/jsf/facelets]:composition/template/" /> <axis path="*/[http://java.sun.com/jsf/facelets]:decorate/template/" /> + <axis path="*/[http://jboss.com/products/seam/taglib]:decorate/template/" /> <axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" /> </partitionType> </contentType> @@ -43,6 +44,7 @@ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <axis path="*/[http://java.sun.com/jsf/facelets]:composition/template/" /> <axis path="*/[http://java.sun.com/jsf/facelets]:decorate/template/" /> + <axis path="*/[http://jboss.com/products/seam/taglib]:decorate/template/" /> <axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" /> </partitionType> </contentType>

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14324 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2009-03-25 08:18:47 -0400 (Wed, 25 Mar 2009) New Revision: 14324 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java Log: minor bug fixed Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2009-03-25 12:06:39 UTC (rev 14323) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2009-03-25 12:18:47 UTC (rev 14324) @@ -130,7 +130,8 @@ if (resourceString.contains(dollarEl)) { result = result.replace(dollarEl, rf.getProperties()); - } else if (resourceString.contains(sharpEl)) { + } + if (resourceString.contains(sharpEl)) { result = result.replace(sharpEl, rf.getProperties()); } }

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14323 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2009-03-25 08:06:39 -0400 (Wed, 25 Mar 2009) New Revision: 14323 Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReference.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java Log: RESOLVED - issue JBIDE-3576: EL expression overriding https://jira.jboss.org/jira/browse/JBIDE-3576 - precedence of scopes is now taken into account Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReference.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReference.java 2009-03-25 11:32:12 UTC (rev 14322) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReference.java 2009-03-25 12:06:39 UTC (rev 14323) @@ -7,24 +7,26 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.common.resref.core; public class ResourceReference { + // Do not alter the values of the scopes! + // FILE_SCOPE should have the lowest value and GLOBAL_SCOPE should have the highest value public final static int FILE_SCOPE = 0; public final static int FOLDER_SCOPE = 1; public final static int PROJECT_SCOPE = 2; public final static int GLOBAL_SCOPE = 3; - + public final static String[] SCOPE_NAMES = new String[]{"Page", "Folder", "Project","Global"}; protected String location; protected int scope; protected int depth = 0; protected String properties = ""; - + protected boolean isGlobal = false; - + public boolean isGlobal() { return isGlobal; } @@ -42,43 +44,43 @@ this.location = location.substring(0, q); } } - + public String getLocation() { return location; } - + public int getScope() { return scope; } - + public void setLocation(String location) { this.location = location; } - + public void setProperties(String properties) { this.properties = properties; } - + public String getProperties() { return properties; } - + public void setScope(int scope) { this.scope = scope; } - + public String getScopeName() { return SCOPE_NAMES[scope]; } - + public void setDepth(int depth) { this.depth = depth; } - + public int getDepth() { return depth; } - + public String getLocationAndProperties() { String v = location; if(properties.length() > 0) { @@ -86,8 +88,7 @@ } return v; } - - + // public static ResourceReference createResourceReference(String location, int scope) { // ResourceReference rst = null; // Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2009-03-25 11:32:12 UTC (rev 14322) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2009-03-25 12:06:39 UTC (rev 14323) @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the @@ -12,6 +12,9 @@ package org.jboss.tools.vpe.editor.util; +import java.util.Arrays; +import java.util.Comparator; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; @@ -28,7 +31,7 @@ /** * The {@link IELService} implementation. - * + * * @author Eugeny Stherbin */ public final class ElService implements IELService { @@ -44,9 +47,9 @@ /** * Checks if is available. - * + * * @param resourceFile the resource file - * + * * @return true, if is available */ public boolean isAvailable(IFile resourceFile) { @@ -58,11 +61,11 @@ } return rst; } - + /** * Gets the singleton instance. - * + * * @return the singleton instance */ public static synchronized IELService getInstance() { @@ -79,12 +82,12 @@ /** * Replace el. - * + * * @param resourceFile the resource file * @param resourceString the resource string - * + * * @return the string - * + * * @see IELService#replaceEl(IFile, String) */ public String replaceEl(IFile resourceFile, String resourceString) { @@ -95,8 +98,8 @@ Assert.isNotNull(resourceFile); String rst = resourceString; final ResourceReference[] references = getAllResources(resourceFile); - - + + if ((references != null) && (references.length > 0)) { rst = replace(resourceString, references); } @@ -105,37 +108,65 @@ + /** - * Replace. - * + * Replace. + * * @param resourceString the resource string * @param references the references - * - * @return the string - */ - private String replace(String resourceString, ResourceReference[] references) { - String result = resourceString; + * + * @return the string + */ + private String replace(String resourceString, ResourceReference[] references) { + String result = resourceString; - for (ResourceReference rf : references) { - final String dollarEl = String.valueOf(DOLLAR_PREFIX)+rf.getLocation()+String.valueOf(SUFFIX); - final String sharpEl = String.valueOf(SHARP_PREFIX)+rf.getLocation()+String.valueOf(SUFFIX); - - if (resourceString.contains(dollarEl)) { - result = result.replace(dollarEl, rf.getProperties()); - }else if(resourceString.contains(sharpEl)){ - result = result.replace(sharpEl, rf.getProperties()); - } - } - return result; - } + // yradtsevich: JBIDE-3576: EL expression overriding. + // Values with higher precedence are replaced in the first place. + ResourceReference[] sortedReferences = sortReferencesByScope(references); + for (ResourceReference rf : sortedReferences) { + final String dollarEl = DOLLAR_PREFIX + rf.getLocation() + SUFFIX; + final String sharpEl = SHARP_PREFIX + rf.getLocation() + SUFFIX; + if (resourceString.contains(dollarEl)) { + result = result.replace(dollarEl, rf.getProperties()); + } else if (resourceString.contains(sharpEl)) { + result = result.replace(sharpEl, rf.getProperties()); + } + } + + return result; + } + + /** + * Creates a copy of {@code references} array and sorts its elements by + * scope value. + * + * References with the lowest scope value ({@link ResourceReference#FILE_SCOPE}) + * become the first in the array and so on. + * + * @param references array to be sorted + * @return sorted copy of {@code references} + * @author yradtsevich + */ + private ResourceReference[] sortReferencesByScope(ResourceReference[] references) { + ResourceReference[] sortedReferences = references.clone(); + + Arrays.sort(sortedReferences, new Comparator<ResourceReference>() { + public int compare(ResourceReference r1, ResourceReference r2) { + return r1.getScope() - r2.getScope(); + } + }); + + return sortedReferences; + } + /** * Checks if is cloneable node. - * + * * @param sourceNode the source node * @param pageContext the page context - * + * * @return true, if is cloneable node */ public boolean isELNode(VpePageContext pageContext,Node sourceNode) { @@ -145,7 +176,7 @@ return rst; } final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile(); - + if (((this.isAvailable(file) && this.isAvailableForNode(sourceNode, file))) || isInResourcesBundle(pageContext, sourceNode)){ rst = true; } @@ -153,7 +184,7 @@ } /** - * + * * @param pageContext * @param sourceNode * @return @@ -171,11 +202,11 @@ */ private boolean findInResourcesBundle(VpePageContext pageContext, Node sourceNode) { boolean rst = false; - + BundleMap bundleMap = pageContext.getBundle(); if (bundleMap != null) { String textValue = null; - + if (sourceNode.getNodeType() == Node.TEXT_NODE) { textValue = sourceNode.getNodeValue(); @@ -215,10 +246,10 @@ /** * Checks if is available for node. - * + * * @param resourceFile the resource file * @param sourceNode the source node - * + * * @return true, if is available for node */ private boolean isAvailableForNode(Node sourceNode, IFile resourceFile) { @@ -236,7 +267,7 @@ boolean rst = false; final ResourceReference[] references = getAllResources(resourceFile); String textValue = null; - + if (sourceNode.getNodeType() == Node.TEXT_NODE) { textValue = sourceNode.getNodeValue(); if (textValue != null) { @@ -250,7 +281,7 @@ for (int i = 0; i < nodeMap.getLength(); i++) { if (isInReferenceResourcesList(references, ((Attr) nodeMap.item(i)).getValue())) { return true; - + } } } @@ -260,10 +291,10 @@ /** * Checks if is in reference resources list. - * + * * @param value the value * @param references the references - * + * * @return true, if is in reference resources list */ private boolean isInReferenceResourcesList(ResourceReference[] references, String value) { @@ -272,39 +303,13 @@ for (ResourceReference ref : references) { //FIXED FOR JBIDE-3149 by sdzmitrovich - if (equalsExppression(value, ref.getLocation())) + if (equalsExppression(value, ref.getLocation())) { return true; + } } return rst; } - - /** - * Reverse replace. - * - * @param resourceFile the resource file - * @param replacedString the replaced string - * - * @return the string - */ - public String reverseReplace(IFile resourceFile, String replacedString) { - String str = replacedString; - final ResourceReference[] references = getAllResources(resourceFile); - //ELReferenceList.getInstance().getAllResources(resourceFile); - - if ((str != null) && (references != null) && (references.length > 0)) { - for (ResourceReference rf : references) { - if (replacedString.contains(rf.getProperties())) { - str = str.replace(rf.getProperties(), rf.getLocation()); - } - } - } - - return str; - } - - - protected ResourceReference[] getAllResources(IFile resourceFile) { ResourceReference[] rst = null; final IPath workspacePath = Platform.getLocation(); @@ -322,14 +327,14 @@ if ((elResources != null) && (elResources.length > 0)) { System.arraycopy(elResources, 0, rst, gResources==null?0:gResources.length, elResources.length); } - + return rst; } - + public String replaceElAndResources(VpePageContext pageContext, Node attributeNode) { - - + + String attribuString = null; if (attributeNode instanceof Attr) { attribuString = ((Attr) attributeNode).getValue(); @@ -337,7 +342,7 @@ attribuString = attributeNode.getNodeValue(); } String rst = attribuString; - + rst = ResourceUtil.getBundleValue(pageContext, attributeNode); //fix for JBIDE-3030 if(pageContext.getVisualBuilder().getCurrentIncludeInfo()==null) { @@ -349,8 +354,8 @@ return rst; } - - + + private boolean equalsExppression(String value, String expression) { final String dollarEl = String.valueOf(DOLLAR_PREFIX) + expression Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java 2009-03-25 11:32:12 UTC (rev 14322) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java 2009-03-25 12:06:39 UTC (rev 14323) @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the @@ -21,48 +21,38 @@ * The service that substitute El values in vpe source editor. For more details * see issues http://jira.jboss.com/jira/browse/JBIDE-2010 and * http://jira.jboss.com/jira/browse/JBIDE-1410 - * + * * @author Eugeny Stherbin */ public interface IELService { /** * Return the {@link String} with substitued el values for given resource. - * + * * @param resourceFile the resource file where resource * @param resourceString the source string that will be substitute - * + * * @return string where el values was substituted. */ String replaceEl(IFile resourceFile, String resourceString); /** * Replace el and resources. - * + * * @param attributeNode the attribute node * @param resourceFile the resource file * @param resourceString the resource string * @param pageContext the page context - * + * * @return the string */ String replaceElAndResources(VpePageContext pageContext, Node attributeNode); - /** - * Reverse replace. - * - * @param resourceFile the resource file - * @param replacedString the replaced string - * - * @return the string - */ - String reverseReplace(IFile resourceFile, String replacedString); - - /** + /** * Checks if is available. - * + * * @param resourceFile the resource file - * + * * @return true, if is available */ boolean isAvailable(IFile resourceFile); @@ -70,21 +60,21 @@ /** * Checks if is node contains el expressions which should be replaced * from el or from resource bundles. - * + * * @param sourceNode the source node * @param pageContext the page context - * + * * @return true, if is cloneable node */ public boolean isELNode(VpePageContext pageContext, Node sourceNode); - - + + /** * Checks if is in resources bundle. - * + * * @param sourceNode the source node * @param pageContext the page context - * + * * @return true, if is in resources bundle */ boolean isInResourcesBundle(VpePageContext pageContext, Node sourceNode);

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r14322 - trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-03-25 07:32:12 -0400 (Wed, 25 Mar 2009) New Revision: 14322 Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_2.png trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_9.png Log: https://jira.jboss.org/jira/browse/JBDS-645 - updating the screens; Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_2.png =================================================================== (Binary files differ) Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png =================================================================== (Binary files differ) Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png =================================================================== (Binary files differ) Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_9.png =================================================================== (Binary files differ)

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits March 2009