From 5484556e2b8dd0a42f98750211a490f2bb337189 Mon Sep 17 00:00:00 2001
From: Daniel Shchur <daniel.shchur@huskers.unl.edu>
Date: Wed, 7 Feb 2018 19:07:58 -0600
Subject: [PATCH] Update Stuff, moving from eclipse.
---
.project | 0
classProject01/bin/.gitignore | 0
classProject01/bin/classes/Grader.class | Bin
classProject01/bin/classes/Student.class | Bin
.../bin/driver/GraderStudentDemo.class | Bin
classProject02/.gitignore | 0
classProject02/data/Persons.json | 0
classProject02/data/Persons.xml | 0
classProject02/data/name.dat | 0
classProject02/src/entities/Person.java | 0
classProject02/src/reader/FlatFileReader.java | 0
.../src/resources/DataConverter.java | 0
classProject02/src/writer/JSONWriter.java | 0
classProject02/src/writer/XMLWriter.java | 0
classProject03/.classpath | 0
.../.settings/org.eclipse.jdt.core.prefs | 0
classProject03/bin/driver/ScoreDemo.class | Bin
classProject03/bin/entities/Course.class | Bin
classProject03/bin/entities/Score.class | Bin
classProject03/src/driver/ScoreDemo.java | 0
classProject03/src/entities/Course.java | 0
classProject03/src/entities/Score.java | 0
hw01/bin/.gitignore | 0
hw01/bin/CGIslands.class | Bin
hw01/bin/HalfLife.class | Bin
hw01/bin/IsotopeHtml.class | Bin
hw01/bin/IsotopeHtml_old.class | Bin
hw01/bin/SudokuVerifier.class | Bin
lab01/bin/.gitignore | 0
lab01/bin/unl/cse/labs/lab01/Statistics.class | Bin
.../unl/cse/labs/lab01/StatisticsDemo.class | Bin
lab02/bin/.gitignore | 0
lab02/bin/cse156/lab02/Birthday.class | Bin
lab02/bin/cse156/lab02/DNA.class | Bin
lab02/bin/cse156/lab02/Natural.class | Bin
...onditionalsRepetitionStringPHP-Handout.pdf | Bin
lab03/bin/.gitignore | 0
lab03/bin/unl/cse/labs/lab03/Baseball$1.class | Bin
lab03/bin/unl/cse/labs/lab03/Baseball.class | Bin
lab03/bin/unl/cse/labs/lab03/Child.class | Bin
.../bin/unl/cse/labs/lab03/ChildCredit.class | Bin
lab03/bin/unl/cse/labs/lab03/Team.class | Bin
...b-StringsFileIOConditionalsPHP-Handout.pdf | Bin
lab04/bin/.gitignore | 0
lab04/src/unl/cse/library/LibraryDemo.java | 0
.../src/org/cinco/payroll/HourlyEmployee.java | 38 ++++++++++++++++++
.../org/cinco/payroll/SalariedEmployee.java | 34 ++++++++++++++++
.../cinco/payroll/StaffedHourlyEmployee.java | 23 +++++++++++
.../org/cinco/payroll/TempHourlyEmployee.java | 22 ++++++++++
lab06/.classpath | 0
lab06/bin/.gitignore | 0
lab07/.classpath | 0
lab07/bin/.gitignore | 0
53 files changed, 117 insertions(+)
mode change 100755 => 100644 .project
mode change 100755 => 100644 classProject01/bin/.gitignore
mode change 100755 => 100644 classProject01/bin/classes/Grader.class
mode change 100755 => 100644 classProject01/bin/classes/Student.class
mode change 100755 => 100644 classProject01/bin/driver/GraderStudentDemo.class
mode change 100755 => 100644 classProject02/.gitignore
mode change 100755 => 100644 classProject02/data/Persons.json
mode change 100755 => 100644 classProject02/data/Persons.xml
mode change 100755 => 100644 classProject02/data/name.dat
mode change 100755 => 100644 classProject02/src/entities/Person.java
mode change 100755 => 100644 classProject02/src/reader/FlatFileReader.java
mode change 100755 => 100644 classProject02/src/resources/DataConverter.java
mode change 100755 => 100644 classProject02/src/writer/JSONWriter.java
mode change 100755 => 100644 classProject02/src/writer/XMLWriter.java
mode change 100755 => 100644 classProject03/.classpath
mode change 100755 => 100644 classProject03/.settings/org.eclipse.jdt.core.prefs
mode change 100755 => 100644 classProject03/bin/driver/ScoreDemo.class
mode change 100755 => 100644 classProject03/bin/entities/Course.class
mode change 100755 => 100644 classProject03/bin/entities/Score.class
mode change 100755 => 100644 classProject03/src/driver/ScoreDemo.java
mode change 100755 => 100644 classProject03/src/entities/Course.java
mode change 100755 => 100644 classProject03/src/entities/Score.java
mode change 100755 => 100644 hw01/bin/.gitignore
mode change 100755 => 100644 hw01/bin/CGIslands.class
mode change 100755 => 100644 hw01/bin/HalfLife.class
mode change 100755 => 100644 hw01/bin/IsotopeHtml.class
mode change 100755 => 100644 hw01/bin/IsotopeHtml_old.class
mode change 100755 => 100644 hw01/bin/SudokuVerifier.class
mode change 100755 => 100644 lab01/bin/.gitignore
mode change 100755 => 100644 lab01/bin/unl/cse/labs/lab01/Statistics.class
mode change 100755 => 100644 lab01/bin/unl/cse/labs/lab01/StatisticsDemo.class
mode change 100755 => 100644 lab02/bin/.gitignore
mode change 100755 => 100644 lab02/bin/cse156/lab02/Birthday.class
mode change 100755 => 100644 lab02/bin/cse156/lab02/DNA.class
mode change 100755 => 100644 lab02/bin/cse156/lab02/Natural.class
mode change 100755 => 100644 lab02/instructions/Lab-ConditionalsRepetitionStringPHP-Handout.pdf
mode change 100755 => 100644 lab03/bin/.gitignore
mode change 100755 => 100644 lab03/bin/unl/cse/labs/lab03/Baseball$1.class
mode change 100755 => 100644 lab03/bin/unl/cse/labs/lab03/Baseball.class
mode change 100755 => 100644 lab03/bin/unl/cse/labs/lab03/Child.class
mode change 100755 => 100644 lab03/bin/unl/cse/labs/lab03/ChildCredit.class
mode change 100755 => 100644 lab03/bin/unl/cse/labs/lab03/Team.class
mode change 100755 => 100644 lab03/instructions/Lab-StringsFileIOConditionalsPHP-Handout.pdf
mode change 100755 => 100644 lab04/bin/.gitignore
mode change 100755 => 100644 lab04/src/unl/cse/library/LibraryDemo.java
create mode 100644 lab05/src/org/cinco/payroll/HourlyEmployee.java
create mode 100644 lab05/src/org/cinco/payroll/SalariedEmployee.java
create mode 100644 lab05/src/org/cinco/payroll/StaffedHourlyEmployee.java
create mode 100644 lab05/src/org/cinco/payroll/TempHourlyEmployee.java
mode change 100755 => 100644 lab06/.classpath
mode change 100755 => 100644 lab06/bin/.gitignore
mode change 100755 => 100644 lab07/.classpath
mode change 100755 => 100644 lab07/bin/.gitignore
diff --git a/.project b/.project
old mode 100755
new mode 100644
diff --git a/classProject01/bin/.gitignore b/classProject01/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/classProject01/bin/classes/Grader.class b/classProject01/bin/classes/Grader.class
old mode 100755
new mode 100644
diff --git a/classProject01/bin/classes/Student.class b/classProject01/bin/classes/Student.class
old mode 100755
new mode 100644
diff --git a/classProject01/bin/driver/GraderStudentDemo.class b/classProject01/bin/driver/GraderStudentDemo.class
old mode 100755
new mode 100644
diff --git a/classProject02/.gitignore b/classProject02/.gitignore
old mode 100755
new mode 100644
diff --git a/classProject02/data/Persons.json b/classProject02/data/Persons.json
old mode 100755
new mode 100644
diff --git a/classProject02/data/Persons.xml b/classProject02/data/Persons.xml
old mode 100755
new mode 100644
diff --git a/classProject02/data/name.dat b/classProject02/data/name.dat
old mode 100755
new mode 100644
diff --git a/classProject02/src/entities/Person.java b/classProject02/src/entities/Person.java
old mode 100755
new mode 100644
diff --git a/classProject02/src/reader/FlatFileReader.java b/classProject02/src/reader/FlatFileReader.java
old mode 100755
new mode 100644
diff --git a/classProject02/src/resources/DataConverter.java b/classProject02/src/resources/DataConverter.java
old mode 100755
new mode 100644
diff --git a/classProject02/src/writer/JSONWriter.java b/classProject02/src/writer/JSONWriter.java
old mode 100755
new mode 100644
diff --git a/classProject02/src/writer/XMLWriter.java b/classProject02/src/writer/XMLWriter.java
old mode 100755
new mode 100644
diff --git a/classProject03/.classpath b/classProject03/.classpath
old mode 100755
new mode 100644
diff --git a/classProject03/.settings/org.eclipse.jdt.core.prefs b/classProject03/.settings/org.eclipse.jdt.core.prefs
old mode 100755
new mode 100644
diff --git a/classProject03/bin/driver/ScoreDemo.class b/classProject03/bin/driver/ScoreDemo.class
old mode 100755
new mode 100644
diff --git a/classProject03/bin/entities/Course.class b/classProject03/bin/entities/Course.class
old mode 100755
new mode 100644
diff --git a/classProject03/bin/entities/Score.class b/classProject03/bin/entities/Score.class
old mode 100755
new mode 100644
diff --git a/classProject03/src/driver/ScoreDemo.java b/classProject03/src/driver/ScoreDemo.java
old mode 100755
new mode 100644
diff --git a/classProject03/src/entities/Course.java b/classProject03/src/entities/Course.java
old mode 100755
new mode 100644
diff --git a/classProject03/src/entities/Score.java b/classProject03/src/entities/Score.java
old mode 100755
new mode 100644
diff --git a/hw01/bin/.gitignore b/hw01/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/hw01/bin/CGIslands.class b/hw01/bin/CGIslands.class
old mode 100755
new mode 100644
diff --git a/hw01/bin/HalfLife.class b/hw01/bin/HalfLife.class
old mode 100755
new mode 100644
diff --git a/hw01/bin/IsotopeHtml.class b/hw01/bin/IsotopeHtml.class
old mode 100755
new mode 100644
diff --git a/hw01/bin/IsotopeHtml_old.class b/hw01/bin/IsotopeHtml_old.class
old mode 100755
new mode 100644
diff --git a/hw01/bin/SudokuVerifier.class b/hw01/bin/SudokuVerifier.class
old mode 100755
new mode 100644
diff --git a/lab01/bin/.gitignore b/lab01/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/lab01/bin/unl/cse/labs/lab01/Statistics.class b/lab01/bin/unl/cse/labs/lab01/Statistics.class
old mode 100755
new mode 100644
diff --git a/lab01/bin/unl/cse/labs/lab01/StatisticsDemo.class b/lab01/bin/unl/cse/labs/lab01/StatisticsDemo.class
old mode 100755
new mode 100644
diff --git a/lab02/bin/.gitignore b/lab02/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/lab02/bin/cse156/lab02/Birthday.class b/lab02/bin/cse156/lab02/Birthday.class
old mode 100755
new mode 100644
diff --git a/lab02/bin/cse156/lab02/DNA.class b/lab02/bin/cse156/lab02/DNA.class
old mode 100755
new mode 100644
diff --git a/lab02/bin/cse156/lab02/Natural.class b/lab02/bin/cse156/lab02/Natural.class
old mode 100755
new mode 100644
diff --git a/lab02/instructions/Lab-ConditionalsRepetitionStringPHP-Handout.pdf b/lab02/instructions/Lab-ConditionalsRepetitionStringPHP-Handout.pdf
old mode 100755
new mode 100644
diff --git a/lab03/bin/.gitignore b/lab03/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/lab03/bin/unl/cse/labs/lab03/Baseball$1.class b/lab03/bin/unl/cse/labs/lab03/Baseball$1.class
old mode 100755
new mode 100644
diff --git a/lab03/bin/unl/cse/labs/lab03/Baseball.class b/lab03/bin/unl/cse/labs/lab03/Baseball.class
old mode 100755
new mode 100644
diff --git a/lab03/bin/unl/cse/labs/lab03/Child.class b/lab03/bin/unl/cse/labs/lab03/Child.class
old mode 100755
new mode 100644
diff --git a/lab03/bin/unl/cse/labs/lab03/ChildCredit.class b/lab03/bin/unl/cse/labs/lab03/ChildCredit.class
old mode 100755
new mode 100644
diff --git a/lab03/bin/unl/cse/labs/lab03/Team.class b/lab03/bin/unl/cse/labs/lab03/Team.class
old mode 100755
new mode 100644
diff --git a/lab03/instructions/Lab-StringsFileIOConditionalsPHP-Handout.pdf b/lab03/instructions/Lab-StringsFileIOConditionalsPHP-Handout.pdf
old mode 100755
new mode 100644
diff --git a/lab04/bin/.gitignore b/lab04/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/lab04/src/unl/cse/library/LibraryDemo.java b/lab04/src/unl/cse/library/LibraryDemo.java
old mode 100755
new mode 100644
diff --git a/lab05/src/org/cinco/payroll/HourlyEmployee.java b/lab05/src/org/cinco/payroll/HourlyEmployee.java
new file mode 100644
index 0000000..6e534e8
--- /dev/null
+++ b/lab05/src/org/cinco/payroll/HourlyEmployee.java
@@ -0,0 +1,38 @@
+package org.cinco.payroll;
+
+public abstract class HourlyEmployee extends Employee{
+
+ private double hourlyPayRate;
+ private double hoursWorked;
+
+ public double getHourlyPayRate() {
+ return hourlyPayRate;
+ }
+ public void setHourlyPayRate(double hourlyPayRate) {
+ this.hourlyPayRate = hourlyPayRate;
+ }
+ public double getHoursWorked() {
+ return hoursWorked;
+ }
+ public void setHoursWorked(double hoursWorked) {
+ this.hoursWorked = hoursWorked;
+ }
+
+ public double getGrossIncome() {
+ return this.hourlyPayRate * this.hoursWorked;
+ }
+
+ public abstract String getType();
+
+ public abstract double getNetIncome();
+
+ public abstract double getTaxes();
+
+ public HourlyEmployee(String id, String lastName, String firstName, String title, String type, double hourlyPayRate,
+ double hoursWorked) {
+ super(id, lastName, firstName, title, type);
+ this.hourlyPayRate = hourlyPayRate;
+ this.hoursWorked = hoursWorked;
+ }
+
+}
diff --git a/lab05/src/org/cinco/payroll/SalariedEmployee.java b/lab05/src/org/cinco/payroll/SalariedEmployee.java
new file mode 100644
index 0000000..5a6ed87
--- /dev/null
+++ b/lab05/src/org/cinco/payroll/SalariedEmployee.java
@@ -0,0 +1,34 @@
+package org.cinco.payroll;
+
+public class SalariedEmployee extends Employee{
+
+ private double grossIncome;
+
+ public String getType() {
+ return "Salaried";
+ }
+
+ public double getGrossIncome() {
+ return grossIncome;
+ }
+
+ public void setGrossIncome(double annualSalary) {
+ this.grossIncome = annualSalary / 52;
+ }
+
+ public double getTaxes(){
+ return this.grossIncome * 0.20;
+ }
+
+ public double getNetIncome() {
+ return this.grossIncome = this.grossIncome - getTaxes() + 100;
+ }
+
+ public SalariedEmployee(String id, String lastName, String firstName, String title, String type, double annualSalary) {
+ super(id, lastName, firstName, title, type);
+ this.grossIncome = annualSalary / 52;
+ }
+
+
+
+}
diff --git a/lab05/src/org/cinco/payroll/StaffedHourlyEmployee.java b/lab05/src/org/cinco/payroll/StaffedHourlyEmployee.java
new file mode 100644
index 0000000..925390a
--- /dev/null
+++ b/lab05/src/org/cinco/payroll/StaffedHourlyEmployee.java
@@ -0,0 +1,23 @@
+package org.cinco.payroll;
+
+public class StaffedHourlyEmployee extends HourlyEmployee{
+
+ public String getType() {
+ return "Staffed";
+ }
+
+ public double getNetIncome() {
+ double gross = this.getGrossIncome();
+ return gross -= gross * 0.15;
+ }
+
+ public double getTaxes() {
+ return this.getGrossIncome() * 0.15;
+ }
+
+ public StaffedHourlyEmployee(String id, String lastName, String firstName, String title, String type, double hourlyPayRate,
+ double hoursWorked) {
+ super(id, lastName, firstName, title, type, hourlyPayRate, hoursWorked);
+ }
+
+}
diff --git a/lab05/src/org/cinco/payroll/TempHourlyEmployee.java b/lab05/src/org/cinco/payroll/TempHourlyEmployee.java
new file mode 100644
index 0000000..8b59a7d
--- /dev/null
+++ b/lab05/src/org/cinco/payroll/TempHourlyEmployee.java
@@ -0,0 +1,22 @@
+package org.cinco.payroll;
+
+public class TempHourlyEmployee extends HourlyEmployee{
+
+ public String getType() {
+ return "Temporary";
+ }
+
+ public double getNetIncome() {
+ return this.getGrossIncome();
+ }
+
+ public double getTaxes() {
+ return 0;
+ }
+
+ public TempHourlyEmployee(String id, String lastName, String firstName, String title, String type, double hourlyPayRate,
+ double hoursWorked) {
+ super(id, lastName, firstName, title, type, hourlyPayRate, hoursWorked);
+ }
+
+}
diff --git a/lab06/.classpath b/lab06/.classpath
old mode 100755
new mode 100644
diff --git a/lab06/bin/.gitignore b/lab06/bin/.gitignore
old mode 100755
new mode 100644
diff --git a/lab07/.classpath b/lab07/.classpath
old mode 100755
new mode 100644
diff --git a/lab07/bin/.gitignore b/lab07/bin/.gitignore
old mode 100755
new mode 100644
--
GitLab