From c98a35a24d3d416c116d748eeedb75c131d5ec31 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov
Date: Thu, 7 Jan 2016 22:04:29 +0100
Subject: Bug 485367 - cleaned trailing spaces in swt (gtk, cairo and Co)
Change-Id: I666ba3c50b8d8d8c8db67db7efd1647115f36cf1
Signed-off-by: Andrey Loskutov null
.
+ * for the platform will be used if null
.
*/
public static String embeddedFrameClass;
/**
* Key for looking up the embedded frame for a Composite using
- * getData().
+ * getData().
*/
static String EMBEDDED_FRAME_KEY = "org.eclipse.swt.awt.SWT_AWT.embeddedFrame";
@@ -94,14 +94,14 @@ static synchronized void initializeSwing() {
/**
* Returns a java.awt.Frame
which is the embedded frame
* associated with the specified composite.
- *
+ *
* @param parent the parent Composite
of the java.awt.Frame
* @return a java.awt.Frame
the embedded frame or null
.
- *
+ *
* @exception IllegalArgumentException
*
- *
+ *
* @since 3.2
*/
public static Frame getFrame (Composite parent) {
@@ -122,15 +122,15 @@ public static Frame getFrame (Composite parent) {
* strongly recommended that a heavyweight component such as java.awt.Panel
* be added to the frame as the root of all components.
*
Composite
of the new java.awt.Frame
* @return a java.awt.Frame
to be the parent of the embedded AWT components
- *
+ *
* @exception IllegalArgumentException Shell
. This Shell is the root for
- * the SWT widgets that will be embedded within the AWT canvas.
- *
+ * the SWT widgets that will be embedded within the AWT canvas.
+ *
* @param display the display for the new Shell
* @param parent the parent java.awt.Canvas
of the new Shell
* @return a Shell
to be the parent of the embedded SWT widgets
- *
+ *
* @exception IllegalArgumentException ACC
constant beginning with RELATION_* indicating the type of relation
* @param target the accessible that is the target for this relation
- *
+ *
* @since 3.6
*/
public void addRelation(int type, Accessible target) {
@@ -422,7 +422,7 @@ public class Accessible {
relations.add(relation);
if (accessibleObject != null) accessibleObject.addRelation(type, target);
}
-
+
void addRelations () {
if (relations == null) return;
if (accessibleObject == null) return;
@@ -431,7 +431,7 @@ public class Accessible {
accessibleObject.addRelation(relation.type, relation.target);
}
}
-
+
/**
* Disposes of the operating system resources associated with
* the receiver, and removes the receiver from its parent's
@@ -445,7 +445,7 @@ public class Accessible {
* It is also not necessary to call this for instances of Accessible
* that were retrieved with Control.getAccessible()
.
*
- *
+ *
* @since 3.6
*/
public void dispose () {
@@ -456,7 +456,7 @@ public class Accessible {
}
/**
- * Returns the control for this Accessible object.
+ * Returns the control for this Accessible object.
*
* @return the receiver's control
* @since 3.0
@@ -470,7 +470,7 @@ public class Accessible {
if (!isValidThread ()) SWT.error (SWT.ERROR_THREAD_INVALID_ACCESS);
if (control.isDisposed ()) SWT.error (SWT.ERROR_WIDGET_DISPOSED);
}
-
+
AccessibleObject getAccessibleObject () {
if (accessibleObject == null) {
if (parent == null) {
@@ -512,14 +512,14 @@ public class Accessible {
* available on all platforms, and should never be called from
* application code.
*
- *
+ *
* @noreference This method is not intended to be referenced by clients.
*/
public void internal_dispose_Accessible() {
AccessibleFactory.unregisterAccessible (Accessible.this);
release ();
}
-
+
/**
* Invokes platform specific functionality to allocate a new accessible object.
*
@@ -532,7 +532,7 @@ public class Accessible {
*
* @param control the control to get the accessible object for
* @return the platform specific accessible object
- *
+ *
* @noreference This method is not intended to be referenced by clients.
*/
public static Accessible internal_new_Accessible (Control control) {
@@ -543,7 +543,7 @@ public class Accessible {
boolean isValidThread () {
return control.getDisplay ().getThread () == Thread.currentThread ();
}
-
+
void release () {
if (children != null) {
for (int i = 0; i < children.size(); i++) {
@@ -556,7 +556,7 @@ public class Accessible {
accessibleObject = null;
}
}
-
+
/**
* Removes the listener from the collection of listeners who will
* be notified when an accessible client asks for custom control
@@ -632,7 +632,7 @@ public class Accessible {
* @see AccessibleTextListener
* @see AccessibleTextExtendedListener
* @see #addAccessibleTextListener
- *
+ *
* @since 3.0
*/
public void removeAccessibleTextListener (AccessibleTextListener listener) {
@@ -650,7 +650,7 @@ public class Accessible {
}
}
}
-
+
/**
* Removes the listener from the collection of listeners that will be
* notified when an accessible client asks for any of the properties
@@ -669,7 +669,7 @@ public class Accessible {
*
* @see AccessibleActionListener
* @see #addAccessibleActionListener
- *
+ *
* @since 3.6
*/
public void removeAccessibleActionListener(AccessibleActionListener listener) {
@@ -699,7 +699,7 @@ public class Accessible {
*
* @see AccessibleEditableTextListener
* @see #addAccessibleEditableTextListener
- *
+ *
* @since 3.7
*/
public void removeAccessibleEditableTextListener(AccessibleEditableTextListener listener) {
@@ -710,7 +710,7 @@ public class Accessible {
if (accessibleEditableTextListeners.isEmpty()) accessibleEditableTextListeners = null;
}
}
-
+
/**
* Removes the listener from the collection of listeners that will be
* notified when an accessible client asks for any of the properties
@@ -729,7 +729,7 @@ public class Accessible {
*
* @see AccessibleHyperlinkListener
* @see #addAccessibleHyperlinkListener
- *
+ *
* @since 3.6
*/
public void removeAccessibleHyperlinkListener(AccessibleHyperlinkListener listener) {
@@ -759,7 +759,7 @@ public class Accessible {
*
* @see AccessibleTableListener
* @see #addAccessibleTableListener
- *
+ *
* @since 3.6
*/
public void removeAccessibleTableListener(AccessibleTableListener listener) {
@@ -789,7 +789,7 @@ public class Accessible {
*
* @see AccessibleTableCellListener
* @see #addAccessibleTableCellListener
- *
+ *
* @since 3.6
*/
public void removeAccessibleTableCellListener(AccessibleTableCellListener listener) {
@@ -819,7 +819,7 @@ public class Accessible {
*
* @see AccessibleValueListener
* @see #addAccessibleValueListener
- *
+ *
* @since 3.6
*/
public void removeAccessibleValueListener(AccessibleValueListener listener) {
@@ -849,7 +849,7 @@ public class Accessible {
*
* @see AccessibleAttributeListener
* @see #addAccessibleAttributeListener
- *
+ *
* @since 3.6
*/
public void removeAccessibleAttributeListener(AccessibleAttributeListener listener) {
@@ -864,10 +864,10 @@ public class Accessible {
/**
* Removes the relation with the specified type and target
* from the receiver's set of relations.
- *
+ *
* @param type an ACC
constant beginning with RELATION_* indicating the type of relation
* @param target the accessible that is the target for this relation
- *
+ *
* @since 3.6
*/
public void removeRelation(int type, Accessible target) {
@@ -887,12 +887,12 @@ public class Accessible {
* @param event an ACC
constant beginning with EVENT_* indicating the message to send
* @param eventData an object containing event-specific data, or null if there is no event-specific data
* (eventData is specified in the documentation for individual ACC.EVENT_* constants)
- *
+ *
* @exception SWTException
- * Application code must explicitly invoke the Path.dispose()
+ * Application code must explicitly invoke the Path.dispose()
* method to release the operating system resources managed by each instance
* when those instances are no longer required.
*
* You must dispose the path when it is no longer required. *
- * + * * @param device the device on which to allocate the path - * + * * @exception IllegalArgumentException* You must dispose the path when it is no longer required. *
- * + * * @param device the device on which to allocate the path * @param path the path to make a copy * @param flatness the flatness value - * + * * @exception IllegalArgumentException* You must dispose the path when it is no longer required. *
- * + * * @param device the device on which to allocate the path * @param data the data for the path - * + * * @exception IllegalArgumentException
- * The resulting arc begins at startAngle
and extends
+ * The resulting arc begins at startAngle
and extends
* for arcAngle
degrees.
* Angles are interpreted such that 0 degrees is at the 3 o'clock
* position. A positive value indicates a counter-clockwise rotation
* while a negative value indicates a clockwise rotation.
*
- * The center of the arc is the center of the rectangle whose origin
- * is (x
, y
) and whose size is specified by the
- * width
and height
arguments.
+ * The center of the arc is the center of the rectangle whose origin
+ * is (x
, y
) and whose size is specified by the
+ * width
and height
arguments.
*
* The resulting arc covers an area width + 1
pixels wide
* by height + 1
pixels tall.
@@ -364,7 +364,7 @@ public boolean contains(float x, float y, GC gc, boolean outline) {
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
if (outline) {
- result = Cairo.cairo_in_stroke(cairo, x, y) != 0;
+ result = Cairo.cairo_in_stroke(cairo, x, y) != 0;
} else {
result = Cairo.cairo_in_fill(cairo, x, y) != 0;
}
@@ -404,7 +404,7 @@ public void cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y
* receiver (i.e. the bounding box).
*
* @param bounds the array to hold the result
- *
+ *
* @exception IllegalArgumentException
- * Application code must explicitly invoke the Pattern.dispose()
+ * Application code must explicitly invoke the Pattern.dispose()
* method to release the operating system resources managed by each instance
* when those instances are no longer required.
*
* You must dispose the pattern when it is no longer required. *
- * + * * @param device the device on which to allocate the pattern * @param image the image that the pattern will draw - * + * * @exception IllegalArgumentException* You must dispose the pattern when it is no longer required. *
- * + * * @param device the device on which to allocate the pattern * @param x1 the x coordinate of the starting corner of the gradient * @param y1 the y coordinate of the starting corner of the gradient @@ -111,9 +111,9 @@ public Pattern(Device device, Image image) { * @param y2 the y coordinate of the ending corner of the gradient * @param color1 the starting color of the gradient * @param color2 the ending color of the gradient - * + * * @exception IllegalArgumentException* You must dispose the pattern when it is no longer required. *
- * + * * @param device the device on which to allocate the pattern * @param x1 the x coordinate of the starting corner of the gradient * @param y1 the y coordinate of the starting corner of the gradient @@ -151,9 +151,9 @@ public Pattern(Device device, float x1, float y1, float x2, float y2, Color colo * @param alpha1 the starting alpha value of the gradient * @param color2 the ending color of the gradient * @param alpha2 the ending alpha value of the gradient - * + * * @exception IllegalArgumentException
- * Application code must explicitly invoke the Transform.dispose()
+ * Application code must explicitly invoke the Transform.dispose()
* method to release the operating system resources managed by each instance
* when those instances are no longer required.
*
@@ -54,11 +54,11 @@ public class Transform extends Resource { * platforms. *
*- * You must dispose the transform when it is no longer required. + * You must dispose the transform when it is no longer required. *
- * + * * @param device the device on which to allocate the Transform - * + * * @exception IllegalArgumentException* This operation requires the operating system's advanced @@ -84,12 +84,12 @@ public Transform (Device device) { * platforms. *
*- * You must dispose the transform when it is no longer required. + * You must dispose the transform when it is no longer required. *
- * + * * @param device the device on which to allocate the Transform * @param elements an array of floats that describe the transformation matrix - * + * * @exception IllegalArgumentException* This operation requires the operating system's advanced @@ -116,9 +116,9 @@ public Transform(Device device, float[] elements) { * platforms. *
*- * You must dispose the transform when it is no longer required. + * You must dispose the transform when it is no longer required. *
- * + * * @param device the device on which to allocate the Transform * @param m11 the first element of the first row of the matrix * @param m12 the second element of the first row of the matrix @@ -126,7 +126,7 @@ public Transform(Device device, float[] elements) { * @param m22 the second element of the second row of the matrix * @param dx the third element of the first row of the matrix * @param dy the third element of the second row of the matrix - * + * * @exception IllegalArgumentExceptionRGB
or RGBA
.
+ * 0 to 255 or provide an instance of an RGB
or RGBA
.
*
* Application code must explicitly invoke the Color.dispose()
* method to release the operating system resources managed by each instance
@@ -82,16 +82,16 @@ public Color(Device device, int red, int green, int blue) {
init();
}
-/**
+/**
* Constructs a new instance of this class given a device and the
* desired red, green, blue & alpha values expressed as ints in the range
* 0 to 255 (where 0 is black and 255 is full brightness). On limited
* color devices, the color instance created by this call may not have
* the same RGB values as the ones specified by the arguments. The
- * RGB values on the returned instance will be the color values of
+ * RGB values on the returned instance will be the color values of
* the operating system color.
*
- * You must dispose the color when it is no longer required. + * You must dispose the color when it is no longer required. *
* * @param device the device on which to allocate the color @@ -143,7 +143,7 @@ public Color(Device device, RGB rgb) { init(); } -/** +/** * Constructs a new instance of this class given a device and an *RGBA
describing the desired red, green, blue & alpha values.
* On limited color devices, the color instance created by this call
@@ -151,7 +151,7 @@ public Color(Device device, RGB rgb) {
* argument. The RGBA values on the returned instance will be the color
* values of the operating system color + alpha.
* - * You must dispose the color when it is no longer required. + * You must dispose the color when it is no longer required. *
* * @param device the device on which to allocate the color @@ -173,16 +173,16 @@ public Color(Device device, RGBA rgba) { init(); } -/** +/** * Constructs a new instance of this class given a device, an *RGB
describing the desired red, green and blue values,
- * alpha specifying the level of transparency.
+ * alpha specifying the level of transparency.
* On limited color devices, the color instance created by this call
* may not have the same RGB values as the ones specified by the
* argument. The RGB values on the returned instance will be the color
* values of the operating system color.
* - * You must dispose the color when it is no longer required. + * You must dispose the color when it is no longer required. *
* * @param device the device on which to allocate the color @@ -364,7 +364,7 @@ public static Color gtk_new(Device device, GdkColor gdkColor) { return gtk_new(device, gdkColor, 255); } -/** +/** * Invokes platform specific functionality to allocate a new color. ** IMPORTANT: This method is not part of the public @@ -377,7 +377,7 @@ public static Color gtk_new(Device device, GdkColor gdkColor) { * @param device the device on which to allocate the color * @param gdkColor the handle for the color * @param alpha the int for the alpha content in the color(Currently SWT honors extreme values for alpha ie. 0 or 255) - * + * * @noreference This method is not intended to be referenced by clients. */ public static Color gtk_new(Device device, GdkColor gdkColor, int alpha) { @@ -388,7 +388,7 @@ public static Color gtk_new(Device device, GdkColor gdkColor, int alpha) { } /** - * Allocates the operating system resources associated + * Allocates the operating system resources associated * with the receiver. * * @param device the device on which to allocate the color @@ -415,7 +415,7 @@ void init(int red, int green, int blue, int alpha) { gdkColor.green = (short)((green & 0xFF) | ((green & 0xFF) << 8)); gdkColor.blue = (short)((blue & 0xFF) | ((blue & 0xFF) << 8)); this.alpha = alpha; - + if (!OS.GTK3) { long /*int*/ colormap = OS.gdk_colormap_get_system(); if (!OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true)) { 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 e0c044977c..319354c761 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 @@ -67,7 +67,7 @@ Font(Device device) { * @exception SWTError
* You must dispose the region when it is no longer required. *
- * + * * @exception SWTError
* The style value is either one of the style constants defined in
* class SWT
which is applicable to instances of this
- * class, or must be built by bitwise OR'ing together
+ * class, or must be built by bitwise OR'ing together
* (that is, using the int
"|" operator) two or more
* of those SWT
style constants. The class description
* lists the style constants that are applicable to the class.
@@ -357,7 +357,7 @@ void destroyItem (TabItem item) {
}
Event event = new Event ();
event.item = items [newIndex];
- sendSelectionEvent (SWT.Selection, event, true);
+ sendSelectionEvent (SWT.Selection, event, true);
// the widget could be destroyed at this point
}
}
@@ -367,7 +367,7 @@ void destroyItem (TabItem item) {
long /*int*/ eventHandle () {
return handle;
}
-
+
@Override
Control[] _getChildren() {
Control [] directChildren = super._getChildren ();
@@ -405,7 +405,7 @@ Control[] _getChildren() {
}
System.arraycopy (directChildren, 0, newChildren, i, directCount);
return newChildren;
-
+
} else {
return directChildren;
}
@@ -428,7 +428,7 @@ Control[] _getChildren() {
*/
public TabItem getItem (int index) {
checkWidget();
- if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
+ if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
int itemCount = OS.g_list_length (list);
@@ -452,7 +452,7 @@ public TabItem getItem (int index) {
*
TabItem
s which are the items
- * in the receiver.
+ * in the receiver.
* * Note: This is not the actual structure used by the receiver * to maintain its list of items, so modifying the array will - * not affect the receiver. + * not affect the receiver. *
* * @return the items in the receiver @@ -520,7 +520,7 @@ public TabItem [] getItems () { ** Note: This is not the actual structure used by the receiver * to maintain its selection, so modifying the array will - * not affect the receiver. + * not affect the receiver. *
* @return an array representing the selection * @@ -586,7 +586,7 @@ void hookEvents () { /** * Searches the receiver's list starting at the first item - * (index 0) until an item is found that is equal to the + * (index 0) until an item is found that is equal to the * argument, and returns the index of that item. If no item * is found, returns -1. * @@ -717,7 +717,7 @@ public void removeSelectionListener (SelectionListener listener) { if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); if (eventTable == null) return; eventTable.unhook (SWT.Selection, listener); - eventTable.unhook (SWT.DefaultSelection,listener); + eventTable.unhook (SWT.DefaultSelection,listener); } @Override @@ -785,7 +785,7 @@ void setOrientation (boolean create) { } /** - * Selects the item at the given zero-relative index in the receiver. + * Selects the item at the given zero-relative index in the receiver. * If the item at the index was already selected, it remains selected. * The current selection is first cleared, then the new items are * selected. Indices that are out of range are ignored. @@ -847,7 +847,7 @@ void setSelection (int index, boolean notify) { *false
otherwise.
*
* @return true
when the widget has auto direction and false
otherwise
- *
+ *
* @see #HAS_AUTO_DIRECTION
- *
+ *
* @since 3.105
*/
public boolean isAutoDirection () {
--
cgit v1.2.3