Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-07 14:42:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename usage of settings to applicationPreferences

Browse source
This commit is contained in:
Manfred Karrer 2014-11-11 18:49:32 +01:00
parent 33085b5c2c
commit eb0bd4a99a
7 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileViewCB.java
View file

@ -35,7 +35,7 @@ import javafx.scene.control.*;
// TODO Arbitration is very basic yet // TODO Arbitration is very basic yet
public class ArbitratorProfileViewCB extends CachedViewCB { public class ArbitratorProfileViewCB extends CachedViewCB {
private final ApplicationPreferences settings; private final ApplicationPreferences applicationPreferences;
private final Persistence persistence; private final Persistence persistence;
private final BSFormatter formatter; private final BSFormatter formatter;
@ -53,12 +53,14 @@ public class ArbitratorProfileViewCB extends CachedViewCB {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@Inject @Inject
public ArbitratorProfileViewCB(ApplicationPreferences settings, Persistence persistence, BSFormatter formatter) { public ArbitratorProfileViewCB(ApplicationPreferences applicationPreferences, Persistence persistence,
this.settings = settings; BSFormatter formatter) {
this.applicationPreferences = applicationPreferences;
this.persistence = persistence; this.persistence = persistence;
// Settings persistedSettings = (Settings) storage.read(settings.getClass().getName()); // ApplicationPreferences persistedApplicationPreferences = (ApplicationPreferences) storage
// settings.applyPersistedSettings(persistedSettings); // .read(settings.getClass().getName());
// settings.applyPersistedSettings(persistedApplicationPreferences);
this.formatter = formatter; this.formatter = formatter;
} }

1
src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationViewCB.java
View file

@ -327,7 +327,6 @@ public class ArbitratorRegistrationViewCB extends CachedViewCB {
@FXML @FXML
public void onPaymentDone() { public void onPaymentDone() {
//To change body of created methods use File | Settings | File Templates.
} }

6
src/main/java/io/bitsquare/gui/main/preferences/PreferencesViewCB.java
View file

@ -42,7 +42,7 @@ public class PreferencesViewCB extends CachedViewCB {
private static final Logger log = LoggerFactory.getLogger(PreferencesViewCB.class); private static final Logger log = LoggerFactory.getLogger(PreferencesViewCB.class);
private final Navigation navigation; private final Navigation navigation;
private ApplicationPreferences settings; private ApplicationPreferences applicationPreferences;
private Navigation.Listener navigationListener; private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener; private ChangeListener<Tab> tabChangeListener;
@ -55,11 +55,11 @@ public class PreferencesViewCB extends CachedViewCB {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@Inject @Inject
PreferencesViewCB(Navigation navigation, ApplicationPreferences settings) { PreferencesViewCB(Navigation navigation, ApplicationPreferences applicationPreferences) {
super(); super();
this.navigation = navigation; this.navigation = navigation;
this.settings = settings; this.applicationPreferences = applicationPreferences;
} }

12
src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java
View file

@ -56,7 +56,7 @@ class OfferBookModel extends UIModel {
private final User user; private final User user;
private final OfferBook offerBook; private final OfferBook offerBook;
private final ApplicationPreferences settings; private final ApplicationPreferences applicationPreferences;
private final BSFormatter formatter; private final BSFormatter formatter;
private final TradeManager tradeManager; private final TradeManager tradeManager;
@ -85,12 +85,12 @@ class OfferBookModel extends UIModel {
OfferBookModel(User user, OfferBookModel(User user,
TradeManager tradeManager, TradeManager tradeManager,
OfferBook offerBook, OfferBook offerBook,
ApplicationPreferences settings, ApplicationPreferences applicationPreferences,
BSFormatter formatter) { BSFormatter formatter) {
this.tradeManager = tradeManager; this.tradeManager = tradeManager;
this.user = user; this.user = user;
this.offerBook = offerBook; this.offerBook = offerBook;
this.settings = settings; this.applicationPreferences = applicationPreferences;
this.formatter = formatter; this.formatter = formatter;
filteredItems = new FilteredList<>(offerBook.getOfferBookListItems()); filteredItems = new FilteredList<>(offerBook.getOfferBookListItems());
@ -119,7 +119,7 @@ class OfferBookModel extends UIModel {
offerBook.addClient(); offerBook.addClient();
user.currentBankAccountProperty().addListener(bankAccountChangeListener); user.currentBankAccountProperty().addListener(bankAccountChangeListener);
btcCode.bind(settings.btcDenominationProperty()); btcCode.bind(applicationPreferences.btcDenominationProperty());
setBankAccount(user.getCurrentBankAccount()); setBankAccount(user.getCurrentBankAccount());
applyFilter(); applyFilter();
@ -199,7 +199,7 @@ class OfferBookModel extends UIModel {
// we might get rid of languages (handles viy arbitrators) // we might get rid of languages (handles viy arbitrators)
/* /*
// disjoint returns true if the two specified collections have no elements in common. // disjoint returns true if the two specified collections have no elements in common.
boolean languageResult = !Collections.disjoint(settings.getAcceptedLanguageLocales(), boolean languageResult = !Collections.disjoint(applicationPreferences.getAcceptedLanguageLocales(),
offer.getAcceptedLanguageLocales()); offer.getAcceptedLanguageLocales());
if (!languageResult) if (!languageResult)
restrictionsInfo.set("This offer requires that the payments account resides in one of those languages:\n" + restrictionsInfo.set("This offer requires that the payments account resides in one of those languages:\n" +
@ -207,7 +207,7 @@ class OfferBookModel extends UIModel {
"\n\nThe country of your payments account (" + user.getCurrentBankAccount().getCountry().getName() + "\n\nThe country of your payments account (" + user.getCurrentBankAccount().getCountry().getName() +
") is not included in that list."); ") is not included in that list.");
boolean arbitratorResult = !Collections.disjoint(settings.getAcceptedArbitrators(), boolean arbitratorResult = !Collections.disjoint(applicationPreferences.getAcceptedArbitrators(),
offer.getArbitrators());*/ offer.getArbitrators());*/
return countryResult; return countryResult;

8
src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
View file

@ -56,7 +56,7 @@ class TakeOfferModel extends UIModel {
private final TradeManager tradeManager; private final TradeManager tradeManager;
private final WalletFacade walletFacade; private final WalletFacade walletFacade;
private final ApplicationPreferences settings; private final ApplicationPreferences applicationPreferences;
private final Persistence persistence; private final Persistence persistence;
private Offer offer; private Offer offer;
@ -83,11 +83,11 @@ class TakeOfferModel extends UIModel {
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
@Inject @Inject
TakeOfferModel(TradeManager tradeManager, WalletFacade walletFacade, ApplicationPreferences settings, TakeOfferModel(TradeManager tradeManager, WalletFacade walletFacade, ApplicationPreferences applicationPreferences,
Persistence persistence) { Persistence persistence) {
this.tradeManager = tradeManager; this.tradeManager = tradeManager;
this.walletFacade = walletFacade; this.walletFacade = walletFacade;
this.settings = settings; this.applicationPreferences = applicationPreferences;
this.persistence = persistence; this.persistence = persistence;
} }
@ -108,7 +108,7 @@ class TakeOfferModel extends UIModel {
public void activate() { public void activate() {
super.activate(); super.activate();
btcCode.bind(settings.btcDenominationProperty()); btcCode.bind(applicationPreferences.btcDenominationProperty());
} }
@SuppressWarnings("EmptyMethod") @SuppressWarnings("EmptyMethod")

18
src/main/java/io/bitsquare/gui/util/Transitions.java
View file

@ -40,16 +40,16 @@ public class Transitions {
public final static int DEFAULT_DURATION = 400; public final static int DEFAULT_DURATION = 400;
private ApplicationPreferences settings; private ApplicationPreferences applicationPreferences;
private Timeline removeBlurTimeLine; private Timeline removeBlurTimeLine;
@Inject @Inject
public Transitions(ApplicationPreferences settings) { public Transitions(ApplicationPreferences applicationPreferences) {
this.settings = settings; this.applicationPreferences = applicationPreferences;
} }
private int evaluateDuration(int duration) { private int evaluateDuration(int duration) {
return settings.getUseAnimations() ? duration : 1; return applicationPreferences.getUseAnimations() ? duration : 1;
} }
// Fade // Fade
@ -58,7 +58,7 @@ public class Transitions {
} }
public void fadeIn(Node node, int duration) { public void fadeIn(Node node, int duration) {
if (settings.getUseEffects()) { if (applicationPreferences.getUseEffects()) {
FadeTransition fade = new FadeTransition(Duration.millis(evaluateDuration(duration)), node); FadeTransition fade = new FadeTransition(Duration.millis(evaluateDuration(duration)), node);
fade.setFromValue(node.getOpacity()); fade.setFromValue(node.getOpacity());
fade.setToValue(1.0); fade.setToValue(1.0);
@ -71,7 +71,7 @@ public class Transitions {
} }
public FadeTransition fadeOut(Node node, int duration) { public FadeTransition fadeOut(Node node, int duration) {
if (!settings.getUseEffects()) if (!applicationPreferences.getUseEffects())
duration = 1; duration = 1;
FadeTransition fade = new FadeTransition(Duration.millis(evaluateDuration(duration)), node); FadeTransition fade = new FadeTransition(Duration.millis(evaluateDuration(duration)), node);
@ -86,7 +86,7 @@ public class Transitions {
} }
public void fadeOutAndRemove(Node node, int duration) { public void fadeOutAndRemove(Node node, int duration) {
if (!settings.getUseEffects()) if (!applicationPreferences.getUseEffects())
duration = 1; duration = 1;
FadeTransition fade = fadeOut(node, evaluateDuration(duration)); FadeTransition fade = fadeOut(node, evaluateDuration(duration));
@ -103,7 +103,7 @@ public class Transitions {
} }
public void blur(Node node, int duration, boolean useDarken, boolean removeNode) { public void blur(Node node, int duration, boolean useDarken, boolean removeNode) {
if (settings.getUseEffects()) { if (applicationPreferences.getUseEffects()) {
if (removeBlurTimeLine != null) if (removeBlurTimeLine != null)
removeBlurTimeLine.stop(); removeBlurTimeLine.stop();
@ -136,7 +136,7 @@ public class Transitions {
} }
public void removeBlur(Node node, int duration, boolean useDarken) { public void removeBlur(Node node, int duration, boolean useDarken) {
if (settings.getUseEffects()) { if (applicationPreferences.getUseEffects()) {
if (node != null) { if (node != null) {
GaussianBlur blur = (GaussianBlur) node.getEffect(); GaussianBlur blur = (GaussianBlur) node.getEffect();
if (blur != null) { if (blur != null) {

2
src/main/java/io/bitsquare/util/Utilities.java
View file

@ -93,7 +93,7 @@ public class Utilities {
objectOutputStream.close(); objectOutputStream.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. e.printStackTrace();
} }
return result; return result;
} }