From 9751a5206e43d90bcfb35f3b98d21e6894fe1cc6 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 11 Nov 2014 17:11:37 +0100
Subject: [PATCH] Rename settings package to preferences

---
 src/main/java/io/bitsquare/gui/Navigation.java              | 6 +++---
 .../gui/main/{settings => preferences}/PreferencesView.fxml | 2 +-
 .../main/{settings => preferences}/PreferencesViewCB.java   | 2 +-
 .../application/ApplicationPreferencesModel.java            | 2 +-
 .../application/ApplicationPreferencesPM.java               | 2 +-
 .../application/ApplicationPreferencesView.fxml             | 2 +-
 .../application/ApplicationPreferencesViewCB.java           | 2 +-
 .../network/NetworkPreferencesModel.java                    | 2 +-
 .../network/NetworkPreferencesPM.java                       | 2 +-
 .../network/NetworkPreferencesView.fxml                     | 2 +-
 .../network/NetworkPreferencesViewCB.java                   | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/PreferencesView.fxml (92%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/PreferencesViewCB.java (99%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/application/ApplicationPreferencesModel.java (97%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/application/ApplicationPreferencesPM.java (97%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/application/ApplicationPreferencesView.fxml (88%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/application/ApplicationPreferencesViewCB.java (97%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/network/NetworkPreferencesModel.java (97%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/network/NetworkPreferencesPM.java (98%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/network/NetworkPreferencesView.fxml (89%)
 rename src/main/java/io/bitsquare/gui/main/{settings => preferences}/network/NetworkPreferencesViewCB.java (97%)

diff --git a/src/main/java/io/bitsquare/gui/Navigation.java b/src/main/java/io/bitsquare/gui/Navigation.java
index 4f3b24950e..dd024d8733 100644
--- a/src/main/java/io/bitsquare/gui/Navigation.java
+++ b/src/main/java/io/bitsquare/gui/Navigation.java
@@ -165,7 +165,7 @@ public class Navigation {
         PORTFOLIO("/io/bitsquare/gui/main/portfolio/PortfolioView.fxml"),
         FUNDS("/io/bitsquare/gui/main/funds/FundsView.fxml"),
         MSG("/io/bitsquare/gui/main/msg/MsgView.fxml"),
-        PREFERENCES("/io/bitsquare/gui/main/settings/PreferencesView.fxml"),
+        PREFERENCES("/io/bitsquare/gui/main/preferences/PreferencesView.fxml"),
         ACCOUNT("/io/bitsquare/gui/main/account/AccountView.fxml"),
 
 
@@ -188,8 +188,8 @@ public class Navigation {
         TRANSACTIONS("/io/bitsquare/gui/main/funds/transactions/TransactionsView.fxml"),
 
         // preferences
-        APPLICATION_PREFERENCES("/io/bitsquare/gui/main/settings/application/ApplicationPreferencesView.fxml"),
-        NETWORK_PREFERENCES("/io/bitsquare/gui/main/settings/network/NetworkPreferencesView.fxml"),
+        APPLICATION_PREFERENCES("/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml"),
+        NETWORK_PREFERENCES("/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml"),
 
         // account
         ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml"),
diff --git a/src/main/java/io/bitsquare/gui/main/settings/PreferencesView.fxml b/src/main/java/io/bitsquare/gui/main/preferences/PreferencesView.fxml
similarity index 92%
rename from src/main/java/io/bitsquare/gui/main/settings/PreferencesView.fxml
rename to src/main/java/io/bitsquare/gui/main/preferences/PreferencesView.fxml
index d147775f11..b07d1eb4db 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/PreferencesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/preferences/PreferencesView.fxml
@@ -19,7 +19,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.PreferencesViewCB"
+<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.preferences.PreferencesViewCB"
          AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0"
          AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"
          xmlns:fx="http://javafx.com/fxml">
diff --git a/src/main/java/io/bitsquare/gui/main/settings/PreferencesViewCB.java b/src/main/java/io/bitsquare/gui/main/preferences/PreferencesViewCB.java
similarity index 99%
rename from src/main/java/io/bitsquare/gui/main/settings/PreferencesViewCB.java
rename to src/main/java/io/bitsquare/gui/main/preferences/PreferencesViewCB.java
index 9eb7e37d7c..bce48fc96d 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/PreferencesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/PreferencesViewCB.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings;
+package io.bitsquare.gui.main.preferences;
 
 import io.bitsquare.gui.CachedViewCB;
 import io.bitsquare.gui.Navigation;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesModel.java b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesModel.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesModel.java
rename to src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesModel.java
index 753709b977..c1849529bb 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings.application;
+package io.bitsquare.gui.main.preferences.application;
 
 import io.bitsquare.gui.UIModel;
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesPM.java b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesPM.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesPM.java
rename to src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesPM.java
index a7fd7b209f..df7d53aaac 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesPM.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings.application;
+package io.bitsquare.gui.main.preferences.application;
 
 import io.bitsquare.gui.PresentationModel;
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesView.fxml b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml
similarity index 88%
rename from src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesView.fxml
rename to src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml
index 8ef5b494ad..1377224c9f 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesView.fxml
@@ -20,7 +20,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.application.ApplicationPreferencesViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.preferences.application.ApplicationPreferencesViewCB"
             xmlns:fx="http://javafx.com/fxml">
 
     <Label text="app"/>
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesViewCB.java b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesViewCB.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesViewCB.java
rename to src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesViewCB.java
index dfce3a09ef..a315b02a88 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/ApplicationPreferencesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/application/ApplicationPreferencesViewCB.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings.application;
+package io.bitsquare.gui.main.preferences.application;
 
 import io.bitsquare.gui.CachedViewCB;
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesModel.java b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesModel.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesModel.java
rename to src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesModel.java
index 869f41a798..c0878a18d2 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings.network;
+package io.bitsquare.gui.main.preferences.network;
 
 import io.bitsquare.gui.UIModel;
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesPM.java b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesPM.java
rename to src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java
index 51e188908d..b67c3d3323 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesPM.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings.network;
+package io.bitsquare.gui.main.preferences.network;
 
 import io.bitsquare.gui.PresentationModel;
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesView.fxml b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
similarity index 89%
rename from src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesView.fxml
rename to src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
index 39a24ded73..c007ce2ebe 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesView.fxml
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesView.fxml
@@ -20,7 +20,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.settings.network.NetworkPreferencesViewCB"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.preferences.network.NetworkPreferencesViewCB"
             xmlns:fx="http://javafx.com/fxml">
 
     <Label text="net"/>
diff --git a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesViewCB.java b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesViewCB.java
rename to src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
index 29784a930a..06fc9cf609 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/network/NetworkPreferencesViewCB.java
+++ b/src/main/java/io/bitsquare/gui/main/preferences/network/NetworkPreferencesViewCB.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.gui.main.settings.network;
+package io.bitsquare.gui.main.preferences.network;
 
 import io.bitsquare.gui.CachedViewCB;