Skip to content

Commit fc58519

Browse files
author
jossonsmith
committed
Remove unnecessary dependency on class org.eclipse.swt.SWT and java.lang.StringBuffer.
1 parent 0b12d56 commit fc58519

14 files changed

Lines changed: 174 additions & 32 deletions

File tree

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/accessibility/Accessible.java‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,46 @@
11
package org.eclipse.swt.accessibility;
22

3-
import java.util.Vector;
3+
//import java.util.Vector;
44

55
import org.eclipse.swt.SWT;
66
import org.eclipse.swt.SWTException;
77
import org.eclipse.swt.widgets.Control;
88

99
public class Accessible {
10+
/*
1011
Vector accessibleListeners = new Vector();
1112
Vector accessibleControlListeners = new Vector();
1213
Vector textListeners = new Vector ();
14+
*/
15+
Object[] accessibleListeners = new Object[0];
16+
Object[] accessibleControlListeners = new Object[0];
17+
Object[] textListeners = new Object[0];
1318
//Object[] variants;
1419
Control control;
20+
21+
private void addElement(Object[] arr, Object element) {
22+
for (int i = 0; i < arr.length; i++) {
23+
if (arr[i] == element) {
24+
return ;
25+
}
26+
}
27+
for (int i = 0; i < arr.length; i++) {
28+
if (arr[i] == null) {
29+
arr[i] = element;
30+
return ;
31+
}
32+
}
33+
arr[arr.length] = element;
34+
}
35+
36+
private void removeElement(Object[] arr, Object element) {
37+
for (int i = 0; i < arr.length; i++) {
38+
if (arr[i] == element) {
39+
arr[i] = null;
40+
return ;
41+
}
42+
}
43+
}
1544
/**
1645
* Adds the listener to the collection of listeners who will
1746
* be notified when an accessible client asks for certain strings,
@@ -36,7 +65,8 @@ public class Accessible {
3665
public void addAccessibleListener(AccessibleListener listener) {
3766
//checkWidget();
3867
if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
39-
accessibleListeners.addElement(listener);
68+
//accessibleListeners.addElement(listener);
69+
addElement(accessibleListeners, listener);
4070
}
4171

4272

@@ -64,7 +94,8 @@ public void addAccessibleListener(AccessibleListener listener) {
6494
public void addAccessibleControlListener(AccessibleControlListener listener) {
6595
//checkWidget();
6696
if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
67-
accessibleControlListeners.addElement(listener);
97+
//accessibleControlListeners.addElement(listener);
98+
addElement(accessibleControlListeners, listener);
6899
}
69100

70101
/**
@@ -93,7 +124,8 @@ public void addAccessibleControlListener(AccessibleControlListener listener) {
93124
public void addAccessibleTextListener (AccessibleTextListener listener) {
94125
//checkWidget ();
95126
if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
96-
textListeners.addElement (listener);
127+
//textListeners.addElement (listener);
128+
addElement(textListeners, listener);
97129
}
98130

99131
/**
@@ -127,7 +159,8 @@ public Control getControl() {
127159
public void removeAccessibleListener(AccessibleListener listener) {
128160
//checkWidget();
129161
if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
130-
accessibleListeners.removeElement(listener);
162+
//accessibleListeners.removeElement(listener);
163+
removeElement(accessibleListeners, listener);
131164
}
132165

133166
/**
@@ -152,7 +185,8 @@ public void removeAccessibleListener(AccessibleListener listener) {
152185
public void removeAccessibleControlListener(AccessibleControlListener listener) {
153186
//checkWidget();
154187
if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
155-
accessibleControlListeners.removeElement(listener);
188+
//accessibleControlListeners.removeElement(listener);
189+
removeElement(accessibleControlListeners, listener);
156190
}
157191

158192
/**
@@ -179,7 +213,8 @@ public void removeAccessibleControlListener(AccessibleControlListener listener)
179213
public void removeAccessibleTextListener (AccessibleTextListener listener) {
180214
//checkWidget ();
181215
if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
182-
textListeners.removeElement (listener);
216+
//textListeners.removeElement (listener);
217+
removeElement(textListeners, listener);
183218
}
184219

185220
/**

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/custom/CCombo.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,8 @@ public void getHelp (AccessibleEvent e) {
746746

747747
arrow.getAccessible ().addAccessibleListener (new AccessibleAdapter() {
748748
public void getName (AccessibleEvent e) {
749-
e.result = isDropped () ? SWT.getMessage ("SWT_Close") : SWT.getMessage ("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
749+
//e.result = isDropped () ? SWT.getMessage ("SWT_Close") : SWT.getMessage ("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
750+
e.result = isDropped () ? "Close" : "Open";
750751
}
751752
public void getKeyboardShortcut (AccessibleEvent e) {
752753
e.result = "Alt+Down Arrow"; //$NON-NLS-1$

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/custom/CTabFolder.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4176,6 +4176,14 @@ boolean updateTabHeight(boolean force){
41764176
notifyListeners(SWT.Resize, new Event());
41774177
return true;
41784178
}
4179+
/**
4180+
* @param x
4181+
* @param y
4182+
* @return
4183+
*
4184+
* @j2sNative
4185+
* return null;
4186+
*/
41794187
String _getToolTip(int x, int y) {
41804188
if (showMin && minRect.contains(x, y)) return minimized ? SWT.getMessage("SWT_Restore") : SWT.getMessage("SWT_Minimize"); //$NON-NLS-1$ //$NON-NLS-2$
41814189
if (showMax && maxRect.contains(x, y)) return maximized ? SWT.getMessage("SWT_Restore") : SWT.getMessage("SWT_Maximize"); //$NON-NLS-1$ //$NON-NLS-2$

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/dnd/DND.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,15 @@ public static void error (int code, int hresult) {
257257
throw new SWTException (code, msg);
258258
}
259259
}
260-
260+
/**
261+
* @j2sNativeSrc
262+
* throw "SWT.error (" + code + ")";
263+
* @j2sNative
264+
* throw "SWT.error (" + a + ")";
265+
*/ {
261266
/* Unknown/Undefined Error */
262267
SWT.error(code);
268+
}
263269
}
264270

265271
}

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/Color.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ private int rgbHandleFromCSS(String cssHandle) {
402402
intHandle = eval ("0x" + $1.substring(4, 6) + $1.substring(2, 4) + $1.substring(0, 2));
403403
} else {
404404
//$WT.error($WT.ERROR_INVALID_ARGUMENT);
405-
$WT.error(4);
405+
//$WT.error(4);
406+
throw "SWT.error (4)";
406407
}
407408
});
408409
* @j2sNative
@@ -415,7 +416,8 @@ private int rgbHandleFromCSS(String cssHandle) {
415416
} else if ($1.length == 6) {
416417
e = eval ("0x" + $1.substring(4, 6) + $1.substring(2, 4) + $1.substring(0, 2));
417418
} else {
418-
$WT.error(4);
419+
//$WT.error(4);
420+
throw "SWT.error (4)";
419421
}
420422
});
421423
*/ {}

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/Cursor.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ public Cursor(Device device, int style) {
210210
case SWT.CURSOR_IBEAM: handle = "text"; break;
211211
case SWT.CURSOR_NO: handle = "auto"; break; /* TODO */
212212
default:
213-
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
213+
//SWT.error(SWT.ERROR_INVALID_ARGUMENT);
214+
if (true) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
215+
;
214216
}
215217
/*
216218
int lpCursorName = 0;

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/FontData.java‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ public int getHeight() {
368368
* @since 3.0
369369
*/
370370
public String getLocale () {
371+
/*
371372
StringBuffer buffer = new StringBuffer ();
372373
char sep = '_';
373374
if (lang != null) {
@@ -383,6 +384,22 @@ public String getLocale () {
383384
}
384385
385386
String result = buffer.toString ();
387+
*/
388+
389+
String result = "";
390+
char sep = '_';
391+
if (lang != null) {
392+
result += lang;
393+
result += sep;
394+
}
395+
if (country != null) {
396+
result += country;
397+
result += sep;
398+
}
399+
if (variant != null) {
400+
result += variant;
401+
}
402+
386403
int length = result.length ();
387404
if (length > 0) {
388405
if (result.charAt (length - 1) == sep) {
@@ -602,15 +619,15 @@ public void setStyle(int style) {
602619
* @see FontData
603620
*/
604621
public String toString() {
605-
StringBuffer buffer = new StringBuffer();
606-
buffer.append("1|"); //$NON-NLS-1$
607-
buffer.append(getName());
608-
buffer.append("|"); //$NON-NLS-1$
609-
buffer.append(getHeight());
610-
buffer.append("|"); //$NON-NLS-1$
611-
buffer.append(getStyle());
612-
buffer.append("|"); //$NON-NLS-1$
613-
buffer.append("WINDOWS|1|"); //$NON-NLS-1$
622+
// StringBuffer buffer = new StringBuffer();
623+
// buffer.append("1|"); //$NON-NLS-1$
624+
// buffer.append(getName());
625+
// buffer.append("|"); //$NON-NLS-1$
626+
// buffer.append(getHeight());
627+
// buffer.append("|"); //$NON-NLS-1$
628+
// buffer.append(getStyle());
629+
// buffer.append("|"); //$NON-NLS-1$
630+
// buffer.append("WINDOWS|1|"); //$NON-NLS-1$
614631
/*
615632
buffer.append(data.lfHeight);
616633
buffer.append("|"); //$NON-NLS-1$
@@ -639,8 +656,18 @@ public String toString() {
639656
buffer.append(data.lfPitchAndFamily);
640657
buffer.append("|"); //$NON-NLS-1$
641658
*/
642-
buffer.append(getName());
643-
return buffer.toString();
659+
// buffer.append(getName());
660+
// return buffer.toString();
661+
String str = "1|"; //$NON-NLS-1$
662+
str += getName();
663+
str += "|"; //$NON-NLS-1$
664+
str += getHeight();
665+
str += "|"; //$NON-NLS-1$
666+
str += getStyle();
667+
str += "|"; //$NON-NLS-1$
668+
str += "WINDOWS|1|"; //$NON-NLS-1$
669+
str += getName();
670+
return str;
644671
}
645672

646673
/*

0 commit comments

Comments
 (0)