mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move proposal and vote package into ballot package

Browse source
This commit is contained in:
Manfred Karrer 2018-04-24 21:04:06 -05:00
parent a66b62ef28
commit 99e9943eb2
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/bisq/desktop/main/dao/proposal/BaseProposalView.java
View file

@ -30,7 +30,7 @@ import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.period.DaoPhase;
import bisq.core.dao.voting.ballot.Ballot;
import bisq.core.dao.voting.proposal.Proposal;
import bisq.core.dao.voting.ballot.proposal.Proposal;
import bisq.core.locale.Res;
import javax.inject.Inject;

2
src/main/java/bisq/desktop/main/dao/proposal/ProposalDetailsWindow.java
View file

@ -22,7 +22,7 @@ import bisq.desktop.util.BsqFormatter;
import bisq.desktop.util.Layout;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.voting.proposal.Proposal;
import bisq.core.dao.voting.ballot.proposal.Proposal;
import bisq.core.locale.Res;
import javafx.geometry.Insets;

10
src/main/java/bisq/desktop/main/dao/proposal/ProposalDisplay.java
View file

@ -28,11 +28,11 @@ import bisq.desktop.util.validation.BsqAddressValidator;
import bisq.desktop.util.validation.BsqValidator;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.voting.proposal.Proposal;
import bisq.core.dao.voting.proposal.ProposalConsensus;
import bisq.core.dao.voting.proposal.ProposalType;
import bisq.core.dao.voting.proposal.compensation.CompensationConsensus;
import bisq.core.dao.voting.proposal.compensation.CompensationProposal;
import bisq.core.dao.voting.ballot.proposal.Proposal;
import bisq.core.dao.voting.ballot.proposal.ProposalConsensus;
import bisq.core.dao.voting.ballot.proposal.ProposalType;
import bisq.core.dao.voting.ballot.proposal.compensation.CompensationConsensus;
import bisq.core.dao.voting.ballot.proposal.compensation.CompensationProposal;
import bisq.core.locale.Res;
import bisq.core.provider.fee.FeeService;

4
src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
View file

@ -29,8 +29,8 @@ import bisq.core.dao.state.BlockListener;
import bisq.core.dao.state.blockchain.Block;
import bisq.core.dao.state.blockchain.Tx;
import bisq.core.dao.voting.ballot.Ballot;
import bisq.core.dao.voting.vote.BooleanVote;
import bisq.core.dao.voting.vote.Vote;
import bisq.core.dao.voting.ballot.vote.BooleanVote;
import bisq.core.dao.voting.ballot.vote.Vote;
import bisq.core.locale.Res;
import org.bitcoinj.core.Transaction;

2
src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
View file

@ -36,7 +36,7 @@ import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.period.DaoPhase;
import bisq.core.dao.voting.ballot.Ballot;
import bisq.core.dao.voting.vote.BooleanVote;
import bisq.core.dao.voting.ballot.vote.BooleanVote;
import bisq.core.locale.Res;
import bisq.common.util.Tuple2;

4
src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
View file

@ -35,8 +35,8 @@ import bisq.core.dao.DaoFacade;
import bisq.core.dao.voting.ValidationException;
import bisq.core.dao.voting.ballot.Ballot;
import bisq.core.dao.voting.ballot.BallotWithTransaction;
import bisq.core.dao.voting.proposal.ProposalConsensus;
import bisq.core.dao.voting.proposal.ProposalType;
import bisq.core.dao.voting.ballot.proposal.ProposalConsensus;
import bisq.core.dao.voting.ballot.proposal.ProposalType;
import bisq.core.locale.Res;
import bisq.core.provider.fee.FeeService;

4
src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
View file

@ -32,8 +32,8 @@ import bisq.desktop.util.Layout;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.voting.ballot.BallotList;
import bisq.core.dao.voting.vote.BooleanVote;
import bisq.core.dao.voting.vote.Vote;
import bisq.core.dao.voting.ballot.vote.BooleanVote;
import bisq.core.dao.voting.ballot.vote.Vote;
import bisq.core.locale.Res;
import bisq.core.user.Preferences;