diff --git a/license.txt b/license.txt index 71619c0..a4e22bb 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) [2018] [Dalton Smith] +Copyright (c) 2022 Pittsford Robotics Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +19,25 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +MIT License + +Copyright (c) [2018] [Dalton Smith] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/src/main/java/activities/LogoutActivity.java b/src/main/java/activities/LogoutActivity.java index 79bd0dc..1641283 100644 --- a/src/main/java/activities/LogoutActivity.java +++ b/src/main/java/activities/LogoutActivity.java @@ -107,7 +107,7 @@ public void logoutUserWithHours( // show user logout text Platform.runLater( () -> { - GrizzlyScene.setMessageBoxText("Logged out user: " + userID); + GrizzlyScene.setMessageBoxText("Logged out user!"); GrizzlyScene.clearInput(); }); } @@ -144,4 +144,4 @@ public int getCurrentDateColumn() { dbUtils.setCellData(0, i, currentDate, Constants.kLogSheet); return i; } -} +} \ No newline at end of file diff --git a/src/main/java/activities/UserActivity.java b/src/main/java/activities/UserActivity.java index 976e359..cc84065 100644 --- a/src/main/java/activities/UserActivity.java +++ b/src/main/java/activities/UserActivity.java @@ -134,7 +134,7 @@ public int doesIdExist(ArrayList ids, String userID) { // login our user public void loginUser(String userID) { - Platform.runLater(() -> GrizzlyScene.setMessageBoxText("Logging in user: " + userID)); + Platform.runLater(() -> GrizzlyScene.setMessageBoxText("Logging in user!")); // grab the current time from system and format it into string LocalDateTime loginTime = LocalDateTime.now(); @@ -149,7 +149,7 @@ public void loginUser(String userID) { Platform.runLater( () -> { - GrizzlyScene.setMessageBoxText("Successfully logged in user: " + userID); + GrizzlyScene.setMessageBoxText("Successfully logged in user!"); GrizzlyScene.clearInput(); }); } @@ -157,7 +157,7 @@ public void loginUser(String userID) { // logout the user public void logoutUser(String userID) { - Platform.runLater(() -> GrizzlyScene.setMessageBoxText("Logging out user: " + userID)); + Platform.runLater(() -> GrizzlyScene.setMessageBoxText("Logging out user!")); // grab the row the user is on int userRow = @@ -260,4 +260,4 @@ public boolean isValidID(String userID) { return false; } } -} +} \ No newline at end of file