Merge pull request #5011 from chimp1984/show-stacktrace-in-error-popu…

…p-at-view-exceptions Show stacktrace in error popup at view exceptions
bisq-network · Dec 29, 2020 · 115ec78 · 115ec78
2 parents 30cfe5d + 6fe19db
commit 115ec78
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java
@@ -51,6 +51,7 @@
 import bisq.common.app.DevEnv;
 import bisq.common.app.Log;
 import bisq.common.app.Version;
+import bisq.common.config.BaseCurrencyNetwork;
 import bisq.common.config.Config;
 import bisq.common.util.InvalidVersionException;
 import bisq.common.util.Utilities;
@@ -273,7 +274,8 @@ public void addBisqSetupListener(BisqSetupListener listener) {
 
     public void start() {
         // If user tried to downgrade we require a shutdown
-        if (hasDowngraded(downGradePreventionHandler)) {
+        if (Config.baseCurrencyNetwork() == BaseCurrencyNetwork.BTC_MAINNET &&
+                hasDowngraded(downGradePreventionHandler)) {
             return;
         }
 

diff --git a/desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java b/desktop/src/main/java/bisq/desktop/common/fxml/FxmlViewLoader.java
@@ -23,9 +23,13 @@
 import bisq.desktop.common.view.ViewFactory;
 import bisq.desktop.common.view.ViewLoader;
 
+import bisq.common.util.Utilities;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import com.google.common.base.Joiner;
+
 import javafx.fxml.FXMLLoader;
 
 import java.net.URL;
@@ -36,8 +40,11 @@
 
 import java.lang.annotation.Annotation;
 
+import lombok.extern.slf4j.Slf4j;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
+@Slf4j
 @Singleton
 public class FxmlViewLoader implements ViewLoader {
 
@@ -107,7 +114,17 @@ private View loadFromFxml(URL fxmlUrl) {
                         "does not implement [%s] as expected.", controller.getClass(), fxmlUrl, View.class);
             return (View) controller;
         } catch (IOException ex) {
-            throw new ViewfxException(ex, "Failed to load view from FXML file at [%s]", fxmlUrl);
+            Throwable cause = ex.getCause();
+            if (cause != null) {
+                cause.printStackTrace();
+                log.error(cause.toString());
+                // We want to show stackTrace in error popup
+                String stackTrace = Utilities.toTruncatedString(Joiner.on("\n").join(cause.getStackTrace()), 800, false);
+                throw new ViewfxException(cause, "%s at loading view class\nStack trace:\n%s",
+                        cause.getClass().getSimpleName(), stackTrace);
+            } else {
+                throw new ViewfxException(ex, "Failed to load view from FXML file at [%s]", fxmlUrl);
+            }
         }
     }
 
@@ -122,8 +139,7 @@ private static Object getDefaultValue(Class<? extends Annotation> annotationType
         }
         try {
             return annotationType.getDeclaredMethod(attributeName).getDefaultValue();
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
             return null;
         }
     }

diff --git a/desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java b/desktop/src/main/java/bisq/desktop/common/view/CachingViewLoader.java
@@ -21,11 +21,12 @@
 import javax.inject.Singleton;
 
 import java.util.HashMap;
+import java.util.Map;
 
 @Singleton
 public class CachingViewLoader implements ViewLoader {
 
-    private final HashMap<Object, View> cache = new HashMap<>();
+    private final Map<Class<? extends View>, View> cache = new HashMap<>();
     private final ViewLoader viewLoader;
 
     @Inject