From a0965cc92a53b551266c978e2646d4a0241892af Mon Sep 17 00:00:00 2001 From: ErdbeerbaerLP <27149563+ErdbeerbaerLP@users.noreply.github.com> Date: Sat, 30 Mar 2019 15:55:55 +0100 Subject: [PATCH] Use spaces instead of tabs --- src/main/java/de/mas/wiiu/streaming/Main.java | 128 +++++++++--------- .../mas/wiiu/streaming/gui/StreamWindow.java | 26 ++-- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/main/java/de/mas/wiiu/streaming/Main.java b/src/main/java/de/mas/wiiu/streaming/Main.java index c7d8da4..075e19e 100644 --- a/src/main/java/de/mas/wiiu/streaming/Main.java +++ b/src/main/java/de/mas/wiiu/streaming/Main.java @@ -40,80 +40,80 @@ import de.mas.wiiu.streaming.gui.StreamWindow; public class Main { - public static void main(String[] args) throws Exception { - if(GraphicsEnvironment.isHeadless()) { - System.out.println("This program does not support running in a headless environment!"); - System.exit(2); - }else { - String ip = null; - if(args.length != 0) { - CommandLineParser parser = new DefaultParser(); + public static void main(String[] args) throws Exception { + if(GraphicsEnvironment.isHeadless()) { + System.out.println("This program does not support running in a headless environment!"); + System.exit(2); + }else { + String ip = null; + if(args.length != 0) { + CommandLineParser parser = new DefaultParser(); - Options options = new Options(); - options.addOption("ip", "ip", true, "IP address of your Wii U Console."); - - CommandLine line = parser.parse(options, args, true); - + Options options = new Options(); + options.addOption("ip", "ip", true, "IP address of your Wii U Console."); - if (line.hasOption("ip")) { - ip = line.getOptionValue("ip"); - }else { - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("streamingTool", options); - System.exit(2); - } - } else{ - - + CommandLine line = parser.parse(options, args, true); - //Create a JFrame to show the icon in the taskbar - final JFrame frame = new JFrame("Wii U Streaming Client - Enter IP..."); - frame.setUndecorated( true ); - frame.setVisible( true ); - frame.setLocationRelativeTo( null ); + if (line.hasOption("ip")) { + ip = line.getOptionValue("ip"); + }else { + HelpFormatter formatter = new HelpFormatter(); + formatter.printHelp("streamingTool", options); + System.exit(2); + } + } else{ - //Display the IP Dialog - ip = JOptionPane.showInputDialog(frame, "Please enter the local IP address of your Wii U", "Wii U streaming client", JOptionPane.PLAIN_MESSAGE); - //Check if user clicked "Cancel" - if(ip == null) { - System.out.println("Cancelled. Exiting program"); - frame.dispose(); - System.exit(0); - } - //Close the JFrame again - frame.dispose(); - } - try { - new Main(ip); - } catch (BindException e) { - //Create a JFrame to show the icon in the taskbar - final JFrame frame = new JFrame("Wii U Streaming Client - "+e.getClass().getName()); - frame.setUndecorated( true ); - frame.setVisible( true ); - frame.setLocationRelativeTo( null ); + //Create a JFrame to show the icon in the taskbar + final JFrame frame = new JFrame("Wii U Streaming Client - Enter IP..."); + frame.setUndecorated( true ); + frame.setVisible( true ); + frame.setLocationRelativeTo( null ); - //Display the Message - JOptionPane.showMessageDialog(frame, "Can't bind socket. The client is probably already running.", e.getClass().getName(), - JOptionPane.WARNING_MESSAGE); - //Close the JFrame again - frame.dispose(); + //Display the IP Dialog + ip = JOptionPane.showInputDialog(frame, "Please enter the local IP address of your Wii U", "Wii U streaming client", JOptionPane.PLAIN_MESSAGE); - System.exit(-1); - } - } - } + //Check if user clicked "Cancel" + if(ip == null) { + System.out.println("Cancelled. Exiting program"); + frame.dispose(); + System.exit(0); + } + //Close the JFrame again + frame.dispose(); - public Main(String ip) throws SocketException { - ImageStreamer imageStreamer = new ImageStreamer(ip); + } - SwingUtilities.invokeLater(new Runnable() { - public void run() { - new StreamWindow(imageStreamer.getImageProvider()); - } - }); - } + try { + new Main(ip); + } catch (BindException e) { + //Create a JFrame to show the icon in the taskbar + final JFrame frame = new JFrame("Wii U Streaming Client - "+e.getClass().getName()); + frame.setUndecorated( true ); + frame.setVisible( true ); + frame.setLocationRelativeTo( null ); + + //Display the Message + JOptionPane.showMessageDialog(frame, "Can't bind socket. The client is probably already running.", e.getClass().getName(), + JOptionPane.WARNING_MESSAGE); + //Close the JFrame again + frame.dispose(); + + System.exit(-1); + } + } + } + + public Main(String ip) throws SocketException { + ImageStreamer imageStreamer = new ImageStreamer(ip); + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + new StreamWindow(imageStreamer.getImageProvider()); + } + }); + } } diff --git a/src/main/java/de/mas/wiiu/streaming/gui/StreamWindow.java b/src/main/java/de/mas/wiiu/streaming/gui/StreamWindow.java index e390e1d..9978f36 100644 --- a/src/main/java/de/mas/wiiu/streaming/gui/StreamWindow.java +++ b/src/main/java/de/mas/wiiu/streaming/gui/StreamWindow.java @@ -34,11 +34,11 @@ import javax.swing.JMenuItem; import javax.swing.WindowConstants; public class StreamWindow { - private final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + private final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); private final ImagePanel image = new ImagePanel(screenSize.width-15, screenSize.height-100); public StreamWindow(IImageProvider imageProvider) { - + JFrame editorFrame = new JFrame("Wii U Streaming Client"); editorFrame.setMaximumSize(screenSize); @@ -46,27 +46,27 @@ public class StreamWindow { imageProvider.setOnImageChange((bi) -> image.setImage(bi)); editorFrame.getContentPane().add(image); - + JMenuBar menuBar = new JMenuBar(); editorFrame.getContentPane().add(menuBar, BorderLayout.NORTH); - + JMenu mnSettings = new JMenu("Settings"); menuBar.add(mnSettings); - - + + JMenuItem mntmNewMenuItem = new JMenuItem("Config (Not implemented!)"); mntmNewMenuItem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //TODO Add program config - } + public void actionPerformed(ActionEvent e) { + //TODO Add program config + } }); JMenuItem mntmExit = new JMenuItem("Exit"); mntmExit.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - System.exit(0); - } + public void actionPerformed(ActionEvent e) { + System.exit(0); + } }); - + mntmNewMenuItem.setEnabled(false); mnSettings.add(mntmNewMenuItem); mnSettings.add(mntmExit);