Fix a NPE bug

zhourenjian · zhourenjian · commit b84f46cfccff · 2009-02-26T15:20:36.000Z
Fix bug that *.custom.* widgets may override Widget#checkStyle with different argument types. Only default #checkStyle method will be called ahead.
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/FontData.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/FontData.java
@@ -305,7 +305,8 @@ public boolean equals (Object object) {
 //		data.lfClipPrecision == lf.lfClipPrecision &&
 //		data.lfQuality == lf.lfQuality &&
 //		data.lfPitchAndFamily == lf.lfPitchAndFamily &&
-		getName().equals(fd.getName());
+		(getName() == null && fd.getName() == null)
+			|| (getName ()!= null && getName().equals(fd.getName()));
 }
 
 /*
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Widget.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Widget.java
@@ -146,7 +146,8 @@ public Widget (Widget parent, int style) {
 	this.style = style;
 	/**
 	 * @j2sNative
-	 * if (!this.styleChecked && this.checkStyle != null) {
+	 * if (!this.styleChecked && this.checkStyle != null
+	 * 		&& this.checkStyle.funParams == "\Number") {
 	 * 	this.style = this.checkStyle (this.style);
 	 * 	this.styleChecked = true;
 	 * }

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,8 @@ public boolean equals (Object object) {`
`305`	`305`	`// data.lfClipPrecision == lf.lfClipPrecision &&`
`306`	`306`	`// data.lfQuality == lf.lfQuality &&`
`307`	`307`	`// data.lfPitchAndFamily == lf.lfPitchAndFamily &&`
`308`		`- getName().equals(fd.getName());`
	`308`	`+ (getName() == null && fd.getName() == null)`
	`309`	`+ \|\| (getName ()!= null && getName().equals(fd.getName()));`
`309`	`310`	`}`
`310`	`311`
`311`	`312`	`/*`