Add commons package, Refactored packages

This commit is contained in:
Manfred Karrer 2015-03-17 09:32:35 +01:00
parent 9a46ef7c4d
commit 6e9539dff8
178 changed files with 637 additions and 4258 deletions

View file

@ -16,6 +16,6 @@
-->
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.viewfx.view.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.common.viewfx.view.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation"
xmlns:fx="http://javafx.com/fxml">
</AnchorPane>

View file

@ -16,6 +16,6 @@
-->
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.viewfx.view.fxml.FxmlViewLoaderTests$WellFormed"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.common.viewfx.view.fxml.FxmlViewLoaderTests$WellFormed"
xmlns:fx="http://javafx.com/fxml">
</AnchorPane>

View file

@ -15,14 +15,14 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view.fxml;
package io.bitsquare.common.viewfx.view.fxml;
import io.bitsquare.viewfx.ViewfxException;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.FxmlView;
import io.bitsquare.viewfx.view.View;
import io.bitsquare.viewfx.view.ViewFactory;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.ViewfxException;
import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.common.viewfx.view.FxmlView;
import io.bitsquare.common.viewfx.view.View;
import io.bitsquare.common.viewfx.view.ViewFactory;
import io.bitsquare.common.viewfx.view.ViewLoader;
import java.util.ResourceBundle;

View file

@ -15,11 +15,11 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.viewfx.view.support;
package io.bitsquare.common.viewfx.view.support;
import io.bitsquare.viewfx.view.AbstractView;
import io.bitsquare.viewfx.view.CachingViewLoader;
import io.bitsquare.viewfx.view.ViewLoader;
import io.bitsquare.common.viewfx.view.AbstractView;
import io.bitsquare.common.viewfx.view.CachingViewLoader;
import io.bitsquare.common.viewfx.view.ViewLoader;
import org.junit.Test;

View file

@ -17,7 +17,7 @@
package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.validation.BtcValidator;
import io.bitsquare.gui.util.validation.FiatValidator;
@ -97,10 +97,10 @@ public class CreateOfferViewModelTest {
assertEquals(Fiat.valueOf("USD", 9999900), model.volumeAsFiat.get());
model.bankAccountType.set(BankAccountType.SEPA.toString());
model.bankAccountType.set(FiatAccountType.SEPA.toString());
assertEquals("Sepa", presenter.bankAccountType.get());
model.bankAccountType.set(BankAccountType.WIRE.toString());
model.bankAccountType.set(FiatAccountType.WIRE.toString());
assertEquals("Wire", presenter.bankAccountType.get());

View file

@ -17,8 +17,8 @@
package io.bitsquare.trade.protocol.placeoffer;
import io.bitsquare.arbitrator.Arbitrator;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.fiat.FiatAccountType;
import io.bitsquare.btc.BitcoinNetwork;
import io.bitsquare.btc.FeePolicy;
import io.bitsquare.btc.UserAgent;
@ -301,7 +301,7 @@ public class PlaceOfferProtocolTest {
100L,
Coin.CENT,
Coin.CENT,
BankAccountType.INTERNATIONAL,
FiatAccountType.INTERNATIONAL,
Currency.getInstance("EUR"),
CountryUtil.getDefaultCountry(),
"bankAccountUID",