Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup fmxlview and javax imports #3661

Merged
merged 3 commits into from Nov 26, 2019
Merged

Cleanup fmxlview and javax imports #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
035dc4b
Remove @FxmlView from abstract view classes
Nov 22, 2019
d4e7f86
Use generic javax imports for DI
Nov 22, 2019
8982612
Additional cleanup of redundant DI annotations
Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java
View file
Open in desktop
Expand Up @@ -23,8 +23,7 @@

import bisq.common.storage.Storage;

import com.google.inject.name.Named;

import javax.inject.Named;
import javax.inject.Inject;

import java.io.File;
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java
View file
Open in desktop
Expand Up @@ -23,8 +23,7 @@

import bisq.common.storage.Storage;

import com.google.inject.name.Named;

import javax.inject.Named;
import javax.inject.Inject;

import java.io.File;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/alert/AlertManager.java
View file
Open in desktop
Expand Up @@ -31,8 +31,8 @@
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;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/alert/PrivateNotificationManager.java
View file
Open in desktop
Expand Up @@ -32,8 +32,8 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/app/TorSetup.java
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
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;
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVoteStorageService.java
View file
Open in desktop
Expand Up @@ -23,8 +23,7 @@

import bisq.common.storage.Storage;

import com.google.inject.name.Named;

import javax.inject.Named;
import javax.inject.Inject;

import java.io.File;
Expand Down
3 changes: 1 addition & 2 deletions ...ain/java/bisq/core/dao/governance/proposal/storage/appendonly/ProposalStorageService.java
View file
Open in desktop
Expand Up @@ -23,8 +23,7 @@

import bisq.common.storage.Storage;

import com.google.inject.name.Named;

import javax.inject.Named;
import javax.inject.Inject;

import java.io.File;
Expand Down
3 changes: 1 addition & 2 deletions .../main/java/bisq/core/dao/governance/proposal/storage/temp/TempProposalStorageService.java
View file
Open in desktop
Expand Up @@ -23,8 +23,7 @@

import bisq.common.storage.Storage;

import com.google.inject.name.Named;

import javax.inject.Named;
import javax.inject.Inject;

import java.io.File;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/filter/FilterManager.java
View file
Open in desktop
Expand Up @@ -41,8 +41,8 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/offer/OfferBookService.java
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
import bisq.common.storage.Storage;
import bisq.common.util.Utilities;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/bisq/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java
View file
Open in desktop
Expand Up @@ -26,9 +26,9 @@

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;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/bisq/core/support/dispute/mediation/mediator/MediatorManager.java
View file
Open in desktop
Expand Up @@ -26,8 +26,8 @@

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;

Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentManager.java
View file
Open in desktop
Expand Up @@ -26,9 +26,9 @@

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;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/trade/statistics/TradeStatistics2StorageService.java
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@

import bisq.common.storage.Storage;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
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;
Expand Down
6 changes: 1 addition & 5 deletions desktop/src/main/java/bisq/desktop/main/account/register/AgentRegistrationView.java
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@


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;
Expand All @@ -38,8 +37,6 @@
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;
Expand Down Expand Up @@ -70,7 +67,6 @@

// 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> {

Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/bisq/desktop/main/account/register/arbitrator/ArbitratorRegistrationView.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion ...p/src/main/java/bisq/desktop/main/account/register/mediator/MediatorRegistrationView.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
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;

Expand Down
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java
View file
Open in desktop
Expand Up @@ -76,7 +76,6 @@
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>,
Expand Down
3 changes: 1 addition & 2 deletions desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View file
Open in desktop
Expand Up @@ -65,8 +65,7 @@

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;
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@

import com.googlecode.jcsv.writer.CSVEntryConverter;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
import bisq.common.UserThread;
import bisq.common.util.Utilities;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View file
Open in desktop
Expand Up @@ -99,7 +99,6 @@

import lombok.Getter;

@FxmlView
public abstract class DisputeView extends ActivatableView<VBox, Void> {

protected final DisputeManager<? extends DisputeList<? extends DisputeList>> disputeManager;
Expand Down
6 changes: 1 addition & 5 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -38,11 +37,8 @@

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,
Expand All @@ -54,7 +50,7 @@ public DisputeAgentView(DisputeManager<? extends DisputeList<? extends DisputeLi
ContractWindow contractWindow,
TradeDetailsWindow tradeDetailsWindow,
AccountAgeWitnessService accountAgeWitnessService,
@Named(AppOptionKeys.USE_DEV_PRIVILEGE_KEYS) boolean useDevPrivilegeKeys) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not obvious to me why injection of this value would still work without the explicit annotation. The value of AppOptionKeys.USE_DEV_PRIVILEGE_KEYS is in fact "useDevPrivilegeKeys", spelled exactly the same as the useDevPrivilegeKeys parameter, so in theory Guice could introspect and do the injection based on that, but this information is not inspectable at runtime unless the -parameters option has been passed to javac to keep the parameter symbol table available (and our build does not do this). What am I missing?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The class is abstract and never instantiated directly. The annotation is legacy from a time before the type hierarchy was in place.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sub-classes should have the annotation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Roger that, and I see that the subclasses are in fact annotated. Thanks.

utACK

boolean useDevPrivilegeKeys) {
super(disputeManager,
keyRing,
tradeManager,
Expand Down
2 changes: 1 addition & 1 deletion ...top/src/main/java/bisq/desktop/main/support/dispute/agent/arbitration/ArbitratorView.java
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@

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;

Expand Down
3 changes: 1 addition & 2 deletions desktop/src/main/java/bisq/desktop/main/support/dispute/agent/mediation/MediatorView.java
View file
Open in desktop
Expand Up @@ -37,8 +37,7 @@

import bisq.common.crypto.KeyRing;

import com.google.inject.name.Named;

import javax.inject.Named;
import javax.inject.Inject;

@FxmlView
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

import bisq.common.crypto.KeyRing;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/support/dispute/client/DisputeClientView.java
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@

import bisq.common.crypto.KeyRing;

@FxmlView
public abstract class DisputeClientView extends DisputeView {
public DisputeClientView(DisputeManager<? extends DisputeList<? extends DisputeList>> DisputeManager,
KeyRing keyRing,
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/bisq/desktop/main/support/dispute/client/arbitration/ArbitrationClientView.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

import bisq.common.crypto.KeyRing;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/bisq/desktop/main/support/dispute/client/mediation/MediationClientView.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

import bisq.common.crypto.KeyRing;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@

import bisq.common.crypto.KeyRing;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
4 changes: 2 additions & 2 deletions p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java
View file
Open in desktop
Expand Up @@ -27,8 +27,8 @@

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;

Expand Down
2 changes: 1 addition & 1 deletion p2p/src/main/java/bisq/network/p2p/network/ConnectionConfig.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@

import bisq.network.NetworkOptionKeys;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion p2p/src/main/java/bisq/network/p2p/peers/BanList.java
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
import bisq.network.NetworkOptionKeys;
import bisq.network.p2p.NodeAddress;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion .../main/java/bisq/network/p2p/storage/persistence/PersistableNetworkPayloadListService.java
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
import bisq.common.storage.FileUtil;
import bisq.common.storage.Storage;

import com.google.inject.name.Named;
import javax.inject.Named;

import javax.inject.Inject;

Expand Down