src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java

rev 9830 : 8039642: Fix raw and unchecked warnings in sun.awt.*
Reviewed-by: darcy, prr

*** 36,57 ****
       * Allowed values are {@link SwingConstants#LEFT}, {@link SwingConstants#RIGHT}, {@link SwingConstants#LEADING},
       * {@link SwingConstants#TRAILING}, {@link SwingConstants#CENTER}
       */
      private Integer alignment;
      private SortOrder sortOrder;
!     private Comparator comparator;
      /**
       * <code>false</code> (default) if the {@link comparator} expects folders as arguments,
       * and <code>true</code> if folder's column values. The first option is used default for comparison
       * on Windows and also for separating files from directories when sorting using
       * ShellFolderManager's inner comparator.
       */
      private boolean compareByColumn;
  
      public ShellFolderColumnInfo(String title, Integer width,
                                   Integer alignment, boolean visible,
!                                  SortOrder sortOrder, Comparator comparator,
                                   boolean compareByColumn) {
          this.title = title;
          this.width = width;
          this.alignment = alignment;
          this.visible = visible;
--- 36,57 ----
       * Allowed values are {@link SwingConstants#LEFT}, {@link SwingConstants#RIGHT}, {@link SwingConstants#LEADING},
       * {@link SwingConstants#TRAILING}, {@link SwingConstants#CENTER}
       */
      private Integer alignment;
      private SortOrder sortOrder;
!     private Comparator<?> comparator;
      /**
       * <code>false</code> (default) if the {@link comparator} expects folders as arguments,
       * and <code>true</code> if folder's column values. The first option is used default for comparison
       * on Windows and also for separating files from directories when sorting using
       * ShellFolderManager's inner comparator.
       */
      private boolean compareByColumn;
  
      public ShellFolderColumnInfo(String title, Integer width,
                                   Integer alignment, boolean visible,
!                                  SortOrder sortOrder, Comparator<?> comparator,
                                   boolean compareByColumn) {
          this.title = title;
          this.width = width;
          this.alignment = alignment;
          this.visible = visible;
*** 60,70 ****
          this.compareByColumn = compareByColumn;
      }
  
      public ShellFolderColumnInfo(String title, Integer width,
                                   Integer alignment, boolean visible,
!                                  SortOrder sortOrder, Comparator comparator) {
          this(title, width, alignment, visible, sortOrder, comparator, false);
      }
  
      /**
       * This constructor is used by native code when getting column set for
--- 60,70 ----
          this.compareByColumn = compareByColumn;
      }
  
      public ShellFolderColumnInfo(String title, Integer width,
                                   Integer alignment, boolean visible,
!                                  SortOrder sortOrder, Comparator<?> comparator) {
          this(title, width, alignment, visible, sortOrder, comparator, false);
      }
  
      /**
       * This constructor is used by native code when getting column set for
*** 113,127 ****
  
      public void setSortOrder(SortOrder sortOrder) {
          this.sortOrder = sortOrder;
      }
  
!     public Comparator getComparator() {
          return comparator;
      }
  
!     public void setComparator(Comparator comparator) {
          this.comparator = comparator;
      }
  
      public boolean isCompareByColumn() {
          return compareByColumn;
--- 113,127 ----
  
      public void setSortOrder(SortOrder sortOrder) {
          this.sortOrder = sortOrder;
      }
  
!     public Comparator<?> getComparator() {
          return comparator;
      }
  
!     public void setComparator(Comparator<?> comparator) {
          this.comparator = comparator;
      }
  
      public boolean isCompareByColumn() {
          return compareByColumn;