TODO: fix Locale problem (doesn't seem to work for non-default currently)
if (lang == null) {
locale = Locale.getDefault();
} else {
if (lang == null) {
locale = Locale.getDefault();
} else {
- locale = Locale.forLanguageTag(lang);
+ locale = new Locale(lang);
}
map = Bundles.getBundle("resources", locale);
}
map = Bundles.getBundle("resources", locale);
public static void main(String[] args) throws IOException {
String path = args[0];
for (int i = 1; i < args.length; i++) {
public static void main(String[] args) throws IOException {
String path = args[0];
for (int i = 1; i < args.length; i++) {
- Locale locale = Locale.forLanguageTag(args[i].replaceAll("_", "-"));
+ Locale locale = new Locale(args[i].replaceAll("_", "-"));
String code = locale.toString();
Trans trans = new Trans(code);
String code = locale.toString();
Trans trans = new Trans(code);
Field charset = Charset.class.getDeclaredField("defaultCharset");
charset.setAccessible(true);
charset.set(null, null);
Field charset = Charset.class.getDeclaredField("defaultCharset");
charset.setAccessible(true);
charset.set(null, null);
- } catch (SecurityException | NoSuchFieldException
- | IllegalArgumentException | IllegalAccessException e) {
+ } catch (SecurityException e) {
+ } catch (NoSuchFieldException e) {
+ } catch (IllegalArgumentException e) {
+ } catch (IllegalAccessException e) {
}
if (win instanceof MainWindow) {
}
if (win instanceof MainWindow) {
- MainWindow mwin = (MainWindow) win;
+ final MainWindow mwin = (MainWindow) win;
mwin.refresh(terminal.getTerminalSize());
terminal.addResizeListener(new ResizeListener() {
@Override
mwin.refresh(terminal.getTerminalSize());
terminal.addResizeListener(new ResizeListener() {
@Override
package be.nikiroo.jvcard.tui.panes;
import java.awt.Image;
package be.nikiroo.jvcard.tui.panes;
import java.awt.Image;
-import java.util.Base64;
import java.util.LinkedList;
import java.util.List;
import java.util.LinkedList;
import java.util.List;
+import javax.xml.bind.DatatypeConverter;
import javax.swing.ImageIcon;
import be.nikiroo.jvcard.Contact;
import javax.swing.ImageIcon;
import be.nikiroo.jvcard.Contact;
if (encoding != null && encoding.getValue() != null
&& encoding.getValue().equalsIgnoreCase("b")) {
if (encoding != null && encoding.getValue() != null
&& encoding.getValue().equalsIgnoreCase("b")) {
- image = new ImageIcon(Base64.getDecoder().decode(
+ image = new ImageIcon(DatatypeConverter.parseBase64Binary(
photo.getValue())).getImage();
}
}
photo.getValue())).getImage();
}
}