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

Cleanup fmxlview and javax imports (#3661)

Browse Source 
* Remove @FxmlView from abstract view classes

* Use generic javax imports for DI

* Additional cleanup of redundant DI annotations
This commit is contained in:
Christoph Atteneder 2019-11-26 14:36:01 +01:00 committed by GitHub
commit 62aea83308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 43 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java
View File

@ -23,8 +23,7 @@ import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import java.io.File;

3
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java
View File

@ -23,8 +23,7 @@ import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import java.io.File;

4
core/src/main/java/bisq/core/alert/AlertManager.java
View File

@ -31,8 +31,8 @@ import bisq.common.crypto.KeyRing;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import javax.inject.Inject;
import javax.inject.Named;
import com.google.common.base.Charsets;

4
core/src/main/java/bisq/core/alert/PrivateNotificationManager.java
View File

@ -32,8 +32,8 @@ import bisq.common.proto.network.NetworkEnvelope;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import javax.inject.Inject;
import javax.inject.Named;
import com.google.common.base.Charsets;

2
core/src/main/java/bisq/core/app/TorSetup.java
View File

@ -22,7 +22,7 @@ import bisq.network.NetworkOptionKeys;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.storage.FileUtil;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import javax.inject.Singleton;

3
core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVoteStorageService.java
View File

@ -23,8 +23,7 @@ import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import java.io.File;

3
core/src/main/java/bisq/core/dao/governance/proposal/storage/appendonly/ProposalStorageService.java
View File

@ -23,8 +23,7 @@ import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import java.io.File;

3
core/src/main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalStorageService.java
View File

@ -23,8 +23,7 @@ import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import java.io.File;

4
core/src/main/java/bisq/core/filter/FilterManager.java
View File

@ -41,8 +41,8 @@ import bisq.common.crypto.KeyRing;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import javax.inject.Inject;
import javax.inject.Named;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;

2
core/src/main/java/bisq/core/offer/OfferBookService.java
View File

@ -34,7 +34,7 @@ import bisq.common.storage.JsonFileManager;
import bisq.common.storage.Storage;
import bisq.common.util.Utilities;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

6
core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java
View File

@ -26,9 +26,9 @@ import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.common.crypto.KeyRing;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.inject.Named;
import java.util.List;

4
core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorManager.java
View File

@ -26,8 +26,8 @@ import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.common.crypto.KeyRing;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
import javax.inject.Singleton;
import javax.inject.Named;
import javax.inject.Inject;

6
core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentManager.java
View File

@ -26,9 +26,9 @@ import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.common.crypto.KeyRing;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.inject.Named;
import java.util.List;

2
core/src/main/java/bisq/core/trade/statistics/TradeStatistics2StorageService.java
View File

@ -23,7 +23,7 @@ import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
View File

@ -31,7 +31,7 @@ import bisq.common.storage.Storage;
import bisq.common.util.Utilities;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import javax.inject.Named;
import javafx.collections.FXCollections;
import javafx.collections.ObservableSet;

6
desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java
View File

@ -19,7 +19,6 @@ package bisq.desktop.main.account.register;
import bisq.desktop.common.view.ActivatableViewAndModel;
import bisq.desktop.common.view.FxmlView;
import bisq.desktop.components.AutoTooltipButton;
import bisq.desktop.components.AutoTooltipLabel;
import bisq.desktop.components.TitledGroupBg;
@ -38,8 +37,6 @@ import bisq.common.UserThread;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;
import com.google.inject.name.Named;
import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
@ -70,7 +67,6 @@ import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
// TODO translation string keys should renamed to be more generic.
// Lets do it for 1.1.7 the translator have time to add new string.
@FxmlView
public abstract class AgentRegistrationView<R extends DisputeAgent, T extends AgentRegistrationViewModel<R, ?>>
extends ActivatableViewAndModel<VBox, T> {
@ -89,7 +85,7 @@ public abstract class AgentRegistrationView<R extends DisputeAgent, T extends Ag
// Constructor, lifecycle
///////////////////////////////////////////////////////////////////////////////////////////
public AgentRegistrationView(T model, @Named(AppOptionKeys.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
public AgentRegistrationView(T model, boolean useDevPrivilegeKeys) {
super(model);
this.useDevPrivilegeKeys = useDevPrivilegeKeys;
}

2
desktop/src/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java
View File

@ -25,7 +25,7 @@ import bisq.core.app.AppOptionKeys;
import bisq.core.locale.Res;
import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
desktop/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.java
View File

@ -25,7 +25,7 @@ import bisq.core.app.AppOptionKeys;
import bisq.core.locale.Res;
import bisq.core.support.dispute.mediation.mediator.Mediator;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java
View File

@ -25,7 +25,7 @@ import bisq.core.app.AppOptionKeys;
import bisq.core.locale.Res;
import bisq.core.support.dispute.refund.refundagent.RefundAgent;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

1
desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java
View File

@ -76,7 +76,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@FxmlView
public abstract class StateMonitorView<StH extends StateHash,
StB extends StateBlock<StH>,
BLI extends StateBlockListItem<StH, StB>,

3
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View File

@ -65,8 +65,7 @@ import bisq.common.util.Tuple3;
import org.bitcoinj.core.Coin;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
import de.jensd.fx.glyphs.GlyphIcons;

2
desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
View File

@ -45,7 +45,7 @@ import bisq.network.p2p.NodeAddress;
import com.googlecode.jcsv.writer.CSVEntryConverter;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
View File

@ -47,7 +47,7 @@ import bisq.network.p2p.NodeAddress;
import bisq.common.UserThread;
import bisq.common.util.Utilities;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

1
desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View File

@ -99,7 +99,6 @@ import java.util.Optional;
import lombok.Getter;
@FxmlView
public abstract class DisputeView extends ActivatableView<VBox, Void> {
protected final DisputeManager<? extends DisputeList<? extends DisputeList>> disputeManager;

6
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
View File

@ -17,7 +17,6 @@
package bisq.desktop.main.support.dispute.agent;
import bisq.desktop.common.view.FxmlView;
import bisq.desktop.components.AutoTooltipButton;
import bisq.desktop.main.overlays.windows.ContractWindow;
import bisq.desktop.main.overlays.windows.DisputeSummaryWindow;
@ -38,11 +37,8 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javafx.scene.control.Button;
@FxmlView
public abstract class DisputeAgentView extends DisputeView {
public DisputeAgentView(DisputeManager<? extends DisputeList<? extends DisputeList>> disputeManager,
@ -54,7 +50,7 @@ public abstract class DisputeAgentView extends DisputeView {
ContractWindow contractWindow,
TradeDetailsWindow tradeDetailsWindow,
AccountAgeWitnessService accountAgeWitnessService,
@Named(AppOptionKeys.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
boolean useDevPrivilegeKeys) {
super(disputeManager,
keyRing,
tradeManager,

2
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java
View File

@ -39,7 +39,7 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javax.inject.Named;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;

3
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java
View File

@ -37,8 +37,7 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;
@FxmlView

2
desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java
View File

@ -37,7 +37,7 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

1
desktop/src/main/java/bisq/desktop/main/support/dispute/client/DisputeClientView.java
View File

@ -34,7 +34,6 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
@FxmlView
public abstract class DisputeClientView extends DisputeView {
public DisputeClientView(DisputeManager<? extends DisputeList<? extends DisputeList>> DisputeManager,
KeyRing keyRing,

2
desktop/src/main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java
View File

@ -37,7 +37,7 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
desktop/src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.java
View File

@ -37,7 +37,7 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java
View File

@ -37,7 +37,7 @@ import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

4
p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java
View File

@ -27,8 +27,8 @@ import bisq.network.p2p.network.TorNetworkNode;
import bisq.common.proto.network.NetworkProtoResolver;
import com.google.inject.Provider;
import com.google.inject.name.Named;
import javax.inject.Provider;
import javax.inject.Named;
import javax.inject.Inject;

2
p2p/src/main/java/bisq/network/p2p/network/ConnectionConfig.java
View File

@ -19,7 +19,7 @@ package bisq.network.p2p.network;
import bisq.network.NetworkOptionKeys;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
p2p/src/main/java/bisq/network/p2p/peers/BanList.java
View File

@ -20,7 +20,7 @@ package bisq.network.p2p.peers;
import bisq.network.NetworkOptionKeys;
import bisq.network.p2p.NodeAddress;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
View File

@ -36,7 +36,7 @@ import bisq.common.app.Capabilities;
import bisq.common.proto.persistable.PersistedDataHost;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;

2
p2p/src/main/java/bisq/network/p2p/storage/persistence/PersistableNetworkPayloadListService.java
View File

@ -23,7 +23,7 @@ import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.common.storage.FileUtil;
import bisq.common.storage.Storage;
import com.google.inject.name.Named;
import javax.inject.Named;
import javax.inject.Inject;