src/com/sun/javatest/mrep/ConflictResolutionDialog.java

rev 145 : 7902237: Fixing raw use of parameterized class
Reviewed-by: jjg

*** 64,74 ****
  
      private JButton resolveButton;
      private JButton cancelButton;
  
      private DefaultListModel<String> listModel;
!     private JList list;
  
      private int     selectedIndex;
      private boolean bPreferredReport;
      private boolean bUseMostRecent;
  
--- 64,74 ----
  
      private JButton resolveButton;
      private JButton cancelButton;
  
      private DefaultListModel<String> listModel;
!     private JList<?> list;
  
      private int     selectedIndex;
      private boolean bPreferredReport;
      private boolean bUseMostRecent;