From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 13 Jan 2015 23:25:04 -0500 Subject: source format change don't hate me too much if you were planning a big merge. =P --- src/cuchaz/enigma/gui/ProgressDialog.java | 90 ++++++++++++++----------------- 1 file changed, 40 insertions(+), 50 deletions(-) (limited to 'src/cuchaz/enigma/gui/ProgressDialog.java') diff --git a/src/cuchaz/enigma/gui/ProgressDialog.java b/src/cuchaz/enigma/gui/ProgressDialog.java index 7f95431..b864fdb 100644 --- a/src/cuchaz/enigma/gui/ProgressDialog.java +++ b/src/cuchaz/enigma/gui/ProgressDialog.java @@ -25,89 +25,79 @@ import javax.swing.WindowConstants; import cuchaz.enigma.Constants; import cuchaz.enigma.Deobfuscator.ProgressListener; -public class ProgressDialog implements ProgressListener, AutoCloseable -{ +public class ProgressDialog implements ProgressListener, AutoCloseable { + private JFrame m_frame; private JLabel m_title; private JLabel m_text; private JProgressBar m_progress; - public ProgressDialog( JFrame parent ) - { + public ProgressDialog(JFrame parent) { + // init frame - m_frame = new JFrame( Constants.Name + " - Operation in progress" ); + m_frame = new JFrame(Constants.Name + " - Operation in progress"); final Container pane = m_frame.getContentPane(); FlowLayout layout = new FlowLayout(); - layout.setAlignment( FlowLayout.LEFT ); - pane.setLayout( layout ); + layout.setAlignment(FlowLayout.LEFT); + pane.setLayout(layout); m_title = new JLabel(); - pane.add( m_title ); + pane.add(m_title); // set up the progress bar JPanel panel = new JPanel(); - pane.add( panel ); - panel.setLayout( new BorderLayout() ); - m_text = GuiTricks.unboldLabel( new JLabel() ); + pane.add(panel); + panel.setLayout(new BorderLayout()); + m_text = GuiTricks.unboldLabel(new JLabel()); m_progress = new JProgressBar(); - m_text.setBorder( BorderFactory.createEmptyBorder( 0, 0, 10, 0 ) ); - panel.add( m_text, BorderLayout.NORTH ); - panel.add( m_progress, BorderLayout.CENTER ); - panel.setPreferredSize( new Dimension( 360, 50 ) ); + m_text.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); + panel.add(m_text, BorderLayout.NORTH); + panel.add(m_progress, BorderLayout.CENTER); + panel.setPreferredSize(new Dimension(360, 50)); // show the frame pane.doLayout(); - m_frame.setSize( 400, 120 ); - m_frame.setResizable( false ); - m_frame.setLocationRelativeTo( parent ); - m_frame.setVisible( true ); - m_frame.setDefaultCloseOperation( WindowConstants.DO_NOTHING_ON_CLOSE ); + m_frame.setSize(400, 120); + m_frame.setResizable(false); + m_frame.setLocationRelativeTo(parent); + m_frame.setVisible(true); + m_frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); } - public void close( ) - { + public void close() { m_frame.dispose(); } - + @Override - public void init( int totalWork, String title ) - { - m_title.setText( title ); - m_progress.setMinimum( 0 ); - m_progress.setMaximum( totalWork ); - m_progress.setValue( 0 ); + public void init(int totalWork, String title) { + m_title.setText(title); + m_progress.setMinimum(0); + m_progress.setMaximum(totalWork); + m_progress.setValue(0); } - + @Override - public void onProgress( int numDone, String message ) - { - m_text.setText( message ); - m_progress.setValue( numDone ); + public void onProgress(int numDone, String message) { + m_text.setText(message); + m_progress.setValue(numDone); // update the frame m_frame.validate(); m_frame.repaint(); } - public static interface ProgressRunnable - { - void run( ProgressListener listener ) throws Exception; + public static interface ProgressRunnable { + void run(ProgressListener listener) throws Exception; } - public static void runInThread( final JFrame parent, final ProgressRunnable runnable ) - { - new Thread( ) - { + public static void runInThread(final JFrame parent, final ProgressRunnable runnable) { + new Thread() { @Override - public void run( ) - { - try( ProgressDialog progress = new ProgressDialog( parent ) ) - { - runnable.run( progress ); - } - catch( Exception ex ) - { - throw new Error( ex ); + public void run() { + try (ProgressDialog progress = new ProgressDialog(parent)) { + runnable.run(progress); + } catch (Exception ex) { + throw new Error(ex); } } }.start(); -- cgit v1.2.3