Mercurial > projects > dwt-addons
diff dwtx/jface/text/TextViewer.d @ 134:51e6e63f930e
Regex fix for casts
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Sun, 24 Aug 2008 01:46:20 +0200 |
parents | 7d818bd32d63 |
children | 65801ad2b265 |
line wrap: on
line diff
--- a/dwtx/jface/text/TextViewer.d Sun Aug 24 01:29:22 2008 +0200 +++ b/dwtx/jface/text/TextViewer.d Sun Aug 24 01:46:20 2008 +0200 @@ -299,7 +299,7 @@ try { if (e instanceof SlaveDocumentEvent) { - SlaveDocumentEvent slave= (SlaveDocumentEvent) e; + SlaveDocumentEvent slave= cast(SlaveDocumentEvent) e; DocumentEvent master= slave.getMasterEvent(); if (master !is null) preservedText= master.getDocument().get(master.getOffset(), master.getLength()); @@ -309,7 +309,7 @@ } catch (BadLocationException x) { preservedText= null; - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.WidgetCommand.setEvent")); //$NON-NLS-1$ } } else @@ -344,7 +344,7 @@ if (event.movement !is DWT.MOVEMENT_WORD_END) return; - if (TRACE_DOUBLE_CLICK) { + if cast(TRACE_DOUBLE_CLICK) { System.out.println("\n+++"); //$NON-NLS-1$ print(event); } @@ -363,18 +363,18 @@ if (event.movement !is DWT.MOVEMENT_WORD_START) return; - if (TRACE_DOUBLE_CLICK) { + if cast(TRACE_DOUBLE_CLICK) { System.out.println("\n---"); //$NON-NLS-1$ print(event); } if (fDoubleClickSelection is null) { - ITextDoubleClickStrategy s= (ITextDoubleClickStrategy) selectContentTypePlugin(getSelectedRange().x, fDoubleClickStrategies); + ITextDoubleClickStrategy s= cast(ITextDoubleClickStrategy) selectContentTypePlugin(getSelectedRange().x, fDoubleClickStrategies); if (s !is null) { StyledText textWidget= getTextWidget(); s.doubleClicked(TextViewer.this); fDoubleClickSelection= textWidget.getSelection(); event.newOffset= fDoubleClickSelection.x; - if (TRACE_DOUBLE_CLICK) + if cast(TRACE_DOUBLE_CLICK) System.out.println("- setting selection: x= " + fDoubleClickSelection.x + ", y= " + fDoubleClickSelection.y); //$NON-NLS-1$ //$NON-NLS-2$ } } else { @@ -614,7 +614,7 @@ fReentranceCount++; Iterator iterator= fListeners.iterator(); while (iterator.hasNext() && event.doit) { - VerifyKeyListener listener= (VerifyKeyListener) iterator.next(); + VerifyKeyListener listener= cast(VerifyKeyListener) iterator.next(); listener.verifyKey(event); // we might trigger reentrant calls on GTK } } finally { @@ -631,7 +631,7 @@ if (!fBatched.isEmpty()) { Iterator e= fBatched.iterator(); while (e.hasNext()) { - Batch batch= (Batch) e.next(); + Batch batch= cast(Batch) e.next(); insertListener(batch.listener, batch.index); } fBatched.clear(); @@ -1126,7 +1126,7 @@ if (replaceAll) { if (document instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) document; + IDocumentExtension4 extension= cast(IDocumentExtension4) document; fRewriteSession= extension.startRewriteSession(DocumentRewriteSessionType.SEQUENTIAL); } else { TextViewer.this.setRedraw(false); @@ -1141,7 +1141,7 @@ } else { if (document instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) document; + IDocumentExtension4 extension= cast(IDocumentExtension4) document; extension.stopRewriteSession(fRewriteSession); } else { TextViewer.this.setRedraw(true); @@ -1227,7 +1227,7 @@ public bool equals(Object obj) { if (obj is null || obj.getClass() !is getClass()) return false; - TextHoverKey textHoverKey= (TextHoverKey)obj; + TextHoverKey textHoverKey= cast(TextHoverKey)obj; return textHoverKey.fContentType.equals(fContentType) && textHoverKey.fStateMask is fStateMask; } @@ -2099,7 +2099,7 @@ if (fAutoIndentStrategies is null) fAutoIndentStrategies= new HashMap(); - List autoEditStrategies= (List) fAutoIndentStrategies.get(contentType); + List autoEditStrategies= cast(List) fAutoIndentStrategies.get(contentType); if (strategies is null) { if (autoEditStrategies is null) @@ -2130,7 +2130,7 @@ if (fAutoIndentStrategies is null) fAutoIndentStrategies= new HashMap(); - List autoEditStrategies= (List) fAutoIndentStrategies.get(contentType); + List autoEditStrategies= cast(List) fAutoIndentStrategies.get(contentType); if (autoEditStrategies is null) { autoEditStrategies= new ArrayList(); fAutoIndentStrategies.put(contentType, autoEditStrategies); @@ -2147,7 +2147,7 @@ if (fAutoIndentStrategies is null) return; - List autoEditStrategies= (List) fAutoIndentStrategies.get(contentType); + List autoEditStrategies= cast(List) fAutoIndentStrategies.get(contentType); if (autoEditStrategies is null) return; @@ -2277,7 +2277,7 @@ Iterator iter= new HashSet(fTextHovers.keySet()).iterator(); while (iter.hasNext()) { - TextHoverKey key= (TextHoverKey)iter.next(); + TextHoverKey key= cast(TextHoverKey)iter.next(); if (key.fContentType.equals(contentType)) fTextHovers.remove(key); } @@ -2317,9 +2317,9 @@ key.setStateMask(ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK); textHover= fTextHovers.get(key); } - return (ITextHover) textHover; + return cast(ITextHover) textHover; } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.selectContentTypePlugin")); //$NON-NLS-1$ } return null; @@ -2390,7 +2390,7 @@ bool accepted= false; if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension) { - IWidgetTokenKeeperExtension extension= (IWidgetTokenKeeperExtension) fWidgetTokenKeeper; + IWidgetTokenKeeperExtension extension= cast(IWidgetTokenKeeperExtension) fWidgetTokenKeeper; accepted= extension.requestWidgetToken(this, priority); } else { accepted= fWidgetTokenKeeper.requestWidgetToken(this); @@ -2551,7 +2551,7 @@ */ public void setSelection(ISelection selection, bool reveal) { if (selection instanceof ITextSelection) { - ITextSelection s= (ITextSelection) selection; + ITextSelection s= cast(ITextSelection) selection; setSelectedRange(s.getOffset(), s.getLength()); if (reveal) revealRange(s.getOffset(), s.getLength()); @@ -2714,7 +2714,7 @@ if (listeners !is null) { listeners= new ArrayList(listeners); for (int i= 0; i < listeners.size(); i++) { - ISelectionChangedListener l= (ISelectionChangedListener) listeners.get(i); + ISelectionChangedListener l= cast(ISelectionChangedListener) listeners.get(i); l.selectionChanged(event); } } @@ -2785,11 +2785,11 @@ textListeners= new ArrayList(textListeners); DocumentEvent event= cmd.event; if (event instanceof SlaveDocumentEvent) - event= ((SlaveDocumentEvent) event).getMasterEvent(); + event= (cast(SlaveDocumentEvent) event).getMasterEvent(); TextEvent e= new TextEvent(cmd.start, cmd.length, cmd.text, cmd.preservedText, event, redraws()); for (int i= 0; i < textListeners.size(); i++) { - ITextListener l= (ITextListener) textListeners.get(i); + ITextListener l= cast(ITextListener) textListeners.get(i); l.textChanged(e); } } @@ -2836,7 +2836,7 @@ List listener= fTextInputListeners; if (listener !is null) { for (int i= 0; i < listener.size(); i++) { - ITextInputListener l= (ITextInputListener) listener.get(i); + ITextInputListener l= cast(ITextInputListener) listener.get(i); l.inputDocumentAboutToBeChanged(oldInput, newInput); } } @@ -2853,7 +2853,7 @@ List listener= fTextInputListeners; if (listener !is null) { for (int i= 0; i < listener.size(); i++) { - ITextInputListener l= (ITextInputListener) listener.get(i); + ITextInputListener l= cast(ITextInputListener) listener.get(i); l.inputDocumentChanged(oldInput, newInput); } } @@ -2882,7 +2882,7 @@ IDocument document= null; if (input instanceof IDocument) - document= (IDocument) input; + document= cast(IDocument) input; setDocument(document); } @@ -2968,7 +2968,7 @@ */ protected bool updateVisibleDocument(IDocument visibleDocument, int visibleRegionOffset, int visibleRegionLength) throws BadLocationException { if (visibleDocument instanceof ChildDocument) { - ChildDocument childDocument= (ChildDocument) visibleDocument; + ChildDocument childDocument= cast(ChildDocument) visibleDocument; IDocument document= childDocument.getParentDocument(); int line= document.getLineOfOffset(visibleRegionOffset); @@ -3080,7 +3080,7 @@ if (topPixel >= 0 && topPixel !is fLastTopPixel) { if (fViewportListeners !is null) { for (int i= 0; i < fViewportListeners.size(); i++) { - IViewportListener l= (IViewportListener) fViewportListeners.get(i); + IViewportListener l= cast(IViewportListener) fViewportListeners.get(i); l.viewportChanged(topPixel); } } @@ -3164,7 +3164,7 @@ top= getVisibleDocument().getLineOffset(top); return widgetOffset2ModelOffset(top); } catch (BadLocationException ex) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getTopIndexStartOffset")); //$NON-NLS-1$ } } @@ -3189,7 +3189,7 @@ return Math.min(coverageEndOffset, bottomEndOffset); } catch (BadLocationException ex) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getBottomIndexEndOffset")); //$NON-NLS-1$ return getDocument().getLength() - 1; } @@ -3300,7 +3300,7 @@ else newOffset= startPixel; - float index= ((float)newOffset) / ((float)getAverageCharWidth()); + float index= (cast(float)newOffset) / (cast(float)getAverageCharWidth()); fTextWidget.setHorizontalIndex(Math.round(index)); } @@ -3555,7 +3555,7 @@ IDocument document= getVisibleDocument(); if (document instanceof ChildDocument) { - ChildDocument cdoc= (ChildDocument) document; + ChildDocument cdoc= cast(ChildDocument) document; return cdoc.getParentDocumentRange().getOffset(); } @@ -3569,7 +3569,7 @@ IDocument document= getVisibleDocument(); if (document instanceof ChildDocument) { - Position p= ((ChildDocument) document).getParentDocumentRange(); + Position p= (cast(ChildDocument) document).getParentDocumentRange(); return new Region(p.getOffset(), p.getLength()); } @@ -3582,7 +3582,7 @@ public bool overlapsWithVisibleRegion(int start, int length) { IDocument document= getVisibleDocument(); if (document instanceof ChildDocument) { - ChildDocument cdoc= (ChildDocument) document; + ChildDocument cdoc= cast(ChildDocument) document; return cdoc.getParentDocumentRange().overlapsWith(start, length); } else if (document !is null) { int size= document.getLength(); @@ -3659,7 +3659,7 @@ try { return selectContentTypePlugin(TextUtilities.getContentType(getDocument(), getDocumentPartitioning(), offset, true), plugins); } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.selectContentTypePlugin")); //$NON-NLS-1$ } return null; @@ -3698,7 +3698,7 @@ if (fTabsToSpacesConverter !is null) fTabsToSpacesConverter.customizeDocumentCommand(document, command); - List strategies= (List) selectContentTypePlugin(command.offset, fAutoIndentStrategies); + List strategies= cast(List) selectContentTypePlugin(command.offset, fAutoIndentStrategies); if (strategies is null) return; @@ -3708,14 +3708,14 @@ break; case 1: - ((IAutoEditStrategy) strategies.iterator().next()).customizeDocumentCommand(document, command); + (cast(IAutoEditStrategy) strategies.iterator().next()).customizeDocumentCommand(document, command); break; // make iterator robust against adding/removing strategies from within strategies default: strategies= new ArrayList(strategies); for (final Iterator iterator= strategies.iterator(); iterator.hasNext(); ) - ((IAutoEditStrategy) iterator.next()).customizeDocumentCommand(document, command); + (cast(IAutoEditStrategy) iterator.next()).customizeDocumentCommand(document, command); break; } @@ -3778,7 +3778,7 @@ } } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.verifyText")); //$NON-NLS-1$ } finally { @@ -3934,7 +3934,7 @@ IDocument document= getDocument(); if (document instanceof IDocumentExtension2) { - IDocumentExtension2 extension= (IDocumentExtension2) document; + IDocumentExtension2 extension= cast(IDocumentExtension2) document; if (ignore) extension.ignorePostNotificationReplaces(); else @@ -4077,7 +4077,7 @@ return (offset > region.getOffset() + region.getLength() ? -1 : startLine + 1); } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getFirstCompleteLineOfRegion")); //$NON-NLS-1$ } @@ -4157,7 +4157,7 @@ } if (d instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) d; + IDocumentExtension4 extension= cast(IDocumentExtension4) d; rewriteSession= extension.startRewriteSession(DocumentRewriteSessionType.SEQUENTIAL); } else { setRedraw(false); @@ -4179,7 +4179,7 @@ } } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.shift_1")); //$NON-NLS-1$ } finally { @@ -4188,7 +4188,7 @@ TextUtilities.addDocumentPartitioners(d, partitioners); if (d instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) d; + IDocumentExtension4 extension= cast(IDocumentExtension4) d; extension.stopRewriteSession(rewriteSession); } else { stopSequentialRewriteMode(); @@ -4219,7 +4219,7 @@ } } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println("TextViewer.shiftRight: BadLocationException"); //$NON-NLS-1$ } } @@ -4285,7 +4285,7 @@ } } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println("TextViewer.shiftLeft: BadLocationException"); //$NON-NLS-1$ } } @@ -4419,7 +4419,7 @@ } } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.findAndSelect")); //$NON-NLS-1$ } @@ -4497,7 +4497,7 @@ } catch (BadLocationException x) { - if (TRACE_ERRORS) + if cast(TRACE_ERRORS) System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.findAndSelect")); //$NON-NLS-1$ } @@ -4556,7 +4556,7 @@ ArrayList ranges= new ArrayList(presentation.getDenumerableRanges()); Iterator e= presentation.getNonDefaultStyleRangeIterator(); while (e.hasNext()) { - range= (StyleRange) e.next(); + range= cast(StyleRange) e.next(); range= modelStyleRange2WidgetStyleRange(range); if (range !is null) ranges.add(range); @@ -4573,7 +4573,7 @@ List list= new ArrayList(presentation.getDenumerableRanges()); Iterator e= presentation.getAllStyleRangeIterator(); while (e.hasNext()) { - range= (StyleRange) e.next(); + range= cast(StyleRange) e.next(); range= modelStyleRange2WidgetStyleRange(range); if (range !is null) list.add(range); @@ -4598,7 +4598,7 @@ List list= new ArrayList(presentation.getDenumerableRanges()); Iterator e= presentation.getAllStyleRangeIterator(); while (e.hasNext()) { - StyleRange range= (StyleRange) e.next(); + StyleRange range= cast(StyleRange) e.next(); range= modelStyleRange2WidgetStyleRange(range); if (range !is null) list.add(range); @@ -4621,7 +4621,7 @@ IDocument document= getVisibleDocument(); if (document instanceof ChildDocument) { - Position p= ((ChildDocument) document).getParentDocumentRange(); + Position p= (cast(ChildDocument) document).getParentDocumentRange(); return new Region(p.getOffset(), p.getLength()); } @@ -4647,7 +4647,7 @@ if (fTextPresentationListeners !is null) { ArrayList listeners= new ArrayList(fTextPresentationListeners); for (int i= 0, size= listeners.size(); i < size; i++) { - ITextPresentationListener listener= (ITextPresentationListener)listeners.get(i); + ITextPresentationListener listener= cast(ITextPresentationListener)listeners.get(i); listener.applyTextPresentation(presentation); } } @@ -4784,7 +4784,7 @@ */ protected void inputChanged(Object newInput, Object oldInput) { - IDocument oldDocument= (IDocument) oldInput; + IDocument oldDocument= cast(IDocument) oldInput; if (oldDocument !is null) { if (fMarkPosition !is null && !fMarkPosition.isDeleted()) @@ -4801,18 +4801,18 @@ fMarkPosition= null; if (oldDocument instanceof IDocumentExtension4) { - IDocumentExtension4 document= (IDocumentExtension4) oldDocument; + IDocumentExtension4 document= cast(IDocumentExtension4) oldDocument; document.removeDocumentRewriteSessionListener(fDocumentRewriteSessionListener); } super.inputChanged(newInput, oldInput); if (newInput instanceof IDocumentExtension4) { - IDocumentExtension4 document= (IDocumentExtension4) newInput; + IDocumentExtension4 document= cast(IDocumentExtension4) newInput; document.addDocumentRewriteSessionListener(fDocumentRewriteSessionListener); } - IDocument newDocument= (IDocument) newInput; + IDocument newDocument= cast(IDocument) newInput; if (newDocument !is null) { newDocument.addPositionCategory(MARK_POSITION_CATEGORY); newDocument.addPositionUpdater(fMarkPositionUpdater); @@ -4846,7 +4846,7 @@ */ protected void enabledRedrawing(int topIndex) { if (fDocumentAdapter instanceof IDocumentAdapterExtension) { - IDocumentAdapterExtension extension= (IDocumentAdapterExtension) fDocumentAdapter; + IDocumentAdapterExtension extension= cast(IDocumentAdapterExtension) fDocumentAdapter; StyledText textWidget= getTextWidget(); if (textWidget !is null && !textWidget.isDisposed()) { extension.resumeForwardingDocumentChanges(); @@ -4880,7 +4880,7 @@ fViewerState= new ViewerState(); if (fDocumentAdapter instanceof IDocumentAdapterExtension) { - IDocumentAdapterExtension extension= (IDocumentAdapterExtension) fDocumentAdapter; + IDocumentAdapterExtension extension= cast(IDocumentAdapterExtension) fDocumentAdapter; extension.stopForwardingDocumentChanges(); } @@ -4950,7 +4950,7 @@ protected final void startSequentialRewriteMode(bool normalized) { IDocument document= getDocument(); if (document instanceof IDocumentExtension) { - IDocumentExtension extension= (IDocumentExtension) document; + IDocumentExtension extension= cast(IDocumentExtension) document; extension.startSequentialRewrite(normalized); } } @@ -4964,7 +4964,7 @@ protected final void stopSequentialRewriteMode() { IDocument document= getDocument(); if (document instanceof IDocumentExtension) { - IDocumentExtension extension= (IDocumentExtension) document; + IDocumentExtension extension= cast(IDocumentExtension) document; extension.stopSequentialRewrite(); } } @@ -5115,11 +5115,11 @@ try { if (modelRange.getLength() < 0) { Region reversed= new Region(modelRange.getOffset() + modelRange.getLength(), -modelRange.getLength()); - IRegion result= ((IDocumentInformationMappingExtension2) fInformationMapping).toClosestImageRegion(reversed); + IRegion result= (cast(IDocumentInformationMappingExtension2) fInformationMapping).toClosestImageRegion(reversed); if (result !is null) return new Region(result.getOffset() + result.getLength(), -result.getLength()); } - return ((IDocumentInformationMappingExtension2) fInformationMapping).toClosestImageRegion(modelRange); + return (cast(IDocumentInformationMappingExtension2) fInformationMapping).toClosestImageRegion(modelRange); } catch (BadLocationException x) { } @@ -5261,7 +5261,7 @@ protected StyleRange modelStyleRange2WidgetStyleRange(StyleRange range) { IRegion region= modelRange2WidgetRange(new Region(range.start, range.length)); if (region !is null) { - StyleRange result= (StyleRange) range.clone(); + StyleRange result= cast(StyleRange) range.clone(); result.start= region.getOffset(); result.length= region.getLength(); return result; @@ -5360,7 +5360,7 @@ */ public bool moveFocusToWidgetToken() { if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension) { - IWidgetTokenKeeperExtension extension= (IWidgetTokenKeeperExtension) fWidgetTokenKeeper; + IWidgetTokenKeeperExtension extension= cast(IWidgetTokenKeeperExtension) fWidgetTokenKeeper; return extension.setFocus(this); } return false; @@ -5452,7 +5452,7 @@ if (fHyperlinkDetectors !is null) { for (int i= 0; i < fHyperlinkDetectors.length; i++) { if (fHyperlinkDetectors[i] instanceof IHyperlinkDetectorExtension) - ((IHyperlinkDetectorExtension)fHyperlinkDetectors[i]).dispose(); + (cast(IHyperlinkDetectorExtension)fHyperlinkDetectors[i]).dispose(); } }