From 609718730ad9bc6d18491cf164360b4a44db5f52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 9 Jan 2019 12:28:37 +0100 Subject: [PATCH] Add a MainWindowsView class and use it in the main(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Persons_Comparator.iml | 1 - src/HelloWorldSwing.java | 66 ---------------------------------------- src/Main.java | 4 ++- src/MainWindowsView.java | 30 ++++++++++++++++++ src/PersonView.java | 4 +++ 5 files changed, 37 insertions(+), 68 deletions(-) delete mode 100644 src/HelloWorldSwing.java create mode 100644 src/MainWindowsView.java diff --git a/Persons_Comparator.iml b/Persons_Comparator.iml index d5c0743..9e63df5 100644 --- a/Persons_Comparator.iml +++ b/Persons_Comparator.iml @@ -9,4 +9,3 @@ - diff --git a/src/HelloWorldSwing.java b/src/HelloWorldSwing.java deleted file mode 100644 index e6cec89..0000000 --- a/src/HelloWorldSwing.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle or the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -/* - * HelloWorldSwing.java requires no other files. - */ - -import javax.swing.*; - -public class HelloWorldSwing extends JFrame { - - HelloWorldSwing(String title) { - //Create and set up the window. - setTitle(title); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - - JPanel panel = new JPanel(); - - //Add the ubiquitous "Hello World" label. - JLabel label = new JLabel("Hello World"); - panel.add(label); - - getContentPane().add(panel); - } - - /** - * Show the GUI. For thread safety, - * this method should be invoked from the - * event-dispatching thread. - */ - public void showGUI() { - - //Display the window. - this.pack(); - this.setVisible(true); - } -} \ No newline at end of file diff --git a/src/Main.java b/src/Main.java index 9467a7a..6937e91 100644 --- a/src/Main.java +++ b/src/Main.java @@ -3,10 +3,12 @@ public class Main { public static void main(String[] args) { //Schedule a job for the event-dispatching thread: //creating and showing this application's GUI. + String programName = "Person Comparator"; + javax.swing.SwingUtilities.invokeLater(new Runnable() { public void run() { - new HelloWorldSwing("HelloWorldSwing").showGUI(); + new MainWindowsView(programName).showGUI(); } }); } diff --git a/src/MainWindowsView.java b/src/MainWindowsView.java new file mode 100644 index 0000000..f4f837f --- /dev/null +++ b/src/MainWindowsView.java @@ -0,0 +1,30 @@ +import javax.swing.*; + +public class MainWindowsView extends JFrame { + MainWindowsView(String title) { + //Create and set up the window. + setTitle(title); + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + + JPanel panel = new PersonView(); + + //TODO: Add content to the panel + //JLabel label = new JLabel("Hello World"); + //panel.add(label); + + getContentPane().add(panel); + } + + /** + * Show the GUI. For thread safety, + * this method should be invoked from the + * event-dispatching thread. + */ + public void showGUI() { + + //Display the window. + this.pack(); + this.setVisible(true); + } + +} diff --git a/src/PersonView.java b/src/PersonView.java index ba03889..9621e47 100644 --- a/src/PersonView.java +++ b/src/PersonView.java @@ -7,6 +7,10 @@ public class PersonView extends JPanel { private WeightView weightView; private EyeView eyeView; + PersonView() { + + } + PersonView(FirstnameView firstnameView, OriginView originView, SizeView sizeView, WeightView weightView, EyeView eyeView) { setFirstnameView(firstnameView); setOriginView(originView); -- 2.34.1