Skip to content

Commit aae9e15

Browse files
hansonrhansonr
authored andcommitted
JTabbedPane addNotify for tab components should check for null
component.
1 parent 0671858 commit aae9e15

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed
136 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190929051131
1+
20191001111303
136 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190929051131
1+
20191001111303
136 Bytes
Binary file not shown.

sources/net.sf.j2s.java.core/src/javax/swing/JTabbedPane.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,8 @@ public int indexOfTabComponent(Component tabComponent) {
24562456
public void addNotify() {
24572457
for(int i = 0; i < getTabCount(); i++) {
24582458
Component c = getTabComponentAt(i);
2459-
c.addNotify();
2459+
if (c != null)
2460+
c.addNotify();
24602461
}
24612462
}
24622463
}

sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3109,11 +3109,11 @@ java.lang.System = System = {
31093109
v = navigator.userAgent;
31103110
break;
31113111
case "javax.xml.datatype.DatatypeFactory":
3112-
v = "org.apache.xerces.jaxp.datatype";
3113-
break;
3114-
case "javax.xml.bind.JAXBContextFactory":
3115-
v = "swingjs.xml.JSJAXBContextFactory";
3116-
break;
3112+
v = "swingjs.xml.JSJAXBDatatypeFactory";
3113+
break;
3114+
case "javax.xml.bind.JAXBContextFactory":
3115+
v = "swingjs.xml.JSJAXBContextFactory";
3116+
break;
31173117
}
31183118
if (v)
31193119
return System.$props[key] = v;

sources/net.sf.j2s.java.core/srcjs/swingjs2.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16873,11 +16873,11 @@ java.lang.System = System = {
1687316873
v = navigator.userAgent;
1687416874
break;
1687516875
case "javax.xml.datatype.DatatypeFactory":
16876-
v = "org.apache.xerces.jaxp.datatype";
16877-
break;
16878-
case "javax.xml.bind.JAXBContextFactory":
16879-
v = "swingjs.xml.JSJAXBContextFactory";
16880-
break;
16876+
v = "swingjs.xml.JSJAXBDatatypeFactory";
16877+
break;
16878+
case "javax.xml.bind.JAXBContextFactory":
16879+
v = "swingjs.xml.JSJAXBContextFactory";
16880+
break;
1688116881
}
1688216882
if (v)
1688316883
return System.$props[key] = v;

0 commit comments

Comments
 (0)