mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Move io.bisq.core.dao.compensation to io.bisq.core.dao.voterequest.compensation

Browse Source
This commit is contained in:
Manfred Karrer 2018-03-06 20:16:32 -05:00
parent 034b113f9e
commit f0a9316999
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
24 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/bisq/core/app/AppSetupWithP2PAndDAO.java
View File

@ -19,7 +19,7 @@ package io.bisq.core.app;
import io.bisq.common.crypto.KeyRing;
import io.bisq.core.dao.DaoManager;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.core.filter.FilterManager;
import io.bisq.core.payment.AccountAgeWitnessService;
import io.bisq.core.trade.statistics.TradeStatisticsManager;

2
core/src/main/java/io/bisq/core/dao/DaoManager.java
View File

@ -22,8 +22,8 @@ import io.bisq.common.handlers.ErrorMessageHandler;
import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.dao.blockchain.BsqNode;
import io.bisq.core.dao.blockchain.BsqNodeProvider;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.vote.VotingManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
/**
* High level entry point for Dao domain

2
core/src/main/java/io/bisq/core/dao/DaoModule.java
View File

@ -26,10 +26,10 @@ import io.bisq.core.dao.blockchain.BsqLiteNode;
import io.bisq.core.dao.blockchain.BsqNodeProvider;
import io.bisq.core.dao.blockchain.json.JsonBlockChainExporter;
import io.bisq.core.dao.blockchain.parse.*;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.vote.VotingDefaultValues;
import io.bisq.core.dao.vote.VotingManager;
import io.bisq.core.dao.vote.VotingService;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import org.springframework.core.env.Environment;
import static com.google.inject.name.Names.named;

4
core/src/main/java/io/bisq/core/dao/blockchain/parse/IssuanceVerification.java
View File

@ -20,8 +20,8 @@ package io.bisq.core.dao.blockchain.parse;
import io.bisq.core.dao.blockchain.vo.Tx;
import io.bisq.core.dao.blockchain.vo.TxOutput;
import io.bisq.core.dao.blockchain.vo.TxType;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import lombok.extern.slf4j.Slf4j;
import javax.inject.Inject;

2
core/src/main/java/io/bisq/core/dao/blockchain/parse/VotingVerification.java
View File

@ -22,7 +22,7 @@ import io.bisq.core.dao.blockchain.vo.Tx;
import io.bisq.core.dao.blockchain.vo.TxOutput;
import io.bisq.core.dao.blockchain.vo.TxOutputType;
import io.bisq.core.dao.blockchain.vo.TxType;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import lombok.extern.slf4j.Slf4j;
import javax.inject.Inject;

2
core/src/main/java/io/bisq/core/dao/vote/CompensationRequestVoteItem.java
View File

@ -19,7 +19,7 @@ package io.bisq.core.dao.vote;
import com.google.protobuf.Message;
import io.bisq.common.proto.persistable.PersistablePayload;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
public final class CompensationRequestVoteItem implements PersistablePayload {
public final CompensationRequest compensationRequest;

6
core/src/main/java/io/bisq/core/dao/vote/VotingManager.java
View File

@ -29,9 +29,9 @@ import io.bisq.core.app.BisqEnvironment;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.dao.DaoPeriodService;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.compensation.CompensationRequestPayload;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestPayload;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.generated.protobuffer.PB;
import lombok.extern.slf4j.Slf4j;

2
core/src/main/java/io/bisq/core/dao/compensation/CompensationAmountException.java → core/src/main/java/io/bisq/core/dao/voterequest/compensation/CompensationAmountException.java
View File

@ -1,4 +1,4 @@
package io.bisq.core.dao.compensation;
package io.bisq.core.dao.voterequest.compensation;
import org.bitcoinj.core.Coin;

2
core/src/main/java/io/bisq/core/dao/compensation/CompensationRequest.java → core/src/main/java/io/bisq/core/dao/voterequest/compensation/CompensationRequest.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.dao.compensation;
package io.bisq.core.dao.voterequest.compensation;
import io.bisq.common.proto.persistable.PersistablePayload;
import io.bisq.core.btc.wallet.BsqWalletService;

2
core/src/main/java/io/bisq/core/dao/compensation/CompensationRequestList.java → core/src/main/java/io/bisq/core/dao/voterequest/compensation/CompensationRequestList.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.dao.compensation;
package io.bisq.core.dao.voterequest.compensation;
import com.google.protobuf.Message;
import io.bisq.common.proto.persistable.PersistableEnvelope;

2
core/src/main/java/io/bisq/core/dao/compensation/CompensationRequestManager.java → core/src/main/java/io/bisq/core/dao/voterequest/compensation/CompensationRequestManager.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.dao.compensation;
package io.bisq.core.dao.voterequest.compensation;
import com.google.common.util.concurrent.FutureCallback;
import com.google.inject.Inject;

2
core/src/main/java/io/bisq/core/dao/compensation/CompensationRequestPayload.java → core/src/main/java/io/bisq/core/dao/voterequest/compensation/CompensationRequestPayload.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.dao.compensation;
package io.bisq.core.dao.voterequest.compensation;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version;

2
core/src/main/java/io/bisq/core/dao/compensation/Restrictions.java → core/src/main/java/io/bisq/core/dao/voterequest/compensation/Restrictions.java
View File

@ -15,7 +15,7 @@
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.core.dao.compensation;
package io.bisq.core.dao.voterequest.compensation;
import org.bitcoinj.core.Coin;

2
core/src/main/java/io/bisq/core/proto/network/CoreNetworkProtoResolver.java
View File

@ -12,7 +12,7 @@ import io.bisq.core.arbitration.messages.*;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksRequest;
import io.bisq.core.dao.blockchain.p2p.messages.GetBsqBlocksResponse;
import io.bisq.core.dao.blockchain.p2p.messages.NewBsqBlockBroadcastMessage;
import io.bisq.core.dao.compensation.CompensationRequestPayload;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestPayload;
import io.bisq.core.filter.Filter;
import io.bisq.core.offer.OfferPayload;
import io.bisq.core.offer.messages.OfferAvailabilityRequest;

4
core/src/main/java/io/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
View File

@ -11,8 +11,8 @@ import io.bisq.core.arbitration.DisputeList;
import io.bisq.core.btc.AddressEntryList;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.dao.blockchain.parse.BsqBlockChain;
import io.bisq.core.dao.compensation.CompensationRequestList;
import io.bisq.core.dao.vote.VoteItemsList;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestList;
import io.bisq.core.payment.PaymentAccountList;
import io.bisq.core.proto.CoreProtoResolver;
import io.bisq.core.trade.TradableList;
@ -20,8 +20,8 @@ import io.bisq.core.user.PreferencesPayload;
import io.bisq.core.user.UserPayload;
import io.bisq.generated.protobuffer.PB;
import io.bisq.network.p2p.peers.peerexchange.PeerList;
import io.bisq.network.p2p.storage.PersistedEntryMap;
import io.bisq.network.p2p.storage.PersistableNetworkPayloadCollection;
import io.bisq.network.p2p.storage.PersistedEntryMap;
import io.bisq.network.p2p.storage.SequenceNumberMap;
import lombok.extern.slf4j.Slf4j;

3
gui/src/main/java/io/bisq/gui/app/BisqApp.java
View File

@ -46,8 +46,8 @@ import io.bisq.core.btc.AddressEntryList;
import io.bisq.core.btc.BaseCurrencyNetwork;
import io.bisq.core.btc.wallet.*;
import io.bisq.core.dao.blockchain.json.JsonBlockChainExporter;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.vote.VotingManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.core.filter.FilterManager;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.trade.TradeManager;
@ -79,7 +79,6 @@ import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Pane;
import javafx.scene.layout.StackPane;
import javafx.scene.text.Font;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.StageStyle;

9
gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestDisplay.java
View File

@ -19,8 +19,8 @@ package io.bisq.gui.main.dao.compensation;
import io.bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.compensation.CompensationRequestPayload;
import io.bisq.core.dao.compensation.Restrictions;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestPayload;
import io.bisq.core.dao.voterequest.compensation.Restrictions;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.gui.components.*;
import io.bisq.gui.util.BsqFormatter;
@ -33,7 +33,10 @@ import javafx.geometry.HPos;
import javafx.geometry.Insets;
import javafx.geometry.Orientation;
import javafx.scene.control.*;
import javafx.scene.layout.*;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.ColumnConstraints;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;
import javafx.util.Callback;
import javax.annotation.Nullable;

2
gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestListItem.java
View File

@ -24,7 +24,7 @@ import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.parse.BsqBlockChain;
import io.bisq.core.dao.blockchain.vo.Tx;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.gui.components.indicator.TxConfidenceIndicator;
import io.bisq.gui.util.BsqFormatter;
import javafx.beans.value.ChangeListener;

4
gui/src/main/java/io/bisq/gui/main/dao/compensation/CompensationRequestView.java
View File

@ -23,8 +23,8 @@ import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.parse.BsqBlockChain;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.gui.common.view.ActivatableView;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.util.BsqFormatter;

4
gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
View File

@ -23,8 +23,8 @@ import io.bisq.core.dao.DaoPeriodService;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.parse.BsqBlockChain;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.gui.Navigation;
import io.bisq.gui.common.view.FxmlView;

8
gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
View File

@ -23,10 +23,10 @@ import io.bisq.common.locale.Res;
import io.bisq.core.btc.exceptions.TransactionVerificationException;
import io.bisq.core.btc.exceptions.WalletException;
import io.bisq.core.btc.wallet.*;
import io.bisq.core.dao.compensation.CompensationAmountException;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.compensation.CompensationRequestPayload;
import io.bisq.core.dao.voterequest.compensation.CompensationAmountException;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestPayload;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.util.CoinUtil;
import io.bisq.gui.common.view.ActivatableView;

2
gui/src/main/java/io/bisq/gui/main/dao/compensation/past/PastCompensationRequestView.java
View File

@ -23,7 +23,7 @@ import io.bisq.core.dao.DaoPeriodService;
import io.bisq.core.dao.blockchain.BsqBlockChainChangeDispatcher;
import io.bisq.core.dao.blockchain.BsqBlockChainListener;
import io.bisq.core.dao.blockchain.parse.BsqBlockChain;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.gui.common.view.FxmlView;
import io.bisq.gui.components.SeparatedPhaseBars;
import io.bisq.gui.main.dao.compensation.CompensationRequestDisplay;

4
gui/src/main/java/io/bisq/gui/main/dao/voting/vote/CompensationViewItem.java
View File

@ -20,9 +20,9 @@ package io.bisq.gui.main.dao.voting.vote;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bisq.common.locale.Res;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestPayload;
import io.bisq.core.dao.vote.CompensationRequestVoteItem;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestPayload;
import io.bisq.gui.components.AutoTooltipButton;
import io.bisq.gui.components.AutoTooltipCheckBox;
import io.bisq.gui.components.HyperlinkWithIcon;

4
gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java
View File

@ -25,9 +25,9 @@ import io.bisq.core.btc.exceptions.WalletException;
import io.bisq.core.btc.wallet.BsqWalletService;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.dao.compensation.CompensationRequest;
import io.bisq.core.dao.compensation.CompensationRequestManager;
import io.bisq.core.dao.vote.*;
import io.bisq.core.dao.voterequest.compensation.CompensationRequest;
import io.bisq.core.dao.voterequest.compensation.CompensationRequestManager;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.core.util.CoinUtil;
import io.bisq.gui.common.view.ActivatableView;