Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JOptionPane.java,v
retrieving revision 1.16
diff -u -r1.16 JOptionPane.java
--- javax/swing/JOptionPane.java	13 Sep 2005 23:23:40 -0000	1.16
+++ javax/swing/JOptionPane.java	15 Sep 2005 14:02:13 -0000
@@ -863,8 +863,10 @@
 
     dialog.pack();
     dialog.show();
-
-    return ((Integer) pane.getValue()).intValue();
+    
+    if (pane.getValue() instanceof Integer)
+      return ((Integer) pane.getValue()).intValue();
+    return -1;
   }
 
   /**
@@ -889,7 +891,9 @@
     dialog.pack();
     dialog.show();
 
-    return ((Integer) pane.getValue()).intValue();
+    if (pane.getValue() instanceof Integer)
+      return ((Integer) pane.getValue()).intValue();
+    return -1;
   }
 
   /**
@@ -915,7 +919,9 @@
     dialog.pack();
     dialog.show();
 
-    return ((Integer) pane.getValue()).intValue();
+    if (pane.getValue() instanceof Integer)
+      return ((Integer) pane.getValue()).intValue();
+    return -1;
   }
 
   /**
@@ -943,7 +949,9 @@
     dialog.pack();
     dialog.show();
 
-    return ((Integer) pane.getValue()).intValue();
+    if (pane.getValue() instanceof Integer)
+      return ((Integer) pane.getValue()).intValue();
+    return -1;
   }
 
   /**
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.22
diff -u -r1.22 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java	13 Sep 2005 23:23:41 -0000	1.22
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java	15 Sep 2005 14:02:13 -0000
@@ -860,10 +860,10 @@
     addIcon(messageArea);
 
     JPanel rightSide = new JPanel();
-    rightSide.setBorder(BorderFactory.createEmptyBorder(0, 11, 17, 0));
+    rightSide.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
     rightSide.setLayout(new GridBagLayout());
     GridBagConstraints con = createConstraints();
-
+    
     addMessageComponents(rightSide, con, getMessage(),
                          getMaxCharactersPerLineCount(), false);
 
@@ -886,7 +886,7 @@
 	  }
       }
 
-    messageArea.add(rightSide, BorderLayout.EAST);
+    messageArea.add(rightSide, BorderLayout.CENTER);
 
     return messageArea;
   }