JBoss Tools SVN: r9428 - in trunk: documentation/guides/Exadel-migration/en and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-07-30 08:22:14 -0400 (Wed, 30 Jul 2008)
New Revision: 9428
Modified:
trunk/as/docs/reference/en/modules/modules.xml
trunk/as/docs/reference/en/modules/perspective.xml
trunk/documentation/guides/Exadel-migration/en/master.xml
trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
trunk/jsf/docs/userguide/en/modules/editors.xml
trunk/jsf/docs/userguide/en/modules/palette.xml
trunk/seam/docs/reference/en/modules/seam_wizards.xml
Log:
https://jira.jboss.org/jira/browse/RF-3937
syntax in xml files is corrected according to scheme
Modified: trunk/as/docs/reference/en/modules/modules.xml
===================================================================
--- trunk/as/docs/reference/en/modules/modules.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/as/docs/reference/en/modules/modules.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -179,10 +179,11 @@
enabling project-specific preferences and ensuring the builder is on.</para>
</section>
- <para>The last chapter covers a variety of methods on how you can deploy needed modules onto a
+ <para>The last chapter covers a variety of methods on how you can deploy needed modules onto a
server.</para>
<para>In summary, this reference supplies you with all necessary information on the
functionality that <property>JBoss Server Manager</property> provides for work with <ulink
url="http://www.jboss.org/jbossas">JBoss AS</ulink>.</para>
+
</chapter>
Modified: trunk/as/docs/reference/en/modules/perspective.xml
===================================================================
--- trunk/as/docs/reference/en/modules/perspective.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/as/docs/reference/en/modules/perspective.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -780,11 +780,12 @@
<title>Relevant Resources Links</title>
<para>Refer to <ulink url="http://ant.apache.org/manual/index.html">Ant manual</ulink>
to find more on how to build your applications with help of Ant.</para>
+
+ <para>At this point, you are guessed to be familiar with <property>JBoss AS
+ Perspective</property> and your next step now is to explore how to work with different kinds
+ of projects.</para>
</section>
-
- <para>At this point, you are guessed to be familiar with <property>JBoss AS
- Perspective</property> and your next step now is to explore how to work with different kinds
- of projects.</para>
+
</section>
Modified: trunk/documentation/guides/Exadel-migration/en/master.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/en/master.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/documentation/guides/Exadel-migration/en/master.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -35,9 +35,7 @@
<releaseinfo>
Version: 1.1.0.GA
</releaseinfo>
- </bookinfo>
-
-
+ </bookinfo>
<toc/>
&introduction;
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/manage.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="manage" xreflabel="manage">
- <?dbhtml filename="manage.html"?>
+ <?dbhtml filename="manage.html"?>
<chapterinfo>
<keywordset>
<keyword>JBoss Developer Studio</keyword>
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -436,6 +436,7 @@
</imageobject>
</mediaobject>
</figure>
+ </para>
<para>Parameters of the Mappings tab in the <property>Hibernate Console Configuration
wizard</property> are explained below:</para>
@@ -485,7 +486,6 @@
</tbody>
</tgroup>
</table>
- </para>
<para>Clicking <emphasis>
<property>Finish</property>
@@ -505,7 +505,6 @@
</mediaobject>
</figure>
-
</section>
<section>
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -423,10 +423,10 @@
</section>
<section id="StrutsProjectFile46s3">
-
+ <title>Struts Project Files</title>
<para>Content Assist features are available when you work with Struts projects.</para>
- <title>Struts Project Files</title>
+
<section id="ContentAssistForStrutsConfigurationFile75">
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -107,6 +107,7 @@
</imageobject>
</mediaobject>
</figure>
+ </para>
<para>The window has two parts. There is a reflected grouped list of components
on the left side of the palette editor. Each group is divided into multiple
groups, every of which is a tag library. The right side of the palette
@@ -322,7 +323,6 @@
</listitem>
</itemizedlist>
- </para>
</section>
<section id="show_hide">
<?dbhtml filename="Show/Hide.html"?>
Modified: trunk/seam/docs/reference/en/modules/seam_wizards.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/seam_wizards.xml 2008-07-30 11:46:50 UTC (rev 9427)
+++ trunk/seam/docs/reference/en/modules/seam_wizards.xml 2008-07-30 12:22:14 UTC (rev 9428)
@@ -251,6 +251,5 @@
</imageobject>
</mediaobject>
</figure>
-
-
+
</chapter>
16 years, 5 months
JBoss Tools SVN: r9427 - queries and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2008-07-30 07:46:50 -0400 (Wed, 30 Jul 2008)
New Revision: 9427
Added:
trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.wnk
Modified:
trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.htm
trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.swf
Log:
https://jira.jboss.org/jira/browse/JBDS-352
More time is added some frames so that every hint is readable.
Modified: trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.htm
===================================================================
--- trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.htm 2008-07-30 11:18:31 UTC (rev 9426)
+++ trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.htm 2008-07-30 11:46:50 UTC (rev 9427)
@@ -1,17 +1,8 @@
<!-- saved from url=(0014)about:internet -->
<HTML>
-<head>
-<link rel="stylesheet" href="../resources/tools.css" type="text/css"/>
-<link xmlns="" rel="shortcut icon" type="image/vnd.microsoft.icon" href="../resources/images/favicon.ico"/>
-</head>
<BODY>
-<div class="book">
-<p id="title"><a href="http://www.jboss.org" class="site_href">
-<strong>JBoss.org</strong></a><a href="http://docs.jboss.org/" class="doc_href">
-<strong >Community Demos</strong></a></p>
-
-<center><OBJECT CLASSID="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" WIDTH="898" HEIGHT="618" CODEBASE="http://active.macromedia.com/flash5/cabs/swflash.cab#version=7,0,0,0">
-<PARAM NAME=movie VALUE="cust_tag_lib_to_palette.swf">
+<center><OBJECT CLASSID="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" WIDTH="752" HEIGHT="628" CODEBASE="http://active.macromedia.com/flash5/cabs/swflash.cab#version=7,0,0,0">
+<PARAM NAME=movie VALUE="HQL_JPA-QL_queries.swf">
<PARAM NAME=play VALUE=true>
<PARAM NAME=loop VALUE=false>
<PARAM NAME=wmode VALUE=transparent>
Modified: trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.swf
===================================================================
(Binary files differ)
Added: trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.wnk
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/movies/HQL_JPA-QL queries/HQL_JPA-QL_queries.wnk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 5 months
JBoss Tools SVN: r9426 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-30 07:18:31 -0400 (Wed, 30 Jul 2008)
New Revision: 9426
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
Log:
Comment debug
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-07-30 10:43:53 UTC (rev 9425)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesComboBoxTemplate.java 2008-07-30 11:18:31 UTC (rev 9426)
@@ -259,8 +259,8 @@
thirdDiv.appendChild(forthEmptyDiv);
final VpeCreationData creationData = new VpeCreationData(secondDiv);
- final DOMTreeDumper dumper = new DOMTreeDumper();
- dumper.dumpToStream(System.err, secondDiv);
+// final DOMTreeDumper dumper = new DOMTreeDumper();
+// dumper.dumpToStream(System.err, secondDiv);
return creationData;
}
16 years, 5 months
JBoss Tools SVN: r9425 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-30 06:43:53 -0400 (Wed, 30 Jul 2008)
New Revision: 9425
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
Log:
Move getBundleValue methods to the ResourceUtil class for (https://jira.jboss.org/jira/browse/JBIDE-2582) issue.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-07-30 10:43:43 UTC (rev 9424)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-07-30 10:43:53 UTC (rev 9425)
@@ -23,18 +23,13 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.wst.xml.core.internal.document.NodeListImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
-import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.css.ELReferenceList;
import org.jboss.tools.vpe.editor.util.ElService;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
import org.mozilla.xpcom.XPCOMException;
-import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -608,36 +603,8 @@
}
}
+
/**
- * Gets the bundle value.
- *
- * @param value the value
- * @param offfset *
- * param pageContext the page context
- * @param pageContext the page context
- * @param offset the offset
- *
- * @return the bundle value
- */
- public static String getBundleValue(VpePageContext pageContext, String value, int offset) {
- BundleMap bundle = pageContext.getBundle();
- return bundle.getBundleValue(value, offset);
-
- }
-
- /**
- * get bundle.
- *
- * @param pageContext the page context
- * @param attr the attr
- *
- * @return the bundle value
- */
- public static String getBundleValue(VpePageContext pageContext, Attr attr) {
- return getBundleValue(pageContext, attr.getNodeValue(), ((IDOMAttr) attr).getValueRegionStartOffset());
- }
-
- /**
* Parses the width height value.
*
* @param value the value
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 2008-07-30 10:43:43 UTC (rev 9424)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelItemTemplate.java 2008-07-30 10:43:53 UTC (rev 9425)
@@ -18,6 +18,7 @@
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.ResourceUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMText;
@@ -215,7 +216,7 @@
}
if (attr != null) {
String itemLabel = attr.getNodeValue();
- String bundleValue = ComponentUtil.getBundleValue(pageContext,
+ String bundleValue = ResourceUtil.getBundleValue(pageContext,
attr);
nsIDOMText text;
// if bundleValue differ from value then will be represent
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-07-30 10:43:43 UTC (rev 9424)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-07-30 10:43:53 UTC (rev 9425)
@@ -26,6 +26,7 @@
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.template.VpeToggableTemplate;
+import org.jboss.tools.vpe.editor.util.ResourceUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -291,7 +292,7 @@
}
if (null != labelAttr) {
labelValue = labelAttr.getNodeValue();
- bundleValue = ComponentUtil.getBundleValue(pageContext,
+ bundleValue = ResourceUtil.getBundleValue(pageContext,
labelAttr);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2008-07-30 10:43:43 UTC (rev 9424)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2008-07-30 10:43:53 UTC (rev 9425)
@@ -20,6 +20,7 @@
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.ResourceUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -212,7 +213,7 @@
}
if (null != labelAttr) {
labelValue = labelAttr.getNodeValue();
- bundleValue = ComponentUtil.getBundleValue(pageContext,
+ bundleValue = ResourceUtil.getBundleValue(pageContext,
labelAttr);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-07-30 10:43:43 UTC (rev 9424)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTabTemplate.java 2008-07-30 10:43:53 UTC (rev 9425)
@@ -18,6 +18,7 @@
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.ResourceUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMText;
@@ -269,7 +270,7 @@
} else if (sourceElement.hasAttribute(LABEL)) {
Attr labelAttr = sourceElement.getAttributeNode(LABEL);
if (null != labelAttr) {
- String bundleValue = ComponentUtil.getBundleValue(pageContext, labelAttr);
+ String bundleValue = ResourceUtil.getBundleValue(pageContext, labelAttr);
mainTd.appendChild(visualDocument.createTextNode(bundleValue));
}
} else {
16 years, 5 months
JBoss Tools SVN: r9424 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-30 06:43:43 -0400 (Wed, 30 Jul 2008)
New Revision: 9424
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ResourceUtil.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
Log:
Move getBundleValue methods to the ResourceUtil class for (https://jira.jboss.org/jira/browse/JBIDE-2582) issue.
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 2008-07-30 10:08:43 UTC (rev 9423)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-07-30 10:43:43 UTC (rev 9424)
@@ -14,7 +14,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.css.ELReferenceList;
@@ -270,12 +269,9 @@
public String replaceElAndResources(VpePageContext pageContext, Attr attributeNode) {
final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
final String attribuString = attributeNode.getValue();
- final BundleMap bundle = pageContext.getBundle();
String rst = attribuString;
-
- int offset = ((IDOMAttr) attributeNode).getValueRegionStartOffset();
- rst = bundle.getBundleValue(attribuString, offset);
-
+
+ rst = ResourceUtil.getBundleValue(pageContext, attributeNode);
rst = replaceEl(file, rst);
return rst;
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ResourceUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ResourceUtil.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ResourceUtil.java 2008-07-30 10:43:43 UTC (rev 9424)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * 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
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.vpe.editor.util;
+
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.jboss.tools.vpe.editor.bundle.BundleMap;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.w3c.dom.Attr;
+
+/**
+ * @author Evgenij Stherbin
+ *
+ */
+@SuppressWarnings("restriction")
+public class ResourceUtil {
+ /**
+ * Gets the bundle value.
+ *
+ * @param value the value
+ * @param offfset *
+ * param pageContext the page context
+ * @param pageContext the page context
+ * @param offset the offset
+ *
+ * @return the bundle value
+ */
+ public static String getBundleValue(VpePageContext pageContext, String value, int offset) {
+ BundleMap bundle = pageContext.getBundle();
+ return bundle.getBundleValue(value, offset);
+
+ }
+
+ /**
+ * get bundle.
+ *
+ * @param pageContext the page context
+ * @param attr the attr
+ *
+ * @return the bundle value
+ */
+ public static String getBundleValue(VpePageContext pageContext, Attr attr) {
+ return getBundleValue(pageContext, attr.getNodeValue(), ((IDOMAttr) attr).getValueRegionStartOffset());
+ }
+
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ResourceUtil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
16 years, 5 months
JBoss Tools SVN: r9423 - in trunk/drools/plugins/org.jboss.tools.flow.ruleflow: src/main/java/org/jboss/tools/process/ruleflow/editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-07-30 06:08:43 -0400 (Wed, 30 Jul 2008)
New Revision: 9423
Removed:
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ConnectionWrapperFactory.java
Modified:
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java
trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java
Log:
refactor PaletteFactory, ditch ConnectionFactory
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml 2008-07-30 10:08:26 UTC (rev 9422)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/plugin.xml 2008-07-30 10:08:43 UTC (rev 9423)
@@ -7,7 +7,7 @@
name="RuleFlow Editor"
extensions="rf"
icon="icons/process.gif"
- contributorClass="org.jboss.tools.process.editor.GenericActionBarContributor"
+ contributorClass="org.jboss.tools.flow.editor.GenericActionBarContributor"
class="org.jboss.tools.process.ruleflow.editor.RuleFlowEditor"
id="org.jboss.tools.process.ruleflow.editor.RuleFlowModelEditor">
</editor>
@@ -24,7 +24,7 @@
toolbarPath="Process"
icon="icons/processV.gif"
tooltip="Auto layout the process (vertical)"
- class="org.jboss.tools.process.editor.action.VerticalAutoLayoutAction"
+ class="org.jboss.tools.flow.editor.action.VerticalAutoLayoutAction"
/>
</editorContribution>
<editorContribution
@@ -36,7 +36,7 @@
toolbarPath="Process"
icon="icons/process.gif"
tooltip="Auto layout the process (horizontal)"
- class="org.jboss.tools.process.editor.action.HorizontalAutoLayoutAction"
+ class="org.jboss.tools.flow.editor.action.HorizontalAutoLayoutAction"
/>
</editorContribution>
</extension>
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2008-07-30 10:08:26 UTC (rev 9422)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/RuleFlowPaletteFactory.java 2008-07-30 10:08:43 UTC (rev 9423)
@@ -24,14 +24,12 @@
import org.eclipse.gef.palette.PaletteContainer;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef.requests.SimpleFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.flow.JBossToolsProcessPlugin;
import org.jboss.tools.flow.editor.PaletteFactory;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
import org.jboss.tools.process.ruleflow.Activator;
-import org.jboss.tools.process.ruleflow.editor.core.ConnectionWrapperFactory;
+import org.jboss.tools.process.ruleflow.editor.core.ConnectionWrapper;
import org.jboss.tools.process.ruleflow.editor.core.StartNodeWrapper;
import org.jboss.tools.process.ruleflow.editor.core.SubProcessWrapper;
@@ -42,10 +40,6 @@
*/
public class RuleFlowPaletteFactory extends PaletteFactory {
- public RuleFlowPaletteFactory() {
- super(new ConnectionWrapperFactory());
- }
-
protected PaletteContainer createControlGroup(PaletteRoot root) {
PaletteContainer controlGroup = super.createControlGroup(root);
controlGroup.add(createConnectionEntry());
@@ -56,14 +50,7 @@
return new ConnectionCreationToolEntry(
"Connection Creation",
"Creating connections",
- new CreationFactory() {
- public Object getNewObject() {
- return connectionFactory.createElementConnection();
- }
- public Object getObjectType() {
- return AbstractConnectionWrapper.class;
- }
- },
+ new SimpleFactory(ConnectionWrapper.class),
ImageDescriptor.createFromURL(JBossToolsProcessPlugin.getDefault().getBundle().getEntry("icons/connection.gif")),
ImageDescriptor.createFromURL(JBossToolsProcessPlugin.getDefault().getBundle().getEntry("icons/connection.gif"))
);
Deleted: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ConnectionWrapperFactory.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ConnectionWrapperFactory.java 2008-07-30 10:08:26 UTC (rev 9422)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/core/ConnectionWrapperFactory.java 2008-07-30 10:08:43 UTC (rev 9423)
@@ -1,33 +0,0 @@
-package org.jboss.tools.process.ruleflow.editor.core;
-
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
-
-/**
- * Factory for creating a connection wrapper.
- *
- * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
- */
-public class ConnectionWrapperFactory implements ConnectionFactory {
-
- public AbstractConnectionWrapper createElementConnection() {
- return new ConnectionWrapper();
- }
-
-}
Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java
===================================================================
--- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java 2008-07-30 10:08:26 UTC (rev 9422)
+++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/src/main/java/org/jboss/tools/process/ruleflow/editor/editpart/ConnectionWrapperEditPart.java 2008-07-30 10:08:43 UTC (rev 9423)
@@ -16,14 +16,13 @@
* limitations under the License.
*/
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
-import org.jboss.tools.process.ruleflow.editor.core.ConnectionWrapperFactory;
+import org.jboss.tools.process.ruleflow.editor.core.ConnectionWrapper;
public class ConnectionWrapperEditPart extends ConnectionEditPart {
- protected ConnectionFactory getElementConnectionFactory() {
- return new ConnectionWrapperFactory();
- }
+ protected Class<?> getElementConnectionType() {
+ return ConnectionWrapper.class;
+ }
}
16 years, 5 months
JBoss Tools SVN: r9422 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph: editpart and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-07-30 06:08:26 -0400 (Wed, 30 Jul 2008)
New Revision: 9422
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java
Log:
refactor PaletteFactory, ditch ConnectionFactory
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-07-30 10:08:06 UTC (rev 9421)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-07-30 10:08:26 UTC (rev 9422)
@@ -7,24 +7,18 @@
import org.eclipse.gef.palette.ConnectionCreationToolEntry;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef.requests.SimpleFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.flow.editor.PaletteFactory;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
import org.jboss.tools.flow.jpdl4.graph.Activator;
import org.jboss.tools.flow.jpdl4.graph.wrapper.EndStateWrapper;
import org.jboss.tools.flow.jpdl4.graph.wrapper.StartStateWrapper;
import org.jboss.tools.flow.jpdl4.graph.wrapper.StateWrapper;
import org.jboss.tools.flow.jpdl4.graph.wrapper.SuperStateWrapper;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapperFactory;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapper;
public class JpdlPaletteFactory extends PaletteFactory {
- public JpdlPaletteFactory() {
- super(new TransitionWrapperFactory());
- }
-
protected List<PaletteEntry> createComponentEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
@@ -71,14 +65,15 @@
ToolEntry tool = new ConnectionCreationToolEntry(
"Transition",
"Creating a new Transition",
- new CreationFactory() {
- public Object getNewObject() {
- return connectionFactory.createElementConnection();
- }
- public Object getObjectType() {
- return AbstractConnectionWrapper.class;
- }
- },
+ new SimpleFactory(TransitionWrapper.class),
+// new CreationFactory() {
+// public Object getNewObject() {
+// return new TransitionWrapper();
+// }
+// public Object getObjectType() {
+// return AbstractConnectionWrapper.class;
+// }
+// },
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/transition.gif")),
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/transition.gif"))
);
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java 2008-07-30 10:08:06 UTC (rev 9421)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editpart/TransitionEditPart.java 2008-07-30 10:08:26 UTC (rev 9422)
@@ -1,13 +1,12 @@
package org.jboss.tools.flow.jpdl4.graph.editpart;
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
-import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapperFactory;
+import org.jboss.tools.flow.jpdl4.graph.wrapper.TransitionWrapper;
public class TransitionEditPart extends ConnectionEditPart {
- protected ConnectionFactory getElementConnectionFactory() {
- return new TransitionWrapperFactory();
- }
+ protected Class<?> getElementConnectionType() {
+ return TransitionWrapper.class;
+ }
}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java 2008-07-30 10:08:06 UTC (rev 9421)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/TransitionWrapperFactory.java 2008-07-30 10:08:26 UTC (rev 9422)
@@ -1,12 +0,0 @@
-package org.jboss.tools.flow.jpdl4.graph.wrapper;
-
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
-
-public class TransitionWrapperFactory implements ConnectionFactory {
-
- public AbstractConnectionWrapper createElementConnection() {
- return new TransitionWrapper();
- }
-
-}
16 years, 5 months
JBoss Tools SVN: r9421 - in trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor: core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-07-30 06:08:06 -0400 (Wed, 30 Jul 2008)
New Revision: 9421
Removed:
trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ConnectionFactory.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/PaletteFactory.java
trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/editpart/ConnectionEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/policy/ConnectionEditPolicy.java
Log:
refactor PaletteFactory, ditch ConnectionFactory
Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/PaletteFactory.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/PaletteFactory.java 2008-07-30 10:07:26 UTC (rev 9420)
+++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/PaletteFactory.java 2008-07-30 10:08:06 UTC (rev 9421)
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.gef.palette.ConnectionCreationToolEntry;
import org.eclipse.gef.palette.MarqueeToolEntry;
import org.eclipse.gef.palette.PaletteContainer;
import org.eclipse.gef.palette.PaletteDrawer;
@@ -28,11 +27,6 @@
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gef.palette.SelectionToolEntry;
import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.jboss.tools.flow.JBossToolsProcessPlugin;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
/**
* Factory for creating a RuleFlow palette.
@@ -41,12 +35,6 @@
*/
public abstract class PaletteFactory {
- protected ConnectionFactory connectionFactory;
-
- public PaletteFactory(ConnectionFactory connectionFactory) {
- this.connectionFactory = connectionFactory;
- }
-
public PaletteRoot createPalette() {
PaletteRoot palette = new PaletteRoot();
palette.addAll(createCategories(palette));
@@ -72,22 +60,6 @@
tool = new MarqueeToolEntry();
entries.add(tool);
-// tool = new ConnectionCreationToolEntry(
-// "Connection Creation",
-// "Creating connections",
-// new CreationFactory() {
-// public Object getNewObject() {
-// return connectionFactory.createElementConnection();
-// }
-// public Object getObjectType() {
-// return AbstractConnectionWrapper.class;
-// }
-// },
-// ImageDescriptor.createFromURL(JBossToolsProcessPlugin.getDefault().getBundle().getEntry("icons/connection.gif")),
-// ImageDescriptor.createFromURL(JBossToolsProcessPlugin.getDefault().getBundle().getEntry("icons/connection.gif"))
-// );
-// entries.add(tool);
-
controlGroup.addAll(entries);
return controlGroup;
}
Deleted: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ConnectionFactory.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ConnectionFactory.java 2008-07-30 10:07:26 UTC (rev 9420)
+++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ConnectionFactory.java 2008-07-30 10:08:06 UTC (rev 9421)
@@ -1,28 +0,0 @@
-package org.jboss.tools.flow.editor.core;
-
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Factory for creating element connections.
- *
- * @author <a href="mailto:kris_verlaenen@hotmail.com">Kris Verlaenen</a>
- */
-public interface ConnectionFactory {
-
- AbstractConnectionWrapper createElementConnection();
-
-}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/editpart/ConnectionEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/editpart/ConnectionEditPart.java 2008-07-30 10:07:26 UTC (rev 9420)
+++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/editpart/ConnectionEditPart.java 2008-07-30 10:08:06 UTC (rev 9421)
@@ -29,8 +29,9 @@
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
+import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef.requests.SimpleFactory;
import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
import org.jboss.tools.flow.editor.core.ModelEvent;
import org.jboss.tools.flow.editor.core.ModelListener;
import org.jboss.tools.flow.editor.policy.ConnectionBendpointEditPolicy;
@@ -55,7 +56,14 @@
installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE, new ConnectionBendpointEditPolicy());
}
- protected abstract ConnectionFactory getElementConnectionFactory();
+ protected CreationFactory getElementConnectionFactory() {
+ return new SimpleFactory(getElementConnectionType());
+ }
+
+
+ protected abstract Class<?> getElementConnectionType();
+
+// protected abstract ConnectionFactory getElementConnectionFactory();
protected IFigure createFigure() {
PolylineConnection result = new PolylineConnection();
Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/policy/ConnectionEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/policy/ConnectionEditPolicy.java 2008-07-30 10:07:26 UTC (rev 9420)
+++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/policy/ConnectionEditPolicy.java 2008-07-30 10:08:06 UTC (rev 9421)
@@ -21,12 +21,12 @@
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef.requests.GroupRequest;
import org.jboss.tools.flow.editor.command.DeleteConnectionCommand;
import org.jboss.tools.flow.editor.command.SplitConnectionCommand;
import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.ConnectionFactory;
import org.jboss.tools.flow.editor.core.NodeWrapper;
import org.jboss.tools.flow.editor.editpart.ConnectionEditPart;
@@ -37,9 +37,11 @@
*/
public class ConnectionEditPolicy extends org.eclipse.gef.editpolicies.ConnectionEditPolicy {
- private ConnectionFactory elementConnectionFactory;
+// private ConnectionFactory elementConnectionFactory;
- public void setElementConnectionFactory(ConnectionFactory elementConnectionFactory) {
+ private CreationFactory elementConnectionFactory;
+
+ public void setElementConnectionFactory(CreationFactory elementConnectionFactory) {
this.elementConnectionFactory = elementConnectionFactory;
}
@@ -69,7 +71,7 @@
}
SplitConnectionCommand cmd = new SplitConnectionCommand();
cmd.setElementConnection(((AbstractConnectionWrapper) getHost().getModel()));
- cmd.setNewSecondConnection(elementConnectionFactory.createElementConnection());
+ cmd.setNewSecondConnection((AbstractConnectionWrapper)elementConnectionFactory.getNewObject());
cmd.setParent(((AbstractFlowWrapper) ((ConnectionEditPart) getHost())
.getSource().getParent().getModel()));
cmd.setNewElement(((NodeWrapper) ((CreateRequest) request).getNewObject()));
16 years, 5 months
JBoss Tools SVN: r9420 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-30 06:07:26 -0400 (Wed, 30 Jul 2008)
New Revision: 9420
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.project
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.project
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.project 2008-07-30 10:07:20 UTC (rev 9419)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.project 2008-07-30 10:07:26 UTC (rev 9420)
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.jsf.vpe.richfaces</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.jsf.vpe.richfaces</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-07-30 10:07:20 UTC (rev 9419)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-07-30 10:07:26 UTC (rev 9420)
@@ -20,4 +20,3 @@
Bundle-Vendor: Red Hat, Inc.
Bundle-ClassPath: lib/jhighlight-1.0.jar,
.
-Export-Package: org.jboss.tools.jsf.vpe.richfaces
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2008-07-30 10:07:20 UTC (rev 9419)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2008-07-30 10:07:26 UTC (rev 9420)
@@ -202,7 +202,6 @@
tr1.appendChild(td2);
td1.appendChild(img1);
td1.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
-
td2.appendChild(img2);
td2.appendChild(visualDocument.createElement(HtmlComponentUtil.HTML_TAG_BR));
16 years, 5 months
JBoss Tools SVN: r9419 - 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: estherbin
Date: 2008-07-30 06:07:20 -0400 (Wed, 30 Jul 2008)
New Revision: 9419
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-07-30 09:21:53 UTC (rev 9418)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-07-30 10:07:20 UTC (rev 9419)
@@ -62,7 +62,6 @@
org.eclipse.ui.ide,
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom,
- org.eclipse.draw2d,
- org.jboss.tools.jsf.vpe.richfaces
+ org.eclipse.draw2d
Bundle-Version: 2.1.0
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 2008-07-30 09:21:53 UTC (rev 9418)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-07-30 10:07:20 UTC (rev 9419)
@@ -14,7 +14,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.css.ELReferenceList;
@@ -270,10 +270,12 @@
public String replaceElAndResources(VpePageContext pageContext, Attr attributeNode) {
final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
final String attribuString = attributeNode.getValue();
+ final BundleMap bundle = pageContext.getBundle();
String rst = attribuString;
-
- rst = ComponentUtil.getBundleValue(pageContext, attributeNode);
+ int offset = ((IDOMAttr) attributeNode).getValueRegionStartOffset();
+ rst = bundle.getBundleValue(attribuString, offset);
+
rst = replaceEl(file, rst);
return rst;
16 years, 5 months