2022 Demo

paulnguyen · May 19, 2022 · ccaeaee · ccaeaee
1 parent 06f4097
commit ccaeaee
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/gaspump/gaspump_v1/.gradle/5.6/gc.properties b/gaspump/gaspump_v1/.gradle/5.6/gc.properties
diff --git a/gaspump/gaspump_v1/.gradle/buildOutputCleanup/cache.properties b/gaspump/gaspump_v1/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Sat May 14 14:20:18 PDT 2022
+gradle.version=4.9
diff --git a/gaspump/gaspump_v1/.gradle/vcs-1/gc.properties b/gaspump/gaspump_v1/.gradle/vcs-1/gc.properties
diff --git a/gaspump/gaspump_v1/.gradle/vcsWorkingDirs/gc.properties b/gaspump/gaspump_v1/.gradle/vcsWorkingDirs/gc.properties
diff --git a/gaspump/gaspump_v1/build.gradle b/gaspump/gaspump_v1/build.gradle
@@ -50,9 +50,7 @@ repositories {
 dependencies {
     runtime fileTree(dir: 'libs', include: '*.jar')
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile group: 'junit', name: 'junit', version: '4.+'
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
-    testCompile group: 'junit', name: 'junit', version: '4.+'
 }
 
 shadowJar {

diff --git a/gaspump/gaspump_v1/src/main/java/Screen.java b/gaspump/gaspump_v1/src/main/java/Screen.java
@@ -36,7 +36,7 @@ private String getAd() {
     private State CW = new StateCarWash(this) ;  
     private State CWP = new StateCarWashPackage(this) ;
 
-    private State current = CW ;
+    private State current = S6 ;
 
     public void setState( int new_state ) {
         switch ( new_state ) {

diff --git a/gaspump/gaspump_v1/src/main/java/State0.java b/gaspump/gaspump_v1/src/main/java/State0.java
@@ -12,19 +12,19 @@ public State0( Screen screen ) {
 
 	public void key( String keypad ) { }
 
-	public String A() { return "Credit" ; }
-	public String B() { return "Debit" ; }
-	public String C() { return "" ; }
-	public String D() { return "" ; }
+	public String A() { return "" ; }
+	public String B() { return "" ; }
+	public String C() { return "Credit" ; }
+	public String D() { return "Debit" ; }
 	public String E() { return "" ; }
 	public String F() { return "" ; }
 	public String G() { return "" ; }
 	public String H() { return "" ; }
 
-	public void doA() { screen.setState(1) ; }
-	public void doB() { screen.setState(2) ; }
-	public void doC() { }
-	public void doD() { }
+	public void doA() { }
+	public void doB() { }
+	public void doC() { screen.setState(1) ; }
+	public void doD() { screen.setState(2) ; }
 	public void doE() { }
 	public void doF() { }
 	public void doG() { }

diff --git a/gaspump/gaspump_v1/src/main/java/State5.java b/gaspump/gaspump_v1/src/main/java/State5.java
@@ -10,7 +10,7 @@ public State5( Screen screen ) {
 	public String message1() { return "Select Grade & Pump Gas..." ; }
 	public String message2() { return "" ; }
 
-	public void key( String keypad ) { screen.setState(6) ; }
+	public void key( String keypad ) { screen.setState(7) ; }
 
 	public String A() { return "" ; }
 	public String B() { return "" ; }

diff --git a/gaspump/gaspump_v1/src/main/java/State6.java b/gaspump/gaspump_v1/src/main/java/State6.java
@@ -10,7 +10,7 @@ public State6( Screen screen ) {
 	public String message1() { return "Print Receipt?" ; }
 	public String message2() { return "" ; }
 
-	public void key( String keypad ) { screen.setState(7) ;}
+	public void key( String keypad ) { screen.setState(-1) ;}
 
 	public String A() { return "" ; 	}
 	public String B() { return "" ; 	}
@@ -21,14 +21,14 @@ public State6( Screen screen ) {
 	public String G() { return "Help" ; }
 	public String H() { return "Done" ; }
 
-	public void doA() { screen.setState(7) ; }
-	public void doB() { screen.setState(7) ; }
-	public void doC() { screen.setState(7) ; }
-	public void doD() { screen.setState(7) ; }
-	public void doE() { screen.setState(7) ; }
-	public void doF() { screen.setState(7) ; }
-	public void doG() { screen.setState(7) ; }
-	public void doH() { screen.setState(7) ; }
+	public void doA() { }
+	public void doB() { }
+	public void doC() { screen.setState(-1) ; }
+	public void doD() { screen.setState(-1) ; }
+	public void doE() { }
+	public void doF() { }
+	public void doG() { screen.setState(-1) ; }
+	public void doH() { screen.setState(-1) ; }
 
 }