Mercurial > projects > dwt-addons
changeset 139:93a6ec48fd28
Regexp throws removal in interfaces
line wrap: on
line diff
--- a/dwtx/jface/internal/text/html/SingleCharReader.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/internal/text/html/SingleCharReader.d Sun Aug 24 02:31:41 2008 +0200 @@ -37,7 +37,7 @@ /** * @see Reader#read() */ - public abstract int read() throws IOException; + public abstract int read() ; /** * @see Reader#read(char[],int,int)
--- a/dwtx/jface/internal/text/html/SubstitutionTextReader.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/internal/text/html/SubstitutionTextReader.d Sun Aug 24 02:31:41 2008 +0200 @@ -71,7 +71,7 @@ * @return the substitution for <code>c</code> * @throws IOException in case computing the substitution fails */ - protected abstract String computeSubstitution(int c) throws IOException; + protected abstract String computeSubstitution(int c) ; /** * Returns the internal reader.
--- a/dwtx/jface/internal/text/revisions/RevisionPainter.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/RevisionPainter.d Sun Aug 24 02:31:41 2008 +0200 @@ -1440,7 +1440,7 @@ * @return <code>true</code> if the receiver can provide a hover */ public bool hasHover(int activeLine) { - return fViewer instanceof ISourceViewer && fHover.getHoverLineRange(cast(ISourceViewer) fViewer, activeLine) !is null; + return cast(ISourceViewer)fViewer && fHover.getHoverLineRange(cast(ISourceViewer) fViewer, activeLine) !is null; } /**
--- a/dwtx/jface/text/AbstractInformationControlManager.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/AbstractInformationControlManager.d Sun Aug 24 02:31:41 2008 +0200 @@ -200,30 +200,30 @@ /** * An internal class that gives access to internal methods. - * + * * @since 3.4 */ class MyInternalAccessor : InternalAccessor { public IInformationControl getCurrentInformationControl() { return this.outer.getCurrentInformationControl(); } - + public void setInformationControlReplacer(InformationControlReplacer replacer) { this.outer.setInformationControlReplacer(replacer); } - + public InformationControlReplacer getInformationControlReplacer() { return this.outer.getInformationControlReplacer(); } - + public bool canReplace(IInformationControl control) { return this.outer.canReplace(control); } - + public bool isReplaceInProgress() { return this.outer.isReplaceInProgress(); } - + public void replaceInformationControl(bool takeFocus) { this.outer.replaceInformationControl(takeFocus); } @@ -231,11 +231,11 @@ public void cropToClosestMonitor(Rectangle bounds) { this.outer.cropToClosestMonitor(bounds); } - + public void setHoverEnrichMode(EnrichMode mode) { throw new UnsupportedOperationException("only implemented in AbstractHoverInformationControlManager"); //$NON-NLS-1$ } - + public bool getAllowMouseExit() { throw new UnsupportedOperationException("only implemented in AnnotationBarHoverManager"); //$NON-NLS-1$ } @@ -299,14 +299,14 @@ /** * Returns the DWT direction flag. One of {@link DWT#BOTTOM}, {@link DWT#TOP}, * {@link DWT#LEFT}, {@link DWT#RIGHT}, {@link DWT#CENTER}, - * + * * @return the DWT direction flag * @since 3.3 */ int getSWTFlag() { return fFlag; } - + public String toString() { switch (fFlag) { case DWT.BOTTOM: return "BOTTOM"; //$NON-NLS-1$ @@ -356,7 +356,7 @@ * @since 3.0 */ public static final String STORE_SIZE_HEIGHT= "size.height"; //$NON-NLS-1$ - + /** * Tells whether this class and its subclasses are in debug mode. * <p> @@ -381,7 +381,7 @@ /** * The information control. - * + * * <p>This field should not be referenced by subclasses. It is <code>protected</code> for API * compatibility reasons. */ @@ -389,7 +389,7 @@ /** * The information control creator. - * + * * <p>This field should not be referenced by subclasses. It is <code>protected</code> for API * compatibility reasons. */ @@ -397,7 +397,7 @@ /** * The information control closer. - * + * * <p>This field should not be referenced by subclasses. It is <code>protected</code> for API * compatibility reasons. */ @@ -405,7 +405,7 @@ /** * Indicates that the information control has been disposed. - * + * * <p>This field should not be referenced by subclasses. It is <code>protected</code> for API * compatibility reasons. */ @@ -414,7 +414,7 @@ /** * The information control replacer to be used when this information control * needs to be replaced with another information control. - * + * * @since 3.4 */ private InformationControlReplacer fInformationControlReplacer; @@ -499,7 +499,7 @@ /** * The dispose listener on the subject control. - * + * * @since 3.1 */ private DisposeListener fSubjectControlDisposeListener; @@ -572,11 +572,11 @@ protected void setCloser(IInformationControlCloser closer) { fInformationControlCloser= closer; } - + /** * Sets the information control replacer for this manager and disposes the * old one if set. - * + * * @param replacer the information control replacer for this manager, or * <code>null</code> if no information control replacing should * take place @@ -590,7 +590,7 @@ /** * Returns the current information control replacer or <code>null</code> if none has been installed. - * + * * @return the current information control replacer or <code>null</code> if none has been installed * @since 3.4 */ @@ -600,30 +600,30 @@ /** * Returns whether an information control replacer has been installed. - * + * * @return whether an information control replacer has been installed * @since 3.4 */ bool hasInformationControlReplacer() { return fInformationControlReplacer !is null; } - + /** * Tests whether the given information control is replaceable. - * + * * @param iControl information control or <code>null</code> if none * @return <code>true</code> if information control is replaceable, <code>false</code> otherwise * @since 3.4 */ bool canReplace(IInformationControl iControl) { - return iControl instanceof IInformationControlExtension3 - && iControl instanceof IInformationControlExtension5 + return cast(IInformationControlExtension3)iControl + && cast(IInformationControlExtension5)iControl && (cast(IInformationControlExtension5) iControl).getInformationPresenterControlCreator() !is null; } - + /** * Returns the current information control, or <code>null</code> if none. - * + * * @return the current information control, or <code>null</code> if none * @since 3.4 */ @@ -633,7 +633,7 @@ /** * Tells whether this manager's information control is currently being replaced. - * + * * @return <code>true</code> if a replace is in progress * @since 3.4 */ @@ -644,7 +644,7 @@ /** * Sets the horizontal and vertical margin to be used when laying out the * information control relative to the subject control. - * + * * @param xMargin the x-margin * @param yMargin the y-Margin */ @@ -744,7 +744,7 @@ * @since 3.0 */ protected void setCustomInformationControlCreator(IInformationControlCreator informationControlCreator) { - if (informationControlCreator !is null && fCustomInformationControlCreator instanceof IInformationControlCreatorExtension) { + if (informationControlCreator !is null && cast(IInformationControlCreatorExtension)fCustomInformationControlCreator) { IInformationControlCreatorExtension extension= cast(IInformationControlCreatorExtension) fCustomInformationControlCreator; if (extension.canReplace(informationControlCreator)) return; @@ -792,11 +792,11 @@ setEnabled(true); fDisposed= false; } - + /** * Returns the dispose listener which gets added * to the subject control. - * + * * @return the dispose listener * @since 3.1 */ @@ -1008,11 +1008,11 @@ return fSubjectControl.toDisplay(new Point(subjectArea.x + xShift, subjectArea.y + yShift)); } - + /** * Computes the area available for an information control given an anchor and the subject area * within <code>bounds</code>. - * + * * @param subjectArea the subject area * @param bounds the bounds * @param anchor the anchor at the subject area @@ -1049,7 +1049,7 @@ area.intersect(bounds); return area; } - + /** * Checks whether a control of the given size at the given location would be completely visible * in the given display area when laid out by using the given anchor. If not, this method tries @@ -1171,7 +1171,7 @@ Monitor monitor= getClosestMonitor(subjectAreaDisplayRelative, testAnchor); if (updateLocation(upperLeft, controlSize, monitor.getClientArea(), testAnchor)) return upperLeft; - + // compute available area for this anchor and update if better than best Rectangle available= computeAvailableArea(subjectAreaDisplayRelative, monitor.getClientArea(), testAnchor); Rectangle proposed= new Rectangle(upperLeft.x, upperLeft.y, controlSize.x, controlSize.y); @@ -1182,20 +1182,20 @@ bestBounds= available; bestAnchor= testAnchor; } - + testAnchor= getNextFallbackAnchor(testAnchor); } while (testAnchor !is fAnchor && testAnchor !is null); - + // no anchor is perfect - select the one with larges area and set the size to not overlap with the subjectArea if (bestAnchor !is ANCHOR_GLOBAL) Geometry.set(controlSize, Geometry.getSize(bestBounds)); return Geometry.getLocation(bestBounds); } - + /** * Gets the closest monitor given an anchor and the subject area. - * + * * @param area the subject area * @param anchor the anchor * @return the monitor closest to the edge of <code>area</code> defined by @@ -1215,7 +1215,7 @@ * Copied from dwtx.jface.window.Window. Returns the monitor whose client area contains * the given point. If no monitor contains the point, returns the monitor that is closest to the * point. If this is ever made public, it should be moved into a separate utility class. - * + * * @param display the display to search for monitors * @param rectangle the rectangle to find the closest monitor for (display coordinates) * @return the monitor closest to the given point @@ -1297,7 +1297,7 @@ (cast(InformationControlReplacer) this).showInformationControl(subjectArea, information); return; } - + IInformationControl informationControl= getInformationControl(); if (informationControl !is null) { @@ -1350,14 +1350,14 @@ size= Geometry.getSize(controlBounds); informationControl.setLocation(location); informationControl.setSize(size.x, size.y); - + showInformationControl(subjectArea); } } /** * Crops the given bounds such that they lie completely on the closest monitor. - * + * * @param bounds shell bounds to crop * @since 3.4 */ @@ -1398,7 +1398,7 @@ * Replaces this manager's information control as defined by * the information control replacer. * <strong>Must only be called when {@link #fInformationControl} instanceof {@link IInformationControlExtension3}!</strong> - * + * * @param takeFocus <code>true</code> iff the replacing information control should take focus * * @since 3.4 @@ -1414,7 +1414,7 @@ } hideInformationControl(); } - + /** * Disposes this manager's information control. */ @@ -1436,12 +1436,12 @@ setEnabled(false); disposeInformationControl(); - + if (fInformationControlReplacer !is null) { fInformationControlReplacer.dispose(); fInformationControlReplacer= null; } - + if (fSubjectControl !is null && !fSubjectControl.isDisposed() && fSubjectControlDisposeListener !is null) fSubjectControl.removeDisposeListener(fSubjectControlDisposeListener); fSubjectControl= null; @@ -1567,7 +1567,7 @@ * Returns an adapter that gives access to internal methods. * <p> * <strong>Note:</strong> This method is not intended to be referenced or overridden by clients.</p> - * + * * @return the replaceable information control accessor * @since 3.4 * @noreference This method is not intended to be referenced by clients.
--- a/dwtx/jface/text/FindReplaceDocumentAdapterContentProposalProvider.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/FindReplaceDocumentAdapterContentProposalProvider.d Sun Aug 24 02:31:41 2008 +0200 @@ -179,43 +179,43 @@ */ public class FindReplaceDocumentAdapterContentProposalProvider : IContentProposalProvider { - + /** * Proposal computer. */ private static class ProposalComputer { private static class Proposal : IContentProposal { - + private String fContent; private String fLabel; private String fDescription; private int fCursorPosition; - + this(String content, String label, String description, int cursorPosition) { fContent= content; fLabel= label; fDescription= description; fCursorPosition= cursorPosition; } - + public String getContent() { return fContent; } - + public String getLabel() { return fLabel; } - + public String getDescription() { return fDescription; } - + public int getCursorPosition() { return fCursorPosition; } } - + /** * The whole regular expression. @@ -248,7 +248,7 @@ fDocumentOffset= position; fPriorityProposals= new ArrayList(); fProposals= new ArrayList(); - + bool isEscape= false; esc: for (int i= position - 1; i >= 0; i--) { if (fExpression.charAt(i) is '\\') @@ -277,7 +277,7 @@ addBsProposal("\\a", RegExMessages.getString("displayString_bs_a"), RegExMessages.getString("additionalInfo_bs_a")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\e", RegExMessages.getString("displayString_bs_e"), RegExMessages.getString("additionalInfo_bs_e")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("\\c", 2, RegExMessages.getString("displayString_bs_c"), RegExMessages.getString("additionalInfo_bs_c")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + if (! fIsEscape) addBracketProposal(".", 1, RegExMessages.getString("displayString_dot"), RegExMessages.getString("additionalInfo_dot")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\d", RegExMessages.getString("displayString_bs_d"), RegExMessages.getString("additionalInfo_bs_d")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -286,15 +286,15 @@ addBsProposal("\\S", RegExMessages.getString("displayString_bs_S"), RegExMessages.getString("additionalInfo_bs_S")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\w", RegExMessages.getString("displayString_bs_w"), RegExMessages.getString("additionalInfo_bs_w")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\W", RegExMessages.getString("displayString_bs_W"), RegExMessages.getString("additionalInfo_bs_W")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + // back reference addBsProposal("\\", RegExMessages.getString("displayString_bs_i"), RegExMessages.getString("additionalInfo_bs_i")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //quoting addBsProposal("\\", RegExMessages.getString("displayString_bs"), RegExMessages.getString("additionalInfo_bs")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\Q", RegExMessages.getString("displayString_bs_Q"), RegExMessages.getString("additionalInfo_bs_Q")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\E", RegExMessages.getString("displayString_bs_E"), RegExMessages.getString("additionalInfo_bs_E")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //character sets if (! fIsEscape) { addBracketProposal("[]", 1, RegExMessages.getString("displayString_set"), RegExMessages.getString("additionalInfo_set")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -309,7 +309,7 @@ addBracketProposal("\\p{}", 3, RegExMessages.getString("displayString_posix"), RegExMessages.getString("additionalInfo_posix")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("\\P{}", 3, RegExMessages.getString("displayString_posixNot"), RegExMessages.getString("additionalInfo_posixNot")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - + //boundary matchers if (fDocumentOffset is 0) { addPriorityProposal("^", RegExMessages.getString("displayString_start"), RegExMessages.getString("additionalInfo_start")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -325,25 +325,25 @@ addBsProposal("\\G", RegExMessages.getString("displayString_bs_G"), RegExMessages.getString("additionalInfo_bs_G")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\Z", RegExMessages.getString("displayString_bs_Z"), RegExMessages.getString("additionalInfo_bs_Z")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBsProposal("\\z", RegExMessages.getString("displayString_bs_z"), RegExMessages.getString("additionalInfo_bs_z")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + if (! fIsEscape) { //capturing groups addBracketProposal("()", 1, RegExMessages.getString("displayString_group"), RegExMessages.getString("additionalInfo_group")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //flags addBracketProposal("(?)", 2, RegExMessages.getString("displayString_flag"), RegExMessages.getString("additionalInfo_flag")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("(?:)", 3, RegExMessages.getString("displayString_flagExpr"), RegExMessages.getString("additionalInfo_flagExpr")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //non-capturing group addBracketProposal("(?:)", 3, RegExMessages.getString("displayString_nonCap"), RegExMessages.getString("additionalInfo_nonCap")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("(?>)", 3, RegExMessages.getString("displayString_atomicCap"), RegExMessages.getString("additionalInfo_atomicCap")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //look around addBracketProposal("(?=)", 3, RegExMessages.getString("displayString_posLookahead"), RegExMessages.getString("additionalInfo_posLookahead")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("(?!)", 3, RegExMessages.getString("displayString_negLookahead"), RegExMessages.getString("additionalInfo_negLookahead")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("(?<=)", 4, RegExMessages.getString("displayString_posLookbehind"), RegExMessages.getString("additionalInfo_posLookbehind")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("(?<!)", 4, RegExMessages.getString("displayString_negLookbehind"), RegExMessages.getString("additionalInfo_negLookbehind")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //greedy quantifiers addBracketProposal("?", 1, RegExMessages.getString("displayString_quest"), RegExMessages.getString("additionalInfo_quest")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("*", 1, RegExMessages.getString("displayString_star"), RegExMessages.getString("additionalInfo_star")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -351,7 +351,7 @@ addBracketProposal("{}", 1, RegExMessages.getString("displayString_exact"), RegExMessages.getString("additionalInfo_exact")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("{,}", 1, RegExMessages.getString("displayString_least"), RegExMessages.getString("additionalInfo_least")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("{,}", 1, RegExMessages.getString("displayString_count"), RegExMessages.getString("additionalInfo_count")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //lazy quantifiers addBracketProposal("??", 1, RegExMessages.getString("displayString_questLazy"), RegExMessages.getString("additionalInfo_questLazy")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("*?", 1, RegExMessages.getString("displayString_starLazy"), RegExMessages.getString("additionalInfo_starLazy")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -359,7 +359,7 @@ addBracketProposal("{}?", 1, RegExMessages.getString("displayString_exactLazy"), RegExMessages.getString("additionalInfo_exactLazy")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("{,}?", 1, RegExMessages.getString("displayString_leastLazy"), RegExMessages.getString("additionalInfo_leastLazy")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("{,}?", 1, RegExMessages.getString("displayString_countLazy"), RegExMessages.getString("additionalInfo_countLazy")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //possessive quantifiers addBracketProposal("?+", 1, RegExMessages.getString("displayString_questPoss"), RegExMessages.getString("additionalInfo_questPoss")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("*+", 1, RegExMessages.getString("displayString_starPoss"), RegExMessages.getString("additionalInfo_starPoss")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -367,11 +367,11 @@ addBracketProposal("{}+", 1, RegExMessages.getString("displayString_exactPoss"), RegExMessages.getString("additionalInfo_exactPoss")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("{,}+", 1, RegExMessages.getString("displayString_leastPoss"), RegExMessages.getString("additionalInfo_leastPoss")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ addBracketProposal("{,}+", 1, RegExMessages.getString("displayString_countPoss"), RegExMessages.getString("additionalInfo_countPoss")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + //alternative addBracketProposal("|", 1, RegExMessages.getString("displayString_alt"), RegExMessages.getString("additionalInfo_alt")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - + fPriorityProposals.addAll(fProposals); return (IContentProposal[]) fPriorityProposals.toArray(new IContentProposal[fProposals.size()]); } @@ -403,10 +403,10 @@ fPriorityProposals.addAll(fProposals); return (IContentProposal[]) fPriorityProposals.toArray(new IContentProposal[fPriorityProposals.size()]); } - + /** * Adds a proposal. - * + * * @param proposal the string to be inserted * @param displayString the proposal's label * @param additionalInfo the additional information @@ -417,7 +417,7 @@ /** * Adds a proposal. - * + * * @param proposal the string to be inserted * @param cursorPosition the cursor position after insertion, * relative to the start of the proposal @@ -430,7 +430,7 @@ /** * Adds a proposal to the priority proposals list. - * + * * @param proposal the string to be inserted * @param displayString the proposal's label * @param additionalInfo the additional information @@ -438,10 +438,10 @@ private void addPriorityProposal(String proposal, String displayString, String additionalInfo) { fPriorityProposals.add(new Proposal(proposal, displayString, additionalInfo, proposal.length())); } - + /** * Adds a proposal. Ensures that existing pre- and postfixes are not duplicated. - * + * * @param proposal the string to be inserted * @param cursorPosition the cursor position after insertion, * relative to the start of the proposal @@ -473,7 +473,7 @@ /** * Adds a proposal that starts with a backslash. * Ensures that the backslash is not repeated if already typed. - * + * * @param proposal the string to be inserted * @param displayString the proposal's label * @param additionalInfo the additional information @@ -494,17 +494,17 @@ } } } - + /** * <code>true</code> iff the processor is for the find field. * <code>false</code> iff the processor is for the replace field. */ private final bool fIsFind; - + /** * Creates a new completion proposal provider. - * + * * @param isFind <code>true</code> if the provider is used for the 'find' field * <code>false</code> if the provider is used for the 'replace' field */ @@ -517,7 +517,7 @@ */ public IContentProposal [] getProposals(String contents, int position) { if (fIsFind) - return new ProposalComputer(contents, position).computeFindProposals(); - return new ProposalComputer(contents, position).computeReplaceProposals(); + return (new ProposalComputer(contents, position)).computeFindProposals(); + return (new ProposalComputer(contents, position)).computeReplaceProposals(); } }
--- a/dwtx/jface/text/IDocument.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocument.d Sun Aug 24 02:31:41 2008 +0200 @@ -275,7 +275,7 @@ * @return the character at the offset * @exception BadLocationException if the offset is invalid in this document */ - char getChar(int offset) throws BadLocationException; + char getChar(int offset) ; /** * Returns the number of characters in this document. @@ -299,7 +299,7 @@ * @return the document's text for the specified range * @exception BadLocationException if the range is invalid in this document */ - String get(int offset, int length) throws BadLocationException; + String get(int offset, int length) ; /** * Replaces the content of the document with the given text. @@ -325,7 +325,7 @@ * @see DocumentEvent * @see IDocumentListener */ - void replace(int offset, int length, String text) throws BadLocationException; + void replace(int offset, int length, String text) ; /** * Registers the document listener with the document. After registration @@ -395,7 +395,7 @@ * @param category the category to be removed * @exception BadPositionCategoryException if category is undefined in this document */ - void removePositionCategory(String category) throws BadPositionCategoryException; + void removePositionCategory(String category) ; /** * Returns all position categories of this document. This @@ -420,7 +420,7 @@ * @param position the position to be added * @exception BadLocationException if position describes an invalid range in this document */ - void addPosition(Position position) throws BadLocationException; + void addPosition(Position position) ; /** * Removes the given position from the document's default position category. @@ -456,7 +456,7 @@ * @param position the position to be deleted * @exception BadPositionCategoryException if category is undefined in this document */ - void removePosition(String category, Position position) throws BadPositionCategoryException; + void removePosition(String category, Position position) ; /** * Returns all positions of the given position category. @@ -468,7 +468,7 @@ * @return the list of all positions * @exception BadPositionCategoryException if category is undefined in this document */ - Position[] getPositions(String category) throws BadPositionCategoryException; + Position[] getPositions(String category) ; /** * Determines whether a position described by the parameters is managed by this document. @@ -571,7 +571,7 @@ * @return the partition type * @exception BadLocationException if offset is invalid in this document */ - String getContentType(int offset) throws BadLocationException; + String getContentType(int offset) ; /** * Returns the document partition in which the position is located. @@ -588,7 +588,7 @@ * @return a specification of the partition * @exception BadLocationException if offset is invalid in this document */ - ITypedRegion getPartition(int offset) throws BadLocationException; + ITypedRegion getPartition(int offset) ; /** * Computes the partitioning of the given document range using the @@ -607,7 +607,7 @@ * @return a specification of the range's partitioning * @exception BadLocationException if the range is invalid in this document */ - ITypedRegion[] computePartitioning(int offset, int length) throws BadLocationException; + ITypedRegion[] computePartitioning(int offset, int length) ; /** * Registers the document partitioning listener with the document. After registration @@ -685,7 +685,7 @@ * @return the length of the line * @exception BadLocationException if the line number is invalid in this document */ - int getLineLength(int line) throws BadLocationException; + int getLineLength(int line) ; /** * Returns the number of the line at which the character of the specified position is located. @@ -697,7 +697,7 @@ * @return the number of the line * @exception BadLocationException if the offset is invalid in this document */ - int getLineOfOffset(int offset) throws BadLocationException; + int getLineOfOffset(int offset) ; /** * Determines the offset of the first character of the given line. @@ -706,7 +706,7 @@ * @return the document offset * @exception BadLocationException if the line number is invalid in this document */ - int getLineOffset(int line) throws BadLocationException; + int getLineOffset(int line) ; /** * Returns a description of the specified line. The line is described by its @@ -716,7 +716,7 @@ * @return a line description * @exception BadLocationException if the line number is invalid in this document */ - IRegion getLineInformation(int line) throws BadLocationException; + IRegion getLineInformation(int line) ; /** * Returns a description of the line at the given offset. @@ -727,7 +727,7 @@ * @return a region describing the line * @exception BadLocationException if offset is invalid in this document */ - IRegion getLineInformationOfOffset(int offset) throws BadLocationException; + IRegion getLineInformationOfOffset(int offset) ; /** * Returns the number of lines in this document @@ -744,7 +744,7 @@ * @return the number of lines occupied by the specified range * @exception BadLocationException if specified range is invalid in this tracker */ - int getNumberOfLines(int offset, int length) throws BadLocationException; + int getNumberOfLines(int offset, int length) ; /** * Computes the number of lines in the given text. For a given @@ -774,7 +774,7 @@ * @return the line's delimiter or <code>null</code> if line does not have a delimiter * @exception BadLocationException if the line number is invalid in this document */ - String getLineDelimiter(int line) throws BadLocationException; + String getLineDelimiter(int line) ; /* ---------------------------- search ------------------------------------ */ @@ -792,5 +792,5 @@ * @exception BadLocationException if startOffset is an invalid document offset * @deprecated as of 3.0 search is provided by {@link FindReplaceDocumentAdapter} */ - int search(int startOffset, String findString, bool forwardSearch, bool caseSensitive, bool wholeWord) throws BadLocationException; + int search(int startOffset, String findString, bool forwardSearch, bool caseSensitive, bool wholeWord) ; }
--- a/dwtx/jface/text/IDocumentExtension.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentExtension.d Sun Aug 24 02:31:41 2008 +0200 @@ -197,7 +197,7 @@ * @exception UnsupportedOperationException if <code>registerPostNotificationReplace</code> * is not supported by this document */ - void registerPostNotificationReplace(IDocumentListener owner, IReplace replace) throws UnsupportedOperationException; + void registerPostNotificationReplace(IDocumentListener owner, IReplace replace) ; /** * Stops the processing of registered post notification replace operations until
--- a/dwtx/jface/text/IDocumentExtension3.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentExtension3.d Sun Aug 24 02:31:41 2008 +0200 @@ -198,7 +198,7 @@ * @return the set of legal content types * @exception BadPartitioningException if partitioning is invalid for this document */ - String[] getLegalContentTypes(String partitioning) throws BadPartitioningException; + String[] getLegalContentTypes(String partitioning) ; /**
--- a/dwtx/jface/text/IDocumentExtension4.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentExtension4.d Sun Aug 24 02:31:41 2008 +0200 @@ -184,7 +184,7 @@ * @return the started rewrite session * @throws IllegalStateException in case there is already an active rewrite session */ - DocumentRewriteSession startRewriteSession(DocumentRewriteSessionType sessionType) throws IllegalStateException; + DocumentRewriteSession startRewriteSession(DocumentRewriteSessionType sessionType) ; /** * Tells the document to stop the rewrite session. This method has only any @@ -244,7 +244,7 @@ * @see DocumentEvent * @see IDocumentListener */ - void replace(int offset, int length, String text, long modificationStamp) throws BadLocationException; + void replace(int offset, int length, String text, long modificationStamp) ; /** * Replaces the content of the document with the given text.
--- a/dwtx/jface/text/IDocumentInformationMapping.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentInformationMapping.d Sun Aug 24 02:31:41 2008 +0200 @@ -193,7 +193,7 @@ * @return the corresponding offset in the original document or <code>-1</code> * @throws BadLocationException if <code>imageOffset</code> is not a valid offset in the image document */ - int toOriginOffset(int imageOffset) throws BadLocationException; + int toOriginOffset(int imageOffset) ; /** * Returns the minimal region of the original document that completely comprises the given region of the @@ -203,7 +203,7 @@ * @return the minimal region of the original document comprising the given region of the image document or <code>null</code> * @throws BadLocationException if <code>imageRegion</code> is not a valid region of the image document */ - IRegion toOriginRegion(IRegion imageRegion) throws BadLocationException; + IRegion toOriginRegion(IRegion imageRegion) ; /** * Returns the range of lines of the original document that corresponds to the given line of the image document or @@ -213,7 +213,7 @@ * @return the corresponding lines of the original document or <code>null</code> * @throws BadLocationException if <code>imageLine</code> is not a valid line number in the image document */ - IRegion toOriginLines(int imageLine) throws BadLocationException; + IRegion toOriginLines(int imageLine) ; /** * Returns the line of the original document that corresponds to the given line of the image document or @@ -223,7 +223,7 @@ * @return the corresponding line of the original document or <code>-1</code> * @throws BadLocationException if <code>imageLine</code> is not a valid line number in the image document */ - int toOriginLine(int imageLine) throws BadLocationException; + int toOriginLine(int imageLine) ; @@ -235,7 +235,7 @@ * @return the corresponding offset in the image document or <code>-1</code> * @throws BadLocationException if <code>originOffset</code> is not a valid offset in the original document */ - int toImageOffset(int originOffset) throws BadLocationException; + int toImageOffset(int originOffset) ; /** * Returns the minimal region of the image document that completely comprises the given region of the @@ -245,7 +245,7 @@ * @return the minimal region of the image document comprising the given region of the original document or <code>null</code> * @throws BadLocationException if <code>originRegion</code> is not a valid region of the original document */ - IRegion toImageRegion(IRegion originRegion) throws BadLocationException; + IRegion toImageRegion(IRegion originRegion) ; /** * Returns the line of the image document that corresponds to the given line of the original document or @@ -255,7 +255,7 @@ * @return the corresponding line of the image document or <code>-1</code> * @throws BadLocationException if <code>originLine</code> is not a valid line number in the original document */ - int toImageLine(int originLine) throws BadLocationException; + int toImageLine(int originLine) ; /** * Returns the line of the image document whose corresponding line in the original document @@ -265,5 +265,5 @@ * @return the line in the image document that corresponds best to the given line in the original document * @throws BadLocationException if <code>originLine</code>is not a valid line in the original document */ - int toClosestImageLine(int originLine) throws BadLocationException; + int toClosestImageLine(int originLine) ; }
--- a/dwtx/jface/text/IDocumentInformationMappingExtension.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentInformationMappingExtension.d Sun Aug 24 02:31:41 2008 +0200 @@ -178,7 +178,7 @@ * @throws BadLocationException if origin region is not a valid region in * the origin document */ - IRegion toExactImageRegion(IRegion originRegion) throws BadLocationException; + IRegion toExactImageRegion(IRegion originRegion) ; /** * Returns the segments of the image document that exactly correspond to the @@ -190,7 +190,7 @@ * @throws BadLocationException in case the given origin region is not valid * in the original document */ - IRegion[] toExactImageRegions(IRegion originRegion) throws BadLocationException; + IRegion[] toExactImageRegions(IRegion originRegion) ; /** * Returns the fragments of the original document that exactly correspond to @@ -201,7 +201,7 @@ * @throws BadLocationException in case the given image region is not valid * in the image document */ - IRegion[] toExactOriginRegions(IRegion imageRegion) throws BadLocationException; + IRegion[] toExactOriginRegions(IRegion imageRegion) ; /** * Returns the length of the image document. @@ -221,5 +221,5 @@ * @throws BadLocationException in case the given origin region is not valid * in the original document */ - IRegion[] getExactCoverage(IRegion originRegion) throws BadLocationException; + IRegion[] getExactCoverage(IRegion originRegion) ; }
--- a/dwtx/jface/text/IDocumentInformationMappingExtension2.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentInformationMappingExtension2.d Sun Aug 24 02:31:41 2008 +0200 @@ -183,5 +183,5 @@ * @throws BadLocationException if <code>originRegion</code> is not a * valid region of the original document */ - IRegion toClosestImageRegion(IRegion originRegion) throws BadLocationException; + IRegion toClosestImageRegion(IRegion originRegion) ; }
--- a/dwtx/jface/text/IDocumentPartitionerExtension3.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IDocumentPartitionerExtension3.d Sun Aug 24 02:31:41 2008 +0200 @@ -176,7 +176,7 @@ * @param session the rewrite session * @throws IllegalStateException in case there is already an active rewrite session */ - void startRewriteSession(DocumentRewriteSession session) throws IllegalStateException; + void startRewriteSession(DocumentRewriteSession session) ; /** * Tells the document partitioner that the rewrite session has finished.
--- a/dwtx/jface/text/ILineTracker.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/ILineTracker.d Sun Aug 24 02:31:41 2008 +0200 @@ -196,7 +196,7 @@ * @return the line's delimiter or <code>null</code> if line does not have a delimiter * @exception BadLocationException if the line number is invalid in this tracker's line structure */ - String getLineDelimiter(int line) throws BadLocationException; + String getLineDelimiter(int line) ; /** * Computes the number of lines in the given text. @@ -221,7 +221,7 @@ * @return the number of lines occupied by the specified range * @exception BadLocationException if specified range is unknown to this tracker */ - int getNumberOfLines(int offset, int length) throws BadLocationException; + int getNumberOfLines(int offset, int length) ; /** * Returns the position of the first character of the specified line. @@ -230,7 +230,7 @@ * @return offset of the first character of the line * @exception BadLocationException if the line is unknown to this tracker */ - int getLineOffset(int line) throws BadLocationException; + int getLineOffset(int line) ; /** * Returns length of the specified line including the line's delimiter. @@ -239,7 +239,7 @@ * @return the length of the line * @exception BadLocationException if line is unknown to this tracker */ - int getLineLength(int line) throws BadLocationException; + int getLineLength(int line) ; /** * Returns the line number the character at the given offset belongs to. @@ -248,7 +248,7 @@ * @return the number of the line the offset is on * @exception BadLocationException if the offset is invalid in this tracker */ - int getLineNumberOfOffset(int offset) throws BadLocationException; + int getLineNumberOfOffset(int offset) ; /** * Returns a line description of the line at the given offset. @@ -259,7 +259,7 @@ * @return a region describing the line * @exception BadLocationException if offset is invalid in this tracker */ - IRegion getLineInformationOfOffset(int offset) throws BadLocationException; + IRegion getLineInformationOfOffset(int offset) ; /** * Returns a line description of the given line. The description @@ -270,7 +270,7 @@ * @return a region describing the line * @exception BadLocationException if line is unknown to this tracker */ - IRegion getLineInformation(int line) throws BadLocationException; + IRegion getLineInformation(int line) ; /** * Informs the line tracker about the specified change in the tracked text. @@ -280,7 +280,7 @@ * @param text the substitution text * @exception BadLocationException if specified range is unknown to this tracker */ - void replace(int offset, int length, String text) throws BadLocationException; + void replace(int offset, int length, String text) ; /** * Sets the tracked text to the specified text.
--- a/dwtx/jface/text/ILineTrackerExtension.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/ILineTrackerExtension.d Sun Aug 24 02:31:41 2008 +0200 @@ -174,7 +174,7 @@ * @throws IllegalStateException in case there is already an active rewrite * session */ - void startRewriteSession(DocumentRewriteSession session) throws IllegalStateException; + void startRewriteSession(DocumentRewriteSession session) ; /** * Tells the line tracker that the rewrite session has finished. This method
--- a/dwtx/jface/text/IRepairableDocumentExtension.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/IRepairableDocumentExtension.d Sun Aug 24 02:31:41 2008 +0200 @@ -179,5 +179,5 @@ * @throws BadLocationException if the offset is invalid in this document * @see IRepairableDocument#repairLineInformation() */ - bool isLineInformationRepairNeeded(int offset, int length, String text) throws BadLocationException; + bool isLineInformationRepairNeeded(int offset, int length, String text) ; }
--- a/dwtx/jface/text/contentassist/AdditionalInfoController.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/contentassist/AdditionalInfoController.d Sun Aug 24 02:31:41 2008 +0200 @@ -348,7 +348,7 @@ } private bool isExt5(ICompletionProposal p) { - return p instanceof ICompletionProposalExtension5; + return cast(ICompletionProposalExtension5)p; } ICompletionProposal getCurrentProposal() {
--- a/dwtx/jface/text/hyperlink/IHyperlinkPresenter.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/hyperlink/IHyperlinkPresenter.d Sun Aug 24 02:31:41 2008 +0200 @@ -72,7 +72,7 @@ * <li>{@link #canShowMultipleHyperlinks()} returns <code>false</code> and <code>hyperlinks</code> contains more than one element</li> * </ul> */ - void showHyperlinks(IHyperlink[] hyperlinks) throws IllegalArgumentException; + void showHyperlinks(IHyperlink[] hyperlinks) ; /** * Tells this hyperlink presenter to hide the hyperlinks
--- a/dwtx/jface/text/projection/IMinimalMapping.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/projection/IMinimalMapping.d Sun Aug 24 02:31:41 2008 +0200 @@ -50,17 +50,17 @@ /* * @see dwtx.jface.text.IDocumentInformationMapping#toOriginRegion(IRegion) */ - IRegion toOriginRegion(IRegion region) throws BadLocationException; + IRegion toOriginRegion(IRegion region) ; /* * @see dwtx.jface.text.IDocumentInformationMapping#toOriginOffset(int) */ - int toOriginOffset(int offset) throws BadLocationException; + int toOriginOffset(int offset) ; /* * @see dwtx.jface.text.IDocumentInformationMappingExtension#toExactOriginRegions(IRegion) */ - IRegion[] toExactOriginRegions(IRegion region) throws BadLocationException; + IRegion[] toExactOriginRegions(IRegion region) ; /* * @see dwtx.jface.text.IDocumentInformationMappingExtension#getImageLength()
--- a/dwtx/jface/text/quickassist/IQuickFixableAnnotation.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/quickassist/IQuickFixableAnnotation.d Sun Aug 24 02:31:41 2008 +0200 @@ -70,6 +70,6 @@ * @return <code>true</code> if this annotation offers quick fixes * @throws AssertionFailedException if called when {@link #isQuickFixableStateSet()} is <code>false</code> */ - bool isQuickFixable() throws AssertionFailedException; + bool isQuickFixable() ; }
--- a/dwtx/jface/text/source/IAnnotationModelExtension.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/source/IAnnotationModelExtension.d Sun Aug 24 02:31:41 2008 +0200 @@ -142,7 +142,7 @@ * @throws ClassCastException if one of the map key or values has a wrong * type */ - void replaceAnnotations(Annotation[] annotationsToRemove, Map annotationsToAdd) throws ClassCastException; + void replaceAnnotations(Annotation[] annotationsToRemove, Map annotationsToAdd) ; /** * Modifies the position associated with the given annotation to equal the
--- a/dwtx/jface/text/source/ILineDiffer.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/source/ILineDiffer.d Sun Aug 24 02:31:41 2008 +0200 @@ -122,7 +122,7 @@ * @param line the line number of the line to be restored. * @throws BadLocationException if <code>line</code> is out of bounds. */ - void revertLine(int line) throws BadLocationException; + void revertLine(int line) ; /** * Reverts a block of modified / added lines to their original state, including any deleted @@ -132,7 +132,7 @@ * @param line any line in the block to be reverted. * @throws BadLocationException if <code>line</code> is out of bounds. */ - void revertBlock(int line) throws BadLocationException; + void revertBlock(int line) ; /** * Reverts a range of lines to their original state, including any deleted @@ -142,7 +142,7 @@ * @param nLines the number of lines to be reverted, must be > 0. * @throws BadLocationException if <code>line</code> is out of bounds. */ - void revertSelection(int line, int nLines) throws BadLocationException; + void revertSelection(int line, int nLines) ; /** * Restores the deleted lines after <code>line</code>. @@ -151,5 +151,5 @@ * @return the number of restored lines. * @throws BadLocationException if <code>line</code> is out of bounds. */ - int restoreAfterLine(int line) throws BadLocationException; + int restoreAfterLine(int line) ; }
--- a/dwtx/jface/text/source/projection/IProjectionPosition.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/jface/text/source/projection/IProjectionPosition.d Sun Aug 24 02:31:41 2008 +0200 @@ -53,7 +53,7 @@ * @return the foldable regions for this position * @throws BadLocationException if accessing the document fails */ - IRegion[] computeProjectionRegions(IDocument document) throws BadLocationException; + IRegion[] computeProjectionRegions(IDocument document) ; /** * Returns the offset of the caption (the anchor region) of this projection @@ -64,6 +64,6 @@ * @return the caption offset relative to the position's offset * @throws BadLocationException if accessing the document fails */ - int computeCaptionOffset(IDocument document) throws BadLocationException; + int computeCaptionOffset(IDocument document) ; }
--- a/dwtx/text/edits/TextEdit.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/text/edits/TextEdit.d Sun Aug 24 02:31:41 2008 +0200 @@ -942,7 +942,7 @@ protected void childDocumentUpdated() { } - abstract int performDocumentUpdating(IDocument document) throws BadLocationException; + abstract int performDocumentUpdating(IDocument document) ; int traverseRegionUpdating(TextEditProcessor processor, IDocument document, int accumulatedDelta, bool delete) { performRegionUpdating(accumulatedDelta, delete);
--- a/dwtx/text/undo/IDocumentUndoManager.d Sun Aug 24 02:26:23 2008 +0200 +++ b/dwtx/text/undo/IDocumentUndoManager.d Sun Aug 24 02:31:41 2008 +0200 @@ -156,14 +156,14 @@ * * @throws ExecutionException if an exception occurred during undo */ - void undo() throws ExecutionException; + void undo() ; /** * Repeats the most recently rolled back text change. * * @throws ExecutionException if an exception occurred during redo */ - void redo() throws ExecutionException; + void redo() ; /** * Transfers the undo history from the specified document undo manager to