Formatting and system property switch to force imports

gluonhq · Jan 23, 2022 · 097e8c3 · 097e8c3
1 parent c64c4ad
commit 097e8c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/AppPlatform.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/AppPlatform.java
@@ -60,8 +60,7 @@ public static synchronized AppPlatformDirectories getAppDirectories() {
         assert platformSpecificDirectories != null;
         return platformSpecificDirectories;
     }
-
-
+
     /*
      * TODO: 
      * How to deal with snapshot versions? 

diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/library/user/UserLibraryImporter.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/library/user/UserLibraryImporter.java
@@ -91,6 +91,10 @@ AppPlatformDirectories getPlatformDirectories() {
      * @return {@link ImportResult} describing how the activity was completed.
      */
     ImportResult performImportWhenDesired() {
+        String forceImport = System.getProperty("forceImport", "false");
+        if ("true".equalsIgnoreCase(forceImport)) {
+            preferences.remove(PREF_IMPORT_USER_LIBRARY);
+        }
         boolean requiresImport = preferences.getBoolean(PREF_IMPORT_USER_LIBRARY, true);
         if (requiresImport) {
             return importPreviousVersionUserLibrary();
-Original file line number
+Diff line change
@@ Expand Up @@
             assert platformSpecificDirectories != null;
             return platformSpecificDirectories;
         }
         /*
          * TODO:
          * How to deal with snapshot versions?
@@ Expand Down @@