Skip to content

Commit 9d2214b

Browse files
updates to 6_CourseSchedulerGUI/*.java files; add 6_CourseSchedulerGUI/{CourseSchedulerGUI.java,README.md,img}; update .gitignore
1 parent 0a3134b commit 9d2214b

Some content is hidden

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

52 files changed

+1046
-75
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.DS_Store
2+
13
# Compiled class file
24
*.class
35

6_CourseSchedulerGUI/CourseEntry.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
public class CourseEntry extends java.lang.Object {
1+
import java.lang.Object;
2+
3+
public class CourseEntry extends Object {
24

35
private String semester;
46
private String courseCode;
@@ -28,17 +30,14 @@ public CourseEntry (String semester,
2830
public int getSeats () { return seats; }
2931
// END getters
3032

31-
33+
3234
// string representation of object `CourseEntry`
3335
@Override
3436
public String toString () {
3537
return String.format(
36-
"Course Entry%n%s%n%s%n%s%n%d%n%n",
37-
getSemester(),
38-
getCourseCode(),
39-
getDescription(),
40-
getSeats()
38+
"%s",
39+
getCourseCode()
4140
);
4241
}
43-
44-
}
42+
43+
}

6_CourseSchedulerGUI/CourseQueries.java

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import java.lang.Object;
12
import java.sql.Connection;
23
import java.sql.PreparedStatement;
34
import java.sql.ResultSet;
45
import java.sql.SQLException;
56
import java.util.ArrayList;
67

7-
public class CourseQueries extends java.lang.Object {
8+
public class CourseQueries extends Object {
89

910
private static Connection conn;
1011
private static PreparedStatement selectAllCourses;
@@ -14,11 +15,12 @@ public class CourseQueries extends java.lang.Object {
1415
private static PreparedStatement deleteCourse;
1516
private static ResultSet resultSet;
1617

17-
public ArrayList<CourseEntry> getAllCourses (String semester) {
18+
19+
public static ArrayList<CourseEntry> getAllCourses (String semester) {
1820
conn = DBConnection.getConnection();
1921
ArrayList<CourseEntry> results = new ArrayList<CourseEntry>();
2022
try {
21-
selectAllCourses = conn.prepareStatement("select * from courses where semester = ?");
23+
selectAllCourses = conn.prepareStatement("select * from app.courses where semester = ?");
2224
selectAllCourses.setString(1, semester);
2325
resultSet = selectAllCourses.executeQuery();
2426
while (resultSet.next()) {
@@ -36,26 +38,28 @@ public ArrayList<CourseEntry> getAllCourses (String semester) {
3638
return results;
3739
}
3840

39-
public void addCourse (CourseEntry course) {
41+
42+
public static void addCourse (CourseEntry course) {
4043
conn = DBConnection.getConnection();
4144
try {
42-
insertCourse = conn.prepareStatement("insert into courses (semester, courseCode, description, seats) values (?, ?, ?, ?)");
45+
insertCourse = conn.prepareStatement("insert into app.courses (semester, courseCode, description, seats) values (?, ?, ?, ?)");
4346
insertCourse.setString(1, course.getSemester());
4447
insertCourse.setString(2, course.getCourseCode());
4548
insertCourse.setString(3, course.getDescription());
46-
insertCourse.setInt(4, course.getSeats());
49+
insertCourse.setInt( 4, course.getSeats());
4750
insertCourse.executeUpdate();
4851
}
4952
catch (SQLException se) {
5053
se.printStackTrace();
5154
}
5255
}
5356

54-
public ArrayList<String> getAllCourseCodes (String semester) {
57+
58+
public static ArrayList<String> getAllCourseCodes (String semester) {
5559
conn = DBConnection.getConnection();
5660
ArrayList<String> results = new ArrayList<String>();
5761
try {
58-
selectAllCourseCodes = conn.prepareStatement("select courseCode from courses where semester = ?");
62+
selectAllCourseCodes = conn.prepareStatement("select courseCode from app.courses where semester = ?");
5963
selectAllCourseCodes.setString(1, semester);
6064
resultSet = selectAllCourseCodes.executeQuery();
6165
while (resultSet.next()) {
@@ -68,15 +72,17 @@ public ArrayList<String> getAllCourseCodes (String semester) {
6872
return results;
6973
}
7074

71-
public int getCourseSeats (String semester,
72-
String courseCode)
75+
76+
public static int getCourseSeats (String semester,
77+
String courseCode)
7378
{
7479
conn = DBConnection.getConnection();
7580
try {
76-
selectCourseSeats = conn.prepareStatement("select seats from courses where semester = ? and courseCode = ?");
81+
selectCourseSeats = conn.prepareStatement("select seats from app.courses where semester = ? and courseCode = ?");
7782
selectCourseSeats.setString(1, semester);
7883
selectCourseSeats.setString(2, courseCode);
7984
resultSet = selectCourseSeats.executeQuery();
85+
resultSet.next();
8086
return resultSet.getInt("seats");
8187
}
8288
catch (SQLException se) {
@@ -85,12 +91,13 @@ public int getCourseSeats (String semester,
8591
}
8692
}
8793

88-
public void dropCourse (String semester,
89-
String courseCode)
94+
95+
public static void dropCourse (String semester,
96+
String courseCode)
9097
{
9198
conn = DBConnection.getConnection();
9299
try {
93-
deleteCourse = conn.prepareStatement("delete from courses where semester = ? and courseCode = ?");
100+
deleteCourse = conn.prepareStatement("delete from app.courses where semester = ? and courseCode = ?");
94101
deleteCourse.setString(1, semester);
95102
deleteCourse.setString(2, courseCode);
96103
deleteCourse.executeUpdate();
@@ -100,4 +107,4 @@ public void dropCourse (String semester,
100107
}
101108
}
102109

103-
}
110+
}

0 commit comments

Comments
 (0)