From 312b8467694ba913816f9e488fe89433d19268f3 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sun, 23 Nov 2014 05:04:52 +0100 Subject: [PATCH] Rename BasicView => AbstractView --- .../io/bitsquare/gui/{BasicView.java => AbstractView.java} | 6 +++--- src/main/java/io/bitsquare/gui/InitializableView.java | 2 +- .../gui/main/account/arbitrator/ArbitratorSettingsView.java | 4 ++-- .../account/arbitrator/profile/ArbitratorProfileView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/home/HomeView.java | 4 ++-- src/main/java/io/bitsquare/gui/main/msg/MsgView.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename src/main/java/io/bitsquare/gui/{BasicView.java => AbstractView.java} (90%) diff --git a/src/main/java/io/bitsquare/gui/BasicView.java b/src/main/java/io/bitsquare/gui/AbstractView.java similarity index 90% rename from src/main/java/io/bitsquare/gui/BasicView.java rename to src/main/java/io/bitsquare/gui/AbstractView.java index ae88c99a47..c891ff9d32 100644 --- a/src/main/java/io/bitsquare/gui/BasicView.java +++ b/src/main/java/io/bitsquare/gui/AbstractView.java @@ -23,18 +23,18 @@ import javafx.scene.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class BasicView implements View { +public abstract class AbstractView implements View { protected final Logger log = LoggerFactory.getLogger(this.getClass()); protected final M model; protected @FXML Parent root; - public BasicView(M model) { + public AbstractView(M model) { this.model = model; } - public BasicView() { + public AbstractView() { this(null); } diff --git a/src/main/java/io/bitsquare/gui/InitializableView.java b/src/main/java/io/bitsquare/gui/InitializableView.java index aea2434b73..62d2c75b89 100644 --- a/src/main/java/io/bitsquare/gui/InitializableView.java +++ b/src/main/java/io/bitsquare/gui/InitializableView.java @@ -23,7 +23,7 @@ import java.util.ResourceBundle; import javafx.fxml.Initializable; -public class InitializableView extends BasicView implements Initializable { +public abstract class InitializableView extends AbstractView implements Initializable { public InitializableView(M model) { super(model); diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java index 4f28f86376..051a8b741e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.account.arbitrator; -import io.bitsquare.gui.BasicView; +import io.bitsquare.gui.AbstractView; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.View; import io.bitsquare.gui.ViewLoader; @@ -31,7 +31,7 @@ import javafx.stage.Modality; import javafx.stage.Stage; // TODO Arbitration is very basic yet -public class ArbitratorSettingsView extends BasicView { +public class ArbitratorSettingsView extends AbstractView { private final ViewLoader viewLoader; private final Navigation navigation; diff --git a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java index f5b2f6afaa..ad39f5e43e 100644 --- a/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java +++ b/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java @@ -18,7 +18,7 @@ package io.bitsquare.gui.main.account.arbitrator.profile; import io.bitsquare.arbitrator.Arbitrator; -import io.bitsquare.gui.BasicView; +import io.bitsquare.gui.AbstractView; import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.persistence.Persistence; import io.bitsquare.settings.Preferences; @@ -29,7 +29,7 @@ import javafx.fxml.FXML; import javafx.scene.control.*; // TODO Arbitration is very basic yet -public class ArbitratorProfileView extends BasicView { +public class ArbitratorProfileView extends AbstractView { private final Preferences preferences; diff --git a/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/src/main/java/io/bitsquare/gui/main/home/HomeView.java index be17e38ed9..f312ff4cee 100644 --- a/src/main/java/io/bitsquare/gui/main/home/HomeView.java +++ b/src/main/java/io/bitsquare/gui/main/home/HomeView.java @@ -17,9 +17,9 @@ package io.bitsquare.gui.main.home; -import io.bitsquare.gui.BasicView; +import io.bitsquare.gui.AbstractView; // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home, // probably overview, event history, news, charts,... -> low prio -public class HomeView extends BasicView { +public class HomeView extends AbstractView { } diff --git a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java index 5b6e3f13e9..2ecbf60c8d 100644 --- a/src/main/java/io/bitsquare/gui/main/msg/MsgView.java +++ b/src/main/java/io/bitsquare/gui/main/msg/MsgView.java @@ -17,7 +17,7 @@ package io.bitsquare.gui.main.msg; -import io.bitsquare.gui.BasicView; +import io.bitsquare.gui.AbstractView; import javax.inject.Inject; @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; // will be probably only used for arbitration communication, will be renamed and the icon changed -public class MsgView extends BasicView { +public class MsgView extends AbstractView { private static final Logger log = LoggerFactory.getLogger(MsgView.class);