Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2012-03-09 16:05:41 +0000
committerGrant Gayed2012-03-09 16:05:41 +0000
commit4d842d1e7eb2ec23c4528724847e2f2c39595e7d (patch)
treea04b34f6e79f9462acf4caa80a4760e27d669ee6 /bundles
parent65025a7edc821ab692899a998f097ee59dcca651 (diff)
downloadeclipse.platform.swt-4d842d1e7eb2ec23c4528724847e2f2c39595e7d.tar.gz
eclipse.platform.swt-4d842d1e7eb2ec23c4528724847e2f2c39595e7d.tar.xz
eclipse.platform.swt-4d842d1e7eb2ec23c4528724847e2f2c39595e7d.zip
Bug 373794 - Malformed Javadoc comments
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs31
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/BrowserFunction.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java9
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java16
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java6
38 files changed, 117 insertions, 104 deletions
diff --git a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs
index 45a9b43b6c..b0cfbaec03 100644
--- a/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.swt/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,22 @@
-#Mon Dec 11 13:38:12 EST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.source=1.3
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/BrowserFunction.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/BrowserFunction.java
index 7e1894d4bf..a33934d1aa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/BrowserFunction.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/BrowserFunction.java
@@ -77,7 +77,7 @@ public class BrowserFunction {
* </ul>
*
* @see #dispose()
- * @see BrowserFunction(Browser, String, boolean, String[])
+ * @see #BrowserFunction(Browser, String, boolean, String[])
* @see org.eclipse.swt.browser.LocationListener#changed(LocationEvent)
*/
public BrowserFunction (Browser browser, String name) {
@@ -116,7 +116,7 @@ public BrowserFunction (Browser browser, String name) {
* </ul>
*
* @see #dispose()
- * @see BrowserFunction(Browser, String)
+ * @see #BrowserFunction(Browser, String)
* @see org.eclipse.swt.browser.LocationListener#changed(LocationEvent)
*
* @since 3.8
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
index 8c2cb5914b..de49fd6296 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.dnd;
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.*;
import org.eclipse.swt.internal.Converter;
import org.eclipse.swt.internal.gtk.GtkSelectionData;
import org.eclipse.swt.internal.gtk.OS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index 8b859befa3..575c44182a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
@@ -1311,12 +1311,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGContextCopyPath)
jintLong rc = 0;
OS_NATIVE_ENTER(env, that, CGContextCopyPath_FUNC);
/*
- rc = (jintLong)CGContextCopyPath(arg0);
+ rc = (jintLong)CGContextCopyPath((CGContextRef)arg0);
*/
{
OS_LOAD_FUNCTION(fp, CGContextCopyPath)
if (fp) {
- rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGContextRef))fp)((CGContextRef)arg0);
}
}
OS_NATIVE_EXIT(env, that, CGContextCopyPath_FUNC);
@@ -5594,12 +5594,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetPrinterResolutionCount)
OS_NATIVE_ENTER(env, that, PMPrinterGetPrinterResolutionCount_FUNC);
if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jintLong)PMPrinterGetPrinterResolutionCount((PMPrinter)arg0, lparg1);
+ rc = (jintLong)PMPrinterGetPrinterResolutionCount((PMPrinter)arg0, (UInt32 *)lparg1);
*/
{
OS_LOAD_FUNCTION(fp, PMPrinterGetPrinterResolutionCount)
if (fp) {
- rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, jint *))fp)((PMPrinter)arg0, lparg1);
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, UInt32 *))fp)((PMPrinter)arg0, (UInt32 *)lparg1);
}
}
fail:
@@ -5938,12 +5938,12 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(TISGetInputSourceProperty)
jintLong rc = 0;
OS_NATIVE_ENTER(env, that, TISGetInputSourceProperty_FUNC);
/*
- rc = (jintLong)TISGetInputSourceProperty(arg0, arg1);
+ rc = (jintLong)TISGetInputSourceProperty((TISInputSourceRef)arg0, (CFStringRef)arg1);
*/
{
OS_LOAD_FUNCTION(fp, TISGetInputSourceProperty)
if (fp) {
- rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(TISInputSourceRef, CFStringRef))fp)((TISInputSourceRef)arg0, (CFStringRef)arg1);
}
}
OS_NATIVE_EXIT(env, that, TISGetInputSourceProperty_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index e7e74e3bf9..7476e2708b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -195,13 +195,13 @@ public static final native int GetDblTime();
@param outIconRef cast=(IconRef *) */
public static final native int GetIconRefFromTypeInfo(int inCreator, int inType, int /*long*/ inExtension, int /*long*/ inMIMEType, int inUsageFlags, int /*long*/ outIconRef[]);
/** @method flags=dynamic
- @param cast=(CGContextRef) */
+ @param context cast=(CGContextRef) */
public static final native int /*long*/ CGContextCopyPath(int /*long*/ context);
/** @method flags=dynamic */
public static final native int /*long*/ TISCopyCurrentKeyboardInputSource();
/** @method flags=dynamic
- @param cast=(TISInputSourceRef)
- @param cast=(CFStringRef) */
+ @param inputSource cast=(TISInputSourceRef)
+ @param propertyKey cast=(CFStringRef) */
public static final native int /*long*/ TISGetInputSourceProperty (int /*long*/ inputSource, int /*long*/ propertyKey);
/** @method flags=no_gen */
public static final native int /*long*/ kTISPropertyUnicodeKeyLayoutData();
@@ -327,7 +327,7 @@ public static final native int /*long*/ PMGetDuplex(int /*long*/ printSettings,
public static final native int /*long*/ PMSetDuplex(int /*long*/ printSettings, int duplexSetting);
/** @method flags=dynamic
* @param pmPrinter cast=(PMPrinter)
- * @param pmPrintSettings cast=(PMPrintSettings)
+ * @param outNumResolutions cast=(UInt32 *)
*/
public static final native int /*long*/ PMPrinterGetPrinterResolutionCount(int /*long*/ pmPrinter, int[] outNumResolutions);
/** @method flags=dynamic
@@ -542,7 +542,6 @@ public static final native boolean class_addMethod(int /*long*/ cls, int /*long*
*/
public static final native boolean class_addProtocol(int /*long*/ cls, int /*long*/ protocol);
/**
- * @param method cast=(Method)
* @param aClass cast=(Class)
* @param aSelector cast=(SEL)
*/
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index bdd7f7430c..f2c9f50487 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -2312,7 +2312,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetSelectionOwner)
{
jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XSetSelectionOwner_FUNC);
- rc = (jintLong)XSetSelectionOwner((Display *)arg0, (Atom)arg1, arg2, (Time)arg3);
+ rc = (jintLong)XSetSelectionOwner((Display *)arg0, (Atom)arg1, (Window)arg2, (Time)arg3);
OS_NATIVE_EXIT(env, that, _1XSetSelectionOwner_FUNC);
return rc;
}
@@ -6217,12 +6217,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv)
if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
/*
- rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6);
+ rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6);
*/
{
OS_LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv)
if (fp) {
- rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, jintLong *, jintLong *, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6);
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, char **, char **, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (char **)lparg4, (char **)lparg5, (GError **)lparg6);
}
}
fail:
@@ -10942,12 +10942,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1orientable_1set_1orientation)
{
OS_NATIVE_ENTER(env, that, _1gtk_1orientable_1set_1orientation_FUNC);
/*
- gtk_orientable_set_orientation(arg0, (GtkOrientation)arg1);
+ gtk_orientable_set_orientation((GtkOrientable *)arg0, (GtkOrientation)arg1);
*/
{
OS_LOAD_FUNCTION(fp, gtk_orientable_set_orientation)
if (fp) {
- ((void (CALLING_CONVENTION*)(jintLong, GtkOrientation))fp)(arg0, (GtkOrientation)arg1);
+ ((void (CALLING_CONVENTION*)(GtkOrientable *, GtkOrientation))fp)((GtkOrientable *)arg0, (GtkOrientation)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1orientable_1set_1orientation_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index ecda2599ed..fc27bfdc98 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -902,7 +902,7 @@ public static final void XFree(int /*long*/ address) {
/**
* @param display cast=(Display *)
* @param selection cast=(Atom)
- * @param owner cast=(Window)
+ * @param window cast=(Window)
* @param time cast=(Time)
*/
public static final native int /*long*/ _XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time);
@@ -934,7 +934,6 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
* @param property cast=(Atom)
* @param req_type cast=(Atom)
* @param actual_type_return cast=(Atom*)
- * @param actual_format_return cast=(Atom*)
* @param actual_format_return cast=(int *)
* @param nitems_return cast=(unsigned long *)
* @param bytes_after_return cast=(unsigned long *)
@@ -4785,8 +4784,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
* @param buffer cast=(gchar **)
* @param buffer_size cast=(gsize *)
* @param type cast=(const char *)
- * @param option_keys=(char **)
- * @param option_values=(char **)
+ * @param option_keys cast=(char **)
+ * @param option_values cast=(char **)
* @param error cast=(GError **)
*/
public static final native boolean _gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error);
@@ -6084,7 +6083,6 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
/**
* @method flags=dynamic
* @param calendar cast=(GtkCalendar *)
- * @param day cast=(guint)
*/
public static final native void _gtk_calendar_clear_marks(int /*long*/ calendar);
public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
@@ -8626,7 +8624,7 @@ public static final void gtk_object_sink(int /*long*/ object) {
}
/**
* @method flags=dynamic
- * @param toolbar cast=(GtkOrientable *)
+ * @param orientable cast=(GtkOrientable *)
* @param orientation cast=(GtkOrientation)
*/
public static final native void _gtk_orientable_set_orientation(int /*long*/ orientable, int orientation);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
index 8f5cc01865..9c5c684d0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 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
@@ -18015,12 +18015,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UnregisterTouchWindow)
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, UnregisterTouchWindow_FUNC);
/*
- rc = (jboolean)UnregisterTouchWindow(arg0);
+ rc = (jboolean)UnregisterTouchWindow((HWND)arg0);
*/
{
OS_LOAD_FUNCTION(fp, UnregisterTouchWindow)
if (fp) {
- rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(HWND))fp)((HWND)arg0);
}
}
OS_NATIVE_EXIT(env, that, UnregisterTouchWindow_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 84e81097ab..1429fac03e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -6921,7 +6921,7 @@ public static final native boolean UnregisterClassA (byte [] lpClassName, int /*
public static final native boolean UpdateLayeredWindow (int /*long*/ hwnd, int /*long*/ hdcDst, POINT pptDst, SIZE psize, int /*long*/ hdcSrc, POINT pptSrc, int crKey, BLENDFUNCTION pblend, int dwFlags);
/**
* @method flags=dynamic
- * @param hWnd cast=(HWND)
+ * @param hwnd cast=(HWND)
*/
public static final native boolean UnregisterTouchWindow (int /*long*/ hwnd);
/** @param hWnd cast=(HWND) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
index 1682623ef8..b367b63836 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
@@ -347,7 +347,7 @@ protected void init () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC(int /*long*/ context, GCData data) {
+public void internal_dispose_GC(int /*long*/ hDC, GCData data) {
if (data != null) isGCCreated = false;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
index c0db7a8895..90c2fef573 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
@@ -488,7 +488,8 @@ public int /*long*/ internal_new_GC(GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC(int /*long*/ gc, GCData data) {
+public void internal_dispose_GC(int /*long*/ hDC, GCData data) {
+ int /*long*/ gc = hDC;
if (data != null) isGCCreated = false;
if (OS.USE_CAIRO) return;
OS.g_object_unref (gc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
index 175dd4843a..3604975261 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
@@ -220,7 +220,8 @@ public RGB getRGB () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Color cocoa_new(Device device, float /*double*/ [] rgbColor) {
+public static Color cocoa_new(Device device, float /*double*/ [] handle) {
+ float /*double*/ [] rgbColor = handle;
Color color = new Color(device);
color.handle = rgbColor;
return color;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
index 161c4cadb0..ce5c821915 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
@@ -572,7 +572,7 @@ public abstract int /*long*/ internal_new_GC (GCData data);
*
* @noreference This method is not intended to be referenced by clients.
*/
-public abstract void internal_dispose_GC (int /*long*/ handle, GCData data);
+public abstract void internal_dispose_GC (int /*long*/ hDC, GCData data);
/**
* Returns <code>true</code> if the device has been disposed,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
index 1382eddd3e..9b0d8164bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
@@ -275,8 +275,6 @@ public FontData[] getFontData() {
*
* @param device the device on which to allocate the color
* @param handle the handle for the font
- * @param style the style for the font
- * @param size the size for the font
*
* @noreference This method is not intended to be referenced by clients.
*/
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
index 8cf8633414..eed7d219cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
@@ -774,8 +774,7 @@ public ImageData getImageData() {
*
* @param device the device on which to allocate the color
* @param type the type of the image (<code>SWT.BITMAP</code> or <code>SWT.ICON</code>)
- * @param handle the OS handle for the image
- * @param data the OS data for the image
+ * @param nsImage the OS data for the image
*
* @noreference This method is not intended to be referenced by clients.
*/
@@ -1167,7 +1166,8 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ context, GCData data) {
+public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+ int /*long*/ context = hDC;
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
index c4478bb587..461e76ea2d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
@@ -1318,11 +1318,11 @@ public int getOrientation() {
*
* @see #getNextOffset(int, int)
*/
-public int getPreviousOffset (int index, int movement) {
+public int getPreviousOffset (int offset, int movement) {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- return _getOffset(index, movement, false);
+ return _getOffset(offset, movement, false);
} finally {
if (pool != null) pool.release();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index 3092d2897c..26c7ba8b84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -2156,8 +2156,9 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ context, GCData data) {
+public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
checkWidget ();
+ int /*long*/ context = hDC;
NSGraphicsContext graphicsContext = new NSGraphicsContext (context);
display.removeContext (data);
if (data != null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index eeb4578b73..ce60fa1df6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -3027,9 +3027,8 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ context, GCData data) {
+public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
if (isDisposed()) SWT.error(SWT.ERROR_DEVICE_DISPOSED);
-
}
boolean isBundled () {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
index 15cb5692a9..2de3f64820 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.widgets;
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.cocoa.*;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
index db0136f9af..5229f8fd13 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.swt.widgets;
-import org.eclipse.swt.SWT;
+import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.cocoa.*;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
index 3b06fb96b7..d5fdfab886 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
@@ -664,11 +664,11 @@ public int getTopIndex () {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public int indexOf (String item) {
+public int indexOf (String string) {
checkWidget();
- if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
for (int i=0; i<itemCount; i++) {
- if (items [i].equals (item)) return i;
+ if (items [i].equals (string)) return i;
}
return -1;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
index 9b163c3cf1..f9a6d25d93 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
@@ -277,10 +277,10 @@ void sendSelection () {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setIncrement (int value) {
+public void setIncrement (int increment) {
checkWidget();
- if (value < 1) return;
- increment = value;
+ if (increment < 1) return;
+ this.increment = increment;
}
/**
@@ -336,10 +336,10 @@ public void setMinimum (int value) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setPageIncrement (int value) {
+public void setPageIncrement (int pageIncrement) {
checkWidget();
- if (value < 1) return;
- pageIncrement = value;
+ if (pageIncrement < 1) return;
+ this.pageIncrement = pageIncrement;
}
/**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
index 02f07e3008..99f84a1777 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
@@ -636,9 +636,9 @@ public void setPageIncrement (int value) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setSelection (int value) {
+public void setSelection (int selection) {
checkWidget();
- updateBar(value, minimum, maximum, thumb);
+ updateBar(selection, minimum, maximum, thumb);
}
/**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java
index a6db36ec2c..6c3af051eb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TaskItem.java
@@ -273,11 +273,11 @@ public void setMenu (Menu menu) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setOverlayImage (Image image) {
+public void setOverlayImage (Image overlayImage) {
checkWidget ();
- if (image != null && image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
- overlayImage = image;
- updateOverlayText (image != null ? null : overlayText);
+ if (overlayImage != null && overlayImage.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+ this.overlayImage = overlayImage;
+ updateOverlayText (overlayImage != null ? null : overlayText);
updateImage ();
}
@@ -307,11 +307,11 @@ public void setOverlayImage (Image image) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setOverlayText (String string) {
+public void setOverlayText (String overlayText) {
checkWidget ();
- if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
- overlayText = string;
- updateOverlayText (string);
+ if (overlayText == null) error (SWT.ERROR_NULL_ARGUMENT);
+ this.overlayText = overlayText;
+ updateOverlayText (overlayText);
updateImage ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
index f4f86724e5..e3be309c92 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
@@ -405,12 +405,12 @@ public ToolItem getItem (int index) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public ToolItem getItem (Point pt) {
+public ToolItem getItem (Point point) {
checkWidget();
- if (pt == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
for (int i=0; i<itemCount; i++) {
Rectangle rect = items [i].getBounds ();
- if (rect.contains (pt)) return items [i];
+ if (rect.contains (point)) return items [i];
}
return null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
index 6ff03ac0ff..be91a84817 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
@@ -1356,11 +1356,11 @@ void releaseWidget () {
* @see #getListeners(int)
* @see #notifyListeners
*/
-public void removeListener (int eventType, Listener handler) {
+public void removeListener (int eventType, Listener listener) {
checkWidget();
- if (handler == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
if (eventTable == null) return;
- eventTable.unhook (eventType, handler);
+ eventTable.unhook (eventType, listener);
}
/**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java
index cf572bfb16..74b54fe451 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java
@@ -489,9 +489,9 @@ public void removeSelectionListener (SelectionListener listener) {
* @see #getVisible
* @see #setVisible
*/
-public void setAutoHide (boolean autohide) {
+public void setAutoHide (boolean autoHide) {
checkWidget ();
- this.autohide = autohide;
+ this.autohide = autoHide;
//TODO - update when visible
}
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 7a57f02670..d2efb779c2 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
@@ -224,7 +224,7 @@ public RGB getRGB () {
* </p>
*
* @param device the device on which to allocate the color
- * @param handle the handle for the color
+ * @param gdkColor the handle for the color
*
* @noreference This method is not intended to be referenced by clients.
*/
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 37a95bf2ae..867cce80aa 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
@@ -694,7 +694,7 @@ public abstract int /*long*/ internal_new_GC (GCData data);
*
* @noreference This method is not intended to be referenced by clients.
*/
-public abstract void internal_dispose_GC (int /*long*/ handle, GCData data);
+public abstract void internal_dispose_GC (int /*long*/ hDC, GCData data);
/**
* Returns <code>true</code> if the device has been disposed,
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 271ef96305..68d13769fe 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
@@ -1585,7 +1585,8 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ gc, GCData data) {
+public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+ int /*long*/ gc = hDC;
if (OS.USE_CAIRO) {
Cairo.cairo_destroy(gc);
} else {
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 7254699556..5bd4f81420 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
@@ -1390,8 +1390,8 @@ public int getOrientation() {
*
* @see #getNextOffset(int, int)
*/
-public int getPreviousOffset (int index, int movement) {
- return _getOffset(index, movement, false);
+public int getPreviousOffset (int offset, int movement) {
+ return _getOffset(offset, movement, false);
}
/**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 14d20d03d2..73fad3ecae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -3271,8 +3271,9 @@ int /*long*/ imHandle () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ gc, GCData data) {
+public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
checkWidget ();
+ int /*long*/ gc = hDC;
if (OS.USE_CAIRO) {
Cairo.cairo_destroy (gc);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 8be3a04e11..3fb89d6fb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -2663,7 +2663,8 @@ void initializeWindowManager () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ gc, GCData data) {
+public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+ int /*long*/ gc = hDC;
if (OS.USE_CAIRO) {
Cairo.cairo_destroy (gc);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
index fa1376624c..c29f7c5c05 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
@@ -281,11 +281,11 @@ public void removeSelectionListener (SelectionListener listener) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setIncrement (int value) {
+public void setIncrement (int increment) {
checkWidget ();
- if (value < 1) return;
+ if (increment < 1) return;
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
- OS.gtk_range_set_increments (handle, value, getPageIncrement ());
+ OS.gtk_range_set_increments (handle, increment, getPageIncrement ());
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
@@ -347,11 +347,11 @@ public void setMinimum (int value) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setPageIncrement (int value) {
+public void setPageIncrement (int pageIncrement) {
checkWidget ();
- if (value < 1) return;
+ if (pageIncrement < 1) return;
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
- OS.gtk_range_set_increments (handle, getIncrement (), value);
+ OS.gtk_range_set_increments (handle, getIncrement (), pageIncrement);
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
index 5d4ab3ab23..1e65c1b60b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
@@ -762,11 +762,11 @@ public void setPageIncrement (int value) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setSelection (int value) {
+public void setSelection (int selection) {
checkWidget ();
- value = Math.min (value, getMaximum() - getThumb());
+ selection = Math.min (selection, getMaximum() - getThumb());
OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
- OS.gtk_adjustment_set_value (adjustmentHandle, value);
+ OS.gtk_adjustment_set_value (adjustmentHandle, selection);
OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
index bd0ac237ed..50e21914c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
@@ -630,9 +630,9 @@ public void removeSelectionListener (SelectionListener listener) {
* @see #getVisible
* @see #setVisible
*/
-public void setAutoHide (boolean autohide) {
+public void setAutoHide (boolean autoHide) {
checkWidget ();
- this.autohide = autohide;
+ this.autohide = autoHide;
//TODO - update when visible
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
index 0453d397da..f24b0b0a1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
@@ -935,9 +935,9 @@ void resizeRectangles (int xChange, int yChange) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void setCursor (Cursor value) {
+public void setCursor (Cursor newCursor) {
checkWidget ();
- cursor = value;
+ cursor = newCursor;
}
/**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index c79498487f..9d223ba73f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -1149,11 +1149,11 @@ void releaseWidget () {
* @see #getListeners(int)
* @see #notifyListeners
*/
-public void removeListener (int eventType, Listener handler) {
+public void removeListener (int eventType, Listener listener) {
checkWidget ();
- if (handler == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
if (eventTable == null) return;
- eventTable.unhook (eventType, handler);
+ eventTable.unhook (eventType, listener);
}
/**

Back to the top