Author: mareshkau Date: 2008-01-23 10:29:57 -0500 (Wed, 23 Jan 2008) New Revision: 5910 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java Log: http://jira.jboss.com/jira/browse/JBIDE-1209 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2008-01-23 14:48:17 UTC (rev 5909) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2008-01-23 15:29:57 UTC (rev 5910) @@ -364,7 +364,12 @@ if(sourceNode.getNodeType()!=Node.TEXT_NODE) { sourceBuilder.setSelection(sourceNode, 0, 0); } else if(sourceNode.getNodeType()==Node.TEXT_NODE) { - sourceBuilder.setSelection(sourceNode, 1, 0); + try{ + IndexedRegion region = (IndexedRegion)sourceNode; + sourceBuilder.setSelection(sourceNode, 0, region.getLength()); + }catch(Exception ex){ + VpePlugin.reportProblem(ex); + } } return sourceNode; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-01-23 14:48:17 UTC (rev 5909) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2008-01-23 15:29:57 UTC (rev 5910) @@ -17,6 +17,7 @@ import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jst.jsp.core.internal.domdocument.TextImplForJSP; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.graphics.Point; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; @@ -28,6 +29,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; +import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; @@ -313,9 +315,18 @@ // info.setSourceCommentValue(pageContext, (Comment)sourceParent); // } //Added by Max Areshkau in scope of bug JBIDE-1209 - } else if (sourceParent.getNodeType()==Node.TEXT_NODE) { - - setSelection(sourceParent, offset, length); + } else if (sourceParent instanceof TextImplForJSP) { + try{ + IndexedRegion region = (IndexedRegion)sourceParent; + String text = sourceParent.getNodeValue(); + int start= TextUtil.sourcePosition(text, visualText.getNodeValue(), offset); + int end =TextUtil.sourcePosition(text, visualText.getNodeValue(), offset+length); + offset=start; + length=end-start; + }catch(Exception ex){ + VpePlugin.reportProblem(ex); + } + setSelection(sourceParent, offset, length); } } }