meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the project structure

android-scanner
VladimirEliTokarev 2016-10-05 12:28:19 +03:00
parent f535847ee5
commit af2622b05c
48 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfiguration.java → voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfiguration.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.gui;
package meerkat.voting.gui.configuration;
import meerkat.protobuf.BallotQuestionUIElementOuterClass;
/**

2
voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothConfigurationCreator.java → voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/VotingBoothConfigurationCreator.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.gui;
package meerkat.voting.gui.configuration;
import com.google.protobuf.ByteString;
import meerkat.protobuf.BallotQuestionUIElementOuterClass;

17
voting-booth-gui/src/main/java/meerkat/voting/gui/ChainBuilder.java → voting-booth-gui/src/main/java/meerkat/voting/gui/managment/ChainBuilder.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/Main.java → voting-booth-gui/src/main/java/meerkat/voting/gui/managment/Main.java
View File

@ -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;

3
voting-booth-gui/src/main/java/meerkat/voting/gui/TwoWayNode.java → voting-booth-gui/src/main/java/meerkat/voting/gui/managment/TwoWayNode.java
View File

@ -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.

6
voting-booth-gui/src/main/java/meerkat/voting/gui/VotingBoothGUIManager.java → voting-booth-gui/src/main/java/meerkat/voting/gui/managment/VotingBoothGUIManager.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryController.java
View File

@ -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.

6
voting-booth-gui/src/main/java/meerkat/voting/gui/ballot_summary/BallotSummaryLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/ballot_summary/BallotSummaryLoader.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditController.java
View File

@ -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.

6
voting-booth-gui/src/main/java/meerkat/voting/gui/cast_or_audit/CastOrAuditLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/cast_or_audit/CastOrAuditLoader.java
View File

@ -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;

2
voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/PicturesAnswersUpdater.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/PicturesAnswersUpdater.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureController.java
View File

@ -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.

8
voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_by_picture/SelectCandidateByPictureLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_by_picture/SelectCandidateByPictureLoader.java
View File

@ -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);

4
voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameController.java
View File

@ -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.

6
voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/SelectCandidateNameLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/SelectCandidateNameLoader.java
View File

@ -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;

2
voting-booth-gui/src/main/java/meerkat/voting/gui/select_candidate_name/StringsAnswersUpdater.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/select_candidate_name/StringsAnswersUpdater.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionController.java
View File

@ -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;

6
voting-booth-gui/src/main/java/meerkat/voting/gui/straight_channel_section/StraightChannelSectionLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/straight_channel_section/StraightChannelSectionLoader.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastController.java
View File

@ -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.

7
voting-booth-gui/src/main/java/meerkat/voting/gui/vote_have_been_cast/VoteHaveBeenCastLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/vote_have_been_cast/VoteHaveBeenCastLoader.java
View File

@ -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;

4
voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashController.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashController.java
View File

@ -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.

8
voting-booth-gui/src/main/java/meerkat/voting/gui/welcome_splash/WelcomeSplashLoader.java → voting-booth-gui/src/main/java/meerkat/voting/gui/panels/welcome_splash/WelcomeSplashLoader.java
View File

@ -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;

6
voting-booth-gui/src/main/java/meerkat/voting/ui/GraphicalUserInterface.java → voting-booth-gui/src/main/java/meerkat/voting/gui/ui/GraphicalUserInterface.java
View File

@ -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;

2
voting-booth-gui/src/main/resources/view/ballot_summary.fxml
View File

@ -7,7 +7,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.ballot_summary.BallotSummaryController">
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.ballot_summary.BallotSummaryController">
<children>
<GridPane>
<children>

2
voting-booth-gui/src/main/resources/view/cast_or_audit.fxml
View File

@ -7,7 +7,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.cast_or_audit.CastOrAuditController">
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.cast_or_audit.CastOrAuditController">
<children>
<GridPane>
<children>

2
voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
View File

@ -7,7 +7,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.select_candidate_by_picture.SelectCandidateByPictureController">
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.select_candidate_by_picture.SelectCandidateByPictureController">
<children>
<GridPane>
<children>

2
voting-booth-gui/src/main/resources/view/select_candidate_name.fxml
View File

@ -6,7 +6,7 @@
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.select_candidate_name.SelectCandidateNameController">
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.select_candidate_name.SelectCandidateNameController">
<children>
<GridPane GridPane.columnIndex="1">
<children>

2
voting-booth-gui/src/main/resources/view/straight_channel_section.fxml
View File

@ -6,7 +6,7 @@
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<GridPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.straight_channel_section.StraightChannelSectionController">
<GridPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.straight_channel_section.StraightChannelSectionController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>

2
voting-booth-gui/src/main/resources/view/vote_have_been_cast.fxml
View File

@ -8,7 +8,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.vote_have_been_cast.VoteHaveBeenCastController">
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.vote_have_been_cast.VoteHaveBeenCastController">
<children>
<GridPane>
<children>

2
voting-booth-gui/src/main/resources/view/welcome_splash_screen.fxml
View File

@ -5,7 +5,7 @@
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.welcome_splash.WelcomeSplashController">
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="meerkat.voting.gui.panels.welcome_splash.WelcomeSplashController">
<columnConstraints>
<ColumnConstraints />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />

2
voting-booth-gui/src/test/java/meerkat/voting/VotingBoothConfigurationCreatorTest.java
View File

@ -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;

2
voting-booth/src/main/java/meerkat/voting/VotingBoothToyRun.java
View File

@ -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;

2
voting-booth/src/main/java/meerkat/voting/controller/VotingBoothController.java
View File

@ -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;

2
voting-booth/src/main/java/meerkat/voting/controller/VotingBoothImpl.java
View File

@ -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;

2
voting-booth/src/main/java/meerkat/voting/controller/callbacks/CastOrAuditCallback.java
View File

@ -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;

2
voting-booth/src/main/java/meerkat/voting/ui/CommandPend.java → voting-booth/src/main/java/meerkat/voting/gui/ui/CommandPend.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui;
package meerkat.voting.gui.ui;
import java.util.concurrent.ArrayBlockingQueue;

5
voting-booth/src/main/java/meerkat/voting/ui/SystemConsoleUI.java → voting-booth/src/main/java/meerkat/voting/gui/ui/SystemConsoleUI.java
View File

@ -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;

6
voting-booth/src/main/java/meerkat/voting/ui/TickerTimerTask.java → voting-booth/src/main/java/meerkat/voting/gui/ui/TickerTimerTask.java
View File

@ -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;

2
voting-booth/src/main/java/meerkat/voting/ui/UIUtils.java → voting-booth/src/main/java/meerkat/voting/gui/ui/UIUtils.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui;
package meerkat.voting.gui.ui;
import com.google.protobuf.ByteString;
import meerkat.protobuf.Voting;

2
voting-booth/src/main/java/meerkat/voting/ui/VotingBoothUI.java → voting-booth/src/main/java/meerkat/voting/gui/ui/VotingBoothUI.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui;
package meerkat.voting.gui.ui;
import com.google.common.util.concurrent.FutureCallback;
import meerkat.protobuf.Voting.*;

4
voting-booth/src/main/java/meerkat/voting/ui/uicommands/CastOrAuditUICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/CastOrAuditUICommand.java
View File

@ -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

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/ChannelChoiceUICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/ChannelChoiceUICommand.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui.uicommands;
package meerkat.voting.gui.ui.uicommands;
import meerkat.protobuf.Voting.*;
import meerkat.voting.controller.callbacks.*;

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/FatalErrorUICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/FatalErrorUICommand.java
View File

@ -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.*;

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/RaceVotingUICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/RaceVotingUICommand.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui.uicommands;
package meerkat.voting.gui.ui.uicommands;
import meerkat.protobuf.Voting.*;
import meerkat.voting.controller.callbacks.*;

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/StartSessionUICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/StartSessionUICommand.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui.uicommands;
package meerkat.voting.gui.ui.uicommands;
import meerkat.voting.controller.callbacks.*;

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/TickCommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/TickCommand.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui.uicommands;
package meerkat.voting.gui.ui.uicommands;
import meerkat.voting.controller.callbacks.*;

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/UICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/UICommand.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui.uicommands;
package meerkat.voting.gui.ui.uicommands;
import meerkat.voting.controller.callbacks.*;

2
voting-booth/src/main/java/meerkat/voting/ui/uicommands/WaitForFinishUICommand.java → voting-booth/src/main/java/meerkat/voting/gui/ui/uicommands/WaitForFinishUICommand.java
View File

@ -1,4 +1,4 @@
package meerkat.voting.ui.uicommands;
package meerkat.voting.gui.ui.uicommands;
import meerkat.protobuf.Voting.*;
import meerkat.voting.controller.callbacks.*;