mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
java fx improvements; but more to go
This commit is contained in:
Greg DiCristofaro
parent
35c08d71a9
commit
2f5c66c7e5
@ -261,27 +261,26 @@ public class Installer extends ModuleInstall {
|
||||
|
||||
private static void initJavaFx() {
|
||||
//initialize java fx if exists
|
||||
// GVDTODO need to fix
|
||||
// System.setProperty("javafx.macosx.embedded", "true");
|
||||
// try {
|
||||
// // Creating a JFXPanel initializes JavaFX
|
||||
// JFXPanel panel = new JFXPanel();
|
||||
// Platform.setImplicitExit(false);
|
||||
// javaFxInit = true;
|
||||
// } catch (UnsatisfiedLinkError | NoClassDefFoundError | Exception e) {
|
||||
// //in case javafx not present
|
||||
// final String msg = NbBundle.getMessage(Installer.class, "Installer.errorInitJavafx.msg");
|
||||
// final String details = NbBundle.getMessage(Installer.class, "Installer.errorInitJavafx.details");
|
||||
// logger.log(Level.SEVERE, msg
|
||||
// + details, e);
|
||||
//
|
||||
// WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
// MessageNotifyUtil.Notify.error(msg, details);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
System.setProperty("javafx.macosx.embedded", "true");
|
||||
try {
|
||||
// Creating a JFXPanel initializes JavaFX
|
||||
new JFXPanel();
|
||||
Platform.setImplicitExit(false);
|
||||
javaFxInit = true;
|
||||
} catch (UnsatisfiedLinkError | NoClassDefFoundError | Exception e) {
|
||||
//in case javafx not present
|
||||
final String msg = NbBundle.getMessage(Installer.class, "Installer.errorInitJavafx.msg");
|
||||
final String details = NbBundle.getMessage(Installer.class, "Installer.errorInitJavafx.details");
|
||||
logger.log(Level.SEVERE, msg
|
||||
+ details, e);
|
||||
|
||||
WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
MessageNotifyUtil.Notify.error(msg, details);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -515,7 +515,7 @@ public class Artifacts {
|
||||
} catch (TskCoreException ex) {
|
||||
logger.log(Level.WARNING, "Error getting child count", ex); //NON-NLS
|
||||
}
|
||||
super.setDisplayName(this.baseName + " \u200E(\u200E" + this.childCount + ")\u200E");
|
||||
super.setDisplayName(this.baseName + " (" + this.childCount + ")");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -55,14 +55,14 @@
|
||||
|
||||
https://github.com/controlsfx/controlsfx/issues/1241
|
||||
-->
|
||||
<dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="9.0.0" />
|
||||
<dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="11.1.2" />
|
||||
|
||||
<dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.10.14" />
|
||||
|
||||
<!-- timeline -->
|
||||
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="11-r1" />
|
||||
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="11-r1" />
|
||||
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="11-r1" />
|
||||
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="17-r1" />
|
||||
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="17-r1" />
|
||||
<dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="17-r1" />
|
||||
<!-- templateing engine used by timeline to generate its snapshot report -->
|
||||
<dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.10" />
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@ file.reference.ant-1.10.12.jar=release/modules/ext/ant-1.10.12.jar
|
||||
file.reference.ant-launcher-1.10.12.jar=release/modules/ext/ant-launcher-1.10.12.jar
|
||||
file.reference.api-common-2.1.4.jar=release/modules/ext/api-common-2.1.4.jar
|
||||
file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar
|
||||
file.reference.assertj-core-3.13.2.jar=release/modules/ext/assertj-core-3.13.2.jar
|
||||
file.reference.auto-value-annotations-1.9.jar=release/modules/ext/auto-value-annotations-1.9.jar
|
||||
file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar
|
||||
file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar
|
||||
@ -27,7 +26,7 @@ file.reference.commons-text-1.9.jar=release/modules/ext/commons-text-1.9.jar
|
||||
file.reference.commons-validator-1.7.jar=release/modules/ext/commons-validator-1.7.jar
|
||||
file.reference.compiler-0.9.10.jar=release/modules/ext/compiler-0.9.10.jar
|
||||
file.reference.conscrypt-openjdk-uber-2.5.1.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar
|
||||
file.reference.controlsfx-9.0.0.jar=release/modules/ext/controlsfx-9.0.0.jar
|
||||
file.reference.controlsfx-11.1.2.jar=release/modules/ext/controlsfx-11.1.2.jar
|
||||
file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar
|
||||
file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar
|
||||
file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar
|
||||
@ -62,7 +61,6 @@ file.reference.grpc-xds-1.44.1.jar=release/modules/ext/grpc-xds-1.44.1.jar
|
||||
file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar
|
||||
file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar
|
||||
file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar
|
||||
file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
|
||||
file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
|
||||
file.reference.httpcore-4.4.15.jar=release/modules/ext/httpcore-4.4.15.jar
|
||||
file.reference.imageio-bmp-3.8.2.jar=release/modules/ext/imageio-bmp-3.8.2.jar
|
||||
@ -87,20 +85,17 @@ file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-
|
||||
file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar
|
||||
file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar
|
||||
file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar
|
||||
file.reference.jfxtras-common-11-r1.jar=release/modules/ext/jfxtras-common-11-r1.jar
|
||||
file.reference.jfxtras-controls-11-r1.jar=release/modules/ext/jfxtras-controls-11-r1.jar
|
||||
file.reference.jfxtras-fxml-11-r1.jar=release/modules/ext/jfxtras-fxml-11-r1.jar
|
||||
file.reference.jfxtras-test-support-11-r1.jar=release/modules/ext/jfxtras-test-support-11-r1.jar
|
||||
file.reference.jfxtras-common-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar
|
||||
file.reference.jfxtras-controls-17-r1.jar=release/modules/ext/jfxtras-controls-17-r1.jar
|
||||
file.reference.jfxtras-fxml-17-r1.jar=release/modules/ext/jfxtras-fxml-17-r1.jar
|
||||
file.reference.jna-5.12.1.jar=release/modules/ext/jna-5.12.1.jar
|
||||
file.reference.jna-platform-5.12.0.jar=release/modules/ext/jna-platform-5.12.0.jar
|
||||
file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar
|
||||
file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
|
||||
file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar
|
||||
file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar
|
||||
file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
|
||||
file.reference.log4j-api-2.17.2.jar=release/modules/ext/log4j-api-2.17.2.jar
|
||||
file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar
|
||||
file.reference.mockito-all-1.9.5.jar=release/modules/ext/mockito-all-1.9.5.jar
|
||||
file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
|
||||
file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar
|
||||
file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.jar
|
||||
@ -117,8 +112,6 @@ file.reference.reload4j-1.2.19.jar=release/modules/ext/reload4j-1.2.19.jar
|
||||
file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
|
||||
file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
|
||||
file.reference.slf4j-reload4j-1.7.36.jar=release/modules/ext/slf4j-reload4j-1.7.36.jar
|
||||
file.reference.testfx-core-4.0.16-alpha.jar=release/modules/ext/testfx-core-4.0.16-alpha.jar
|
||||
file.reference.testfx-junit-4.0.15-alpha.jar=release/modules/ext/testfx-junit-4.0.15-alpha.jar
|
||||
file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar
|
||||
file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
|
||||
javac.source=17
|
||||
|
||||
@ -506,10 +506,6 @@
|
||||
<runtime-relative-path>ext/AppleJavaExtensions-1.4.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/AppleJavaExtensions-1.4.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/assertj-core-3.13.2.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/assertj-core-3.13.2.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/auto-value-annotations-1.9.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/auto-value-annotations-1.9.jar</binary-origin>
|
||||
@ -599,8 +595,8 @@
|
||||
<binary-origin>release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/controlsfx-9.0.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/controlsfx-9.0.0.jar</binary-origin>
|
||||
<runtime-relative-path>ext/controlsfx-11.1.2.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/controlsfx-11.1.2.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/dd-plist-1.23.jar</runtime-relative-path>
|
||||
@ -738,10 +734,6 @@
|
||||
<runtime-relative-path>ext/guava-31.1-jre.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/guava-31.1-jre.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/httpclient-4.5.13.jar</binary-origin>
|
||||
@ -839,20 +831,16 @@
|
||||
<binary-origin>release/modules/ext/jericho-html-3.4.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jfxtras-common-11-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-common-11-r1.jar</binary-origin>
|
||||
<runtime-relative-path>ext/jfxtras-common-17-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-common-17-r1.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jfxtras-controls-11-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-controls-11-r1.jar</binary-origin>
|
||||
<runtime-relative-path>ext/jfxtras-controls-17-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-controls-17-r1.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jfxtras-fxml-11-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-fxml-11-r1.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jfxtras-test-support-11-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-test-support-11-r1.jar</binary-origin>
|
||||
<runtime-relative-path>ext/jfxtras-fxml-17-r1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jfxtras-fxml-17-r1.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/jna-5.12.1.jar</runtime-relative-path>
|
||||
@ -870,10 +858,6 @@
|
||||
<runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/jsr305-3.0.2.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/junit-4.13.2.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/junit-4.13.2.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/LGoodDatePicker-11.2.1.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/LGoodDatePicker-11.2.1.jar</binary-origin>
|
||||
@ -890,10 +874,6 @@
|
||||
<runtime-relative-path>ext/log4j-core-2.17.2.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/log4j-core-2.17.2.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/mockito-all-1.9.5.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/mockito-all-1.9.5.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/opencensus-api-0.31.0.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/opencensus-api-0.31.0.jar</binary-origin>
|
||||
@ -958,14 +938,6 @@
|
||||
<runtime-relative-path>ext/slf4j-reload4j-1.7.36.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/slf4j-reload4j-1.7.36.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/testfx-core-4.0.16-alpha.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/testfx-core-4.0.16-alpha.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/testfx-junit-4.0.15-alpha.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/testfx-junit-4.0.15-alpha.jar</binary-origin>
|
||||
</class-path-extension>
|
||||
<class-path-extension>
|
||||
<runtime-relative-path>ext/threetenbp-1.5.2.jar</runtime-relative-path>
|
||||
<binary-origin>release/modules/ext/threetenbp-1.5.2.jar</binary-origin>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user