Merge branch 'main' of https://github.com/Software-Engineering-Expedi…

…a/projectFiles
Software-Engineering-Expedia · May 13, 2021 · b0a1336 · b0a1336
2 parents d9f22c3 + d205a90
commit b0a1336
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/Expedia/src/application/Main.java b/Expedia/src/application/Main.java
@@ -63,7 +63,7 @@ public void start(Stage primaryStage)
 
  //DepartTimes
  GridPane right = new GridPane();
- Label lb1 = new Label("Depart Times: "
+ Label lb1 = new Label("Depart Times and Price: "
  + " ");
  right.setMinWidth(200);
  right.setMaxWidth(200);
@@ -134,19 +134,11 @@ public void start(Stage primaryStage)
  {
  String strSTA = startLocTF.getValue();
  String strEND = endLocTF.getValue();
-
- System.out.println(strEND);
- if(strEND =="Miami")
- {
- //waiting.setText("Select One Time");
- times1.setText("11:30 AM\n");
- times2.setText("12:20 PM\n");
- times3.setText("1:15 PM");
- }
- else
- {
- waiting.setText( "1");
- }
+ waiting.setText("Select One Time");
+ times1.setText("11:30 AM - $150\n");
+ times2.setText("12:20 PM - $230\n");
+ times3.setText("1:15 PM - $275");
+
  //fileIO locLog = new fileIO();
  //locLog.writeToFile(strSTA, strEND);