src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java

rev 1580 : 6727661: Code improvement and warnings removing from the swing/plaf packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: alexp
Contributed-by: Florian Brunner <fbrunnerlist@gmx.ch>

*** 757,767 ****
  
      /**
       * Data model for a type-face selection combo-box.
       */
      protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel {
!         Vector directories = new Vector();
          int[] depths = null;
          File selectedDirectory = null;
          JFileChooser chooser = getFileChooser();
          FileSystemView fsv = chooser.getFileSystemView();
  
--- 757,767 ----
  
      /**
       * Data model for a type-face selection combo-box.
       */
      protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel {
!         Vector<File> directories = new Vector<File>();
          int[] depths = null;
          File selectedDirectory = null;
          JFileChooser chooser = getFileChooser();
          FileSystemView fsv = chooser.getFileSystemView();
  
*** 797,807 ****
              directories.addAll(Arrays.asList(baseFolders));
  
              // Get the canonical (full) path. This has the side
              // benefit of removing extraneous chars from the path,
              // for example /foo/bar/ becomes /foo/bar
!             File canonical = null;
              try {
                  canonical = directory.getCanonicalFile();
              } catch (IOException e) {
                  // Maybe drive is not ready. Can't abort here.
                  canonical = directory;
--- 797,807 ----
              directories.addAll(Arrays.asList(baseFolders));
  
              // Get the canonical (full) path. This has the side
              // benefit of removing extraneous chars from the path,
              // for example /foo/bar/ becomes /foo/bar
!             File canonical;
              try {
                  canonical = directory.getCanonicalFile();
              } catch (IOException e) {
                  // Maybe drive is not ready. Can't abort here.
                  canonical = directory;
*** 810,828 ****
              // create File instances of each directory leading up to the top
              try {
                  File sf = useShellFolder ? ShellFolder.getShellFolder(canonical)
                                           : canonical;
                  File f = sf;
!                 Vector path = new Vector(10);
                  do {
                      path.addElement(f);
                  } while ((f = f.getParentFile()) != null);
  
                  int pathCount = path.size();
                  // Insert chain at appropriate place in vector
                  for (int i = 0; i < pathCount; i++) {
!                     f = (File)path.get(i);
                      if (directories.contains(f)) {
                          int topIndex = directories.indexOf(f);
                          for (int j = i-1; j >= 0; j--) {
                              directories.insertElementAt(path.get(j), topIndex+i-j);
                          }
--- 810,828 ----
              // create File instances of each directory leading up to the top
              try {
                  File sf = useShellFolder ? ShellFolder.getShellFolder(canonical)
                                           : canonical;
                  File f = sf;
!                 Vector<File> path = new Vector<File>(10);
                  do {
                      path.addElement(f);
                  } while ((f = f.getParentFile()) != null);
  
                  int pathCount = path.size();
                  // Insert chain at appropriate place in vector
                  for (int i = 0; i < pathCount; i++) {
!                     f = path.get(i);
                      if (directories.contains(f)) {
                          int topIndex = directories.indexOf(f);
                          for (int j = i-1; j >= 0; j--) {
                              directories.insertElementAt(path.get(j), topIndex+i-j);
                          }
*** 837,852 ****
          }
  
          private void calculateDepths() {
              depths = new int[directories.size()];
              for (int i = 0; i < depths.length; i++) {
!                 File dir = (File)directories.get(i);
                  File parent = dir.getParentFile();
                  depths[i] = 0;
                  if (parent != null) {
                      for (int j = i-1; j >= 0; j--) {
!                         if (parent.equals((File)directories.get(j))) {
                              depths[i] = depths[j] + 1;
                              break;
                          }
                      }
                  }
--- 837,852 ----
          }
  
          private void calculateDepths() {
              depths = new int[directories.size()];
              for (int i = 0; i < depths.length; i++) {
!                 File dir = directories.get(i);
                  File parent = dir.getParentFile();
                  depths[i] = 0;
                  if (parent != null) {
                      for (int j = i-1; j >= 0; j--) {
!                         if (parent.equals(directories.get(j))) {
                              depths[i] = depths[j] + 1;
                              break;
                          }
                      }
                  }
*** 968,979 ****
              // is set. Lets be paranoid just in case someone overrides
              // setFileFilter in JFileChooser.
              FileFilter currentFilter = getFileChooser().getFileFilter();
              boolean found = false;
              if(currentFilter != null) {
!                 for(int i=0; i < filters.length; i++) {
!                     if(filters[i] == currentFilter) {
                          found = true;
                      }
                  }
                  if(found == false) {
                      getFileChooser().addChoosableFileFilter(currentFilter);
--- 968,979 ----
              // is set. Lets be paranoid just in case someone overrides
              // setFileFilter in JFileChooser.
              FileFilter currentFilter = getFileChooser().getFileFilter();
              boolean found = false;
              if(currentFilter != null) {
!                 for (FileFilter filter : filters) {
!                     if (filter == currentFilter) {
                          found = true;
                      }
                  }
                  if(found == false) {
                      getFileChooser().addChoosableFileFilter(currentFilter);