4040import java .io .File ;
4141import java .io .IOException ;
4242import java .io .InputStream ;
43+ import java .nio .file .Files ;
44+ import java .nio .file .InvalidPathException ;
45+ import java .nio .file .Path ;
46+ import java .nio .file .Paths ;
47+ import java .util .ArrayList ;
48+ import java .util .List ;
4349import java .util .Properties ;
4450import javafx .fxml .FXML ;
4551import javafx .scene .control .TextArea ;
@@ -57,7 +63,7 @@ public final class AboutWindowController extends AbstractFxmlWindowController {
5763 private GridPane vbox ;
5864 @ FXML
5965 private TextArea textArea ;
60-
66+
6167 private String sbBuildInfo ;
6268 private String sbBuildVersion ;
6369 private String sbBuildDate ;
@@ -87,7 +93,7 @@ public AboutWindowController() {
8793 // We go with default values
8894 }
8995 }
90-
96+
9197 @ FXML
9298 public void onMousePressed (MouseEvent event ) {
9399 if ((event .getClickCount () == 2 ) && event .isAltDown ()) {
@@ -128,28 +134,45 @@ private String getAboutText() {
128134 .append (getLoggingParagraph ())
129135 .append (getJavaFXParagraph ())
130136 .append (getJavaParagraph ())
137+ .append (getJavaLibraryPathParagraph ())
131138 .append (getOsParagraph ())
139+ .append (getApplicationDirectoriesParagraph ())
132140 .append (I18N .getString (sbAboutCopyrightKeyName ));
133141
134142 return text .toString ();
135143 }
136-
144+
145+ private StringBuilder getApplicationDirectoriesParagraph () {
146+ return new StringBuilder (I18N .getString ("about.app.data.directory" ))
147+ .append ("\n \t " ) // NOI18N
148+ .append (Paths .get (AppPlatform .getApplicationDataFolder ()).normalize ()) //NOI18N
149+ .append ("\n \n " ) //NOI18N
150+ .append (I18N .getString ("about.app.user.library" ))
151+ .append ("\n \t " ) //NOI18N
152+ .append (Paths .get (AppPlatform .getUserLibraryFolder ()).normalize ()) //NOI18N
153+ .append ("\n \n " ) //NOI18N
154+ .append (I18N .getString ("about.app.program.directory" ))
155+ .append ("\n \t " ) //NOI18N
156+ .append (Paths .get ("." ).toAbsolutePath ().normalize ()) //NOI18N
157+ .append ("\n \n " ); //NOI18N
158+ }
159+
137160 /**
138161 *
139162 * @treatAsPrivate
140163 */
141164 public String getBuildJavaVersion () {
142165 return sbBuildJavaVersion ;
143166 }
144-
167+
145168 /**
146169 *
147170 * @treatAsPrivate
148171 */
149172 public String getBuildInfo () {
150173 return sbBuildInfo ;
151174 }
152-
175+
153176 private StringBuilder getVersionParagraph () {
154177 StringBuilder sb = new StringBuilder (I18N .getString ("about.product.version" ));
155178 sb .append ("\n JavaFX Scene Builder " ).append (sbBuildVersion ) //NOI18N
@@ -194,11 +217,50 @@ private StringBuilder getJavaFXParagraph() {
194217
195218 private StringBuilder getJavaParagraph () {
196219 StringBuilder sb = new StringBuilder ("Java\n " ); //NOI18N
197- sb .append (System .getProperty ("java.runtime.version" )).append (", " ) //NOI18N
198- .append (System .getProperty ("java.vendor" )).append ("\n \n " ); //NOI18N
220+ sb .append (System .getProperty ("java.version" )).append (", " ) //NOI18N
221+ .append (System .getProperty ("java.runtime.name" )) // NOI18N
222+ .append ("\n \n " );
199223 return sb ;
200224 }
201225
226+ private StringBuilder getJavaLibraryPathParagraph () {
227+ StringBuilder sb = new StringBuilder (I18N .getString ("about.java.library.paths" ))
228+ .append ("\n " ); //NOI18N
229+ String libPaths = System .getProperty ("java.library.path" ); //NOI18N
230+ List <String > invalidPaths = new ArrayList <>();
231+ String separator = getPathSeparator ();
232+ for (String libPath : libPaths .split (separator )) {
233+ try {
234+ Path absolutePath = Paths .get (libPath ).normalize ().toAbsolutePath ();
235+ if (Files .exists (absolutePath )) {
236+ String path = absolutePath .toString ();
237+ sb .append ("\t " ).append (path ).append ("\n " );
238+ } else {
239+ invalidPaths .add (libPath );
240+ }
241+ } catch (InvalidPathException error ) {
242+ invalidPaths .add (libPath );
243+ }
244+ }
245+ sb .append ("\n " );
246+ if (!invalidPaths .isEmpty ()) {
247+ sb .append (I18N .getString ("about.java.library.paths.invalids" )); //NOI18N
248+ sb .append ("\n " );
249+ invalidPaths .forEach (invalidPath -> sb .append ("\t " ).append (invalidPath ).append ("\n " ));
250+ sb .append ("\n " );
251+ }
252+ return sb ;
253+ }
254+
255+ private String getPathSeparator () {
256+ String os = System .getProperty ("os.name" ).toLowerCase ();
257+ if (os .indexOf ("win" ) >= 0 ) {
258+ return ";" ;
259+ } else {
260+ return ":" ;
261+ }
262+ }
263+
202264 private StringBuilder getOsParagraph () {
203265 StringBuilder sb = new StringBuilder (I18N .getString ("about.operating.system" ));
204266 sb .append ("\n " ).append (System .getProperty ("os.name" )).append (", " ) //NOI18N
0 commit comments