[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath ChangeLog javax/swing/JMenuBar.java
From: |
Lillian Angel |
Subject: |
[commit-cp] classpath ChangeLog javax/swing/JMenuBar.java |
Date: |
Wed, 07 Jun 2006 20:29:41 +0000 |
CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Lillian Angel <langel> 06/06/07 20:29:41
Modified files:
. : ChangeLog
javax/swing : JMenuBar.java
Log message:
2006-06-07 Francis Kung <address@hidden>
* javax/swing/JMenuBar.java:
(getSubElements): Do not return null values.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7704&r2=1.7705
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/JMenuBar.java?cvsroot=classpath&r1=1.24&r2=1.25
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7704
retrieving revision 1.7705
diff -u -b -r1.7704 -r1.7705
--- ChangeLog 7 Jun 2006 19:30:05 -0000 1.7704
+++ ChangeLog 7 Jun 2006 20:29:41 -0000 1.7705
@@ -1,3 +1,8 @@
+2006-06-07 Francis Kung <address@hidden>
+
+ * javax/swing/JMenuBar.java:
+ (getSubElements): Do not return null values.
+
2006-06-07 Roman Kennke <address@hidden>
PR 27902
Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuBar.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- javax/swing/JMenuBar.java 6 Jun 2006 12:54:37 -0000 1.24
+++ javax/swing/JMenuBar.java 7 Jun 2006 20:29:41 -0000 1.25
@@ -370,10 +370,30 @@
{
MenuElement[] subElements = new MenuElement[getComponentCount()];
+ int j = 0;
+ boolean doResize = false;
+ MenuElement menu;
for (int i = 0; i < getComponentCount(); i++)
- subElements[i] = (MenuElement) getMenu(i);
+ {
+ menu = getMenu(i);
+ if (menu != null)
+ {
+ subElements[j++] = (MenuElement) menu;
+ }
+ else
+ doResize = true;
+ }
+ if (! doResize)
return subElements;
+ else
+ {
+ MenuElement[] subElements2 = new MenuElement[j];
+ for (int i = 0; i < j; i++)
+ subElements2[i] = subElements[i];
+
+ return subElements2;
+ }
}
/**
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-cp] classpath ChangeLog javax/swing/JMenuBar.java,
Lillian Angel <=