Attachment 137992 Details for Bug 278438 – getSystemCursor implementataion

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] getSystemCursor implementataion

clipboard.txt (text/plain), 4.45 KB, created by Rüdiger Herrmann

on 2009-06-02 09:18:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-06-02 09:18:25 EDT

Size: 4.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/graphics/Graphics.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/graphics/Graphics.java,v
>retrieving revision 1.16
>diff -u -r1.16 Graphics.java
>--- src/org/eclipse/rwt/graphics/Graphics.java	15 Feb 2009 12:50:15 -0000	1.16
>+++ src/org/eclipse/rwt/graphics/Graphics.java	2 Jun 2009 13:18:50 -0000
>@@ -154,6 +154,8 @@
>    * @see SWT#CURSOR_HAND
>    * 
>    * @since 1.2
>+   * @deprecated use {@link org.eclipse.swt.widgets.Display#getSystemCursor(int) 
>+   * Display#getSystemCursor(int)}
>    */
>   public static Cursor getCursor( final int style ) {
>     return ResourceFactory.getCursor( style );
>Index: src/org/eclipse/swt/internal/graphics/ResourceFactory.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/internal/graphics/ResourceFactory.java,v
>retrieving revision 1.15
>diff -u -r1.15 ResourceFactory.java
>--- src/org/eclipse/swt/internal/graphics/ResourceFactory.java	29 Oct 2008 06:58:36 -0000	1.15
>+++ src/org/eclipse/swt/internal/graphics/ResourceFactory.java	2 Jun 2009 13:18:50 -0000
>@@ -215,7 +215,7 @@
>     return result;
>   }
> 
>-  ////////
>+  ///////////
>   // Cursors
> 
>   public static Cursor getCursor( final int style ) {
>@@ -301,7 +301,6 @@
>     //                It would be nice to find a solution without reading the
>     //                stream twice.
> 
>-    IResourceManager manager = ResourceManager.getInstance();
>     BufferedInputStream bis = new BufferedInputStream( inputStream );
>     bis.mark( Integer.MAX_VALUE );
>     Point size = readImageSize( bis );
>@@ -317,6 +316,7 @@
>       String msg = MessageFormat.format( txt, new Object[] { path } );
>       throw new RuntimeException( msg, shouldNotHappen );
>     }
>+    IResourceManager manager = ResourceManager.getInstance();
>     manager.register( path, bis );
> 
>     ////////////////////////////////////////////////////////////////////////////
>Index: src/org/eclipse/swt/widgets/Display.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Display.java,v
>retrieving revision 1.68
>diff -u -r1.68 Display.java
>--- src/org/eclipse/swt/widgets/Display.java	8 May 2009 16:41:43 -0000	1.68
>+++ src/org/eclipse/swt/widgets/Display.java	2 Jun 2009 13:18:51 -0000
>@@ -34,6 +34,7 @@
> import org.eclipse.swt.events.FocusEvent;
> import org.eclipse.swt.events.ShellEvent;
> import org.eclipse.swt.graphics.*;
>+import org.eclipse.swt.internal.graphics.ResourceFactory;
> import org.eclipse.swt.internal.widgets.IDisplayAdapter;
> import org.eclipse.swt.internal.widgets.WidgetAdapter;
> import org.eclipse.swt.internal.widgets.IDisplayAdapter.IFilterEntry;
>@@ -1017,6 +1018,48 @@
>   }
> 
>   /**
>+   * Returns the matching standard platform cursor for the given
>+   * constant, which should be one of the cursor constants
>+   * specified in class <code>SWT</code>. This cursor should
>+   * not be free'd because it was allocated by the system,
>+   * not the application.  A value of <code>null</code> will
>+   * be returned if the supplied constant is not an SWT cursor
>+   * constant. 
>+   *
>+   * @param id the SWT cursor constant
>+   * @return the corresponding cursor or <code>null</code>
>+   *
>+   * @exception SWTException <ul>
>+   *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
>+   *    <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
>+   * </ul>
>+   *
>+   * @see SWT#CURSOR_ARROW
>+   * @see SWT#CURSOR_WAIT
>+   * @see SWT#CURSOR_CROSS
>+   * @see SWT#CURSOR_HELP
>+   * @see SWT#CURSOR_SIZEALL
>+   * @see SWT#CURSOR_SIZENS
>+   * @see SWT#CURSOR_SIZEWE
>+   * @see SWT#CURSOR_SIZEN
>+   * @see SWT#CURSOR_SIZES
>+   * @see SWT#CURSOR_SIZEE
>+   * @see SWT#CURSOR_SIZEW
>+   * @see SWT#CURSOR_SIZENE
>+   * @see SWT#CURSOR_SIZESE
>+   * @see SWT#CURSOR_SIZESW
>+   * @see SWT#CURSOR_SIZENW
>+   * @see SWT#CURSOR_IBEAM
>+   * @see SWT#CURSOR_HAND
>+   * 
>+   * @since 1.3
>+   */
>+  public Cursor getSystemCursor( final int id ) {
>+    checkDevice();
>+    return ResourceFactory.getCursor( id );
>+  }
>+
>+  /**
>    * Returns the longest duration, in milliseconds, between
>    * two mouse button clicks that will be considered a
>    * <em>double click</em> .

Actions: View | Diff

Attachments on bug 278438: 137992