--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/DefaultMenuLayout.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.plaf.synth;
+
+import javax.swing.*;
+import javax.swing.plaf.UIResource;
+
+import java.awt.Container;
+import java.awt.Dimension;
+
+/**
+ * The default layout manager for Popup menus and menubars.  This
+ * class is an extension of BoxLayout which adds the UIResource tag
+ * so that plauggable L&Fs can distinguish it from user-installed
+ * layout managers on menus.
+ *
+ * Derived from javax.swing.plaf.basic.DefaultMenuLayout
+ *
+ * @author Georges Saab
+ */
+
+class DefaultMenuLayout extends BoxLayout implements UIResource {
+    public DefaultMenuLayout(Container target, int axis) {
+        super(target, axis);
+    }
+
+    public void invalidateLayout(Container target) {
+        if (target instanceof JPopupMenu) {
+            SynthPopupMenuUI popupUI = (SynthPopupMenuUI)((JPopupMenu)target).
+                                  getUI();
+            popupUI.resetAlignmentHints();
+        }
+        super.invalidateLayout(target);
+    }
+
+    public Dimension preferredLayoutSize(Container target) {
+        if (target instanceof JPopupMenu && target.getComponentCount() == 0) {
+            return new Dimension(0, 0);
+        }
+        return super.preferredLayoutSize(target);
+    }
+}