diff options
| author | Lars Vogel | 2015-12-03 08:57:51 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2015-12-03 09:31:12 +0000 |
| commit | 23c7a0b716afce6ddef36e18027b330087ac0c96 (patch) | |
| tree | 92a7ac517c6f56d8e0865b8650b796e7cdade5f3 /bundles | |
| parent | 3fcbd57c75f4617d6ea12d7354b1b4b64834d7d3 (diff) | |
| download | eclipse.platform.swt-23c7a0b716afce6ddef36e18027b330087ac0c96.tar.gz eclipse.platform.swt-23c7a0b716afce6ddef36e18027b330087ac0c96.tar.xz eclipse.platform.swt-23c7a0b716afce6ddef36e18027b330087ac0c96.zip | |
Bug 483540 - Change Combo#setItems to varargsI20151203-1230I20151203-0800
Method setItems already defines that null is invalid so it can be
adjusted it to use varargs.
Change-Id: I43a4fa68b5808ab2ae1ee4e987dcec912440cb37
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles')
3 files changed, 8 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java index 52bb7393c6..7d6b10be84 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2015 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 @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Lars Vogel <Lars.Vogel@vogella.com> - Bug 483540 *******************************************************************************/ package org.eclipse.swt.widgets; @@ -1629,7 +1630,7 @@ public void setItem (int index, String string) { * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> * </ul> */ -public void setItems (String [] items) { +public void setItems (String... items) { checkWidget(); if (items == null) error (SWT.ERROR_NULL_ARGUMENT); for (int i=0; i<items.length; i++) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java index be06855b9b..921aa03393 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2015 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 @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Lars Vogel <Lars.Vogel@vogella.com> - Bug 483540 *******************************************************************************/ package org.eclipse.swt.widgets; @@ -2026,7 +2027,7 @@ public void setItem (int index, String string) { * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> * </ul> */ -public void setItems (String [] items) { +public void setItems (String... items) { checkWidget(); if (items == null) error (SWT.ERROR_NULL_ARGUMENT); for (int i=0; i<items.length; i++) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java index 4fff6dd15c..af4e97841a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Lars Vogel <Lars.Vogel@vogella.com> - Bug 483540 *******************************************************************************/ package org.eclipse.swt.widgets; @@ -2094,7 +2095,7 @@ public void setItem (int index, String string) { * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> * </ul> */ -public void setItems (String [] items) { +public void setItems (String... items) { checkWidget (); if (items == null) error (SWT.ERROR_NULL_ARGUMENT); for (int i=0; i<items.length; i++) { |