Rearrange code.

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

diff --git a/src/Country.java b/src/Country.java
index 7f2486bae6be22d6ed02628bdac1ab12baf8c422..2e35db2d815fd7a9cb523d82dcaddd8d218d1b95 100644 (file)
--- a/src/Country.java
+++ b/src/Country.java
@@ -27,42 +27,42 @@ public class Country {
         setFlag(flag);
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void setRegion(String region) {
-        this.region = region;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public void setLat(double lat) {
-        this.lat = lat;
+    public void setRegion(String region) {
+        this.region = region;
     }
 
     public double getLat() {
         return lat;
     }
 
-    public void setLng(double lng) {
-        this.lng = lng;
+    public void setLat(double lat) {
+        this.lat = lat;
     }
 
     public double getLng() {
         return lng;
     }
 
-    public void setFlag(String flag) {
-        this.flag = flag;
+    public void setLng(double lng) {
+        this.lng = lng;
     }
 
     public String getFlag() {
         return flag;
     }
 
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
     public int distanceTo(Country country) {
         if ((this.getLat() == country.getLat()) && (this.getLng() == country.getLng())) {
             return 0;

diff --git a/src/MainWindowsView.java b/src/MainWindowsView.java
index 703792124cb31db55c285d7cd3ff79d65e9c00ec..18e1ba1e9c7b3bbce6e8f70f3d2a71723204db66 100644 (file)
--- a/src/MainWindowsView.java
+++ b/src/MainWindowsView.java
@@ -13,6 +13,10 @@ public class MainWindowsView extends JFrame {
     private MainWindowsView() {
     }
 
+    public static MainWindowsView getInstance() {
+        return ourInstance;
+    }
+
     public void setMainWindowsView(String title, PersonView personView) {
         this.currentPersonView = personView;
         Container panel = getContentPane();
@@ -42,10 +46,6 @@ public class MainWindowsView extends JFrame {
         panel.add(getCurrentPersonView().getPersonPanel(), BorderLayout.CENTER);
     }
 
-    public static MainWindowsView getInstance() {
-        return ourInstance;
-    }
-
     public PersonView getCurrentPersonView() {
         return currentPersonView;
     }

diff --git a/src/Person.java b/src/Person.java
index f8432505cca4c4efe0392a74266da46a716e3af8..6e5ff4012e13f44e14f3df3e023a51f58bca8f00 100644 (file)
--- a/src/Person.java
+++ b/src/Person.java
@@ -29,62 +29,62 @@ public class Person implements Comparator<Person> {
         setDistanceFromReference(0);
     }
 
-    public void setFirstname(Firstname firstname) {
-        this.firstname = firstname;
-    }
-
     public Firstname getFirstname() {
         return firstname;
     }
 
-    public void setOrigin(Origin origin) {
-        this.origin = origin;
+    public void setFirstname(Firstname firstname) {
+        this.firstname = firstname;
     }
 
     public Origin getOrigin() {
         return origin;
     }
 
-    public void setCountry(Country country) {
-        this.country = country;
+    public void setOrigin(Origin origin) {
+        this.origin = origin;
     }
 
     public Country getCountry() {
         return country;
     }
 
-    public void setPersonSize(Size size) {
-        this.size = size;
+    public void setCountry(Country country) {
+        this.country = country;
     }
 
     public Size getPersonSize() {
         return size;
     }
 
-    public void setWeight(Weight weight) {
-        this.weight = weight;
+    public void setPersonSize(Size size) {
+        this.size = size;
     }
 
     public Weight getWeight() {
         return weight;
     }
 
-    public void setEye(Eye eye) {
-        this.eye = eye;
+    public void setWeight(Weight weight) {
+        this.weight = weight;
     }
 
     public Eye getEye() {
         return eye;
     }
 
-    public void setDistanceFromReference(Integer distanceFromReference) {
-        this.distanceFromReference = distanceFromReference;
+    public void setEye(Eye eye) {
+        this.eye = eye;
     }
 
     public Integer getDistanceFromReference() {
         return distanceFromReference;
     }
 
+    public void setDistanceFromReference(Integer distanceFromReference) {
+        this.distanceFromReference = distanceFromReference;
+    }
+
     @Override
     public String toString() {
         return "Person{" +

diff --git a/src/PersonRightPanel.java b/src/PersonRightPanel.java
index 8814863980a6598a5acbc4eea0d78ef3f208a8ec..7cbf331539804e907b1e8790e6f04a3cbc63239a 100644 (file)
--- a/src/PersonRightPanel.java
+++ b/src/PersonRightPanel.java
@@ -19,14 +19,14 @@ public class PersonRightPanel extends JPanel {
         }
     }
 
-    public void setContentText(String contentText) {
-        this.contentText = contentText;
-    }
-
     public String getContentText() {
         return contentText;
     }
 
+    public void setContentText(String contentText) {
+        this.contentText = contentText;
+    }
+
     //FIXME: redraw on resizing
     /*@Override
     public void paint(Graphics g) {
@@ -48,7 +48,7 @@ public class PersonRightPanel extends JPanel {
         g2d.setColor(personObj.getEye().getColor());
         g2d.fillOval(50, 50, 6, 3);
         g2d.fillOval(62, 50, 6, 3);
-        // Weigth
+        // Weight
         g2d.setColor(Color.black);
         g2d.fillOval(44, 80, 30, (personObj.getWeight().getWeight() * 30) / 250);
     }

diff --git a/src/RegionView.java b/src/RegionView.java
index 42941ac2d6f27247f749a309994f98fdd3854172..c5921d6a881b6ac4a59297a2463c4bcf7fbced1a 100644 (file)
--- a/src/RegionView.java
+++ b/src/RegionView.java
@@ -56,7 +56,7 @@ public class RegionView extends JPanel {
         add(new JScrollPane(tree));
     }
 
-    public static DefaultMutableTreeNode sortTree(DefaultMutableTreeNode root) {
+    private void sortTree(DefaultMutableTreeNode root) {
         {
             for (int i = 0; i < root.getChildCount() - 1; i++) {
                 DefaultMutableTreeNode node = (DefaultMutableTreeNode) root.getChildAt(i);
@@ -72,10 +72,9 @@ public class RegionView extends JPanel {
                     }
                 }
                 if (node.getChildCount() > 0) {
-                    sortTree(node);
+                    this.sortTree(node);
                 }
             }
-            return root;
         }
     }
 
@@ -83,11 +82,11 @@ public class RegionView extends JPanel {
         return tree;
     }
 
-    public void setRegionObj(Region regionObj) {
-        this.regionObj = regionObj;
-    }
-
     public Region getRegionObj() {
         return regionObj;
     }
+
+    public void setRegionObj(Region regionObj) {
+        this.regionObj = regionObj;
+    }
 }