Merge pull request #1 from eviltester/master

Update

Author: kzaorski

source/src/main/java/com/javafortesters/classes/AnEmptyClass.java

@@ -2,15 +2,13 @@
 
 public class User {
 
-
     private String username;
     private String password;
 
     public User(){
         this("username", "password");
     }
 
-
     public User(String username, String password) {
         this.username = username;
         this.password = password;
@@ -31,4 +29,4 @@ public void setPassword(String password) {
     public String getPermission() {
         return "Normal";
     }
-}
+}

source/src/main/java/com/javafortesters/domainentities/User.java

@@ -36,9 +36,3 @@ public int compare(Object oUser1, Object oUser2) {
         return val;
     }
 }
-
-/*
-// add the following line just before return val; to see the comparator in action
-   System.out.println("Compare " + user1.getUsername() +
-                     " with " + user2.getUsername() + " = " + val);
-*/

source/src/main/java/com/javafortesters/domainentities/UserComparator.java

@@ -17,6 +17,11 @@ public User(){
         password = "password";
     }
 
+    public User(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
     public String getUsername() {
         return username;
     }

source/src/main/java/com/javafortesters/domainentities/interim/User.java

@@ -27,7 +27,6 @@ public User(String username, String password) throws InvalidPassword{
     }
 
     public void setPassword(String password) throws InvalidPassword {
-
       if(password.length()<7){
          throw new InvalidPassword("Password must be > 6 chars");
       }

source/src/main/java/com/javafortesters/domainentities/interim/exceptions/custom/User.java

@@ -1,4 +1,4 @@
-package com.javafortesters.unusedCode;
+package com.javafortesters.booksupport.unusedCode;
 
 
 import com.javafortesters.domainentities.interim.exceptions.User;

…usedCode/UserPasswordExceptionsTest.java …usedCode/UserPasswordExceptionsTest.javasource/src/test/java/com/javafortesters/unusedCode/UserPasswordExceptionsTest.java renamed to source/src/test/java/com/javafortesters/booksupport/unusedCode/UserPasswordExceptionsTest.java source/src/test/java/com/javafortesters/unusedCode/UserPasswordExceptionsTest.java renamed to source/src/test/java/com/javafortesters/booksupport/unusedCode/UserPasswordExceptionsTest.java

@@ -1,4 +1,4 @@
-package com.javafortesters.classes;
+package com.javafortesters.chap001basicsofjava.examples.classes;
 
 public class AClassWithAMethod {
 

…ortesters/classes/AClassWithAMethod.java …/examples/classes/AClassWithAMethod.javasource/src/main/java/com/javafortesters/classes/AClassWithAMethod.java renamed to source/src/test/java/com/javafortesters/chap001basicsofjava/examples/classes/AClassWithAMethod.java source/src/main/java/com/javafortesters/classes/AClassWithAMethod.java renamed to source/src/test/java/com/javafortesters/chap001basicsofjava/examples/classes/AClassWithAMethod.java

@@ -0,0 +1,4 @@
+package com.javafortesters.chap001basicsofjava.examples.classes;
+
+public class AnEmptyClass {
+}

source/src/test/java/com/javafortesters/chap001basicsofjava/examples/classes/AnEmptyClass.java

@@ -1,4 +1,4 @@
-package com.javafortesters.myfirsttest;
+package com.javafortesters.chap003myfirsttest.examples;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 

…afortesters/myfirsttest/MyFirstTest.java …003myfirsttest/examples/MyFirstTest.javasource/src/test/java/com/javafortesters/myfirsttest/MyFirstTest.java renamed to source/src/test/java/com/javafortesters/chap003myfirsttest/examples/MyFirstTest.java source/src/test/java/com/javafortesters/myfirsttest/MyFirstTest.java renamed to source/src/test/java/com/javafortesters/chap003myfirsttest/examples/MyFirstTest.java

@@ -1,4 +1,4 @@
-package com.javafortesters.myfirsttest.examples;
+package com.javafortesters.chap003myfirsttest.examples;
 
 import org.junit.Test;