src/solaris/classes/sun/awt/X11/XFileDialogPeer.java

*** 197,212 ****
  
          // Fixed 6260650: FileDialog.getDirectory() does not return null when file dialog is cancelled
          // After showing we should display 'user.dir' as current directory
          // if user didn't set directory programatically
          pathField = new TextField(savedDir != null ? savedDir : userDir);
! 
!         pathChoice = new Choice() {
                  public Dimension getPreferredSize() {
                      return new Dimension(PATH_CHOICE_WIDTH, pathField.getPreferredSize().height);
                  }
              };
          pathPanel = new Panel();
          pathPanel.setLayout(new BorderLayout());
  
          pathPanel.add(pathField,BorderLayout.CENTER);
          pathPanel.add(pathChoice,BorderLayout.EAST);
--- 197,213 ----
  
          // Fixed 6260650: FileDialog.getDirectory() does not return null when file dialog is cancelled
          // After showing we should display 'user.dir' as current directory
          // if user didn't set directory programatically
          pathField = new TextField(savedDir != null ? savedDir : userDir);
!         @SuppressWarnings("serial") // Anonymous class
!         Choice tmp = new Choice() {
                  public Dimension getPreferredSize() {
                      return new Dimension(PATH_CHOICE_WIDTH, pathField.getPreferredSize().height);
                  }
              };
+         pathChoice = tmp;
          pathPanel = new Panel();
          pathPanel.setLayout(new BorderLayout());
  
          pathPanel.add(pathField,BorderLayout.CENTER);
          pathPanel.add(pathChoice,BorderLayout.EAST);
*** 843,852 ****
--- 844,854 ----
            String dir = pathChoice.getSelectedItem();
            target.setDirectory(dir);
      }
  }
  
+ @SuppressWarnings("serial") // JDK-implementation class
  class Separator extends Canvas {
      public final static int HORIZONTAL = 0;
      public final static int VERTICAL = 1;
      int orientation;