[jbosstools-commits] JBoss Tools SVN: r9419 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/util and 1 other directory.

[jbosstools-commits at 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;