From c66d969c2e67d7d89b9468ce73a0b3eb4de1d55a Mon Sep 17 00:00:00 2001 From: saf Date: Wed, 3 Jun 2020 16:58:15 +0200 Subject: [PATCH] add library name as section name for user imported libraries --- .../kit/library/user/LibraryFolderWatcher.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/library/user/LibraryFolderWatcher.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/library/user/LibraryFolderWatcher.java index 2ce1c0530..3e60a38ff 100644 --- a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/library/user/LibraryFolderWatcher.java +++ b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/library/user/LibraryFolderWatcher.java @@ -411,9 +411,19 @@ private Collection makeLibraryItems(JarReport jarOrFolderReport) th final String canonicalName = e.getKlass().getCanonicalName(); if (!excludedItems.contains(canonicalName) && !artifactsFilter.contains(canonicalName)) { - final String name = e.getKlass().getSimpleName(); - final String fxmlText = JarExplorer.makeFxmlText(e.getKlass()); - result.add(new LibraryItem(name, UserLibrary.TAG_USER_DEFINED, fxmlText, iconURL, library)); + + final String name = e.getKlass().getSimpleName(); + String sectionName =jarOrFolderReport.getJar().toString(); + + // if some os don't use '/' for folder path (don't know if there is) + if (sectionName.lastIndexOf("\\")==-1) + sectionName=UserLibrary.TAG_USER_DEFINED; + else + sectionName=sectionName.substring(sectionName.lastIndexOf("\\")+1, + sectionName.lastIndexOf(".")); + + final String fxmlText = JarExplorer.makeFxmlText(e.getKlass()); + result.add(new LibraryItem(name, sectionName, fxmlText, iconURL, library)); } } }