Skip to content

Fix small things #1287

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

Merged
stephengold merged 2 commits into from
Feb 12, 2020
Merged

Fix small things #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6adfb7
JmeVersion: Don't throw a NullPointerException when version.propertie…
MeFisto94 Feb 11, 2020
4e0faf5
ImplHandler: Reduce Code-Duplication by using a multi-catch statement
MeFisto94 Feb 11, 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
11 changes: 3 additions & 8 deletions jme3-core/src/main/java/com/jme3/asset/ImplHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2012 jMonkeyEngine
* Copyright (c) 2009-2020 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -120,16 +120,11 @@ protected T initialValue(){
((AssetLocator)obj).setRootPath(path);
}
return obj;
} catch (InstantiationException ex) {
} catch (InstantiationException | IllegalAccessException ex) {
logger.log(Level.SEVERE,"Cannot create locator of type {0}, does"
+ " the class have an empty and publically accessible"+
+ " the class have an empty and publicly accessible"+
" constructor?", type.getName());
logger.throwing(type.getName(), "<init>", ex);
} catch (IllegalAccessException ex) {
logger.log(Level.SEVERE,"Cannot create locator of type {0}, "
+ "does the class have an empty and publically "
+ "accessible constructor?", type.getName());
logger.throwing(type.getName(), "<init>", ex);
}
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions jme3-core/src/main/java/com/jme3/system/JmeVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2015 jMonkeyEngine
* Copyright (c) 2009-2020 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -49,7 +49,7 @@ public class JmeVersion {
static {
try {
props.load(JmeVersion.class.getResourceAsStream("version.properties"));
} catch (IOException ex) {
} catch (IOException | NullPointerException ex) {
logger.log(Level.WARNING, "Unable to read version info!", ex);
}
}
Expand Down