68e1737f22
Dependency cleaning; more spongification; use composite build to include qilin (need qilin 1.3+ now)
2017-06-26 01:59:32 +03:00
324a079a90
Refactored and fixed NetworkVirtualPrinter
2017-06-25 17:51:25 +03:00
cb1d2343c4
More refactoring for scannerAPI
2017-06-25 10:15:09 +03:00
97fbfcecaf
remove unused import and fixed cast/audit buttons width
2017-01-25 22:10:09 +02:00
17d7d5eca4
Merge branch 'master' of https://vcs.factcenter.org/meerkat/meerkat-java into voting-booth-gui
2017-01-25 21:45:50 +02:00
b360ae81bb
Fix gradle build files to work without nexus repository credentials
2017-01-25 19:10:18 +02:00
480f4e52bb
moved code for fx to voting-booth-gui
2017-01-25 16:01:13 +02:00
0cf9390fa5
prints test qr-code to virtual printer
2017-01-25 12:50:01 +02:00
e60e76f104
changed titles of FX windows
2017-01-25 10:46:13 +02:00
06526a16db
Clean up build files and remove dependency on local nexus repository
2017-01-24 17:17:09 +02:00
53cc13b51b
Cleaning up unchecked casts
2017-01-24 16:28:57 +02:00
5386acfd1b
added css
2017-01-12 18:24:38 +02:00
72d96c4d78
virtual printer (javaFX window) added
2017-01-12 18:03:40 +02:00
b8418156b1
got to Cast or Audit screen
2017-01-12 12:32:59 +02:00
29b8ef9734
javafx integration runs till channel choice
2017-01-06 17:24:38 +02:00
c8044fc93d
fx gui with mainController and navigator (incomplete again)
2016-12-16 22:11:00 +02:00
5113c2235b
fx gui with MainController and Navigator (incomplete)
2016-12-16 22:10:23 +02:00
c97519c28e
starting fx window and communicating with graphicalUI thread
2016-12-16 17:55:56 +02:00
0b1d334d3c
start javaFX window from voting booth ToyRun
2016-12-13 10:23:51 +02:00
af2622b05c
Changed the project structure
2016-10-05 12:28:19 +03:00
a9fbf555d6
Refactored voting-booth-gui to use gradle and match maven directory style
2016-09-21 17:21:34 +03:00
1ff490a354
Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java into voting-booth-gui
2016-09-21 16:23:45 +03:00
267164e996
Update to Gradle 3.1
2016-09-21 16:19:45 +03:00
d8adf7b49e
Created the VotingBoothGUIManager
...
This object creates a map of visual panels and can convert the
VotingBoothUI methods into actions (can execute them on wanted panels)
2016-09-17 13:29:21 +03:00
9444072f40
Created the Graphical User Interface
...
This objhect is the connector between the backed and the voting booth gui
also moved number of methods from SystemConsoleUI into Utils class for
all the UI's classes be able to use those methods.
2016-09-17 12:33:40 +03:00
4ddd5f852a
Fix: better test of the NetworkVirtualPrinter
2016-08-02 14:24:25 +03:00
c78b78aa3c
no change
2016-08-02 14:22:21 +03:00
da7a05ecd8
Fix: UI now has command queue of size 1.
...
A new CommandPend class is introduced. It functions basically as
an ArrayBlockingQueue of size 1.
Difference is that it can handle two functions from two different threads
- trample(cmd): removes the previously kept command (if there is such) and overrides it with the next command
- offer(cmd): keeps the given command, but only if it doesn't currently keeps an older one
This new functionality is used so the UI can get commands from the controller
(but only take into account the latest one). At the same time it gets tick commands
from its clock ticker, but only keep and handle those if it doesn't have
a real controller command to handle.
2016-07-19 12:05:06 +03:00
1cf16d8386
Fix: output device now has queue of size 1. a newer command always overrides the previous one
2016-07-19 11:59:50 +03:00
88991ea9ff
Refactor: some more comments, and better looking code in VotingBoothImpl.java
2016-07-12 15:32:22 +03:00
0956fa98d3
Refactor: add comments to VotingBoothImpl.java, and rename tasks to commands (because they were two names of the same thing)
...
Signed-off-by: Hai Brenner <haibrenner@gmail.com>
2016-07-12 15:23:46 +03:00
42d68b7ce8
Test: Add NetworkVirtualPrinterTest
2016-07-12 11:54:50 +03:00
5404bb9ed2
Fix error in setting name of output device thread
2016-07-12 11:51:16 +03:00
f2836d277a
Add polling-station project dependency to VB build.gradle for testing purposes
2016-07-12 11:50:21 +03:00
49551dc36b
Merge branch 'master' into vbdev2
...
Conflicts:
meerkat-common/src/main/proto/meerkat/voting.proto
2016-07-06 21:55:34 +03:00
88c4e0e644
Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java
2016-07-06 21:45:35 +03:00
d804f0dbac
voting-booth gradle.build now has dependencies on jetty and RESTful API for testing purposes
2016-07-06 21:33:30 +03:00
b1a033da5e
Add the channel identifier to the PlaintextBallot, so it is now printed by the output device
2016-07-06 13:24:10 +03:00
853a6b5684
Another (final) Generics type fix
2016-07-04 16:05:52 +03:00
2336d44ffc
reduced more compilation warnings by having better Generics type handling and better JavaDocs
2016-07-04 16:04:04 +03:00
d8b766725b
Removed many compilation warnings by having better handling of Generics types and better JavaDocs
2016-07-04 15:52:05 +03:00
218677fd96
added many comments and JavaDocs
2016-07-04 14:17:11 +03:00
2b56928e9a
added some JavaDoc comments and documentation
2016-07-04 11:54:36 +03:00
7db6218735
fixed: access to the static system messages from the StorageManage class, rather than its instance
2016-07-04 11:53:28 +03:00
66e5db9f22
cleared some unnecessary imports
2016-07-04 11:51:49 +03:00
14fac728b3
1. ScannedData now has a Channel and a SignedEncryptedBallot attributes,
...
rather than just 'data' attribute
2. Implemented a NetworkVirtualPrinter output device, and now both
this class and the previous SystemConsoleOutputDevice extend the same
new abstract class AsyncRunnableOutputDevice which supplies default
implementations for the interface methods.
2016-06-28 11:32:00 +03:00
3a5908ac49
A cancel by the voter is now sent to the execution flow as a Throwable
...
rather than an Exception.
2016-06-28 11:28:14 +03:00
438df78e36
Changed the ToySignature test file to match the new Signature interface.
2016-06-28 11:26:50 +03:00
4379921445
For some reason restful API did not appear in my gradle.build. It is fixed now.
2016-06-28 11:26:00 +03:00
d12ad408c4
Merge branch 'master' into vbdev2
...
Conflicts:
meerkat-common/src/main/proto/meerkat/voting.proto
2016-06-26 17:17:24 +03:00
Tal Moran
Laura Radaelli
VladimirEliTokarev
Hai Brenner