Add a MainWindowsView class and use it in the main().

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/Persons_Comparator.iml b/Persons_Comparator.iml
index d5c074327501eaec3fe451ed56ce5160f1e97e16..9e63df535372836ff11d9e232cc5572e58fdefee 100644 (file)
--- a/Persons_Comparator.iml
+++ b/Persons_Comparator.iml
@@ -9,4 +9,3 @@
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

-

diff --git a/src/HelloWorldSwing.java b/src/HelloWorldSwing.java
deleted file mode 100644 (file)
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 9467a7a44b4a122eeee37587cea1c8657cde6ce8..6937e91dd1a36423a2ff453374736bc0c5e33605 100644 (file)
--- 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.
     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() {
 
         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 (file)
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 ba0388950231ec42c2002aa73d0ff0f3a161d094..9621e47905162246e6e9a3de1a3b83a6ec0663be 100644 (file)
--- a/src/PersonView.java
+++ b/src/PersonView.java
@@ -7,6 +7,10 @@ public class PersonView extends JPanel {
     private WeightView weightView;
     private EyeView eyeView;
 
     private WeightView weightView;
     private EyeView eyeView;
 

+    PersonView() {
+
+    }
+

     PersonView(FirstnameView firstnameView, OriginView originView, SizeView sizeView, WeightView weightView, EyeView eyeView) {
         setFirstnameView(firstnameView);
         setOriginView(originView);
     PersonView(FirstnameView firstnameView, OriginView originView, SizeView sizeView, WeightView weightView, EyeView eyeView) {
         setFirstnameView(firstnameView);
         setOriginView(originView);