Skip to content

Commit 5bdbda9

Browse files
vogellaakurtakov
authored andcommitted
Convert FileDialog#setFilterExtensions and setFilterNames to varargs
Nicer to use for end user and API compliant. If this change is integrated we must update the usage of this method in platform to avoid compiler warnings.
1 parent 3c87f89 commit 5bdbda9

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ public void setFileName (String string) {
630630
* @see #setFilterNames to specify the user-friendly
631631
* names corresponding to the extensions
632632
*/
633-
public void setFilterExtensions (String [] extensions) {
633+
public void setFilterExtensions (String... extensions) {
634634
filterExtensions = extensions;
635635
}
636636

@@ -668,7 +668,7 @@ public void setFilterIndex (int index) {
668668
*
669669
* @see #setFilterExtensions
670670
*/
671-
public void setFilterNames (String [] names) {
671+
public void setFilterNames (String... names) {
672672
filterNames = names;
673673
}
674674

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ public void setFileName (String string) {
745745
* @see #setFilterNames to specify the user-friendly
746746
* names corresponding to the extensions
747747
*/
748-
public void setFilterExtensions (String [] extensions) {
748+
public void setFilterExtensions (String... extensions) {
749749
filterExtensions = extensions;
750750
}
751751
/**
@@ -781,7 +781,7 @@ public void setFilterIndex (int index) {
781781
*
782782
* @see #setFilterExtensions
783783
*/
784-
public void setFilterNames (String [] names) {
784+
public void setFilterNames (String... names) {
785785
filterNames = names;
786786
}
787787
/**

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public void setFileName (String string) {
457457
* @see #setFilterNames to specify the user-friendly
458458
* names corresponding to the extensions
459459
*/
460-
public void setFilterExtensions (String [] extensions) {
460+
public void setFilterExtensions (String... extensions) {
461461
filterExtensions = extensions;
462462
}
463463

@@ -495,7 +495,7 @@ public void setFilterIndex (int index) {
495495
*
496496
* @see #setFilterExtensions
497497
*/
498-
public void setFilterNames (String [] names) {
498+
public void setFilterNames (String... names) {
499499
filterNames = names;
500500
}
501501

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,32 +101,52 @@ public void test_setFileNameLjava_lang_String() {
101101

102102
@Test
103103
public void test_setFilterExtensions$Ljava_lang_String() {
104+
fileDialog.setFilterExtensions("txt");
105+
String[] filters = fileDialog.getFilterExtensions();
106+
assertEquals(1, filters.length);
107+
assertEquals("txt", filters[0]);
104108
fileDialog.setFilterExtensions(new String[] {"txt","java"});
105-
String filters[] = fileDialog.getFilterExtensions();
109+
filters = fileDialog.getFilterExtensions();
106110
assertEquals(2, filters.length);
107111
assertEquals("txt", filters[0]);
108112
assertEquals("java", filters[1]);
109113
fileDialog.setFilterExtensions(new String[] {""});
110114
filters = fileDialog.getFilterExtensions();
111115
assertEquals(1, filters.length);
112-
fileDialog.setFilterExtensions(null);
116+
fileDialog.setFilterExtensions();
117+
filters = fileDialog.getFilterExtensions();
118+
assertEquals(0, filters.length);
119+
fileDialog.setFilterExtensions((String[])null);
113120
filters = fileDialog.getFilterExtensions();
114121
assertNull(filters);
122+
fileDialog.setFilterExtensions(new String[0]);
123+
filters = fileDialog.getFilterExtensions();
124+
assertEquals(0, filters.length);
115125
}
116126

117127
@Test
118128
public void test_setFilterNames$Ljava_lang_String() {
129+
fileDialog.setFilterNames("a.txt");
130+
String[] filters = fileDialog.getFilterNames();
131+
assertEquals(1, filters.length);
132+
assertEquals("a.txt", filters[0]);
119133
fileDialog.setFilterNames(new String[] {"a.txt","b.java"});
120-
String filters[] = fileDialog.getFilterNames();
134+
filters = fileDialog.getFilterNames();
121135
assertEquals(2, filters.length);
122136
assertEquals("a.txt", filters[0]);
123137
assertEquals("b.java", filters[1]);
124138
fileDialog.setFilterNames(new String[] {""});
125139
filters = fileDialog.getFilterNames();
126140
assertEquals(1, filters.length);
127-
fileDialog.setFilterNames(null);
141+
fileDialog.setFilterNames();
142+
filters = fileDialog.getFilterNames();
143+
assertEquals(0,filters.length);
144+
fileDialog.setFilterNames((String[])null);
128145
filters = fileDialog.getFilterNames();
129146
assertNull(filters);
147+
fileDialog.setFilterNames(new String[0]);
148+
filters = fileDialog.getFilterNames();
149+
assertEquals(0,filters.length);
130150
}
131151

132152
@Test

0 commit comments

Comments
 (0)