Author: dgolovin Date: 2008-10-27 18:35:17 -0400 (Mon, 27 Oct 2008) New Revision: 11226 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLContextParamLinkHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLDoctypeHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLJumpToHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLLinkHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTagAttributeValueHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSFContextParamLinkHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java Log: remove copy-pasted inline classes Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.jface.text.rules.IToken; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; @@ -202,16 +203,7 @@ if (("." + styleName).equalsIgnoreCase(name)) { final int offset = startOffset + scanner.getTokenOffset(); final int length = scanner.getTokenLength(); - region = new IRegion () { - public int getLength() { - return length; - } - - public int getOffset() { - return offset; - } - }; - return region; + return new Region (offset,length); } } else if (CSSTextScanner.CSS_CLASS_BODY.equals(tToken.getType())) { // String body = tToken.getText(); @@ -243,15 +235,7 @@ if (("." + styleName).equalsIgnoreCase(name)) { final int offset = scanner.getTokenOffset(); final int length = scanner.getTokenLength(); - return new IRegion () { - public int getLength() { - return length; - } - - public int getOffset() { - return offset; - } - }; + return new Region (offset,length); } } else if (CSSTextScanner.CSS_CLASS_BODY.equals(tToken.getType())) { // String body = tToken.getText(); @@ -265,7 +249,9 @@ ExtensionsPlugin.getPluginLog().logError("Error while looking for style region ", x); } finally { try { - stream.close(); + if(stream!=null) { + stream.close(); + } } catch (IOException x) { //ignore } @@ -352,31 +338,7 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - - }; - return region; + return new Region (propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -37,6 +37,7 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IStorageEditorInput; @@ -247,31 +248,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JSPStylesheetRelLinkHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -12,6 +12,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -96,28 +97,7 @@ if (propStart > offset || propStart + propLength < offset) return null; -// String propText = text.substring(bStart, bEnd); - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -190,25 +190,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } catch (BadLocationException e) { openFileFailed(); } finally { Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; import org.jboss.tools.common.text.ext.ExtensionsPlugin; @@ -123,32 +124,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.project.IPromptingProvider; import org.jboss.tools.common.model.project.PromptingProviderFactory; @@ -108,31 +109,7 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - - }; - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -14,6 +14,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; @@ -69,28 +70,7 @@ final int offset = Utils.getValueStart(element); final int length = ((IDOMElement)element).getStartStructuredDocumentRegion().getLength(); - return new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return length; - } - - public int getOffset() { - return offset; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; + return new Region (offset, length); } finally { smw.dispose(); } @@ -191,31 +171,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region (propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPStylesheetRelLinkHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -13,6 +13,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -224,28 +225,7 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; @@ -137,26 +138,7 @@ final int taglibLength = taglib.getEndOffset() - taglib.getStartOffset(); final int taglibOffset = taglib.getStartOffset(); - IRegion region = new IRegion () { - public int getLength() { - return taglibLength; - } - - public int getOffset() { - return taglibOffset; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - }; - return region; + return new Region(taglibOffset,taglibLength); } finally { smw.dispose(); } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -14,6 +14,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; @@ -150,27 +151,8 @@ final int taglibLength = xmlnsAttr.getValueRegionText().length(); final int taglibOffset = xmlnsAttr.getValueRegionStartOffset(); - - IRegion region = new IRegion () { - public int getLength() { - return taglibLength; - } - public int getOffset() { - return taglibOffset; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - }; - return region; + return new Region(taglibOffset,taglibLength); } finally { smw.dispose(); } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLContextParamLinkHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLContextParamLinkHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLContextParamLinkHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -13,6 +13,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.Text; @@ -98,27 +99,8 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLDoctypeHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLDoctypeHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLDoctypeHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -12,6 +12,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.text.ext.ExtensionsPlugin; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; @@ -79,26 +80,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } finally { smw.dispose(); } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLJumpToHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLJumpToHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLJumpToHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -17,6 +17,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -106,27 +107,8 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLLinkHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLLinkHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLLinkHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -13,6 +13,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -103,31 +104,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { // Ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTagAttributeValueHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTagAttributeValueHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTagAttributeValueHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -13,6 +13,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -94,26 +95,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { //ignore return null; Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -29,6 +29,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput; import org.eclipse.pde.internal.ui.editor.JarEntryFile; import org.eclipse.ui.IEditorInput; @@ -354,26 +355,8 @@ taglibLength = newLength; taglibOffset = newOffset; } - IRegion region = new IRegion () { - public int getLength() { - return taglibLength; - } - public int getOffset() { - return taglibOffset; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - }; - return region; + return new Region(taglibOffset,taglibLength); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -22,6 +22,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; import org.jboss.tools.common.model.XModel; @@ -317,31 +318,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; @@ -115,32 +116,8 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; @@ -57,28 +58,7 @@ if (element != null) { final int offset = element.getStartOffset(); final int length = element.getStartStructuredDocumentRegion().getLength(); - return new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return length; - } - - public int getOffset() { - return offset; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; + return new Region(offset,length); } return null; } finally { @@ -190,31 +170,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSFContextParamLinkHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSFContextParamLinkHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSFContextParamLinkHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -12,6 +12,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -78,28 +79,8 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - public int getOffset() { - return propStart; - } - - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPValidatorHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -13,6 +13,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -104,27 +105,8 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log(x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; @@ -197,32 +198,8 @@ final int propLength = bEnd - bStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -16,6 +16,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -135,30 +136,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -17,6 +17,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; @@ -153,32 +154,8 @@ final int nameEnd = nameStart + tagName.length(); if (nameStart > offset || nameEnd <= offset) return null; - - IRegion region = new IRegion () { - - public int getLength() { - return nameEnd - nameStart; - } - - public int getOffset() { - return nameStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - return region; + return new Region(nameStart,nameEnd - nameStart); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -107,31 +108,7 @@ if (nameStart > offset || nameEnd <= offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return nameEnd - nameStart; - } - - public int getOffset() { - return nameStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(nameStart,nameEnd - nameStart); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; @@ -100,26 +101,7 @@ final int taglibLength = xmlnsAttr.getValueRegionText().length(); final int taglibOffset = xmlnsAttr.getValueRegionStartOffset(); - IRegion region = new IRegion () { - public int getLength() { - return taglibLength; - } - - public int getOffset() { - return taglibOffset; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - }; - return region; + return new Region(taglibOffset,taglibLength); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -106,26 +107,8 @@ final int propLength = Utils.getValueEnd(n) - propStart; if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -14,6 +14,7 @@ import java.util.Properties; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; @@ -88,26 +89,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlinkPartitioner.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -115,25 +116,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - }; - return region; + return new Region(propStart,propLength); } finally { smw.dispose(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; @@ -167,31 +168,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -15,6 +15,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; @@ -115,31 +116,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - IRegion region = new IRegion () { - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-10-27 20:18:14 UTC (rev 11225) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-10-27 22:35:17 UTC (rev 11226) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; @@ -123,31 +124,7 @@ if (propStart > offset || propStart + propLength < offset) return null; - - IRegion region = new IRegion () { - public boolean equals(Object arg) { - if (!(arg instanceof IRegion)) return false; - IRegion region = (IRegion)arg; - - if (getOffset() != region.getOffset()) return false; - if (getLength() != region.getLength()) return false; - return true; - } - - public int getLength() { - return propLength; - } - - public int getOffset() { - return propStart; - } - - public String toString() { - return "IRegion [" + getOffset() +", " + getLength()+ "]"; - } - }; - - return region; + return new Region(propStart,propLength); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); return null;