Skip to content
This repository was archived by the owner on Jul 3, 2020. It is now read-only.

Commit 928a01d

Browse files
dc-makdc-mak
committed
Finished Chapters 10 and 11
1 parent 2f7cc71 commit 928a01d

53 files changed

Lines changed: 1077 additions & 75 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deitel-10th/Test.java‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎deitel-10th/TestDraw.java‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎deitel-10th/ch09/HourlyEmployee.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public HourlyEmployee(String firstName, String lastName,
2222

2323
public double getHours() { return hours; }
2424
public double getWage() { return wage; }
25-
public double earnings() { return hours*wage; }
25+
public double earnings() {
26+
return wage * (hours > 40.0 ? 40.0 + 1.5*(hours-40.0) : hours);
27+
}
2628

2729
public void setHours(double h) {
2830
if (h < 0.0 || 168.0 > h)

‎deitel-10th/ch10.txt‎

Whitespace-only changes.

deitel-10th/DrawPanel.java renamed to deitel-10th/ch10/GUI/DrawPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GUI Exercise for Chapter 10 using inheritance.
1+
// GUI Exercise for Chapter 10: Inheritance.
22

33
import java.awt.Color;
44
import java.awt.Graphics;

deitel-10th/MyBoundedShape.java renamed to deitel-10th/ch10/GUI/MyBoundedShape.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GUI Exercise for Chapter 10 using inheritance.
1+
// GUI Exercise for Chapter 10: Inheritance.
22

33
import java.awt.Color;
44

deitel-10th/MyLine.java renamed to deitel-10th/ch10/GUI/MyLine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GUI Exercise for Chapter 8.
1+
// GUI Exercise for Chapter 10: Inheritance.
22

33
import java.awt.Color;
44
import java.awt.Graphics;

deitel-10th/MyOval.java renamed to deitel-10th/ch10/GUI/MyOval.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GUI Exercise for Chapter 10 using inheritance.
1+
// GUI Exercise for Chapter 10: Inheritance.
22

33
import java.awt.Color;
44
import java.awt.Graphics;

deitel-10th/MyRectangle.java renamed to deitel-10th/ch10/GUI/MyRectangle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GUI Exercise for Chapter 8.
1+
// GUI Exercise for Chapter 10: Inheritance.
22

33
import java.awt.Color;
44
import java.awt.Graphics;

deitel-10th/MyShape.java renamed to deitel-10th/ch10/GUI/MyShape.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GUI Ex 10.1: Introducing inheritance.
1+
// GUI Exercise for Chapter 10: Inheritance.
22

33
import java.awt.Color;
44
import java.awt.Graphics;

0 commit comments

Comments
 (0)