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

Jump to bottom

Try to fix loading of CSL again #6002

Closed
wants to merge 8 commits into from
Closed

Try to fix loading of CSL again #6002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9cac551
remove check for jar
Siedlerchr Feb 23, 2020
d2733c8
add catch
Siedlerchr Feb 23, 2020
2a55830
try a more direct approach
Siedlerchr Feb 23, 2020
c3777e1
fix syntax error
Siedlerchr Feb 23, 2020
29a9259
Merge remote-tracking branch 'upstream/master' into fixcslpathdiscover
Siedlerchr Feb 24, 2020
07868ff
single loading of resource also fails
Siedlerchr Feb 25, 2020
0898e53
Merge remote-tracking branch 'upstream/master' into fixcslpathdiscover
Siedlerchr Feb 26, 2020
eef9a82
try loadigg single resource and getting path
Siedlerchr Feb 26, 2020
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ task deleteInstallerTemp(type: Delete) {

jpackage.dependsOn deleteInstallerTemp
jlink {
options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
options = [ '--compress', '2', '--no-header-files', '--no-man-pages']
launcher {
name = 'JabRef'
}
Expand Down
25 changes: 8 additions & 17 deletions src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystem;
import java.nio.file.FileSystemAlreadyExistsException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
Expand Down Expand Up @@ -138,25 +135,19 @@ public static List<CitationStyle> discoverCitationStyles() {
return STYLES;
}

URL url = CitationStyle.class.getResource(STYLES_ROOT);
URL url = CitationStyle.class.getResource("csl-styles/academy-of-management-review.csl");
Objects.requireNonNull(url);
if (url == null) {
return Collections.emptyList();
}
try {
URI uri = url.toURI();
if ("jar".equals(uri.getScheme())) {
try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
Path path = fs.getPath(STYLES_ROOT);
STYLES.addAll(discoverCitationStylesInPath(path));
} catch (FileSystemAlreadyExistsException e) {
try (FileSystem fs = FileSystems.getFileSystem(uri)) {
Path path = fs.getPath(STYLES_ROOT);
STYLES.addAll(discoverCitationStylesInPath(path));
}
}
} else {
STYLES.addAll(discoverCitationStylesInPath(Paths.get(uri)));
}
LOGGER.debug("Uri " + uri);
System.out.println(uri);

Path path = Path.of(uri).getParent();
STYLES.addAll(discoverCitationStylesInPath(path));

return STYLES;
} catch (URISyntaxException | IOException e) {
LOGGER.error("something went wrong while searching available CitationStyles. Are you running directly from source code?", e);
Expand Down