[Ch15] Made the code match the actual example (da0b86ca) · Commits · examples / Head First Java 3rd Edition

src/main/java/ch15/ryanmonica/RyanAndMonicaBankChecksTest.java

+7 −7

Changes for src/main/java/ch15/ryanmonica/RyanAndMonicaBankChecksTest.java: 7 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@ import java.util.concurrent.Executors;
		public class RyanAndMonicaBankChecksTest {
		public static void main(String[] args) throws InterruptedException {
		BankAccountChecks account = new BankAccountChecks();
		RyanAndMonicaBankChecksJob ryan = new RyanAndMonicaBankChecksJob("Ryan", account);
		RyanAndMonicaBankChecksJob monica = new RyanAndMonicaBankChecksJob("Monica", account);
		RyanAndMonicaBankChecksJob ryan = new RyanAndMonicaBankChecksJob("Ryan", account, 50);
		RyanAndMonicaBankChecksJob monica = new RyanAndMonicaBankChecksJob("Monica", account, 100);
		ExecutorService executor = Executors.newFixedThreadPool(2);
		executor.execute(ryan);
		executor.execute(monica);
		@@ -18,16 +18,16 @@ public class RyanAndMonicaBankChecksTest {
		class RyanAndMonicaBankChecksJob implements Runnable {
		private final String name;
		private final BankAccountChecks account;
		private final int amountToSpend;

		RyanAndMonicaBankChecksJob(String name, BankAccountChecks account) {
		RyanAndMonicaBankChecksJob(String name, BankAccountChecks account, int amountToSpend) {
		this.name = name;
		this.account = account;
		this.amountToSpend = amountToSpend;
		}

		public void run() {
		while (account.getBalance() > 0) {
		goShopping(10);
		}
		goShopping(amountToSpend);
		}

		private void goShopping(int amount) {
		@@ -38,7 +38,7 @@ class RyanAndMonicaBankChecksJob implements Runnable {
		}

		class BankAccountChecks {
		private int balance = 50;
		private int balance = 100;

		public int getBalance() {
		return balance;

src/main/java/ch15/ryanmonica/RyanAndMonicaSynchronizedTest.java

+7 −7

Changes for src/main/java/ch15/ryanmonica/RyanAndMonicaSynchronizedTest.java: 7 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@ import java.util.concurrent.Executors;
		public class RyanAndMonicaSynchronizedTest {
		public static void main(String[] args) throws InterruptedException {
		BankAccountSynchronized account = new BankAccountSynchronized();
		RyanAndMonicaSynchronizedJob ryan = new RyanAndMonicaSynchronizedJob("Ryan", account);
		RyanAndMonicaSynchronizedJob monica = new RyanAndMonicaSynchronizedJob("Monica", account);
		RyanAndMonicaSynchronizedJob ryan = new RyanAndMonicaSynchronizedJob("Ryan", account, 50);
		RyanAndMonicaSynchronizedJob monica = new RyanAndMonicaSynchronizedJob("Monica", account, 100);
		ExecutorService executor = Executors.newFixedThreadPool(2);
		executor.execute(ryan);
		executor.execute(monica);
		@@ -18,16 +18,16 @@ public class RyanAndMonicaSynchronizedTest {
		class RyanAndMonicaSynchronizedJob implements Runnable {
		private final String name;
		private final BankAccountSynchronized account;
		private final int amountToSpend;

		RyanAndMonicaSynchronizedJob(String name, BankAccountSynchronized account) {
		RyanAndMonicaSynchronizedJob(String name, BankAccountSynchronized account, int amountToSpend) {
		this.name = name;
		this.account = account;
		this.amountToSpend = amountToSpend;
		}

		public void run() {
		while (account.getBalance() > 0) {
		goShopping(10);
		}
		goShopping(amountToSpend);
		}

		private void goShopping(int amount) {
		@@ -44,7 +44,7 @@ class RyanAndMonicaSynchronizedJob implements Runnable {
		}

		class BankAccountSynchronized {
		private int balance = 50;
		private int balance = 100;

		public int getBalance() {
		return balance;

src/main/java/ch15/ryanmonica/RyanAndMonicaTest.java

+7 −7

Changes for src/main/java/ch15/ryanmonica/RyanAndMonicaTest.java: 7 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,8 +6,8 @@ import java.util.concurrent.Executors;
		public class RyanAndMonicaTest {
		public static void main(String[] args) throws InterruptedException {
		final BankAccount account = new BankAccount();
		RyanAndMonicaJob ryan = new RyanAndMonicaJob("Ryan", account);
		RyanAndMonicaJob monica = new RyanAndMonicaJob("Monica", account);
		RyanAndMonicaJob ryan = new RyanAndMonicaJob("Ryan", account, 50);
		RyanAndMonicaJob monica = new RyanAndMonicaJob("Monica", account, 100);
		ExecutorService executor = Executors.newFixedThreadPool(2);
		executor.execute(ryan);
		executor.execute(monica);
		@@ -18,16 +18,16 @@ public class RyanAndMonicaTest {
		class RyanAndMonicaJob implements Runnable {
		private final String name;
		private final BankAccount account;
		private final int amountToSpend;

		RyanAndMonicaJob(String name, BankAccount account) {
		RyanAndMonicaJob(String name, BankAccount account, int amountToSpend) {
		this.name = name;
		this.account = account;
		this.amountToSpend = amountToSpend;
		}

		public void run() {
		while (account.getBalance() > 0) {
		goShopping(10);
		}
		goShopping(amountToSpend);
		}

		private void goShopping(int amount) {
		@@ -42,7 +42,7 @@ class RyanAndMonicaJob implements Runnable {
		}

		class BankAccount {
		private int balance = 50;
		private int balance = 100;

		public int getBalance() {
		return balance;