Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-25 16:05:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change package structure

Browse source
This commit is contained in:
Manfred Karrer 2014-09-11 01:08:34 +02:00
parent fcb2e6c5f9
commit 78d939f181
130 changed files with 244 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/java/io/bitsquare/BitSquareTestSuite.java
View file

@ -18,7 +18,7 @@
package io.bitsquare;
import io.bitsquare.btc.RestrictionsTest;
import io.bitsquare.gui.pm.trade.CreateOfferPMTest;
import io.bitsquare.gui.main.trade.createoffer.CreateOfferPMTest;
import io.bitsquare.gui.util.BSFormatterTest;
import io.bitsquare.gui.util.BitSquareConverterTest;
import io.bitsquare.gui.util.BitSquareNumberValidatorTest;

4
src/test/java/io/bitsquare/gui/account/AccountSettingsUITestRunner.java → src/test/java/io/bitsquare/gui/main/account/AccountSettingsUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class AccountSettingsUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/AccountSettingsView.fxml"), false);
getUrl("/io/bitsquare/gui/account/AccountSettingsView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/account/AccountUITestRunner.java → src/test/java/io/bitsquare/gui/main/account/AccountUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class AccountUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/AccountView.fxml"), false);
getUrl("/io/bitsquare/gui/account/AccountView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/account/RegistrationUITestRunner.java → src/test/java/io/bitsquare/gui/main/account/RegistrationUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class RegistrationUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), false);
getUrl("/io/bitsquare/gui/account/content/RegistrationView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

2
src/test/java/io/bitsquare/gui/account/SetupUITestRunner.java → src/test/java/io/bitsquare/gui/main/account/SetupUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account;
package io.bitsquare.gui.main.account;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletControllerUIMock.java → src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account.registration.uimock;
package io.bitsquare.gui.main.account.registration.uimock;
import java.net.URL;

2
src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletUIMockRunner.java → src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletUIMockRunner.java
View file

@ -1,4 +1,4 @@
package io.bitsquare.gui.account.registration.uimock;
package io.bitsquare.gui.main.account.registration.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/account/registration/uimock/FundRegistrationWalletViewUIMock.fxml
View file

@ -24,7 +24,7 @@
<GridPane fx:id="root" hgap="5.0" stylesheets="@../../../../../../../java/io/bitsquare/gui/bitsquare.css"
vgap="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="io.bitsquare.gui.account.registration.uimock.FundRegistrationWalletControllerUIMock">
fx:controller="io.bitsquare.gui.main.account.registration.uimock.FundRegistrationWalletControllerUIMock">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="26.0"/>

2
src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationControllerUIMock.java → src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.account.registration.uimock;
package io.bitsquare.gui.main.account.registration.uimock;
import java.net.URL;

2
src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationUIMockRunner.java → src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationUIMockRunner.java
View file

@ -1,4 +1,4 @@
package io.bitsquare.gui.account.registration.uimock;
package io.bitsquare.gui.main.account.registration.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/account/registration/uimock/RegistrationViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/account/registration/uimock/RegistrationViewUIMock.fxml
View file

@ -24,7 +24,7 @@
<BorderPane fx:id="root" prefHeight="660.0" prefWidth="1000.0" style="-fx-background-color: f4f4f4;"
stylesheets="@../../../../../../../../main/java/io/bitsquare/gui/bitsquare.css"
xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="io.bitsquare.gui.account.registration.uimock.RegistrationControllerUIMock">
fx:controller="io.bitsquare.gui.main.account.registration.uimock.RegistrationControllerUIMock">
<left>
<VBox spacing="5" prefWidth="300.0" BorderPane.alignment="CENTER">

4
src/test/java/io/bitsquare/gui/settings/FiatAccountUITestRunner.java → src/test/java/io/bitsquare/gui/main/settings/FiatAccountUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings;
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class FiatAccountUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/content/FiatAccountView.fxml"), false);
getUrl("/io/bitsquare/gui/account/content/FiatAccountView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/settings/PasswordUITestRunner.java → src/test/java/io/bitsquare/gui/main/settings/PasswordUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings;
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class PasswordUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/content/PasswordView.fxml"), false);
getUrl("/io/bitsquare/gui/account/content/PasswordView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/settings/RegistrationUITestRunner.java → src/test/java/io/bitsquare/gui/main/settings/RegistrationUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings;
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class RegistrationUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/content/RegistrationView.fxml"), false);
getUrl("/io/bitsquare/gui/account/content/RegistrationView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/settings/RestrictionsUITestRunner.java → src/test/java/io/bitsquare/gui/main/settings/RestrictionsUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings;
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class RestrictionsUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/content/RestrictionsView.fxml"), false);
getUrl("/io/bitsquare/gui/account/content/RestrictionsView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

4
src/test/java/io/bitsquare/gui/settings/SeedWordsUITestRunner.java → src/test/java/io/bitsquare/gui/main/settings/SeedWordsUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings;
package io.bitsquare.gui.main.settings;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class SeedWordsUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/account/content/SeedWordsView.fxml"), false);
getUrl("/io/bitsquare/gui/account/content/SeedWordsView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

2
src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsControllerUIMock.java → src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.bank.BankAccount;
import io.bitsquare.bank.BankAccountType;

2
src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsUIMockRunner.java → src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsUIMockRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/settings/uimock/BankAccountSettingsViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/settings/uimock/BankAccountSettingsViewUIMock.fxml
View file

@ -22,7 +22,7 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<GridPane hgap="5.0" vgap="5.0" fx:id="root"
fx:controller="io.bitsquare.gui.settings.uimock.BankAccountSettingsControllerUIMock"
fx:controller="io.bitsquare.gui.main.settings.uimock.BankAccountSettingsControllerUIMock"
stylesheets="@../../../../../../../main/java/io/bitsquare/gui/bitsquare.css"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"

2
src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsControllerUIMock.java → src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import java.net.URL;

2
src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsUIMockRunner.java → src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsUIMockRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/settings/uimock/RestrictionSettingsViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/settings/uimock/RestrictionSettingsViewUIMock.fxml
View file

@ -23,7 +23,7 @@
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" hgap="5.0" stylesheets="@../../../../../../../main/java/io/bitsquare/gui/bitsquare.css"
vgap="5.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="io.bitsquare.gui.settings.uimock.RestrictionSettingsControllerUIMock">
fx:controller="io.bitsquare.gui.main.settings.uimock.RestrictionSettingsControllerUIMock">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="26.0"/>

2
src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsControllerUIMock.java → src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import java.net.URL;

2
src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsUIMockRunner.java → src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsUIMockRunner.java
View file

@ -1,4 +1,4 @@
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/settings/uimock/SeedWordsViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/settings/uimock/SeedWordsViewUIMock.fxml
View file

@ -26,7 +26,7 @@
stylesheets="@../../../../../../../main/java/io/bitsquare/gui/bitsquare.css" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="io.bitsquare.gui.settings.uimock.SeedWordsControllerUIMock">
fx:controller="io.bitsquare.gui.main.settings.uimock.SeedWordsControllerUIMock">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="26.0"/>

2
src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordControllerUIMock.java → src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import java.net.URL;

2
src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordUIMockRunner.java → src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordUIMockRunner.java
View file

@ -1,4 +1,4 @@
package io.bitsquare.gui.settings.uimock;
package io.bitsquare.gui.main.settings.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/settings/uimock/SetPasswordViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/settings/uimock/SetPasswordViewUIMock.fxml
View file

@ -24,7 +24,7 @@
<GridPane fx:id="root" hgap="5.0" stylesheets="@../../../../../../../main/java/io/bitsquare/gui/bitsquare.css"
vgap="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="io.bitsquare.gui.settings.uimock.SetPasswordControllerUIMock">
fx:controller="io.bitsquare.gui.main.settings.uimock.SetPasswordControllerUIMock">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="26.0"/>

3
src/test/java/io/bitsquare/gui/pm/trade/CreateOfferPMTest.java → src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java
View file

@ -15,10 +15,9 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.pm.trade;
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.model.trade.CreateOfferModel;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.locale.Country;

4
src/test/java/io/bitsquare/gui/trade/createoffer/CreateOfferUITestRunner.java → src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferUITestRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade.createoffer;
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;
@ -68,7 +68,7 @@ public class CreateOfferUITestRunner extends Application {
log.debug("re load");
pane.getChildren().removeAll();
BSFXMLLoader loader = new BSFXMLLoader(
getUrl("/io/bitsquare/gui/view/trade/CreateOfferView.fxml"), false);
getUrl("/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml"), false);
try {
view = loader.load();
pane.getChildren().setAll(view);

2
src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferControllerUIMock.java → src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferControllerUIMock.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade.createoffer.uimock;
package io.bitsquare.gui.main.trade.createoffer.uimock;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;

2
src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferUIMockRunner.java → src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferUIMockRunner.java
View file

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.trade.createoffer.uimock;
package io.bitsquare.gui.main.trade.createoffer.uimock;
import io.bitsquare.di.BitSquareModule;
import io.bitsquare.util.BSFXMLLoader;

2
src/test/java/io/bitsquare/gui/trade/createoffer/uimock/CreateOfferViewUIMock.fxml → src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferViewUIMock.fxml
View file

@ -26,7 +26,7 @@
stylesheets="@../../../../../../../../main/java/io/bitsquare/gui/bitsquare.css"
AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0"
AnchorPane.topAnchor="10.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="io.bitsquare.gui.trade.createoffer.uimock.CreateOfferControllerUIMock">
fx:controller="io.bitsquare.gui.main.trade.createoffer.uimock.CreateOfferControllerUIMock">
<children>
<ScrollPane fitToHeight="true" fitToWidth="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">