Skip to content

Commit 0e9b01c

Browse files
committed
minor changes
1 parent aa6f6ae commit 0e9b01c

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

Customer/src/main/java/de/openindex/support/customer/CustomerApplication.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,14 @@
7474
*
7575
* @author Andreas Rudolph
7676
*/
77+
@SuppressWarnings("WeakerAccess")
7778
public class CustomerApplication {
7879
@SuppressWarnings("unused")
7980
private static Logger LOGGER;
80-
@SuppressWarnings("WeakerAccess")
8181
public final static ResourceBundle SETTINGS;
82-
@SuppressWarnings("WeakerAccess")
8382
public final static String NAME;
84-
@SuppressWarnings("WeakerAccess")
8583
public final static String TITLE;
86-
@SuppressWarnings("WeakerAccess")
8784
public final static String VERSION;
88-
@SuppressWarnings("WeakerAccess")
8985
public final static File WORK_DIR;
9086
private final static float JPEG_COMPRESSION = 0.6f;
9187
private final static int SLICE_WIDTH = 100;
@@ -240,14 +236,19 @@ public static void main(String[] args) {
240236
}));
241237
}
242238

243-
@SuppressWarnings("WeakerAccess")
244239
public static URL resource(String file) {
245240
return CustomerApplication.class.getResource("resources/" + file);
246241
}
247242

248-
@SuppressWarnings("WeakerAccess")
243+
@SuppressWarnings("Duplicates")
249244
public static URL resourceBranding() {
250-
return resource("branding.png");
245+
final Locale l = Locale.getDefault();
246+
247+
URL branding = resource("branding_" + l.getLanguage() + "-" + l.getCountry() + ".png");
248+
if (branding == null) branding = resource("branding_" + l.getLanguage() + ".png");
249+
if (branding == null) branding = resource("branding.png");
250+
251+
return branding;
251252
}
252253

253254
public static String setting(String key) {

Staff/src/main/java/de/openindex/support/staff/StaffApplication.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,14 @@
8181
*
8282
* @author Andreas Rudolph
8383
*/
84+
@SuppressWarnings("WeakerAccess")
8485
public class StaffApplication {
8586
@SuppressWarnings("unused")
8687
private static Logger LOGGER;
87-
@SuppressWarnings("WeakerAccess")
8888
public final static ResourceBundle SETTINGS;
89-
@SuppressWarnings("WeakerAccess")
9089
public final static String NAME;
91-
@SuppressWarnings("WeakerAccess")
9290
public final static String TITLE;
93-
@SuppressWarnings("WeakerAccess")
9491
public final static String VERSION;
95-
@SuppressWarnings("WeakerAccess")
9692
public final static File WORK_DIR;
9793
private static StaffOptions options = null;
9894
private static StaffFrame frame = null;
@@ -242,14 +238,19 @@ public static void main(String[] args) {
242238
}));
243239
}
244240

245-
@SuppressWarnings("WeakerAccess")
246241
public static URL resource(String file) {
247242
return StaffApplication.class.getResource("resources/" + file);
248243
}
249244

250-
@SuppressWarnings("WeakerAccess")
245+
@SuppressWarnings("Duplicates")
251246
public static URL resourceBranding() {
252-
return resource("branding.png");
247+
final Locale l = Locale.getDefault();
248+
249+
URL branding = resource("branding_" + l.getLanguage() + "-" + l.getCountry() + ".png");
250+
if (branding == null) branding = resource("branding_" + l.getLanguage() + ".png");
251+
if (branding == null) branding = resource("branding.png");
252+
253+
return branding;
253254
}
254255

255256
public static String setting(String key) {

0 commit comments

Comments
 (0)