branch develop updated (4efddf4 -> 2528866)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from 4efddf4 Mise en place de AboutUI dans la démo (See #4024) new 2528866 Stay on java 6 level The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 252886681c549ca9d7f1c064dda4e7e3cbc9eef7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 13 14:34:55 2016 +0200 Stay on java 6 level Summary of changes: .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 252886681c549ca9d7f1c064dda4e7e3cbc9eef7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 13 14:34:55 2016 +0200 Stay on java 6 level --- .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java index ee50295..ed7de5e 100644 --- a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java @@ -1,5 +1,28 @@ package org.nuiton.jaxx.widgets.about; +/*- + * #%L + * JAXX :: Widgets About + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.io.Resources; import jaxx.runtime.SwingUtil; @@ -21,7 +44,6 @@ import javax.swing.event.HyperlinkListener; import java.awt.Frame; import java.awt.event.ActionEvent; import java.io.IOException; -import java.nio.charset.StandardCharsets; import static org.nuiton.i18n.I18n.t; @@ -175,7 +197,7 @@ public class AboutUIBuilder { protected String load(String resourceName) { String result = null; try { - result = Resources.asCharSource(Resources.getResource(resourceName), StandardCharsets.UTF_8).read(); + result = Resources.asCharSource(Resources.getResource(resourceName), Charsets.UTF_8).read(); } catch (IOException ex) { // ignore it -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm