Re: [jbosstools-dev] Cyclic dependency

Hi, The issue has been introduced by fixing https://jira.jboss.org/jira/browse/JBIDE-2582 (svn commit #9402). Attached is a patch that solves this issue. Snjeza Marshall Culpepper wrote: > Hey guys.. > > Taking a look at org.jboss.tools.vpe and > org.jboss.tools.jsf.vpe.richfaces, I noticed a cyclic dependency between the > two (making the compilation fail). Obviously trying to remove the dependency > from either side gets rid of the error, but introduces compilation problems > since there are imports / code use from the dependencies. > > I was wondering if y'all were aware and had any plans to seperate the > code.. the easiest side to fix seems to be org.jboss.tools.vpe, as the only > code dependency is in org.jboss.tools.vpe.editor.util.ElService at line 275: > > rst = ComponentUtil.getBundleValue(pageContext, attributeNode); > > Any thoughts? > ------------------------------------------------------------------------ > > _______________________________________________ > jbosstools-dev mailing list > jbosstools-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/jbosstools-dev > Index: E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java =================================================================== --- E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java (revision 9402) +++ E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java (working copy) @@ -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; @@ -272,7 +272,12 @@ final String attribuString = attributeNode.getValue(); String rst = attribuString; - rst = ComponentUtil.getBundleValue(pageContext, attributeNode); + //rst = ComponentUtil.getBundleValue(pageContext, attributeNode); + BundleMap bundle = pageContext.getBundle(); + String value = attributeNode.getNodeValue(); + + int offset=((IDOMAttr) attributeNode).getValueRegionStartOffset(); + rst = bundle.getBundleValue(value, offset); rst = replaceEl(file, rst); Index: E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =================================================================== --- E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF (revision 9402) +++ E:/workspace-3.4M7-JBoss/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF (working copy) @@ -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