Mercurial > projects > dwt-addons
changeset 160:3678e4f1a766
toHash, toString
line wrap: on
line diff
--- a/dwtx/jface/internal/text/html/BrowserInformationControl.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/internal/text/html/BrowserInformationControl.d Wed Aug 27 02:07:22 2008 +0200 @@ -607,7 +607,7 @@ * @see java.lang.Object#toString() * @since 3.4 */ - public String toString() { + public override String toString() { String style= (getShell().getStyle() & DWT.RESIZE) is 0 ? "fixed" : "resizeable"; //$NON-NLS-1$ //$NON-NLS-2$ return super.toString() + " - style: " + style; //$NON-NLS-1$ } @@ -638,4 +638,4 @@ } -++/ \ No newline at end of file +++/
--- a/dwtx/jface/internal/text/html/BrowserInformationControlInput.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/internal/text/html/BrowserInformationControlInput.d Wed Aug 27 02:07:22 2008 +0200 @@ -65,7 +65,7 @@ * * @return {@link #getHtml()} */ - public String toString() { + public override String toString() { return getHtml(); } }
--- a/dwtx/jface/internal/text/revisions/ChangeRegion.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/ChangeRegion.d Wed Aug 27 02:07:22 2008 +0200 @@ -171,7 +171,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return "ChangeRegion [" + fRevision.toString() + ", [" + fLines.getStartLine() + "+" + fLines.getNumberOfLines() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } }
--- a/dwtx/jface/internal/text/revisions/Hunk.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/internal/text/revisions/Hunk.d Wed Aug 27 02:07:22 2008 +0200 @@ -64,14 +64,14 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return "Hunk [" + line + ">" + changed + (delta < 0 ? "-" : "+") + Math.abs(delta) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } /* * @see java.lang.Object#hashCode() */ - public int hashCode() { + public override hash_t toHash() { final int prime= 31; int result= 1; result= prime * result + changed;
--- a/dwtx/jface/text/AbstractInformationControlManager.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/AbstractInformationControlManager.d Wed Aug 27 02:07:22 2008 +0200 @@ -307,7 +307,7 @@ return fFlag; } - public String toString() { + public override String toString() { switch (fFlag) { case DWT.BOTTOM: return "BOTTOM"; //$NON-NLS-1$ case DWT.TOP: return "TOP"; //$NON-NLS-1$
--- a/dwtx/jface/text/DefaultUndoManager.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/DefaultUndoManager.d Wed Aug 27 02:07:22 2008 +0200 @@ -531,7 +531,7 @@ * @see java.lang.Object#toString() * @since 3.1 */ - public String toString() { + public override String toString() { String delimiter= ", "; //$NON-NLS-1$ StringBuffer text= new StringBuffer(super.toString()); text.append("\n"); //$NON-NLS-1$
--- a/dwtx/jface/text/DocumentEvent.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/DocumentEvent.d Wed Aug 27 02:07:22 2008 +0200 @@ -287,7 +287,7 @@ * @see java.lang.Object#toString() * @since 3.4 */ - public String toString() { + public override String toString() { StringBuffer buffer= new StringBuffer(); buffer.append("offset: " ); //$NON-NLS-1$ buffer.append(fOffset);
--- a/dwtx/jface/text/DocumentRewriteSession.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/DocumentRewriteSession.d Wed Aug 27 02:07:22 2008 +0200 @@ -190,7 +190,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { - return (new StringBuffer()).append(hashCode()).toString(); + public override String toString() { + return (new StringBuffer()).append(toHash()).toString(); } }
--- a/dwtx/jface/text/FindReplaceDocumentAdapter.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/FindReplaceDocumentAdapter.d Wed Aug 27 02:07:22 2008 +0200 @@ -776,7 +776,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return fDocument.get(); } }
--- a/dwtx/jface/text/ITextViewerExtension8.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/ITextViewerExtension8.d Wed Aug 27 02:07:22 2008 +0200 @@ -94,7 +94,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return fName; } }
--- a/dwtx/jface/text/PaintManager.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/PaintManager.d Wed Aug 27 02:07:22 2008 +0200 @@ -243,7 +243,7 @@ * position category using its class name and its hash value. */ public this() { - fCategory= getClass().getName() + hashCode(); + fCategory= getClass().getName() + toHash(); fPositionUpdater= new PaintPositionUpdater(fCategory); }
--- a/dwtx/jface/text/Position.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/Position.d Wed Aug 27 02:07:22 2008 +0200 @@ -220,7 +220,7 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { + public override hash_t toHash() { int deleted= isDeleted_ ? 0 : 1; return (offset << 24) | (length << 16) | deleted; }
--- a/dwtx/jface/text/Region.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/Region.d Wed Aug 27 02:07:22 2008 +0200 @@ -206,14 +206,14 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { + public override hash_t toHash() { return (fOffset << 24) | (fLength << 16); } /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return "[" + fOffset + '+' + fLength + ']'; //$NON-NLS-1$ } }
--- a/dwtx/jface/text/TextAttribute.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/TextAttribute.d Wed Aug 27 02:07:22 2008 +0200 @@ -277,13 +277,13 @@ /* * @see Object#hashCode() */ - public int hashCode() { + public override hash_t toHash() { if (fHashCode is 0) { int multiplier= 37; // some prime fHashCode= 13; // some random value - fHashCode= multiplier * fHashCode + (font is null ? 0 : font.hashCode()); - fHashCode= multiplier * fHashCode + (background is null ? 0 : background.hashCode()); - fHashCode= multiplier * fHashCode + (foreground is null ? 0 : foreground.hashCode()); + fHashCode= multiplier * fHashCode + (font is null ? 0 : font.toHash()); + fHashCode= multiplier * fHashCode + (background is null ? 0 : background.toHash()); + fHashCode= multiplier * fHashCode + (foreground is null ? 0 : foreground.toHash()); fHashCode= multiplier * fHashCode + style; } return fHashCode;
--- a/dwtx/jface/text/TextSelection.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/TextSelection.d Wed Aug 27 02:07:22 2008 +0200 @@ -325,8 +325,8 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { - int low= fDocument !is null ? fDocument.hashCode() : 0; + public override hash_t toHash() { + int low= fDocument !is null ? fDocument.toHash() : 0; return (fOffset << 24) | (fLength << 16) | low; } }
--- a/dwtx/jface/text/TextViewer.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/TextViewer.d Wed Aug 27 02:07:22 2008 +0200 @@ -1226,8 +1226,8 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { - return fStateMask << 16 | fContentType.hashCode(); + public override hash_t toHash() { + return fStateMask << 16 | fContentType.toHash(); } /** @@ -1363,7 +1363,7 @@ Assert.isLegal(!isConnected()); fUpdaterDocument= document; try { - fUpdaterCategory= SELECTION_POSITION_CATEGORY + hashCode(); + fUpdaterCategory= SELECTION_POSITION_CATEGORY + toHash(); fUpdater= new NonDeletingPositionUpdater(fUpdaterCategory); fUpdaterDocument.addPositionCategory(fUpdaterCategory); fUpdaterDocument.addPositionUpdater(fUpdater); @@ -1792,7 +1792,7 @@ fVerifyListener= new TextVerifyListener(); fDocumentCommand= new DocumentCommand(); fVerifyKeyListenersManager= new VerifyKeyListenersManager(); - MARK_POSITION_CATEGORY=Format("__mark_category_{}", hashCode()); //$NON-NLS-1$ + MARK_POSITION_CATEGORY=Format("__mark_category_{}", toHash()); //$NON-NLS-1$ fMarkPositionUpdater= new DefaultPositionUpdater(MARK_POSITION_CATEGORY); fDocumentRewriteSessionListener= new DocumentRewriteSessionListener(); }
--- a/dwtx/jface/text/TreeLineTracker.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/TreeLineTracker.d Wed Aug 27 02:07:22 2008 +0200 @@ -261,7 +261,7 @@ /* * @see java.lang.Object#toString() */ - public final String toString() { + public final override String toString() { String bal; switch (balance) { case 0: @@ -1395,7 +1395,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { int depth= computeDepth(fRoot); int WIDTH= 30; int leaves= cast(int) Math.pow(2, depth - 1);
--- a/dwtx/jface/text/TypedPosition.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/TypedPosition.d Wed Aug 27 02:07:22 2008 +0200 @@ -217,8 +217,8 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { - int type= fType is null ? 0 : fType.hashCode(); - return super.hashCode() | type; + public override hash_t toHash() { + int type= fType is null ? 0 : fType.toHash(); + return super.toHash() | type; } }
--- a/dwtx/jface/text/TypedRegion.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/TypedRegion.d Wed Aug 27 02:07:22 2008 +0200 @@ -199,8 +199,8 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { - int type= fType is null ? 0 : fType.hashCode(); - return super.hashCode() | type; + public override hash_t toHash() { + int type= fType is null ? 0 : fType.toHash(); + return super.toHash() | type; } }
--- a/dwtx/jface/text/contentassist/AdditionalInfoController.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/contentassist/AdditionalInfoController.d Wed Aug 27 02:07:22 2008 +0200 @@ -125,7 +125,7 @@ return Long.MAX_VALUE; } - public String toString() { + public override String toString() { return "IDLE"; //$NON-NLS-1$ } }; @@ -168,7 +168,7 @@ return DELAY_UNTIL_JOB_IS_SCHEDULED; } - public String toString() { + public override String toString() { return "FIRST_WAIT"; //$NON-NLS-1$ } }; @@ -193,7 +193,7 @@ return fDelay - DELAY_UNTIL_JOB_IS_SCHEDULED; } - public String toString() { + public override String toString() { return "SECOND_WAIT"; //$NON-NLS-1$ } }; @@ -228,7 +228,7 @@ return fDelay; } - public String toString() { + public override String toString() { return "LEGACY_WAIT"; //$NON-NLS-1$ } }; @@ -252,7 +252,7 @@ Assert.isTrue(false); } - public String toString() { + public override String toString() { return "EXIT"; //$NON-NLS-1$ } };
--- a/dwtx/jface/text/contentassist/ContextInformation.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/contentassist/ContextInformation.d Wed Aug 27 02:07:22 2008 +0200 @@ -111,9 +111,9 @@ * @see java.lang.Object#hashCode() * @since 3.1 */ - public int hashCode() { - int low= fContextDisplayString !is null ? fContextDisplayString.hashCode() : 0; - return (fInformationDisplayString.hashCode() << 16) | low; + public override hash_t toHash() { + int low= fContextDisplayString !is null ? fContextDisplayString.toHash() : 0; + return (fInformationDisplayString.toHash() << 16) | low; } /*
--- a/dwtx/jface/text/contentassist/ContextInformationPopup.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/contentassist/ContextInformationPopup.d Wed Aug 27 02:07:22 2008 +0200 @@ -114,8 +114,8 @@ * @see java.lang.Object#hashCode() * @since 3.1 */ - public int hashCode() { - return (fInformation.hashCode() << 16) | fBeginOffset; + public override hash_t toHash() { + return (fInformation.toHash() << 16) | fBeginOffset; } }
--- a/dwtx/jface/text/hyperlink/HyperlinkManager.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/hyperlink/HyperlinkManager.d Wed Aug 27 02:07:22 2008 +0200 @@ -74,7 +74,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return fName; } }
--- a/dwtx/jface/text/link/LinkedPosition.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/link/LinkedPosition.d Wed Aug 27 02:07:22 2008 +0200 @@ -187,7 +187,7 @@ /* * @see dwtx.jface.text.Position#hashCode() */ - public int hashCode() { - return fDocument.hashCode() | super.hashCode() | fSequenceNumber; + public override hash_t toHash() { + return fDocument.toHash() | super.toHash() | fSequenceNumber; } }
--- a/dwtx/jface/text/link/ProposalPosition.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/link/ProposalPosition.d Wed Aug 27 02:07:22 2008 +0200 @@ -110,7 +110,7 @@ /* * @see dwtx.jdt.internal.ui.text.link.LinkedPosition#hashCode() */ - public int hashCode() { - return super.hashCode() | (fProposals is null ? 0 : fProposals.hashCode()); + public override hash_t toHash() { + return super.toHash() | (fProposals is null ? 0 : fProposals.toHash()); } }
--- a/dwtx/jface/text/projection/ProjectionDocument.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/projection/ProjectionDocument.d Wed Aug 27 02:07:22 2008 +0200 @@ -132,7 +132,7 @@ fMasterDocumentExtension= cast(IDocumentExtension) fMasterDocument; fSegmentsCategory= SEGMENTS_CATEGORY; - fFragmentsCategory= FRAGMENTS_CATEGORY_PREFIX + hashCode(); + fFragmentsCategory= FRAGMENTS_CATEGORY_PREFIX + toHash(); fMasterDocument.addPositionCategory(fFragmentsCategory); fFragmentsUpdater= new FragmentUpdater(fFragmentsCategory); fMasterDocument.addPositionUpdater(fFragmentsUpdater);
--- a/dwtx/jface/text/revisions/Revision.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/revisions/Revision.d Wed Aug 27 02:07:22 2008 +0200 @@ -150,7 +150,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return "Revision " + getId(); //$NON-NLS-1$ }
--- a/dwtx/jface/text/revisions/RevisionRange.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/revisions/RevisionRange.d Wed Aug 27 02:07:22 2008 +0200 @@ -71,7 +71,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { return "RevisionRange [" + fRevision.toString() + ", [" + getStartLine() + "+" + getNumberOfLines() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } }
--- a/dwtx/jface/text/rules/DefaultPartitioner.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/rules/DefaultPartitioner.d Wed Aug 27 02:07:22 2008 +0200 @@ -128,7 +128,7 @@ public this(IPartitionTokenScanner scanner, String[] legalContentTypes) { fScanner= scanner; fLegalContentTypes= TextUtilities.copy(legalContentTypes); - fPositionCategory= CONTENT_TYPES_CATEGORY + hashCode(); + fPositionCategory= CONTENT_TYPES_CATEGORY + toHash(); fPositionUpdater= new DefaultPositionUpdater(fPositionCategory); }
--- a/dwtx/jface/text/rules/FastPartitioner.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/rules/FastPartitioner.d Wed Aug 27 02:07:22 2008 +0200 @@ -136,7 +136,7 @@ public this(IPartitionTokenScanner scanner, String[] legalContentTypes) { fScanner= scanner; fLegalContentTypes= TextUtilities.copy(legalContentTypes); - fPositionCategory= CONTENT_TYPES_CATEGORY + hashCode(); + fPositionCategory= CONTENT_TYPES_CATEGORY + toHash(); fPositionUpdater= new DefaultPositionUpdater(fPositionCategory); } @@ -845,7 +845,7 @@ * @param position the position to format * @return a formatted string */ - private String toString(Position position) { + private override String toString(Position position) { return "P[" + position.getOffset() + "+" + position.getLength() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } }
--- a/dwtx/jface/text/rules/RuleBasedPartitioner.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/rules/RuleBasedPartitioner.d Wed Aug 27 02:07:22 2008 +0200 @@ -119,7 +119,7 @@ public this(RuleBasedScanner scanner, String[] legalContentTypes) { fScanner= scanner; fLegalContentTypes= TextUtilities.copy(legalContentTypes); - fPositionCategory= CONTENT_TYPES_CATEGORY + hashCode(); + fPositionCategory= CONTENT_TYPES_CATEGORY + toHash(); fPositionUpdater= new DefaultPositionUpdater(fPositionCategory); }
--- a/dwtx/jface/text/source/SourceViewer.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/source/SourceViewer.d Wed Aug 27 02:07:22 2008 +0200 @@ -794,7 +794,7 @@ final IDocument document= getDocument(); if (fSelections.isEmpty()) { - fSelectionCategory= _SELECTION_POSITION_CATEGORY + hashCode(); + fSelectionCategory= _SELECTION_POSITION_CATEGORY + toHash(); fSelectionUpdater= new NonDeletingPositionUpdater(fSelectionCategory); document.addPositionCategory(fSelectionCategory); document.addPositionUpdater(fSelectionUpdater);
--- a/dwtx/jface/text/templates/Template.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/templates/Template.d Wed Aug 27 02:07:22 2008 +0200 @@ -113,8 +113,8 @@ /* * @see Object#hashCode() */ - public int hashCode() { - return fName.hashCode() ^ fPattern.hashCode() ^ fContextTypeId.hashCode(); + public override hash_t toHash() { + return fName.toHash() ^ fPattern.toHash() ^ fContextTypeId.toHash(); } /**
--- a/dwtx/jface/text/templates/TemplateVariableType.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/jface/text/templates/TemplateVariableType.d Wed Aug 27 02:07:22 2008 +0200 @@ -99,15 +99,15 @@ /* * @see java.lang.Object#hashCode() */ - public int hashCode() { - return fName.hashCode() + fParams.hashCode(); + public override hash_t toHash() { + return fName.toHash() + fParams.toHash(); } /* * @see java.lang.Object#toString() * @since 3.3 */ - public String toString() { + public override String toString() { return fName + fParams.toString(); } }
--- a/dwtx/text/edits/TextEdit.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/text/edits/TextEdit.d Wed Aug 27 02:07:22 2008 +0200 @@ -514,14 +514,14 @@ * * @see Object#hashCode() */ - public final int hashCode() { - return super.hashCode(); + public final override hash_t toHash() { + return super.toHash(); } /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { StringBuffer buffer= new StringBuffer(); toStringWithChildren(buffer, 0); return buffer.toString();
--- a/dwtx/text/undo/DocumentUndoManager.d Wed Aug 27 01:57:58 2008 +0200 +++ b/dwtx/text/undo/DocumentUndoManager.d Wed Aug 27 02:07:22 2008 +0200 @@ -389,7 +389,7 @@ /* * @see java.lang.Object#toString() */ - public String toString() { + public override String toString() { String delimiter= ", "; //$NON-NLS-1$ StringBuffer text= new StringBuffer(super.toString()); text.append("\n"); //$NON-NLS-1$