projects/dwt-addons: dwtx/jface/text/TextViewer.d comparison

comparison dwtx/jface/text/TextViewer.d @ 140:26688fec6d23

Following dsss compile errors

author	Frank Benoit <benoit@tionex.de>
date	Sun, 24 Aug 2008 03:23:46 +0200
parents	b6bad70d540a
children	75302ef3f92f

comparison

equal deleted inserted replaced

-:93a6ec48fd28
+:26688fec6d23
 /**
 * Height constraint for text hovers (in characters).
 * @since 3.4
 */
 private static final int TEXT_HOVER_HEIGHT_CHARS= 12; //used to be 10 (text font)
 /**
 * Represents a replace command that brings the text viewer's text widget
 * back in synchronization with text viewer's document after the document
 * has been changed.
 */
 preservedText= e.getDocument().get(e.getOffset(), e.getLength());
 }
 } catch (BadLocationException x) {
 preservedText= null;
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.WidgetCommand.setEvent")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.WidgetCommand.setEvent")); //$NON-NLS-1$
 }
 } else
 preservedText= null;
 }
 }
 * @since 3.3
 */
 public void getNextOffset(MovementEvent event) {
 if (event.movement !is DWT.MOVEMENT_WORD_END)
 return;
-if cast(TRACE_DOUBLE_CLICK) {
+if (TRACE_DOUBLE_CLICK) {
-System.out.println("\n+++"); //$NON-NLS-1$
+System.out_.println("\n+++"); //$NON-NLS-1$
 print(event);
 }
 if (fDoubleClickSelection !is null) {
 if (fDoubleClickSelection.x <= event.offset && event.offset <= fDoubleClickSelection.y)
 event.newOffset= fDoubleClickSelection.y;
 }
 }
 * @since 3.3
 */
 public void getPreviousOffset(MovementEvent event) {
 if (event.movement !is DWT.MOVEMENT_WORD_START)
 return;
-if cast(TRACE_DOUBLE_CLICK) {
+if (TRACE_DOUBLE_CLICK) {
-System.out.println("\n---"); //$NON-NLS-1$
+System.out_.println("\n---"); //$NON-NLS-1$
 print(event);
 }
 if (fDoubleClickSelection is null) {
 ITextDoubleClickStrategy s= cast(ITextDoubleClickStrategy) selectContentTypePlugin(getSelectedRange().x, fDoubleClickStrategies);
 if (s !is null) {
 StyledText textWidget= getTextWidget();
-s.doubleClicked(TextViewer.this);
+s.doubleClicked(this.outer);
 fDoubleClickSelection= textWidget.getSelection();
 event.newOffset= fDoubleClickSelection.x;
-if cast(TRACE_DOUBLE_CLICK)
+if (TRACE_DOUBLE_CLICK)
-System.out.println("- setting selection: x= " + fDoubleClickSelection.x + ", y= " + fDoubleClickSelection.y); //$NON-NLS-1$ //$NON-NLS-2$
+System.out_.println("- setting selection: x= " + fDoubleClickSelection.x + ", y= " + fDoubleClickSelection.y); //$NON-NLS-1$ //$NON-NLS-2$
 }
 } else {
 if (fDoubleClickSelection.x <= event.offset && event.offset <= fDoubleClickSelection.y)
 event.newOffset= fDoubleClickSelection.x;
 }
 }
 }
 /**
 * Print trace info about <code>MovementEvent</code>.
 *
 * @param e the event to print
 * @since 3.3
 */
 private void print(MovementEvent e) {
-System.out.println("line offset: " + e.lineOffset); //$NON-NLS-1$
+System.out_.println("line offset: " + e.lineOffset); //$NON-NLS-1$
-System.out.println("line: " + e.lineText); //$NON-NLS-1$
+System.out_.println("line: " + e.lineText); //$NON-NLS-1$
-System.out.println("type: " + e.movement); //$NON-NLS-1$
+System.out_.println("type: " + e.movement); //$NON-NLS-1$
-System.out.println("offset: " +  e.offset); //$NON-NLS-1$
+System.out_.println("offset: " +  e.offset); //$NON-NLS-1$
-System.out.println("newOffset: " + e.newOffset); //$NON-NLS-1$
+System.out_.println("newOffset: " + e.newOffset); //$NON-NLS-1$
 }
 /**
 * Monitors the area of the viewer's document that is visible in the viewer.
 * If the area might have changed, it informs the text viewer about this
 /*
 * @see IFindReplaceTargetExtension#setScope(IRegion)
 * @since 2.0
 */
-public void setScope(IRegion scope) {
+public void setScope(IRegion scope_) {
 if (fRange !is null)
 fRange.uninstall();
-if (scope is null) {
+if (scope_ is null) {
 fRange= null;
 return;
 }
-fRange= new FindReplaceRange(scope);
+fRange= new FindReplaceRange(scope_);
 fRange.setHighlightColor(fScopeHighlightColor);
 fRange.install();
 }
 /*
 */
 private void setStateMask(int stateMask) {
 fStateMask= stateMask;
 }
 }
 /**
 * Captures and remembers the viewer state (selection and visual position). {@link TextViewer.ViewerState}
 * instances are normally used once and then discarded, similar to the following snippet:
 * <pre>
 * ViewerState state= new ViewerState(); // remember the state
 * doStuff(); // operation that may call setRedraw() and perform complex document modifications
 * state.restore(true); // restore the remembered state
 * </pre>
 *
 * @since 3.3
 */
 private final class ViewerState {
 /** The position tracking the selection. */
 private Position fSelection;
 connect(document);
 }
 /**
 * Returns the normalized selection, i.e. the the selection length is always non-negative.
 *
 * @return the normalized selection
 */
 public Point getSelection() {
 if (fSelection is null)
 return new Point(-1, -1);
 return new Point(fSelection.getOffset(), fSelection.getLength());
 }
 /**
 * Updates the selection.
 *
 * @param offset the new selection offset
 * @param length the new selection length
 */
 public void updateSelection(int offset, int length) {
 fSelectionSet= true;
 }
 /**
 * Restores the state and disconnects it from the document. The selection is no longer
 * tracked after this call.
 *
 * @param restoreViewport <code>true</code> to restore both selection and viewport,
 *        <code>false</code> to only restore the selection
 */
 public void restore(bool restoreViewport) {
 if (isConnected())
 }
 }
 /**
 * Remembers the viewer state.
 *
 * @param document the document to remember the state of
 */
 private void connect(IDocument document) {
 Assert.isLegal(document !is null);
 Assert.isLegal(!isConnected());
 }
 }
 /**
 * Updates a position with the given information and clears its deletion state.
 *
 * @param position the position to update
 * @param offset the new selection offset
 * @param length the new selection length
 */
 private void updatePosition(Position position, int offset, int length) {
 }
 /**
 * Returns the document line to keep visually stable. If the caret line is (partially)
 * visible, it is returned, otherwise the topmost (partially) visible line is returned.
 *
 * @return the visually stable line of this viewer state
 */
 private int getStableLine() {
 int stableLine; // the model line that we try to keep stable
 int caretLine= getTextWidget().getLineAtOffset(getTextWidget().getCaretOffset());
 if (caretLine < JFaceTextUtil.getPartialTopIndex(getTextWidget()) || caretLine > JFaceTextUtil.getPartialBottomIndex(getTextWidget())) {
-stableLine= JFaceTextUtil.getPartialTopIndex(TextViewer.this);
+stableLine= JFaceTextUtil.getPartialTopIndex(this.outer);
 } else {
 stableLine= widgetLine2ModelLine(caretLine);
 }
 return stableLine;
 }
 /**
 * Returns <code>true</code> if the viewer state is being tracked, <code>false</code>
 * otherwise.
 *
 * @return the tracking state
 */
 private bool isConnected() {
 return fUpdater !is null;
 }
 }
 }
 /**
 * Internal cursor listener i.e. aggregation of mouse and key listener.
 *
 * @since 3.0
 */
 private class CursorListener : KeyListener, MouseListener {
 /**
 if (toggleRedraw)
 target.setRedraw(true);
 }
 }
 }
 /**
 * Identifies the scrollbars as originators of a view port change.
 */
 protected static final int SCROLLER=    1;
 /**
 * @param styles the DWT style bits for the viewer's control
 */
 protected void createControl(Composite parent, int styles) {
 fTextWidget= createTextWidget(parent, styles);
 // Support scroll page upon MOD1+MouseWheel
 fTextWidget.addListener(DWT.MouseWheel, new class()  Listener {
 public void handleEvent(Event event) {
 if (((event.stateMask & DWT.MOD1) is 0))
 fTextWidget.setTopIndex(bottomIndex);
 updateViewportListeners(INTERNAL);
 }
 });
 fTextWidget.addDisposeListener(
 new class()  DisposeListener {
 public void widgetDisposed(DisposeEvent e) {
 handleDispose();
 }
 /**
 * Frees all resources allocated by this viewer. Internally called when the viewer's
 * control has been disposed.
 */
 protected void handleDispose() {
 setDocument(null);
 if (fPaintManager !is null) {
 fPaintManager.dispose();
 fPaintManager= null;
 fHyperlinkDetectors= null;
 fVisibleDocument= null;
 fDocument= null;
 fScroller= null;
 fTextWidget= null;
 }
 //---- simple getters and setters
 * @deprecated since 3.1, use
 *             {@link ITextViewerExtension2#prependAutoEditStrategy(IAutoEditStrategy, String)} and
 *             {@link ITextViewerExtension2#removeAutoEditStrategy(IAutoEditStrategy, String)} instead
 */
 public void setAutoIndentStrategy(IAutoIndentStrategy strategy, String contentType) {
-setAutoEditStrategies(new IAutoEditStrategy[] { strategy }, contentType);
+setAutoEditStrategies([ strategy ], contentType);
 }
 /**
 * Sets the given edit strategy as the only strategy for the given content type.
 *
 */
 public void removeTextHovers(String contentType) {
 if (fTextHovers is null)
 return;
-Iterator iter= new HashSet(fTextHovers.keySet()).iterator();
+Iterator iter= (new HashSet(fTextHovers.keySet())).iterator();
 while (iter.hasNext()) {
 TextHoverKey key= cast(TextHoverKey)iter.next();
 if (key.fContentType.equals(contentType))
 fTextHovers.remove(key);
 }
 key.setStateMask(ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK);
 textHover= fTextHovers.get(key);
 }
 return cast(ITextHover) textHover;
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.selectContentTypePlugin")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.selectContentTypePlugin")); //$NON-NLS-1$
 }
 return null;
 }
 /**
 fHoverControlCreator= creator;
 }
 /**
 * {@inheritDoc}
 *
 * @since 3.4
 */
 public void setHoverEnrichMode(ITextViewerExtension8.EnrichMode mode) {
 if (fTextHoverManager is null)
 return;
 return;
 IRegion widgetSelection= modelRange2ClosestWidgetRange(new Region(selectionOffset, selectionLength));
 if (widgetSelection !is null) {
-int[] selectionRange= new int[] { widgetSelection.getOffset(), widgetSelection.getLength() };
+int[] selectionRange= [ widgetSelection.getOffset(), widgetSelection.getLength() ];
 validateSelectionRange(selectionRange);
 if (selectionRange[0] >= 0) {
 fTextWidget.setSelectionRange(selectionRange[0], selectionRange[1]);
 selectionChanged(selectionRange[0], selectionRange[1]);
 }
 * Returns the number of lines that can fully fit into the viewport. This is computed by
 * dividing the widget's client area height by the widget's line height. The result is only
 * accurate if the widget does not use variable line heights - for that reason, clients should
 * not use this method any longer and use the client area height of the text widget to find out
 * how much content fits into it.
 *
 * @return the view port height in lines
 * @deprecated as of 3.2
 */
 protected int getVisibleLinesInViewport() {
 if (fTextWidget !is null) {
 */
 public int getBottomIndex() {
 if (fTextWidget is null)
 return -1;
 int widgetBottom= JFaceTextUtil.getBottomIndex(fTextWidget);
 return widgetLine2ModelLine(widgetBottom);
 }
 /*
 int top= fTextWidget.getTopIndex();
 try {
 top= getVisibleDocument().getLineOffset(top);
 return widgetOffset2ModelOffset(top);
 } catch (BadLocationException ex) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getTopIndexStartOffset")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getTopIndexStartOffset")); //$NON-NLS-1$
 }
 }
 return -1;
 }
 int coverageEndOffset=  coverage.getOffset() + coverage.getLength() - 1;
 return Math.min(coverageEndOffset, bottomEndOffset);
 } catch (BadLocationException ex) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getBottomIndexEndOffset")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getBottomIndexEndOffset")); //$NON-NLS-1$
 return getDocument().getLength() - 1;
 }
 }
 /*
 IRegion modelRange= new Region(start, length);
 IRegion widgetRange= modelRange2ClosestWidgetRange(modelRange);
 if (widgetRange !is null) {
-int[] range= new int[] { widgetRange.getOffset(), widgetRange.getLength() };
+int[] range= [ widgetRange.getOffset(), widgetRange.getLength() ];
 validateSelectionRange(range);
 if (range[0] >= 0)
 internalRevealRange(range[0], range[0] + range[1]);
 } else {
 if (top > -1) {
 // scroll vertically
 int bottom= JFaceTextUtil.getBottomIndex(fTextWidget);
 int lines= bottom - top;
 // if the widget is not scrollable as it is displaying the entire content
 // setTopIndex won't have any effect.
 if (startLine >= top && startLine <= bottom && endLine >= top && endLine <= bottom ) {
 final protected IRegion getExtent(int start, int end) {
 if (end > 0 && start < end) {
 Rectangle bounds= fTextWidget.getTextBounds(start, end - 1);
 return new Region(bounds.x, bounds.width);
 }
 return new Region(fTextWidget.getLocationAtOffset(start).x, 0);
 }
 /**
 * Returns the width of the representation of a text range in the
 *
 * @param document the visible document
 */
 protected void setVisibleDocument(IDocument document) {
-if (fVisibleDocument is document && fVisibleDocument instanceof ChildDocument) {
+if (fVisibleDocument is document && cast(ChildDocument)fVisibleDocument ) {
 // optimization for new child documents
 return;
 }
 if (fVisibleDocument !is null) {
 */
 protected Object selectContentTypePlugin(int offset, Map plugins) {
 try {
 return selectContentTypePlugin(TextUtilities.getContentType(getDocument(), getDocumentPartitioning(), offset, true), plugins);
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.selectContentTypePlugin")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.selectContentTypePlugin")); //$NON-NLS-1$
 }
 return null;
 }
 /**
 * @param command the document command representing the verify event
 */
 protected void customizeDocumentCommand(DocumentCommand command) {
 if (isIgnoringAutoEditStrategies())
 return;
 IDocument document= getDocument();
 if (fTabsToSpacesConverter !is null)
 fTabsToSpacesConverter.customizeDocumentCommand(document, command);
 List strategies= cast(List) selectContentTypePlugin(command.offset, fAutoIndentStrategies);
 if (strategies is null)
 fTextWidget.showSelection();
 }
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.verifyText")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.verifyText")); //$NON-NLS-1$
 } finally {
 if (compoundChange && fUndoManager !is null)
 fUndoManager.endCompoundChange();
 * Copies/cuts the marked region.
 *
 * @param delete <code>true</code> if the region should be deleted rather than copied.
 * @since 2.0
 */
-protected void copyMarkedRegion(bool delete) {
+protected void copyMarkedRegion(bool delete_) {
 if (fTextWidget is null)
 return;
 if (fMarkPosition is null || fMarkPosition.isDeleted() || modelRange2WidgetRange(fMarkPosition) is null)
 if (selection.x <= widgetMarkOffset)
 fTextWidget.setSelection(selection.x, widgetMarkOffset);
 else
 fTextWidget.setSelection(widgetMarkOffset, selection.x);
-if (delete) {
+if (delete_) {
 fTextWidget.cut();
 } else {
 fTextWidget.copy();
 fTextWidget.setSelection(selection.x); // restore old cursor position
 }
 offset= d.getLineOffset(startLine + 1);
 return (offset > region.getOffset() + region.getLength() ? -1 : startLine + 1);
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getFirstCompleteLineOfRegion")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.getFirstCompleteLineOfRegion")); //$NON-NLS-1$
 }
 return -1;
 }
 * @since 2.0
 */
 protected void shift(bool useDefaultPrefixes, bool right, bool ignoreWhitespace) {
 if (fUndoManager !is null)
 fUndoManager.beginCompoundChange();
 IDocument d= getDocument();
 Map partitioners= null;
 DocumentRewriteSession rewriteSession= null;
 try {
 Point selection= getSelectedRange();
 shiftLeft(lines[j], lines[j + 1], prefixes, ignoreWhitespace);
 }
 }
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.shift_1")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.shift_1")); //$NON-NLS-1$
 } finally {
 if (partitioners !is null)
 TextUtilities.addDocumentPartitioners(d, partitioners);
 if ( cast(IDocumentExtension4)d ) {
 IDocumentExtension4 extension= cast(IDocumentExtension4) d;
 extension.stopRewriteSession(rewriteSession);
 } else {
 stopSequentialRewriteMode();
 while (startLine <= endLine) {
 d.replace(d.getLineOffset(startLine++), 0, prefix);
 }
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println("TextViewer.shiftRight: BadLocationException"); //$NON-NLS-1$
+System.out_.println("TextViewer.shiftRight: BadLocationException"); //$NON-NLS-1$
 }
 }
 /**
 * Shifts the specified lines to the right or to the left. On shifting to the right
 d.replace(r.getOffset() - decrement, r.getLength(), ""); //$NON-NLS-1$
 decrement += r.getLength();
 }
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println("TextViewer.shiftLeft: BadLocationException"); //$NON-NLS-1$
+System.out_.println("TextViewer.shiftLeft: BadLocationException"); //$NON-NLS-1$
 }
 }
 /**
 * Returns whether the shown text can be printed.
 return (printerList !is null && printerList.length > 0);
 }
 /**
 * {@inheritDoc}
 *
 * @since 3.4
 */
 public void print(StyledTextPrintOptions options) {
 final PrintDialog dialog= new PrintDialog(fTextWidget.getShell(), DWT.PRIMARY_MODAL);
 final PrinterData data= dialog.open();
 if (data !is null) {
 final Printer printer= new Printer(data);
 final Runnable styledTextPrinter= fTextWidget.print(printer, options);
-Thread printingThread= new Thread("Printing") { //$NON-NLS-1$
+void threadrun() {
-public void run() {
+styledTextPrinter.run();
-styledTextPrinter.run();
+printer.dispose();
-printer.dispose();
+}
-}
+Thread printingThread= new Thread( &threadrun );
-};
+printingThread.name = "Printing"; //$NON-NLS-1$
 printingThread.start();
 }
 }
 /**
 return widgetOffset2ModelOffset(widgetPos);
 }
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.findAndSelect")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.findAndSelect")); //$NON-NLS-1$
 }
 return -1;
 }
 return modelPos;
 }
 } catch (BadLocationException x) {
-if cast(TRACE_ERRORS)
+if (TRACE_ERRORS)
-System.out.println(JFaceTextMessages.getString("TextViewer.error.bad_location.findAndSelect")); //$NON-NLS-1$
+System.out_.println(JFaceTextMessages.getString("TextViewer.error.bad_location.findAndSelect")); //$NON-NLS-1$
 }
 return -1;
 }
 if (range !is null) {
 range= modelStyleRange2WidgetStyleRange(range);
 if (range !is null)
 fTextWidget.setStyleRange(range);
 ArrayList ranges= new ArrayList(presentation.getDenumerableRanges());
 Iterator e= presentation.getNonDefaultStyleRangeIterator();
 while (e.hasNext()) {
 range= cast(StyleRange) e.next();
 range= modelStyleRange2WidgetStyleRange(range);
 if (range !is null)
 ranges.add(range);
 }
 if (!ranges.isEmpty())
 fTextWidget.replaceStyleRanges(0, 0, (StyleRange[])ranges.toArray(new StyleRange[ranges.size()]));
 } else {
 IRegion region= modelRange2WidgetRange(presentation.getCoverage());
 if (region is null)
 return;
 * @since 3.1
 */
 public void setHyperlinkDetectors(IHyperlinkDetector[] hyperlinkDetectors, int eventStateMask) {
 if (fHyperlinkDetectors !is null) {
 for (int i= 0; i < fHyperlinkDetectors.length; i++) {
-if (fHyperlinkDetectors[i] instanceof IHyperlinkDetectorExtension)
+if (cast(IHyperlinkDetectorExtension)fHyperlinkDetectors[i] )
 (cast(IHyperlinkDetectorExtension)fHyperlinkDetectors[i]).dispose();
 }
 }
 bool enable= hyperlinkDetectors !is null && hyperlinkDetectors.length > 0;
 fHyperlinkStateMask= eventStateMask;
 fHyperlinkDetectors= hyperlinkDetectors;
 if (enable) {
 if (fHyperlinkManager !is null) {

Mercurial > projects > dwt-addons

comparison dwtx/jface/text/TextViewer.d @ 140:26688fec6d23