test/jdk/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 20,72 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /*
!   test
    @bug 6448069
    @summary namefilter is not called for file dialog on windows
!   @author oleg.sukhodolsky: area= awt.filedialog
!   @run applet FilenameFilterTest.html
  */
  
- /**
-  * FilenameFilterTest.java
-  *
-  * summary: namefilter is not called for file dialog on windows
-  */
- 
- import java.applet.Applet;
  import java.awt.*;
  
  import java.io.File;
  import java.io.FilenameFilter;
  
  import test.java.awt.regtesthelpers.Util;
  
! public class FilenameFilterTest extends Applet
! {
!     //Declare things used in the test, like buttons and labels here
!     volatile boolean filter_was_called = false;
!     FileDialog fd;
! 
!     public void init()
!     {
!         // Set up the environment -- set the layout manager, add
!         // buttons, etc.
! 
!         setLayout (new BorderLayout ());
! 
!     }//End  init()
! 
!     public void start ()
!     {
!         //Get things going.  Request focus, set size, et cetera
!         setSize (200,200);
!         setVisible(true);
!         validate();
  
          EventQueue.invokeLater(new Runnable() {
                  public void run() {
                      fd = new FileDialog(new Frame(""), "hello world", FileDialog.LOAD);
                      fd.setFilenameFilter(new FilenameFilter() {
                              public boolean accept(File dir, String name) {
--- 20,51 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /*
!   @test
!   @key headful
    @bug 6448069
    @summary namefilter is not called for file dialog on windows
!   @library ../../regtesthelpers
!   @build Util
!   @run main FilenameFilterTest
  */
  
  import java.awt.*;
  
  import java.io.File;
  import java.io.FilenameFilter;
  
  import test.java.awt.regtesthelpers.Util;
  
! public class FilenameFilterTest {
  
+     static volatile boolean filter_was_called = false;
+     static FileDialog fd;
+ 
+     public static void main(final String[] args) {
          EventQueue.invokeLater(new Runnable() {
                  public void run() {
                      fd = new FileDialog(new Frame(""), "hello world", FileDialog.LOAD);
                      fd.setFilenameFilter(new FilenameFilter() {
                              public boolean accept(File dir, String name) {
*** 91,98 ****
          }
          fd.dispose();
          if (!filter_was_called) {
              throw new RuntimeException("Filter was not called");
          }
!     }// start()
! 
  }// class FilenameFilterTest
--- 70,76 ----
          }
          fd.dispose();
          if (!filter_was_called) {
              throw new RuntimeException("Filter was not called");
          }
!     }
  }// class FilenameFilterTest