mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-20 06:06:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use static emptyList and close InputStream

Browse Source
This commit is contained in:
En-Jan Chou
2020-01-12 21:17:56 -05:00
parent 7ec7cecbfd
commit cb97905c98
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
+14 -8
View File
@@ -22,9 +22,8 @@ import org.cryptomator.ui.unlock.UnlockComponent;
import javax.inject.Named;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@Module(includes = {UpdateCheckerModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, QuitComponent.class})
abstract class FxApplicationModule {
@@ -40,15 +39,22 @@ abstract class FxApplicationModule {
@FxApplicationScoped
static List<Image> provideWindowIcons() {
if (SystemUtils.IS_OS_MAC) {
return new ArrayList<>();
return Collections.emptyList();
}
ArrayList<Image> icons = new ArrayList<>();
icons.add(new Image(FxApplicationModule.class.getResourceAsStream("/window_icon_32.png")));
icons.add(new Image(FxApplicationModule.class.getResourceAsStream("/window_icon_512.png")));
return icons;
try {
return List.of(createImageFromResource("/window_icon_32.png"), createImageFromResource("/window_icon_512.png"));
} catch (IOException e) {
return Collections.emptyList();
}
}
private static Image createImageFromResource(String resourceName) throws IOException {
try (InputStream in = FxApplicationModule.class.getResourceAsStream(resourceName)) {
return new Image(in);
}
}
@Binds
abstract Application bindApplication(FxApplication application);