tooltip change

s0urc3d3v · Feb 2, 2017 · 4345cee · 4345cee
1 parent 86e4d2f
commit 4345cee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/WHS_planner/Main.java b/src/main/java/WHS_planner/Main.java
@@ -20,6 +20,9 @@
 
 public class
 Main extends Application {
+
+    public static final String  VERSION_NUMBER = "1.1.1";
+
     //ON first run move jfoenix to a place it can be referenced on a remote system
     private static String readKey = null;
     private static MainPane mainPane;

diff --git a/src/main/java/WHS_planner/UI/Home.java b/src/main/java/WHS_planner/UI/Home.java
@@ -374,14 +374,16 @@ private void checkForSpecialDayTooltip(Tooltip temp){
             e.printStackTrace();
         }
 
-        try {
-            if(bellTimesFile.size()>5) {
-                if (now.get(Calendar.MONTH) == Integer.parseInt(bellTimesFile.get(0)) - 1 && now.get(Calendar.DAY_OF_MONTH) == Integer.parseInt(bellTimesFile.get(1)) && now.get(Calendar.YEAR) == Integer.parseInt(bellTimesFile.get(2))) {
-                    temp.setText("Today is a special schedule, check 'Bell Schedule' for the updated info!");
+        while(bellTimesFile.size()>4) {
+            if (now.get(Calendar.MONTH) == Integer.parseInt(bellTimesFile.get(0)) - 1 && now.get(Calendar.DAY_OF_MONTH) == Integer.parseInt(bellTimesFile.get(1)) && now.get(Calendar.YEAR) == Integer.parseInt(bellTimesFile.get(2))) {
+                temp.setText("Today is a special schedule, check 'Bell Schedule' for the updated info!");
+                break;
+            }else{
+                int numberOfRows = Integer.parseInt(bellTimesFile.get(3));
+                for (int i = 0; i < numberOfRows*2+4; i++) {
+                    bellTimesFile.remove(0);
                 }
             }
-        }catch (Exception e){
-            e.printStackTrace();
         }
     }
 }
diff --git a/src/main/java/WHS_planner/UI/MainPane.java b/src/main/java/WHS_planner/UI/MainPane.java
@@ -1,6 +1,7 @@
 package WHS_planner.UI;
 
 import WHS_planner.Calendar.CalendarYear;
+import WHS_planner.Main;
 import WHS_planner.News.ui.NewsUI;
 import WHS_planner.Schedule.Schedule;
 import com.jfoenix.controls.*;
@@ -160,7 +161,7 @@ private void initiateDropDown(Button bigButton) {
                 info.getChildren().add(new Label("Created in HACS under the guidance of Mr. Hopps!\n "));
 
                 info.getChildren().add(versionLabel);
-                info.getChildren().add(new Label("1.1.0\n "));
+                info.getChildren().add(new Label(Main.VERSION_NUMBER+" \n "));
                 info.getChildren().add(peopleLabel);
                 String[] names = new String[]{
                         "Tzur Almog - Calendar",