add library name as section name for user imported libraries

gluonhq · Jun 3, 2020 · c66d969 · c66d969
1 parent 7585da2
commit c66d969
Showing 1 changed file with 13 additions and 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
@@ -411,9 +411,19 @@ private Collection<LibraryItem> 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));
                 }
             }
         }