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

Run reformat and organize imports

Browse source
This commit is contained in:
Manfred Karrer 2016-01-21 02:48:44 +01:00
parent f723bf5737
commit cb685d3b5c
73 changed files with 802 additions and 829 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/java/io/bitsquare/locale/CountryUtil.java
View file

@ -19,7 +19,10 @@ package io.bitsquare.locale;
import io.bitsquare.user.Preferences;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
public class CountryUtil {

12
gui/src/main/java/eu/hansolo/enzo/notification/Notification.java
View file

@ -387,8 +387,7 @@ public class Notification {
if (stage.isShowing()) {
stage.toFront();
}
else {
} else {
stage.show();
}
@ -530,14 +529,11 @@ public class Notification {
final EventHandler<NotificationEvent> HANDLER;
if (NotificationEvent.NOTIFICATION_PRESSED == TYPE) {
HANDLER = getOnNotificationPressed();
}
else if (NotificationEvent.SHOW_NOTIFICATION == TYPE) {
} else if (NotificationEvent.SHOW_NOTIFICATION == TYPE) {
HANDLER = getOnShowNotification();
}
else if (NotificationEvent.HIDE_NOTIFICATION == TYPE) {
} else if (NotificationEvent.HIDE_NOTIFICATION == TYPE) {
HANDLER = getOnHideNotification();
}
else {
} else {
HANDLER = null;
}
if (null == HANDLER) return;

3
gui/src/main/java/io/bitsquare/gui/common/fxml/FxmlViewLoader.java
View file

@ -58,8 +58,7 @@ public class FxmlViewLoader implements ViewLoader {
if (fxmlView == null) {
convention = defaultConvention;
specifiedLocation = defaultLocation;
}
else {
} else {
convention = fxmlView.convention();
specifiedLocation = fxmlView.location();
}

7
gui/src/main/java/io/bitsquare/gui/common/view/AbstractView.java
View file

@ -18,8 +18,7 @@
package io.bitsquare.gui.common.view;
import javafx.fxml.FXML;
import javafx.scene.*;
import javafx.scene.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -27,7 +26,9 @@ public abstract class AbstractView<R extends Node, M> implements View {
protected final Logger log = LoggerFactory.getLogger(this.getClass());
protected @FXML R root;
protected
@FXML
R root;
protected final M model;
public AbstractView(M model) {

2
gui/src/main/java/io/bitsquare/gui/common/view/ActivatableView.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.gui.common.view;
import javafx.scene.*;
import javafx.scene.Node;
public abstract class ActivatableView<R extends Node, M> extends InitializableView<R, M> {

3
gui/src/main/java/io/bitsquare/gui/common/view/CachingViewLoader.java
View file

@ -17,9 +17,8 @@
package io.bitsquare.gui.common.view;
import java.util.HashMap;
import javax.inject.Inject;
import java.util.HashMap;
public class CachingViewLoader implements ViewLoader {

3
gui/src/main/java/io/bitsquare/gui/common/view/FxmlView.java
View file

@ -17,12 +17,11 @@
package io.bitsquare.gui.common.view;
import java.util.function.Function;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.function.Function;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)

9
gui/src/main/java/io/bitsquare/gui/common/view/InitializableView.java
View file

@ -17,12 +17,11 @@
package io.bitsquare.gui.common.view;
import java.net.URL;
import java.util.ResourceBundle;
import javafx.fxml.Initializable;
import javafx.scene.*;
import javafx.scene.Node;
import java.net.URL;
import java.util.ResourceBundle;
public abstract class InitializableView<R extends Node, M> extends AbstractView<R, M> implements Initializable {

2
gui/src/main/java/io/bitsquare/gui/common/view/View.java
View file

@ -17,7 +17,7 @@
package io.bitsquare.gui.common.view;
import javafx.scene.*;
import javafx.scene.Node;
public interface View {
Node getRoot();

4
gui/src/main/java/io/bitsquare/gui/common/view/guice/InjectorViewFactory.java
View file

@ -17,11 +17,9 @@
package io.bitsquare.gui.common.view.guice;
import io.bitsquare.gui.common.view.ViewFactory;
import com.google.common.base.Preconditions;
import com.google.inject.Injector;
import io.bitsquare.gui.common.view.ViewFactory;
public class InjectorViewFactory implements ViewFactory {

3
gui/src/main/java/io/bitsquare/gui/components/InfoDisplay.java
View file

@ -117,8 +117,7 @@ public class InfoDisplay extends Parent {
link.setStyle("-fx-focus-color: transparent;");
link.setOnAction(onAction.get());
getParent().layout();
}
else {
} else {
onAction.get().handle(actionEvent);
}
}

13
gui/src/main/java/io/bitsquare/gui/components/InputTextField.java
View file

@ -18,17 +18,18 @@
package io.bitsquare.gui.components;
import io.bitsquare.gui.util.validation.InputValidator;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.geometry.Insets;
import javafx.geometry.Point2D;
import javafx.scene.control.*;
import javafx.scene.effect.*;
import javafx.scene.layout.*;
import javafx.scene.paint.*;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.effect.BlurType;
import javafx.scene.effect.DropShadow;
import javafx.scene.effect.Effect;
import javafx.scene.layout.Region;
import javafx.scene.paint.Color;
import javafx.stage.Window;
import org.controlsfx.control.PopOver;
/**

6
gui/src/main/java/io/bitsquare/gui/components/NetworkSyncPane.java
View file

@ -19,8 +19,10 @@ package io.bitsquare.gui.components;
import javafx.animation.FadeTransition;
import javafx.animation.Interpolator;
import javafx.scene.control.*;
import javafx.scene.layout.*;
import javafx.scene.control.Label;
import javafx.scene.control.ProgressBar;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Pane;
import javafx.util.Duration;
// TODO replace with new notification component from lighthouse/bitcoinJ

3
gui/src/main/java/io/bitsquare/gui/components/confidence/behavior/ConfidenceProgressIndicatorBehavior.java
View file

@ -25,12 +25,11 @@
package io.bitsquare.gui.components.confidence.behavior;
import com.sun.javafx.scene.control.behavior.BehaviorBase;
import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
import java.util.Collections;
import com.sun.javafx.scene.control.behavior.BehaviorBase;
// TODO Copied form OpenJFX, check license issues and way how we integrated it
// We changed behaviour which was not exposed via APIs

25
gui/src/main/java/io/bitsquare/gui/components/processbar/ProcessStepBarSkin.java
View file

@ -17,24 +17,25 @@
package io.bitsquare.gui.components.processbar;
import com.sun.javafx.scene.control.behavior.BehaviorBase;
import com.sun.javafx.scene.control.behavior.KeyBinding;
import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
import io.bitsquare.gui.util.Colors;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.Border;
import javafx.scene.layout.BorderStroke;
import javafx.scene.layout.BorderStrokeStyle;
import javafx.scene.layout.BorderWidths;
import javafx.scene.paint.Color;
import javafx.scene.shape.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.*;
import javafx.scene.control.*;
import javafx.scene.layout.*;
import javafx.scene.paint.*;
import javafx.scene.shape.*;
import com.sun.javafx.scene.control.behavior.BehaviorBase;
import com.sun.javafx.scene.control.behavior.KeyBinding;
import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
class ProcessStepBarSkin<T> extends BehaviorSkinBase<ProcessStepBar<T>, BehaviorBase<ProcessStepBar<T>>> {
private final ProcessStepBar<T> controller;

3
gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
View file

@ -113,8 +113,7 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
tab = arbitratorRegistrationTab;
arbitratorRegistrationView = (ArbitratorRegistrationView) view;
arbitratorRegistrationView.onTabSelection(true);
}
else {
} else {
throw new IllegalArgumentException("View not supported: " + view);
}

3
gui/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
View file

@ -17,11 +17,10 @@
package io.bitsquare.gui.main.account;
import com.google.inject.Inject;
import io.bitsquare.gui.common.model.ViewModel;
import io.bitsquare.user.User;
import com.google.inject.Inject;
class AccountViewModel implements ViewModel {
private final User user;

18
gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
View file

@ -22,19 +22,23 @@ import io.bitsquare.gui.common.view.InitializableView;
import io.bitsquare.gui.common.view.Wizard;
import io.bitsquare.gui.main.help.Help;
import io.bitsquare.gui.main.help.HelpId;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.PasswordField;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javax.inject.Inject;
import javafx.fxml.FXML;
import javafx.scene.control.*;
import javafx.scene.layout.*;
@FxmlView
public class ChangePasswordView extends InitializableView<GridPane, ChangePasswordViewModel> implements Wizard.Step {
@FXML HBox buttonsHBox;
@FXML Button saveButton, skipButton;
@FXML PasswordField oldPasswordField, passwordField, repeatedPasswordField;
@FXML
HBox buttonsHBox;
@FXML
Button saveButton, skipButton;
@FXML
PasswordField oldPasswordField, passwordField, repeatedPasswordField;
private Wizard wizard;

10
gui/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
View file

@ -17,12 +17,10 @@
package io.bitsquare.gui.main.account.content.changepassword;
import com.google.inject.Inject;
import io.bitsquare.gui.common.model.ViewModel;
import io.bitsquare.gui.util.validation.InputValidator;
import io.bitsquare.gui.util.validation.PasswordValidator;
import com.google.inject.Inject;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty;
@ -74,12 +72,10 @@ class ChangePasswordViewModel implements ViewModel {
return true;
else
errorMessage = "The 2 passwords does not match.";
}
else {
} else {
errorMessage = result.errorMessage;
}
}
else {
} else {
errorMessage = result.errorMessage;
}
return false;

12
gui/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
View file

@ -38,8 +38,10 @@ import javax.inject.Inject;
@FxmlView
public class AccountSetupWizard extends ActivatableView implements Wizard {
@FXML VBox leftVBox;
@FXML AnchorPane content;
@FXML
VBox leftVBox;
@FXML
AnchorPane content;
private WizardItem seedWords, password, fiatAccount, restrictions;
private Navigation.Listener listener;
@ -63,8 +65,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
if (viewClass == SeedWordsView.class) {
seedWords.show();
}
else if (viewClass == PasswordView.class) {
} else if (viewClass == PasswordView.class) {
seedWords.onCompleted();
password.show();
} else if (viewClass == ArbitratorSelectionView.class) {
@ -107,8 +108,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
if (currentStep instanceof SeedWordsView) {
seedWords.onCompleted();
password.show();
}
else if (currentStep instanceof PasswordView) {
} else if (currentStep instanceof PasswordView) {
password.onCompleted();
restrictions.show();
} else if (currentStep instanceof ArbitratorSelectionView) {

3
gui/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
View file

@ -38,7 +38,8 @@ import javax.inject.Inject;
@FxmlView
public class FundsView extends ActivatableViewAndModel<TabPane, Activatable> {
@FXML Tab reservedTab, withdrawalTab, transactionsTab;
@FXML
Tab reservedTab, withdrawalTab, transactionsTab;
private Navigation.Listener navigationListener;
private ChangeListener<Tab> tabChangeListener;

9
gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
View file

@ -47,7 +47,8 @@ import java.util.stream.Stream;
@FxmlView
public class ReservedView extends ActivatableView<VBox, Void> {
@FXML TableView<ReservedListItem> table;
@FXML
TableView<ReservedListItem> table;
@FXML
TableColumn<ReservedListItem, ReservedListItem> labelColumn, addressColumn, balanceColumn, confidenceColumn;
@ -154,8 +155,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
});
}
setGraphic(hyperlink);
}
else {
} else {
setGraphic(null);
setId(null);
}
@ -233,8 +233,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
if (item != null && !empty) {
setGraphic(item.getProgressIndicator());
}
else {
} else {
setGraphic(null);
}
}

4
gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.fxml
View file

@ -17,8 +17,8 @@
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.BuyOfferView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"

4
gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.fxml
View file

@ -17,8 +17,8 @@
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.layout.AnchorPane?>
<TabPane fx:id="root" fx:controller="io.bitsquare.gui.main.offer.SellOfferView"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
AnchorPane.topAnchor="0.0"

3
gui/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
View file

@ -38,7 +38,8 @@ import javax.inject.Inject;
@FxmlView
public class PortfolioView extends ActivatableViewAndModel<TabPane, Activatable> {
@FXML Tab openOffersTab, pendingTradesTab, closedTradesTab;
@FXML
Tab openOffersTab, pendingTradesTab, closedTradesTab;
private final Tab failedTradesTab = new Tab("Failed");
private Tab currentTab;
private Navigation.Listener navigationListener;

3
gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesView.java
View file

@ -100,8 +100,7 @@ public class ClosedTradesView extends ActivatableViewAndModel<VBox, ClosedTrades
offerDetailsPopup.show(tradable.getOffer());
});
setGraphic(hyperlink);
}
else {
} else {
setGraphic(null);
setId(null);
}

3
gui/src/main/java/io/bitsquare/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
View file

@ -91,8 +91,7 @@ class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTradesDataMod
log.error("That must not happen. We got a pending state but we are in the closed trades list.");
return trade.getState().toString();
}
}
else if (item.getTradable() instanceof OpenOffer) {
} else if (item.getTradable() instanceof OpenOffer) {
OpenOffer.State state = ((OpenOffer) item.getTradable()).getState();
log.trace("OpenOffer state {}", state);
switch (state) {

9
gui/src/main/java/io/bitsquare/gui/main/portfolio/failedtrades/FailedTradesView.java
View file

@ -32,8 +32,10 @@ import javax.inject.Inject;
@FxmlView
public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTradesViewModel> {
@FXML TableView<FailedTradesListItem> table;
@FXML TableColumn<FailedTradesListItem, FailedTradesListItem> priceColumn, amountColumn, volumeColumn,
@FXML
TableView<FailedTradesListItem> table;
@FXML
TableColumn<FailedTradesListItem, FailedTradesListItem> priceColumn, amountColumn, volumeColumn,
directionColumn, dateColumn, tradeIdColumn, stateColumn;
private final TradeDetailsPopup tradeDetailsPopup;
@ -86,8 +88,7 @@ public class FailedTradesView extends ActivatableViewAndModel<VBox, FailedTrades
tradeDetailsPopup.show(trade);
});
setGraphic(hyperlink);
}
else {
} else {
setGraphic(null);
setId(null);
}

11
gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeWizardItem.java
View file

@ -17,14 +17,13 @@
package io.bitsquare.gui.main.portfolio.pendingtrades.steps;
import io.bitsquare.gui.util.Colors;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.*;
import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
import io.bitsquare.gui.util.Colors;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
public class TradeWizardItem extends Button {
public Class<? extends TradeStepDetailsView> getViewClass() {

6
gui/src/main/java/io/bitsquare/gui/util/Profiler.java
View file

@ -18,14 +18,12 @@
package io.bitsquare.gui.util;
import com.google.common.base.Stopwatch;
import java.util.concurrent.TimeUnit;
import javafx.animation.AnimationTimer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.concurrent.TimeUnit;
public class Profiler {
private static final Logger log = LoggerFactory.getLogger(Profiler.class);

3
gui/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
View file

@ -50,8 +50,7 @@ public class OptionalBtcValidator extends BtcValidator {
result = validateIfNotNegative(input)
.and(validateIfNotFractionalBtcValue(input))
.and(validateIfNotExceedsMaxBtcValue(input));
}
else {
} else {
// we accept zero input
return new ValidationResult(true);
}

3
gui/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
View file

@ -48,8 +48,7 @@ public class OptionalFiatValidator extends FiatValidator {
result = validateIfNotNegative(input)
.and(validateIfNotExceedsMinFiatValue(input))
.and(validateIfNotExceedsMaxFiatValue(input));
}
else {
} else {
// we accept zero input
return new ValidationResult(true);
}

3
gui/src/test/java/io/bitsquare/app/BitsquareEnvironmentTests.java
View file

@ -18,7 +18,6 @@
package io.bitsquare.app;
import org.junit.Test;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertySource;
@ -26,7 +25,7 @@ import org.springframework.mock.env.MockPropertySource;
import static io.bitsquare.app.BitsquareEnvironment.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.*;
import static org.junit.Assert.assertThat;
import static org.springframework.core.env.PropertySource.named;
import static org.springframework.core.env.StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME;
import static org.springframework.core.env.StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME;

2
gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxController.fxml
View file

@ -14,7 +14,7 @@
~ You should have received a copy of the GNU Affero General Public License
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.AnchorPane?>
<AnchorPane xmlns:fx="http://javafx.com/fxml">
</AnchorPane>

2
gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
View file

@ -15,7 +15,7 @@
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.AnchorPane?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.common.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation"
xmlns:fx="http://javafx.com/fxml">
</AnchorPane>

2
gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests$WellFormed.fxml
View file

@ -15,7 +15,7 @@
~ along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
-->
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.AnchorPane?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.common.fxml.FxmlViewLoaderTests$WellFormed"
xmlns:fx="http://javafx.com/fxml">
</AnchorPane>

14
gui/src/test/java/io/bitsquare/common/fxml/FxmlViewLoaderTests.java
View file

@ -19,24 +19,18 @@ package io.bitsquare.common.fxml;
import io.bitsquare.gui.common.ViewfxException;
import io.bitsquare.gui.common.fxml.FxmlViewLoader;
import io.bitsquare.gui.common.view.AbstractView;
import io.bitsquare.gui.common.view.FxmlView;
import io.bitsquare.gui.common.view.View;
import io.bitsquare.gui.common.view.ViewFactory;
import io.bitsquare.gui.common.view.ViewLoader;
import java.util.ResourceBundle;
import io.bitsquare.gui.common.view.*;
import javafx.fxml.LoadException;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import java.util.ResourceBundle;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.*;
import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;

4
gui/src/test/java/io/bitsquare/common/support/CachingViewLoaderTests.java
View file

@ -20,11 +20,11 @@ package io.bitsquare.common.support;
import io.bitsquare.gui.common.view.AbstractView;
import io.bitsquare.gui.common.view.CachingViewLoader;
import io.bitsquare.gui.common.view.ViewLoader;
import org.junit.Test;
import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
public class CachingViewLoaderTests {

4
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/FileUtilities.java
View file

@ -25,6 +25,7 @@ public class FileUtilities {
/**
* Closes both input and output streams when done.
*
* @param in Stream to read from
* @param out Stream to write to
* @throws java.io.IOException - If close on input or output fails
@ -39,6 +40,7 @@ public class FileUtilities {
/**
* Won't close the input stream when it's done, needed to handle ZipInputStreams
*
* @param in Won't be closed
* @param out Will be closed
* @throws java.io.IOException - If close on output fails
@ -84,6 +86,7 @@ public class FileUtilities {
/**
* Reads the input stream, deletes fileToWriteTo if it exists and over writes it with the stream.
*
* @param readFrom Stream to read from
* @param fileToWriteTo File to write to
* @throws java.io.IOException - If any of the file operations fail
@ -110,6 +113,7 @@ public class FileUtilities {
/**
* This has to exist somewhere! Why isn't it a part of the standard Java library?
*
* @param destinationDirectory Directory files are to be extracted to
* @param zipFileInputStream Stream to unzip
* @throws java.io.IOException - If there are any file errors

3
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OnionProxyContext.java
View file

@ -80,8 +80,7 @@ abstract public class OnionProxyContext {
/**
* Sets environment variables and working directory needed for Tor
*
* @param processBuilder
* we will call start on this to run Tor
* @param processBuilder we will call start on this to run Tor
*/
void setEnvironmentArgsAndWorkingDirectoryForStart(ProcessBuilder processBuilder) {
processBuilder.directory(getWorkingDirectory());

52
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OnionProxyManager.java
View file

@ -50,11 +50,11 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
* Note that you will most likely need to actually call into the
* AndroidOnionProxyManager or JavaOnionProxyManager in order to create the
* right bindings for your environment.
* <p/>
* <p>
* This class is thread safe but that's mostly because we hit everything over
* the head with 'synchronized'. Given the way this class is used there
* shouldn't be any performance implications of this.
* <p/>
* <p>
* This class began life as TorPlugin from the Briar Project
*/
public abstract class OnionProxyManager {
@ -98,17 +98,13 @@ public abstract class OnionProxyManager {
* given time for bootstrap to finish and if it doesn't then will restart
* the bootstrap process the given number of repeats.
*
* @param secondsBeforeTimeOut
* Seconds to wait for boot strapping to finish
* @param numberOfRetries
* Number of times to try recycling the Tor OP before giving up
* @param secondsBeforeTimeOut Seconds to wait for boot strapping to finish
* @param numberOfRetries Number of times to try recycling the Tor OP before giving up
* on bootstrapping working
* @return True if bootstrap succeeded, false if there is a problem or the
* bootstrap couldn't complete in the given time.
* @throws java.lang.InterruptedException
* - You know, if we are interrupted
* @throws java.io.IOException
* - IO Exceptions
* @throws java.lang.InterruptedException - You know, if we are interrupted
* @throws java.io.IOException - IO Exceptions
*/
public synchronized boolean startWithRepeat(int secondsBeforeTimeOut, int numberOfRetries)
throws InterruptedException, IOException {
@ -165,8 +161,7 @@ public abstract class OnionProxyManager {
* listening on
*
* @return Discovered socks port
* @throws java.io.IOException
* - File errors
* @throws java.io.IOException - File errors
*/
public synchronized int getIPv4LocalHostSocksPort() throws IOException {
if (isRunning() == false) {
@ -191,14 +186,11 @@ public abstract class OnionProxyManager {
/**
* Publishes a hidden service
*
* @param hiddenServicePort
* The port that the hidden service will accept connections on
* @param localPort
* The local port that the hidden service will relay connections
* @param hiddenServicePort The port that the hidden service will accept connections on
* @param localPort The local port that the hidden service will relay connections
* to
* @return The hidden service's onion address in the form X.onion.
* @throws java.io.IOException
* - File errors
* @throws java.io.IOException - File errors
*/
public synchronized String publishHiddenService(int hiddenServicePort, int localPort) throws IOException {
if (controlConnection == null) {
@ -283,8 +275,7 @@ public abstract class OnionProxyManager {
* going to work until you either call startWithRepeat or
* installAndStartTorOp
*
* @throws java.io.IOException
* - File errors
* @throws java.io.IOException - File errors
*/
public synchronized void stop() throws IOException {
try {
@ -308,8 +299,7 @@ public abstract class OnionProxyManager {
* to network connections.
*
* @return True if running
* @throws java.io.IOException
* - IO exceptions
* @throws java.io.IOException - IO exceptions
*/
public synchronized boolean isRunning() throws IOException {
return isBootstrapped() && isNetworkEnabled();
@ -318,11 +308,9 @@ public abstract class OnionProxyManager {
/**
* Tells the Tor OP if it should accept network connections
*
* @param enable
* If true then the Tor OP will accept SOCKS connections,
* @param enable If true then the Tor OP will accept SOCKS connections,
* otherwise not.
* @throws java.io.IOException
* - IO exceptions
* @throws java.io.IOException - IO exceptions
*/
public synchronized void enableNetwork(boolean enable) throws IOException {
if (controlConnection == null) {
@ -337,8 +325,7 @@ public abstract class OnionProxyManager {
*
* @return True if network is enabled (that doesn't mean that the device is
* online, only that the Tor OP is trying to connect to the network)
* @throws java.io.IOException
* - IO exceptions
* @throws java.io.IOException - IO exceptions
*/
public synchronized boolean isNetworkEnabled() throws IOException {
if (controlConnection == null) {
@ -391,10 +378,8 @@ public abstract class OnionProxyManager {
* to actually connect it to the network.
*
* @return True if all files installed and Tor OP successfully started
* @throws java.io.IOException
* - IO Exceptions
* @throws java.lang.InterruptedException
* - If we are, well, interrupted
* @throws java.io.IOException - IO Exceptions
* @throws java.lang.InterruptedException - If we are, well, interrupted
*/
public synchronized boolean installAndStartTorOp() throws IOException, InterruptedException {
// The Tor OP will die if it looses the connection to its socket so if
@ -598,8 +583,7 @@ public abstract class OnionProxyManager {
/**
* Alas old versions of Android do not support setExecutable.
*
* @param f
* File to make executable
* @param f File to make executable
* @return True if it worked, otherwise false.
*/
protected abstract boolean setExecutable(File f);

1
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/OsData.java
View file

@ -34,6 +34,7 @@ import java.util.Scanner;
public class OsData {
public enum OsType {Windows, Linux32, Linux64, Mac, Android}
private static OsType detectedType = null;
public static OsType getOsType() {

1
jtorproxy/src/main/java/com/msopentech/thali/toronionproxy/WriteObserver.java
View file

@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
public interface WriteObserver {
/**
* Waits timeout of unit to see if file is modified
*
* @param timeout How long to wait before returning
* @param unit Unit to wait in
* @return True if file was modified, false if it was not

1
network/src/test/java/io/bitsquare/p2p/P2PServiceTest.java
View file

@ -44,6 +44,7 @@ public class P2PServiceTest {
private P2PService p2PService1, p2PService2, p2PService3;
private SeedNode seedNode1, seedNode2, seedNode3;
private File dir1, dir2, dir3;
@Before
public void setup() throws InterruptedException, CertificateException, NoSuchAlgorithmException, KeyStoreException, IOException, CryptoException {
Security.addProvider(new BouncyCastleProvider());

3
seednode/pom.xml
View file

@ -40,7 +40,8 @@
<!-- broken with Java 8 (MSHADE-174), using ProGuard instead. -->
<minimizeJar>false</minimizeJar>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.bitsquare.p2p.seed.SeedNodeMain</mainClass>
</transformer>
</transformers>