improve SwingDemo