From 85d9ae55ddd947fc858cf8a128ee30c182f58369 Mon Sep 17 00:00:00 2001 From: Silenio Quarti Date: Wed, 30 Mar 2005 22:40:23 +0000 Subject: 87695 --- .../cairo/org/eclipse/swt/graphics/Path.java | 2 +- .../cairo/org/eclipse/swt/graphics/Transform.java | 2 +- .../carbon/org/eclipse/swt/graphics/Color.java | 2 +- .../carbon/org/eclipse/swt/graphics/Cursor.java | 2 +- .../carbon/org/eclipse/swt/graphics/Device.java | 2 +- .../carbon/org/eclipse/swt/graphics/Font.java | 2 +- .../carbon/org/eclipse/swt/graphics/GC.java | 2 +- .../carbon/org/eclipse/swt/graphics/Image.java | 2 +- .../carbon/org/eclipse/swt/graphics/Path.java | 2 +- .../carbon/org/eclipse/swt/graphics/Region.java | 2 +- .../org/eclipse/swt/graphics/TextLayout.java | 2 +- .../carbon/org/eclipse/swt/graphics/Transform.java | 2 +- .../common/org/eclipse/swt/graphics/Resource.java | 54 ++++++++++++++++++++++ .../graphics/org/eclipse/swt/graphics/Path.java | 2 +- .../org/eclipse/swt/graphics/Transform.java | 2 +- .../gtk/org/eclipse/swt/graphics/Color.java | 2 +- .../gtk/org/eclipse/swt/graphics/Cursor.java | 2 +- .../gtk/org/eclipse/swt/graphics/Device.java | 2 +- .../gtk/org/eclipse/swt/graphics/Font.java | 2 +- .../gtk/org/eclipse/swt/graphics/GC.java | 2 +- .../gtk/org/eclipse/swt/graphics/Image.java | 2 +- .../gtk/org/eclipse/swt/graphics/Region.java | 2 +- .../gtk/org/eclipse/swt/graphics/TextLayout.java | 2 +- .../motif/org/eclipse/swt/graphics/Color.java | 2 +- .../motif/org/eclipse/swt/graphics/Cursor.java | 2 +- .../motif/org/eclipse/swt/graphics/Device.java | 2 +- .../motif/org/eclipse/swt/graphics/Font.java | 2 +- .../motif/org/eclipse/swt/graphics/GC.java | 2 +- .../motif/org/eclipse/swt/graphics/Image.java | 2 +- .../motif/org/eclipse/swt/graphics/Region.java | 2 +- .../motif/org/eclipse/swt/graphics/TextLayout.java | 2 +- .../photon/org/eclipse/swt/graphics/Color.java | 2 +- .../photon/org/eclipse/swt/graphics/Cursor.java | 2 +- .../photon/org/eclipse/swt/graphics/Device.java | 2 +- .../photon/org/eclipse/swt/graphics/Font.java | 2 +- .../photon/org/eclipse/swt/graphics/GC.java | 2 +- .../photon/org/eclipse/swt/graphics/Image.java | 2 +- .../photon/org/eclipse/swt/graphics/Region.java | 2 +- .../win32/org/eclipse/swt/graphics/Color.java | 2 +- .../win32/org/eclipse/swt/graphics/Cursor.java | 2 +- .../win32/org/eclipse/swt/graphics/Device.java | 2 +- .../win32/org/eclipse/swt/graphics/Font.java | 2 +- .../win32/org/eclipse/swt/graphics/GC.java | 2 +- .../win32/org/eclipse/swt/graphics/Image.java | 2 +- .../win32/org/eclipse/swt/graphics/Path.java | 2 +- .../win32/org/eclipse/swt/graphics/Region.java | 2 +- .../win32/org/eclipse/swt/graphics/TextLayout.java | 2 +- .../win32/org/eclipse/swt/graphics/Transform.java | 2 +- 48 files changed, 101 insertions(+), 47 deletions(-) create mode 100644 bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Resource.java (limited to 'bundles/org.eclipse.swt/Eclipse SWT') diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java index 88d83a1a27..8aafa9d360 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java @@ -14,7 +14,7 @@ import org.eclipse.swt.*; import org.eclipse.swt.internal.*; import org.eclipse.swt.internal.cairo.*; -public class Path { +public class Path extends Resource { /** * the handle to the OS path resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Transform.java index 4e173611d3..55f179d629 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Transform.java @@ -14,7 +14,7 @@ import org.eclipse.swt.*; import org.eclipse.swt.internal.*; import org.eclipse.swt.internal.cairo.*; -public class Transform { +public class Transform extends Resource { /** * the handle to the OS transform resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Color.java index 0ba192106c..aba957ab7a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Color.java @@ -27,7 +27,7 @@ import org.eclipse.swt.*; * @see RGB * @see Device#getSystemColor */ -public final class Color { +public final class Color extends Resource { /** * the handle to the OS color resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Cursor.java index 70ecf2e62c..4fd921d2fd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Cursor.java @@ -39,7 +39,7 @@ import org.eclipse.swt.*; *

*/ -public final class Cursor { +public final class Cursor extends Resource { /** * the handle to the OS cursor resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Device.java index ff0cb070f6..d3a2f38205 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Device.java @@ -21,7 +21,7 @@ import org.eclipse.swt.*; * can have a graphics context (GC) created for them, and they * can be drawn on by sending messages to the associated GC. */ -public abstract class Device implements Drawable { +public abstract class Device extends Resource implements Drawable { /* Debugging */ public static boolean DEBUG; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java index 3850ba45fc..6323c53fc1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Font.java @@ -27,7 +27,7 @@ import org.eclipse.swt.*; * * @see FontData */ -public final class Font { +public final class Font extends Resource { /** * the handle to the OS font resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java index f1879e78e9..d2c645c3c1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java @@ -43,7 +43,7 @@ import org.eclipse.swt.*; * * @see org.eclipse.swt.events.PaintEvent */ -public final class GC { +public final class GC extends Resource { /** * the handle to the OS device context * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Image.java index 185592bcb9..4ddb91d4a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Image.java @@ -62,7 +62,7 @@ import java.io.*; * @see ImageData * @see ImageLoader */ -public final class Image implements Drawable{ +public final class Image extends Resource implements Drawable { /** * specifies whether the receiver is a bitmap or an icon diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Path.java index bf483dcaad..b34cafc259 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Path.java @@ -17,7 +17,7 @@ import org.eclipse.swt.internal.carbon.*; /** * WARNING API STILL UNDER CONSTRUCTION AND SUBJECT TO CHANGE */ -public class Path { +public class Path extends Resource { /** * the handle to the OS path resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Region.java index fbefbd9fed..0fb38f90c7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Region.java @@ -24,7 +24,7 @@ import org.eclipse.swt.*; * when those instances are no longer required. *

*/ -public final class Region { +public final class Region extends Resource { /** * the OS resource for the region * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/TextLayout.java index 66c8d7514d..e8203c1696 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/TextLayout.java @@ -31,7 +31,7 @@ import org.eclipse.swt.*; * * @since 3.0 */ -public final class TextLayout { +public final class TextLayout extends Resource { static class StyleItem { TextStyle style; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Transform.java index e483fe4077..9a9aef7bfd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/Transform.java @@ -17,7 +17,7 @@ import org.eclipse.swt.internal.carbon.*; /** * WARNING API STILL UNDER CONSTRUCTION AND SUBJECT TO CHANGE */ -public class Transform { +public class Transform extends Resource { /** * the handle to the OS path resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Resource.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Resource.java new file mode 100644 index 0000000000..3ca3757ab9 --- /dev/null +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Resource.java @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2000, 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.swt.graphics; + +/** + * This class is the abstract superclass of all graphics resource objects. + * Resources created by the application must be disposed. + *

+ * IMPORTANT: This class is intended to be subclassed only + * within the SWT implementation. However, it has not been marked + * final to allow those outside of the SWT development team to implement + * patched versions of the class in order to get around specific + * limitations in advance of when those limitations can be addressed + * by the team. Any class built using subclassing to access the internals + * of this class will likely fail to compile or run between releases and + * may be strongly platform specific. Subclassing should not be attempted + * without an intimate and detailed understanding of the workings of the + * hierarchy. No support is provided for user-written classes which are + * implemented as subclasses of this class. + *

+ * + * @see #dispose + * @see #isDisposed + */ +public abstract class Resource { + +/** + * Disposes of the operating system resources associated with + * this resource. Applications must dispose of all resources + * which they allocate. + */ +public abstract void dispose(); + +/** + * Returns true if the resource has been disposed, + * and false otherwise. + *

+ * This method gets the dispose state for the resource. + * When a resource has been disposed, it is an error to + * invoke any other method using the resource. + * + * @return true when the resource is disposed and false otherwise + */ +public abstract boolean isDisposed(); + +} diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Path.java index f54e25a8e9..b44b815a93 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Path.java @@ -15,7 +15,7 @@ import org.eclipse.swt.*; /** * WARNING API STILL UNDER CONSTRUCTION AND SUBJECT TO CHANGE */ -public class Path { +public class Path extends Resource { /** * the handle to the OS path resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java index 7ae8080338..49afe62389 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/graphics/org/eclipse/swt/graphics/Transform.java @@ -15,7 +15,7 @@ import org.eclipse.swt.*; /** * WARNING API STILL UNDER CONSTRUCTION AND SUBJECT TO CHANGE */ -public class Transform { +public class Transform extends Resource { /** * the handle to the OS path resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java index 79fb84e4d5..6bb7914634 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java @@ -28,7 +28,7 @@ import org.eclipse.swt.*; * @see RGB * @see Device#getSystemColor */ -public final class Color { +public final class Color extends Resource { /** * the handle to the OS color resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java index 67b3792c87..d9f5d3e843 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java @@ -38,7 +38,7 @@ import org.eclipse.swt.internal.gtk.*; * Note: Only one of the above styles may be specified. *

*/ -public final class Cursor { +public final class Cursor extends Resource { /** * the handle to the OS cursor resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java index 8249f627c9..df27c3a389 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java @@ -21,7 +21,7 @@ import org.eclipse.swt.internal.gtk.*; * can have a graphics context (GC) created for them, and they * can be drawn on by sending messages to the associated GC. */ -public abstract class Device implements Drawable { +public abstract class Device extends Resource implements Drawable { /** * the handle to the X Display */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java index 1f91aa6917..5a82240193 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java @@ -28,7 +28,7 @@ import org.eclipse.swt.internal.gtk.*; * * @see FontData */ -public final class Font { +public final class Font extends Resource { /** * the handle to the OS font resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java index 0dfac22f9b..7a087be869 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java @@ -45,7 +45,7 @@ import org.eclipse.swt.*; * * @see org.eclipse.swt.events.PaintEvent */ -public final class GC { +public final class GC extends Resource { /** * the handle to the OS device context * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java index be8ce6281e..db124702cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java @@ -63,7 +63,7 @@ import java.io.*; * @see ImageData * @see ImageLoader */ -public final class Image implements Drawable { +public final class Image extends Resource implements Drawable { /** * specifies whether the receiver is a bitmap or an icon diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java index 2d26d47d0f..a2e0b78196 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java @@ -24,7 +24,7 @@ import org.eclipse.swt.*; * when those instances are no longer required. *

*/ -public final class Region { +public final class Region extends Resource { /** * the OS resource for the region * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java index fa7a6108e8..b02eeaaa4e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java @@ -31,7 +31,7 @@ import org.eclipse.swt.*; * * @since 3.0 */ -public final class TextLayout { +public final class TextLayout extends Resource { static class StyleItem { TextStyle style; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java index fdebf25a00..36038afc21 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java @@ -28,7 +28,7 @@ import org.eclipse.swt.*; * @see RGB * @see Device#getSystemColor */ -public final class Color { +public final class Color extends Resource { /** * the handle to the OS color resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java index a08559851e..d84b66c0d8 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java @@ -38,7 +38,7 @@ import org.eclipse.swt.*; * Note: Only one of the above styles may be specified. *

*/ -public final class Cursor { +public final class Cursor extends Resource { /** * the handle to the OS cursor resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java index b6f1d84d70..69ff150a28 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java @@ -21,7 +21,7 @@ import org.eclipse.swt.internal.motif.*; * can have a graphics context (GC) created for them, and they * can be drawn on by sending messages to the associated GC. */ -public abstract class Device implements Drawable { +public abstract class Device extends Resource implements Drawable { /** * the handle to the X Display * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java index be17f41761..cba2a682aa 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java @@ -28,7 +28,7 @@ import org.eclipse.swt.*; * * @see FontData */ -public final class Font { +public final class Font extends Resource { /** * the handle to the OS font resource * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java index 419cfaf8c3..815969643f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java @@ -45,7 +45,7 @@ import org.eclipse.swt.*; * * @see org.eclipse.swt.events.PaintEvent */ -public final class GC { +public final class GC extends Resource { /** * the handle to the OS device context * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java index bf6f92e4c1..43314001de 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java @@ -63,7 +63,7 @@ import java.io.*; * @see ImageData * @see ImageLoader */ -public final class Image implements Drawable { +public final class Image extends Resource implements Drawable { /** * specifies whether the receiver is a bitmap or an icon * (one of SWT.BITMAP, SWT.ICON) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java index be128407fb..0166f8fdb4 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java @@ -24,7 +24,7 @@ import org.eclipse.swt.*; * when those instances are no longer required. *

*/ -public final class Region { +public final class Region extends Resource { /** * the OS resource for the region * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java index 258c320eac..d7cf4c76af 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/TextLayout.java @@ -31,7 +31,7 @@ import org.eclipse.swt.*; * * @since 3.0 */ -public final class TextLayout { +public final class TextLayout extends Resource { Device device; Font font; String text; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java index cc44be70ca..ffb390c53e 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java @@ -27,7 +27,7 @@ import org.eclipse.swt.*; * @see RGB * @see Device#getSystemColor */ -public final class Color { +public final class Color extends Resource { /** * the handle to the OS color resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java index 889b491e6c..96b0e66ae1 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java @@ -38,7 +38,7 @@ import org.eclipse.swt.*; * Note: Only one of the above styles may be specified. *

*/ -public final class Cursor { +public final class Cursor extends Resource { /** * the type to the OS cursor resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java index e467e74e79..4bfe04fc88 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java @@ -21,7 +21,7 @@ import org.eclipse.swt.internal.photon.*; * can have a graphics context (GC) created for them, and they * can be drawn on by sending messages to the associated GC. */ -public abstract class Device implements Drawable { +public abstract class Device extends Resource implements Drawable { /* Debugging */ public static boolean DEBUG; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java index 194e8403fd..6aa17f725f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java @@ -28,7 +28,7 @@ import org.eclipse.swt.*; * * @see FontData */ -public final class Font { +public final class Font extends Resource { /** * the handle to the OS font resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java index 091a685284..06085b4678 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java @@ -44,7 +44,7 @@ import org.eclipse.swt.*; * * @see org.eclipse.swt.events.PaintEvent */ -public final class GC { +public final class GC extends Resource { /** * the handle to the OS device context * (Warning: This field is platform dependent) diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java index 9aed8f3641..1d7d0f9b35 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java @@ -62,7 +62,7 @@ import java.io.*; * @see ImageData * @see ImageLoader */ -public final class Image implements Drawable { +public final class Image extends Resource implements Drawable { /** * specifies whether the receiver is a bitmap or an icon diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java index b565603454..66c1d8afd2 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java @@ -24,7 +24,7 @@ import org.eclipse.swt.*; * when those instances are no longer required. *

*/ -public final class Region { +public final class Region extends Resource { /** * the OS resource for the region diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java index d2ae145d76..ba2158e748 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java @@ -29,7 +29,7 @@ import org.eclipse.swt.*; * @see Device#getSystemColor */ -public final class Color { +public final class Color extends Resource { /** * the handle to the OS color resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java index bc1c8a93eb..15e04eecac 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java @@ -39,7 +39,7 @@ import org.eclipse.swt.*; *

*/ -public final class Cursor { +public final class Cursor extends Resource { /** * the handle to the OS cursor resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java index e810a592d7..d95dd5e206 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java @@ -22,7 +22,7 @@ import org.eclipse.swt.*; * can have a graphics context (GC) created for them, and they * can be drawn on by sending messages to the associated GC. */ -public abstract class Device implements Drawable { +public abstract class Device extends Resource implements Drawable { /* Debugging */ public static boolean DEBUG; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java index eb7df5729a..c6a59a434d 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java @@ -28,7 +28,7 @@ import org.eclipse.swt.*; * @see FontData */ -public final class Font { +public final class Font extends Resource { /** * the handle to the OS font resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java index 018a54c47b..9967a3679c 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java @@ -46,7 +46,7 @@ import org.eclipse.swt.*; * @see org.eclipse.swt.events.PaintEvent */ -public final class GC { +public final class GC extends Resource { /** * the handle to the OS device context diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java index 1ffc5a0000..411f99a2a4 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java @@ -63,7 +63,7 @@ import java.io.*; * @see ImageLoader */ -public final class Image implements Drawable { +public final class Image extends Resource implements Drawable { /** * specifies whether the receiver is a bitmap or an icon diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java index 7174a0e68a..d318d1fa58 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java @@ -17,7 +17,7 @@ import org.eclipse.swt.internal.win32.*; /** * WARNING API STILL UNDER CONSTRUCTION AND SUBJECT TO CHANGE */ -public class Path { +public class Path extends Resource { /** * the handle to the OS path resource diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java index 9f82ee6342..5fa537b62f 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java @@ -25,7 +25,7 @@ import org.eclipse.swt.*; *

*/ -public final class Region { +public final class Region extends Resource { /** * the OS resource for the region diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java index 618702f5d6..77dd6a43c6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java @@ -31,7 +31,7 @@ import org.eclipse.swt.*; * * @since 3.0 */ -public final class TextLayout { +public final class TextLayout extends Resource { Device device; Font font; String text, segmentsText; diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java index 7cf64c8963..2f68e36f22 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java @@ -16,7 +16,7 @@ import org.eclipse.swt.internal.gdip.*; /** * WARNING API STILL UNDER CONSTRUCTION AND SUBJECT TO CHANGE */ -public class Transform { +public class Transform extends Resource { /** * the handle to the OS path resource * (Warning: This field is platform dependent) -- cgit