Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

section name for imported libraries #277

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

section name for imported libraries #277

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c66d969
add library name as section name for user imported libraries
safirex Jun 3, 2020
914d85a
taking possible errors into account
safirex Mar 23, 2021
0824915
Merge branch 'master' into master
safirex Mar 23, 2021
9ad272a
move sectionName creation to function
safirex Apr 2, 2021
1044fbf
updating license year
safirex Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions kit/src/main/java/com/oracle/javafx/scenebuilder/kit/library/user/LibraryFolderWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
safirex marked this conversation as resolved.
Show resolved Hide resolved

// 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
safirex marked this conversation as resolved.
Show resolved Hide resolved
sectionName=sectionName.substring(sectionName.lastIndexOf("\\")+1,
sectionName.lastIndexOf("."));
safirex marked this conversation as resolved.
Show resolved Hide resolved

final String fxmlText = JarExplorer.makeFxmlText(e.getKlass());
safirex marked this conversation as resolved.
Show resolved Hide resolved
result.add(new LibraryItem(name, sectionName, fxmlText, iconURL, library));
}
}
}
Expand Down