From af2622b05c8b67c42135448ccaf5d63883618e76 Mon Sep 17 00:00:00 2001 From: VladimirEliTokarev Date: Wed, 5 Oct 2016 12:28:19 +0300 Subject: [PATCH] Changed the project structure --- .../VotingBoothConfiguration.java | 2 +- .../VotingBoothConfigurationCreator.java | 2 +- .../gui/{ => managment}/ChainBuilder.java | 17 +++++++++-------- .../voting/gui/{ => managment}/Main.java | 4 +++- .../voting/gui/{ => managment}/TwoWayNode.java | 3 ++- .../{ => managment}/VotingBoothGUIManager.java | 6 +++--- .../ballot_summary/BallotSummaryController.java | 4 ++-- .../ballot_summary/BallotSummaryLoader.java | 6 +++--- .../cast_or_audit/CastOrAuditController.java | 4 ++-- .../cast_or_audit/CastOrAuditLoader.java | 6 +++--- .../PicturesAnswersUpdater.java | 2 +- .../SelectCandidateByPictureController.java | 4 ++-- .../SelectCandidateByPictureLoader.java | 8 ++++---- .../SelectCandidateNameController.java | 4 ++-- .../SelectCandidateNameLoader.java | 6 +++--- .../StringsAnswersUpdater.java | 2 +- .../StraightChannelSectionController.java | 4 ++-- .../StraightChannelSectionLoader.java | 6 +++--- .../VoteHaveBeenCastController.java | 4 ++-- .../VoteHaveBeenCastLoader.java | 7 +++---- .../welcome_splash/WelcomeSplashController.java | 4 ++-- .../welcome_splash/WelcomeSplashLoader.java | 8 +++----- .../{ => gui}/ui/GraphicalUserInterface.java | 6 +++--- .../src/main/resources/view/ballot_summary.fxml | 2 +- .../src/main/resources/view/cast_or_audit.fxml | 2 +- .../view/select_candidate_by_picture.fxml | 2 +- .../resources/view/select_candidate_name.fxml | 2 +- .../view/straight_channel_section.fxml | 2 +- .../resources/view/vote_have_been_cast.fxml | 2 +- .../resources/view/welcome_splash_screen.fxml | 2 +- .../VotingBoothConfigurationCreatorTest.java | 2 +- .../java/meerkat/voting/VotingBoothToyRun.java | 2 +- .../controller/VotingBoothController.java | 2 +- .../voting/controller/VotingBoothImpl.java | 2 +- .../callbacks/CastOrAuditCallback.java | 2 +- .../voting/{ => gui}/ui/CommandPend.java | 2 +- .../voting/{ => gui}/ui/SystemConsoleUI.java | 5 ++--- .../voting/{ => gui}/ui/TickerTimerTask.java | 6 +++--- .../meerkat/voting/{ => gui}/ui/UIUtils.java | 2 +- .../voting/{ => gui}/ui/VotingBoothUI.java | 2 +- .../ui/uicommands/CastOrAuditUICommand.java | 4 ++-- .../ui/uicommands/ChannelChoiceUICommand.java | 2 +- .../ui/uicommands/FatalErrorUICommand.java | 2 +- .../ui/uicommands/RaceVotingUICommand.java | 2 +- .../ui/uicommands/StartSessionUICommand.java | 2 +- .../{ => gui}/ui/uicommands/TickCommand.java | 2 +- .../{ => gui}/ui/uicommands/UICommand.java | 2 +- .../ui/uicommands/WaitForFinishUICommand.java | 2 +- 48 files changed, 89 insertions(+), 89 deletions(-) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => configuration}/VotingBoothConfiguration.java (91%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => configuration}/VotingBoothConfigurationCreator.java (99%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => managment}/ChainBuilder.java (87%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => managment}/Main.java (88%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => managment}/TwoWayNode.java (95%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => managment}/VotingBoothGUIManager.java (97%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/ballot_summary/BallotSummaryController.java (89%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/ballot_summary/BallotSummaryLoader.java (89%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/cast_or_audit/CastOrAuditController.java (86%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/cast_or_audit/CastOrAuditLoader.java (89%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/select_candidate_by_picture/PicturesAnswersUpdater.java (98%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/select_candidate_by_picture/SelectCandidateByPictureController.java (91%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/select_candidate_by_picture/SelectCandidateByPictureLoader.java (81%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/select_candidate_name/SelectCandidateNameController.java (91%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/select_candidate_name/SelectCandidateNameLoader.java (89%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/select_candidate_name/StringsAnswersUpdater.java (98%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/straight_channel_section/StraightChannelSectionController.java (95%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/straight_channel_section/StraightChannelSectionLoader.java (89%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/vote_have_been_cast/VoteHaveBeenCastController.java (78%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/vote_have_been_cast/VoteHaveBeenCastLoader.java (88%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/welcome_splash/WelcomeSplashController.java (86%) rename voting-booth-gui/src/main/java/meerkat/voting/gui/{ => panels}/welcome_splash/WelcomeSplashLoader.java (88%) rename voting-booth-gui/src/main/java/meerkat/voting/{ => gui}/ui/GraphicalUserInterface.java (97%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/CommandPend.java (98%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/SystemConsoleUI.java (99%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/TickerTimerTask.java (74%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/UIUtils.java (98%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/VotingBoothUI.java (98%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/CastOrAuditUICommand.java (76%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/ChannelChoiceUICommand.java (93%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/FatalErrorUICommand.java (94%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/RaceVotingUICommand.java (93%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/StartSessionUICommand.java (87%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/TickCommand.java (89%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/UICommand.java (90%) rename voting-booth/src/main/java/meerkat/voting/{ => gui}/ui/uicommands/WaitForFinishUICommand.java (92%) diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfiguration.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfiguration.java similarity index 91% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfiguration.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfiguration.java index f87507e..9a1b73c 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfiguration.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfiguration.java @@ -1,4 +1,4 @@ -package meerkat.voting.gui; +package meerkat.voting.gui.configuration; import meerkat.protobuf.BallotQuestionUIElementOuterClass; /** diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfigurationCreator.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfigurationCreator.java similarity index 99% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfigurationCreator.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfigurationCreator.java index 213e2db..405065f 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfigurationCreator.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfigurationCreator.java @@ -1,4 +1,4 @@ -package meerkat.voting.gui; +package meerkat.voting.gui.configuration; import com.google.protobuf.ByteString; import meerkat.protobuf.BallotQuestionUIElementOuterClass; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/ChainBuilder.java similarity index 87% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/managment/ChainBuilder.java index dd3d572..c2fb51e 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/ChainBuilder.java @@ -1,13 +1,14 @@ -package meerkat.voting.gui; +package meerkat.voting.gui.managment; import javafx.stage.Stage; -import meerkat.voting.gui.ballot_summary.BallotSummaryLoader; -import meerkat.voting.gui.cast_or_audit.CastOrAuditLoader; -import meerkat.voting.gui.select_candidate_by_picture.SelectCandidateByPictureLoader; -import meerkat.voting.gui.select_candidate_name.SelectCandidateNameLoader; -import meerkat.voting.gui.straight_channel_section.StraightChannelSectionLoader; -import meerkat.voting.gui.vote_have_been_cast.VoteHaveBeenCastLoader; -import meerkat.voting.gui.welcome_splash.WelcomeSplashLoader; +import meerkat.voting.gui.panels.ballot_summary.BallotSummaryLoader; +import meerkat.voting.gui.panels.cast_or_audit.CastOrAuditLoader; +import meerkat.voting.gui.panels.select_candidate_by_picture.SelectCandidateByPictureLoader; +import meerkat.voting.gui.panels.select_candidate_name.SelectCandidateNameLoader; +import meerkat.voting.gui.panels.straight_channel_section.StraightChannelSectionLoader; +import meerkat.voting.gui.panels.vote_have_been_cast.VoteHaveBeenCastLoader; +import meerkat.voting.gui.panels.welcome_splash.WelcomeSplashLoader; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; import java.util.HashMap; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/Main.java similarity index 88% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/managment/Main.java index eed61fe..e0e0daa 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/Main.java @@ -1,7 +1,9 @@ -package meerkat.voting.gui; +package meerkat.voting.gui.managment; import javafx.application.Application; import javafx.stage.Stage; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; +import meerkat.voting.gui.configuration.VotingBoothConfigurationCreator; import org.json.JSONException; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/TwoWayNode.java similarity index 95% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/managment/TwoWayNode.java index 9a0fd4e..201bc16 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/TwoWayNode.java @@ -1,8 +1,9 @@ -package meerkat.voting.gui; +package meerkat.voting.gui.managment; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.stage.Stage; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/VotingBoothGUIManager.java similarity index 97% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/managment/VotingBoothGUIManager.java index 9b3f1ca..b3764e4 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/managment/VotingBoothGUIManager.java @@ -1,11 +1,11 @@ -package meerkat.voting.gui; +package meerkat.voting.gui.managment; import com.google.common.util.concurrent.FutureCallback; import javafx.application.Application; import javafx.stage.Stage; import meerkat.protobuf.Voting; -import meerkat.voting.VotingBooth; -import meerkat.voting.ui.VotingBoothUI; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; +import meerkat.voting.gui.ui.VotingBoothUI; import org.slf4j.LoggerFactory; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryController.java similarity index 89% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryController.java index cde28bb..ebe0034 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryController.java @@ -1,8 +1,8 @@ -package meerkat.voting.gui.ballot_summary; +package meerkat.voting.gui.panels.ballot_summary; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryLoader.java similarity index 89% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryLoader.java index ef8ac28..93413fa 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryLoader.java @@ -1,10 +1,10 @@ -package meerkat.voting.gui.ballot_summary; +package meerkat.voting.gui.panels.ballot_summary; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditController.java similarity index 86% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditController.java index 61f7301..bd59780 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditController.java @@ -1,8 +1,8 @@ -package meerkat.voting.gui.cast_or_audit; +package meerkat.voting.gui.panels.cast_or_audit; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditLoader.java similarity index 89% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditLoader.java index d3adc8c..1bcffbf 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditLoader.java @@ -1,10 +1,10 @@ -package meerkat.voting.gui.cast_or_audit; +package meerkat.voting.gui.panels.cast_or_audit; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/PicturesAnswersUpdater.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/PicturesAnswersUpdater.java similarity index 98% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/PicturesAnswersUpdater.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/PicturesAnswersUpdater.java index cc77b6e..f6819b1 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/PicturesAnswersUpdater.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/PicturesAnswersUpdater.java @@ -1,4 +1,4 @@ -package meerkat.voting.gui.select_candidate_by_picture; +package meerkat.voting.gui.panels.select_candidate_by_picture; import com.google.protobuf.ByteString; import javafx.embed.swing.SwingFXUtils; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureController.java similarity index 91% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureController.java index 6ebb0ea..12fea25 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureController.java @@ -1,8 +1,8 @@ -package meerkat.voting.gui.select_candidate_by_picture; +package meerkat.voting.gui.panels.select_candidate_by_picture; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureLoader.java similarity index 81% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureLoader.java index cdbb4a7..9381ddb 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureLoader.java @@ -1,10 +1,10 @@ -package meerkat.voting.gui.select_candidate_by_picture; +package meerkat.voting.gui.panels.select_candidate_by_picture; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; /** @@ -33,7 +33,7 @@ public class SelectCandidateByPictureLoader { */ public TwoWayNode GetSelectCandidateByPicture() throws IOException { Parent selectByPicture = fxmlLoader.load(); - meerkat.voting.gui.select_candidate_by_picture.SelectCandidateByPictureController controller = fxmlLoader.getController(); + meerkat.voting.gui.panels.select_candidate_by_picture.SelectCandidateByPictureController controller = fxmlLoader.getController(); // set the controller to be functional TwoWayNode controller.SetCurrentScene(selectByPicture); diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameController.java similarity index 91% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameController.java index 1cc2653..f2305d1 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameController.java @@ -1,8 +1,8 @@ -package meerkat.voting.gui.select_candidate_name; +package meerkat.voting.gui.panels.select_candidate_name; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameLoader.java similarity index 89% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameLoader.java index 0daa19c..e8a9860 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameLoader.java @@ -1,10 +1,10 @@ -package meerkat.voting.gui.select_candidate_name; +package meerkat.voting.gui.panels.select_candidate_name; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/StringsAnswersUpdater.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/StringsAnswersUpdater.java similarity index 98% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/StringsAnswersUpdater.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/StringsAnswersUpdater.java index cb8ba57..455232e 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/StringsAnswersUpdater.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/StringsAnswersUpdater.java @@ -1,4 +1,4 @@ -package meerkat.voting.gui.select_candidate_name; +package meerkat.voting.gui.panels.select_candidate_name; import com.google.protobuf.ByteString; import javafx.event.Event; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java similarity index 95% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java index ac8c33a..1bce65a 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java @@ -1,10 +1,10 @@ -package meerkat.voting.gui.straight_channel_section; +package meerkat.voting.gui.panels.straight_channel_section; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.TextField; import javafx.scene.input.MouseEvent; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; import java.util.ArrayList; import java.util.List; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionLoader.java similarity index 89% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionLoader.java index 8ed626e..ed29109 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionLoader.java @@ -1,10 +1,10 @@ -package meerkat.voting.gui.straight_channel_section; +package meerkat.voting.gui.panels.straight_channel_section; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java similarity index 78% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java index fc433fd..4b498a2 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java @@ -1,6 +1,6 @@ -package meerkat.voting.gui.vote_have_been_cast; +package meerkat.voting.gui.panels.vote_have_been_cast; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastLoader.java similarity index 88% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastLoader.java index fbbe670..17844e7 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastLoader.java @@ -1,11 +1,10 @@ -package meerkat.voting.gui.vote_have_been_cast; +package meerkat.voting.gui.panels.vote_have_been_cast; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; -import meerkat.voting.ui.VotingBoothUI; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashController.java similarity index 86% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashController.java index b4e93fc..4c723d1 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashController.java @@ -1,8 +1,8 @@ -package meerkat.voting.gui.welcome_splash; +package meerkat.voting.gui.panels.welcome_splash; import javafx.fxml.FXML; import javafx.scene.input.MouseEvent; -import meerkat.voting.gui.TwoWayNode; +import meerkat.voting.gui.managment.TwoWayNode; /** * Created by Vladimir Eliezer Tokarev on 8/27/2016. diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashLoader.java similarity index 88% rename from voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashLoader.java index 9914f86..4c8a77b 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashLoader.java @@ -1,12 +1,10 @@ -package meerkat.voting.gui.welcome_splash; +package meerkat.voting.gui.panels.welcome_splash; -import javafx.concurrent.Task; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; -import javafx.scene.Scene; import javafx.stage.Stage; -import meerkat.voting.gui.TwoWayNode; -import meerkat.voting.gui.VotingBoothConfiguration; +import meerkat.voting.gui.managment.TwoWayNode; +import meerkat.voting.gui.configuration.VotingBoothConfiguration; import java.io.IOException; diff --git a/voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java similarity index 97% rename from voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java rename to voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java index 6fba00d..e8847f6 100644 --- a/voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java +++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java @@ -1,9 +1,9 @@ -package meerkat.voting.ui; +package meerkat.voting.gui.ui; -import meerkat.voting.gui.VotingBoothGUIManager; +import meerkat.voting.gui.managment.VotingBoothGUIManager; import meerkat.protobuf.Voting; import meerkat.voting.controller.callbacks.*; -import meerkat.voting.ui.uicommands.*; +import meerkat.voting.gui.ui.uicommands.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/voting-booth-gui/src/main/resources/view/ballot_summary.fxml b/voting-booth-gui/src/main/resources/view/ballot_summary.fxml index eadc6fa..82d804e 100644 --- a/voting-booth-gui/src/main/resources/view/ballot_summary.fxml +++ b/voting-booth-gui/src/main/resources/view/ballot_summary.fxml @@ -7,7 +7,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml b/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml index 8d8270f..a64f674 100644 --- a/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml +++ b/voting-booth-gui/src/main/resources/view/cast_or_audit.fxml @@ -7,7 +7,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml index 096b1f7..cbfb246 100644 --- a/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml +++ b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml @@ -7,7 +7,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml index dd0d5f5..20c6065 100644 --- a/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml +++ b/voting-booth-gui/src/main/resources/view/select_candidate_name.fxml @@ -6,7 +6,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml b/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml index b497086..f5ad9a4 100644 --- a/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml +++ b/voting-booth-gui/src/main/resources/view/straight_channel_section.fxml @@ -6,7 +6,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml b/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml index 9ee4093..0633ef4 100644 --- a/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml +++ b/voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml @@ -8,7 +8,7 @@ - + diff --git a/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml b/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml index 24de823..ebd4801 100644 --- a/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml +++ b/voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml @@ -5,7 +5,7 @@ - + diff --git a/voting-booth-gui/src/test/java/meerkat/voting/VotingBoothConfigurationCreatorTest.java b/voting-booth-gui/src/test/java/meerkat/voting/VotingBoothConfigurationCreatorTest.java index b32d6be..3bc834e 100644 --- a/voting-booth-gui/src/test/java/meerkat/voting/VotingBoothConfigurationCreatorTest.java +++ b/voting-booth-gui/src/test/java/meerkat/voting/VotingBoothConfigurationCreatorTest.java @@ -1,6 +1,6 @@ package meerkat.voting; -import meerkat.voting.gui.VotingBoothConfigurationCreator; +import meerkat.voting.gui.configuration.VotingBoothConfigurationCreator; import org.factcenter.qilin.util.Pair; import org.json.JSONArray; import org.json.JSONException; diff --git a/voting-booth/src/main/java/meerkat/voting/VotingBoothToyRun.java b/voting-booth/src/main/java/meerkat/voting/VotingBoothToyRun.java index 65b6685..f872d83 100644 --- a/voting-booth/src/main/java/meerkat/voting/VotingBoothToyRun.java +++ b/voting-booth/src/main/java/meerkat/voting/VotingBoothToyRun.java @@ -8,7 +8,7 @@ import meerkat.voting.controller.*; import meerkat.voting.output.*; import meerkat.voting.storage.*; import meerkat.voting.encryptor.*; -import meerkat.voting.ui.*; +import meerkat.voting.gui.ui.*; import java.io.FileOutputStream; import java.io.IOException; diff --git a/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothController.java b/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothController.java index 6008d24..a7204bf 100644 --- a/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothController.java +++ b/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothController.java @@ -1,7 +1,7 @@ package meerkat.voting.controller; import meerkat.voting.encryptor.VBCryptoManager; -import meerkat.voting.ui.VotingBoothUI; +import meerkat.voting.gui.ui.VotingBoothUI; import meerkat.voting.output.BallotOutputDevice; import meerkat.voting.storage.StorageManager; diff --git a/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothImpl.java b/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothImpl.java index 4903424..8c4fd31 100644 --- a/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothImpl.java +++ b/voting-booth/src/main/java/meerkat/voting/controller/VotingBoothImpl.java @@ -9,7 +9,7 @@ import meerkat.voting.encryptor.VBCryptoManager; import meerkat.voting.encryptor.VBCryptoManager.EncryptionAndSecrets; import meerkat.voting.output.BallotOutputDevice; import meerkat.voting.storage.StorageManager; -import meerkat.voting.ui.VotingBoothUI; +import meerkat.voting.gui.ui.VotingBoothUI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/voting-booth/src/main/java/meerkat/voting/controller/callbacks/CastOrAuditCallback.java b/voting-booth/src/main/java/meerkat/voting/controller/callbacks/CastOrAuditCallback.java index 7226f83..7d5de80 100644 --- a/voting-booth/src/main/java/meerkat/voting/controller/callbacks/CastOrAuditCallback.java +++ b/voting-booth/src/main/java/meerkat/voting/controller/callbacks/CastOrAuditCallback.java @@ -2,7 +2,7 @@ package meerkat.voting.controller.callbacks; import meerkat.protobuf.Voting.UIElement; import meerkat.voting.controller.commands.*; -import meerkat.voting.ui.VotingBoothUI.*; +import meerkat.voting.gui.ui.VotingBoothUI.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.concurrent.LinkedBlockingQueue; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/CommandPend.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/CommandPend.java similarity index 98% rename from voting-booth/src/main/java/meerkat/voting/ui/CommandPend.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/CommandPend.java index a12d3ac..cbaffa1 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/CommandPend.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/CommandPend.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui; +package meerkat.voting.gui.ui; import java.util.concurrent.ArrayBlockingQueue; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/SystemConsoleUI.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/SystemConsoleUI.java similarity index 99% rename from voting-booth/src/main/java/meerkat/voting/ui/SystemConsoleUI.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/SystemConsoleUI.java index 8c3f8aa..cb00216 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/SystemConsoleUI.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/SystemConsoleUI.java @@ -1,7 +1,6 @@ -package meerkat.voting.ui; +package meerkat.voting.gui.ui; import com.google.common.util.concurrent.FutureCallback; -import com.google.protobuf.ByteString; import meerkat.protobuf.Voting.*; import java.io.BufferedReader; @@ -10,7 +9,7 @@ import java.io.InputStreamReader; import java.util.*; import meerkat.voting.controller.callbacks.*; -import meerkat.voting.ui.uicommands.*; +import meerkat.voting.gui.ui.uicommands.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/TickerTimerTask.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java similarity index 74% rename from voting-booth/src/main/java/meerkat/voting/ui/TickerTimerTask.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java index 42924c2..fd6a804 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/TickerTimerTask.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java @@ -1,7 +1,7 @@ -package meerkat.voting.ui; +package meerkat.voting.gui.ui; -import meerkat.voting.ui.uicommands.TickCommand; -import meerkat.voting.ui.uicommands.UICommand; +import meerkat.voting.gui.ui.uicommands.TickCommand; +import meerkat.voting.gui.ui.uicommands.UICommand; import java.util.TimerTask; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/UIUtils.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java similarity index 98% rename from voting-booth/src/main/java/meerkat/voting/ui/UIUtils.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java index 9c723e0..580b579 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/UIUtils.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui; +package meerkat.voting.gui.ui; import com.google.protobuf.ByteString; import meerkat.protobuf.Voting; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/VotingBoothUI.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/VotingBoothUI.java similarity index 98% rename from voting-booth/src/main/java/meerkat/voting/ui/VotingBoothUI.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/VotingBoothUI.java index c4e1f1e..52e7b2a 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/VotingBoothUI.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/VotingBoothUI.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui; +package meerkat.voting.gui.ui; import com.google.common.util.concurrent.FutureCallback; import meerkat.protobuf.Voting.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/CastOrAuditUICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/CastOrAuditUICommand.java similarity index 76% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/CastOrAuditUICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/CastOrAuditUICommand.java index 583a4a2..915db6f 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/CastOrAuditUICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/CastOrAuditUICommand.java @@ -1,7 +1,7 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.voting.controller.callbacks.*; -import meerkat.voting.ui.VotingBoothUI.FinalizeBallotChoice; +import meerkat.voting.gui.ui.VotingBoothUI.FinalizeBallotChoice; /** * This command signals the UI that the voter should now choose whether to Cast or Audit the ballot diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/ChannelChoiceUICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/ChannelChoiceUICommand.java similarity index 93% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/ChannelChoiceUICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/ChannelChoiceUICommand.java index 185e255..6e43239 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/ChannelChoiceUICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/ChannelChoiceUICommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.protobuf.Voting.*; import meerkat.voting.controller.callbacks.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/FatalErrorUICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/FatalErrorUICommand.java similarity index 94% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/FatalErrorUICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/FatalErrorUICommand.java index 98af0e4..5c19dc2 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/FatalErrorUICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/FatalErrorUICommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.protobuf.Voting.UIElement; import meerkat.voting.controller.callbacks.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/RaceVotingUICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/RaceVotingUICommand.java similarity index 93% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/RaceVotingUICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/RaceVotingUICommand.java index 9b329bc..83432d3 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/RaceVotingUICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/RaceVotingUICommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.protobuf.Voting.*; import meerkat.voting.controller.callbacks.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/StartSessionUICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/StartSessionUICommand.java similarity index 87% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/StartSessionUICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/StartSessionUICommand.java index b40bb5d..24b7fa3 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/StartSessionUICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/StartSessionUICommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.voting.controller.callbacks.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/TickCommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/TickCommand.java similarity index 89% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/TickCommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/TickCommand.java index e9bb2b7..4d80005 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/TickCommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/TickCommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.voting.controller.callbacks.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/UICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/UICommand.java similarity index 90% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/UICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/UICommand.java index e579133..19844e3 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/UICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/UICommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.voting.controller.callbacks.*; diff --git a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/WaitForFinishUICommand.java b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/WaitForFinishUICommand.java similarity index 92% rename from voting-booth/src/main/java/meerkat/voting/ui/uicommands/WaitForFinishUICommand.java rename to voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/WaitForFinishUICommand.java index 5e5d504..205bac2 100644 --- a/voting-booth/src/main/java/meerkat/voting/ui/uicommands/WaitForFinishUICommand.java +++ b/voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/WaitForFinishUICommand.java @@ -1,4 +1,4 @@ -package meerkat.voting.ui.uicommands; +package meerkat.voting.gui.ui.uicommands; import meerkat.protobuf.Voting.*; import meerkat.voting.controller.callbacks.*;