From scm@users.nuiton.org Tue Sep 13 14:34:59 2016
From: "nuiton.org scm" <scm@users.nuiton.org>
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] branch develop updated (4efddf4 -> 2528866)
Date: Tue, 13 Sep 2016 14:34:59 +0200
Message-ID: <20160913123459.5266.34740@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2811214126427729432=="

--===============2811214126427729432==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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=C3=A9mo (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(-)

--=20
To stop receiving notification emails like this one, please contact
nuiton.org SCM administrator <admin+scm@nuiton.org>.

--===============2811214126427729432==--


From scm@users.nuiton.org Tue Sep 13 14:34:59 2016
From: "nuiton.org scm" <scm@users.nuiton.org>
To: jaxx-commits@list.nuiton.org
Subject: [Jaxx-commits] 01/01: Stay on java 6 level
Date: Tue, 13 Sep 2016 14:35:00 +0200
Message-ID: <20160913123459.7A3EA5D65E3@goh.codelutin.com>
In-Reply-To: <20160913123459.5266.34740@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1865912551474123947=="

--===============1865912551474123947==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/A=
boutUIBuilder.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/AboutUIB=
uilder.java
+++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIB=
uilder.java
@@ -1,5 +1,28 @@
 package org.nuiton.jaxx.widgets.about;
=20
+/*-
+ * #%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.
+ *=20
+ * 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.
+ *=20
+ * 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;
=20
 import static org.nuiton.i18n.I18n.t;
=20
@@ -175,7 +197,7 @@ public class AboutUIBuilder {
     protected String load(String resourceName) {
         String result =3D null;
         try {
-            result =3D Resources.asCharSource(Resources.getResource(resource=
Name), StandardCharsets.UTF_8).read();
+            result =3D Resources.asCharSource(Resources.getResource(resource=
Name), Charsets.UTF_8).read();
=20
         } catch (IOException ex) {
             // ignore it

--=20
To stop receiving notification emails like this one, please contact
nuiton.org SCM administrator <admin+scm@nuiton.org>.

--===============1865912551474123947==--


