diff -r -U2 java_awt_orig/GridBagLayout.java java/awt/GridBagLayout.java --- java_awt_orig/GridBagLayout.java Fri Mar 30 22:54:53 2001 +++ java/awt/GridBagLayout.java Fri Mar 30 22:58:28 2001 @@ -467,5 +467,5 @@ switch ( cc.fill ) { - case cc.BOTH: + case GridBagConstraints.BOTH: cx += in.left + cc.ipadx; cy += in.top + cc.ipady; @@ -474,24 +474,24 @@ break; - case cc.HORIZONTAL: + case GridBagConstraints.HORIZONTAL: cx += in.left + cc.ipadx; cw = cRect.width - (in.left + in.right + 2 * cc.ipadx); switch ( cc.anchor ) { - case cc.WEST: - case cc.CENTER: - case cc.EAST: + case GridBagConstraints.WEST: + case GridBagConstraints.CENTER: + case GridBagConstraints.EAST: default: cy += (cRect.height - ch) / 2; break; - case cc.NORTH: - case cc.NORTHEAST: - case cc.NORTHWEST: + case GridBagConstraints.NORTH: + case GridBagConstraints.NORTHEAST: + case GridBagConstraints.NORTHWEST: cy += in.top + cc.ipady; break; - case cc.SOUTHEAST: - case cc.SOUTH: - case cc.SOUTHWEST: + case GridBagConstraints.SOUTHEAST: + case GridBagConstraints.SOUTH: + case GridBagConstraints.SOUTHWEST: cy += cRect.height - (cd.height + in.bottom + cc.ipady); break; @@ -499,24 +499,24 @@ break; - case cc.VERTICAL: + case GridBagConstraints.VERTICAL: cy += in.top + cc.ipady; ch = cRect.height - (in.top + in.bottom + 2 * cc.ipady); switch ( cc.anchor ) { - case cc.NORTH: - case cc.CENTER: - case cc.SOUTH: + case GridBagConstraints.NORTH: + case GridBagConstraints.CENTER: + case GridBagConstraints.SOUTH: default: cx += (cRect.width - cw) / 2; break; - case cc.NORTHWEST: - case cc.WEST: - case cc.SOUTHWEST: + case GridBagConstraints.NORTHWEST: + case GridBagConstraints.WEST: + case GridBagConstraints.SOUTHWEST: cx += in.left + cc.ipadx; break; - case cc.NORTHEAST: - case cc.SOUTHEAST: - case cc.EAST: + case GridBagConstraints.NORTHEAST: + case GridBagConstraints.SOUTHEAST: + case GridBagConstraints.EAST: cx += cRect.width - (cw + in.right + cc.ipadx); break; @@ -524,48 +524,48 @@ break; - case cc.NONE: + case GridBagConstraints.NONE: default: switch ( cc.anchor ) { - case cc.NORTH: + case GridBagConstraints.NORTH: cy += in.top + cc.ipady; cx += (cRect.width - cw) / 2; break; - case cc.NORTHEAST: + case GridBagConstraints.NORTHEAST: cy += in.top + cc.ipady; cx += cRect.width - (cw + in.right + cc.ipadx); break; - case cc.EAST: + case GridBagConstraints.EAST: cy += (cRect.height - ch) / 2; cx += cRect.width - (cw + in.right + cc.ipadx); break; - case cc.SOUTHEAST: + case GridBagConstraints.SOUTHEAST: cy += cRect.height - (ch + in.bottom + cc.ipady); cx += cRect.width - (cw + in.right + cc.ipadx); break; - case cc.SOUTH: + case GridBagConstraints.SOUTH: cy += cRect.height - (ch + in.bottom + cc.ipady); cx += (cRect.width - cw) / 2; break; - case cc.SOUTHWEST: + case GridBagConstraints.SOUTHWEST: cy += cRect.height - (ch + in.bottom + cc.ipady); cx += in.left + cc.ipadx; break; - case cc.WEST: + case GridBagConstraints.WEST: cy += (cRect.height - ch) / 2; cx += in.left + cc.ipadx; break; - case cc.NORTHWEST: + case GridBagConstraints.NORTHWEST: cy += in.top + cc.ipady; cx += in.left + cc.ipadx; break; - case cc.CENTER: + case GridBagConstraints.CENTER: default: cy += (cRect.height - ch) / 2; diff -r -U2 java_awt_orig/PopupWindow.java java/awt/PopupWindow.java --- java_awt_orig/PopupWindow.java Fri Mar 30 22:54:53 2001 +++ java/awt/PopupWindow.java Fri Mar 30 23:27:14 2001 @@ -211,5 +211,5 @@ // to our owner switch ( evt.id ){ - case evt.KEY_PRESSED: + case KeyEvent.KEY_PRESSED: switch( evt.getKeyCode() ) { case KeyEvent.VK_ENTER: @@ -250,5 +250,5 @@ switch ( evt.id ){ - case evt.MOUSE_MOVED: + case MouseEvent.MOUSE_MOVED: mi = itemAt( v); @@ -259,5 +259,5 @@ break; - case evt.MOUSE_DRAGGED: + case MouseEvent.MOUSE_DRAGGED: skipRelease = false; @@ -290,9 +290,9 @@ switch ( evt.id ){ - case evt.MOUSE_PRESSED: + case MouseEvent.MOUSE_PRESSED: selectItem( itemAt( v)); break; - case evt.MOUSE_RELEASED: + case MouseEvent.MOUSE_RELEASED: if ( MouseEvt.getGrab() == this ) MouseEvt.releaseMouse(null); @@ -311,5 +311,5 @@ break; - case evt.MOUSE_ENTERED: + case MouseEvent.MOUSE_ENTERED: requestFocus(); break;