diff dwtx/jface/text/hyperlink/HyperlinkManager.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
line wrap: on
line diff
--- a/dwtx/jface/text/hyperlink/HyperlinkManager.d	Sun Aug 24 02:31:41 2008 +0200
+++ b/dwtx/jface/text/hyperlink/HyperlinkManager.d	Sun Aug 24 03:23:46 2008 +0200
@@ -180,7 +180,7 @@
         text.addMouseTrackListener(this);
 
         fTextViewer.addTextListener(this);
-        
+
         fHyperlinkPresenter.install(fTextViewer);
     }
 
@@ -234,7 +234,7 @@
             text.removeMouseTrackListener(this);
         }
         fTextViewer.removeTextListener(this);
-        
+
         fHyperlinkPresenter.uninstall();
 
         fHyperlinkPresenter= null;
@@ -252,7 +252,7 @@
 
     /**
      * Finds hyperlinks at the current offset.
-     * 
+     *
      * @return the hyperlinks or <code>null</code> if none.
      */
     protected IHyperlink[] findHyperlinks() {
@@ -268,7 +268,7 @@
                 IHyperlinkDetector detector= fHyperlinkDetectors[i];
                 if (detector is null)
                     continue;
-                
+
                 if ( cast(IHyperlinkDetectorExtension2)detector ) {
                     int stateMask= (cast(IHyperlinkDetectorExtension2)detector).getStateMask();
                     if (stateMask !is -1 && stateMask !is fActiveHyperlinkStateMask)
@@ -287,7 +287,7 @@
                 if (fDetectionStrategy is FIRST) {
                     if (hyperlinks.length is 1)
                         return hyperlinks;
-                    return new IHyperlink[] {hyperlinks[0]};
+                    return [hyperlinks[0]];
                 }
                 allHyperlinks.addAll(Arrays.asList(hyperlinks));
             }
@@ -298,7 +298,7 @@
 
         if (fDetectionStrategy !is ALL) {
             int maxLength= computeLongestHyperlinkLength(allHyperlinks);
-            Iterator iter= new ArrayList(allHyperlinks).iterator();
+            Iterator iter= (new ArrayList(allHyperlinks)).iterator();
             while (iter.hasNext()) {
                 IHyperlink hyperlink= cast(IHyperlink)iter.next();
                 if (hyperlink.getHyperlinkRegion().getLength() < maxLength)
@@ -307,16 +307,16 @@
         }
 
         if (fDetectionStrategy is LONGEST_REGION_FIRST)
-            return new IHyperlink[] {cast(IHyperlink)allHyperlinks.get(0)};
+            return [cast(IHyperlink)allHyperlinks.get(0)];
 
-        return (IHyperlink[])allHyperlinks.toArray(new IHyperlink[allHyperlinks.size()]);
+        return arraycast!(IHyperlink)(allHyperlinks.toArray());
 
     }
 
     /**
      * Computes the length of the longest detected
      * hyperlink.
-     * 
+     *
      * @param hyperlinks
      * @return the length of the longest detected
      */
@@ -335,7 +335,7 @@
 
     /**
      * Returns the current text offset.
-     * 
+     *
      * @return the current text offset
      */
     protected int getCurrentTextOffset() {
@@ -353,7 +353,7 @@
             Point p= text.getLocationAtOffset(widgetOffset);
             if (p.x > relativePosition.x)
                 widgetOffset--;
-            
+
             if ( cast(ITextViewerExtension5)fTextViewer ) {
                 ITextViewerExtension5 extension= cast(ITextViewerExtension5)fTextViewer;
                 return extension.widgetOffset2ModelOffset(widgetOffset);
@@ -457,14 +457,14 @@
             if (!(cast(IHyperlinkPresenterExtension)fHyperlinkPresenter).canHideHyperlinks())
                 return;
         }
-        
+
         if (!isRegisteredStateMask(event.stateMask)) {
             if (fActive)
                 deactivate();
-            
+
             return;
         }
-        
+
         fActive= true;
         fActiveHyperlinkStateMask= event.stateMask;
 
@@ -488,10 +488,10 @@
         fHyperlinkPresenter.showHyperlinks(fActiveHyperlinks);
 
     }
-    
+
     /**
      * Checks whether the given state mask is registered.
-     * 
+     *
      * @param stateMask
      * @return <code>true</code> if a detector is registered for the given state mask
      * @since 3.3
@@ -499,10 +499,10 @@
     private bool isRegisteredStateMask(int stateMask) {
         if (stateMask is fHyperlinkStateMask)
             return true;
-        
+
         synchronized (fHyperlinkDetectors) {
             for (int i= 0; i < fHyperlinkDetectors.length; i++) {
-                if (fHyperlinkDetectors[i] instanceof IHyperlinkDetectorExtension2) {
+                if (cast(IHyperlinkDetectorExtension2)fHyperlinkDetectors[i] ) {
                     if (stateMask is (cast(IHyperlinkDetectorExtension2)fHyperlinkDetectors[i]).getStateMask())
                         return true;
                 }
@@ -510,7 +510,7 @@
         }
         return false;
     }
-    
+
     /*
      * @see dwt.events.FocusListener#focusGained(dwt.events.FocusEvent)
      */
@@ -531,7 +531,7 @@
         //key up
         deactivate();
     }
-    
+
     /*
      * @see dwtx.jface.text.ITextListener#textChanged(TextEvent)
      * @since 3.2
@@ -543,7 +543,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @since 3.4
      */
     public void mouseExit(MouseEvent e) {
@@ -556,7 +556,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @since 3.4
      */
     public void mouseEnter(MouseEvent e) {
@@ -564,7 +564,7 @@
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @since 3.4
      */
     public void mouseHover(MouseEvent e) {