- Nuiton-utils-commits - mailman.cloud.codelutin.com

r2285 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: maven-release Date: 2012-01-17 09:44:46 +0100 (Tue, 17 Jan 2012) New Revision: 2285 Url: http://nuiton.org/repositories/revision/nuiton-utils/2285 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-csv/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-profiling/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-utils/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-validator/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -214,12 +214,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2284 - in tags: . nuiton-utils-2.4.3
by maven-release＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: maven-release Date: 2012-01-17 09:44:45 +0100 (Tue, 17 Jan 2012) New Revision: 2284 Url: http://nuiton.org/repositories/revision/nuiton-utils/2284 Log: [maven-release-plugin] copy for tag nuiton-utils-2.4.3 Added: tags/nuiton-utils-2.4.3/ Property changes on: tags/nuiton-utils-2.4.3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2283 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: maven-release Date: 2012-01-17 09:44:44 +0100 (Tue, 17 Jan 2012) New Revision: 2283 Url: http://nuiton.org/repositories/revision/nuiton-utils/2283 Log: [maven-release-plugin] prepare release nuiton-utils-2.4.3 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-csv/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-profiling/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-utils/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-validator/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> <modules> <module>nuiton-utils</module> @@ -214,12 +214,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.3 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> </scm> <distributionManagement>

1 0

r2282 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: tchemit Date: 2012-01-17 09:42:50 +0100 (Tue, 17 Jan 2012) New Revision: 2282 Url: http://nuiton.org/repositories/revision/nuiton-utils/2282 Log: add license headerz Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java 2012-01-16 18:18:43 UTC (rev 2281) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java 2012-01-17 08:42:50 UTC (rev 2282) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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% + */ package org.nuiton.util; import org.apache.commons.logging.Log; Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java 2012-01-16 18:18:43 UTC (rev 2281) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java 2012-01-17 08:42:50 UTC (rev 2282) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 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% + */ package org.nuiton.util; import java.io.IOException; Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2281 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org Jan. 16, 2012

Jan. 16, 2012

Author: tchemit Date: 2012-01-16 19:18:43 +0100 (Mon, 16 Jan 2012) New Revision: 2281 Url: http://nuiton.org/repositories/revision/nuiton-utils/2281 Log: Anomalie #1629: VersionUtil fail with 0.5-beta1 Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java 2012-01-16 16:32:34 UTC (rev 2280) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java 2012-01-16 18:18:43 UTC (rev 2281) @@ -25,7 +25,10 @@ package org.nuiton.util; +import org.apache.commons.lang3.ObjectUtils; + import java.io.Serializable; +import java.util.Arrays; import java.util.regex.Matcher; import static org.nuiton.i18n.I18n._; @@ -88,7 +91,23 @@ * @since 2.4.3 */ protected final boolean snapshot; + /** + * A flag to attach or not the classifier with his number. + * + * If set to false (the default cas then a - will be used to separe them). + * + * Even if the {@link Version} class is immutable, this state can be change + * since it is only used to build the string representation of a version. + * + * Notes that this state is NOT used to test equality of two version, + * neither for the comparaison. + * + * @since 2.4.3 + */ + protected boolean classifierNumberAttached; + + /** * representation textuelle de la version (celle utilisee dans le * {@link #toString()}. */ @@ -155,6 +174,13 @@ Matcher matcher = VersionUtil.VERSION_PATTERN.matcher(version); if (!matcher.matches()) { + + // try with classifier number attached to classifier + matcher = VersionUtil.VERSION_PATTERN2.matcher(version); + classifierNumberAttached = true; + } + + if (!matcher.matches()) { // not a known pattern throw new IllegalArgumentException( _("nuitonutil.error.version.pattern", version)); @@ -216,6 +242,10 @@ return numbers.length; } + public boolean isClassifierNumberAttached() { + return classifierNumberAttached; + } + public int getNumber(int level) { if (level < 0 || level >= numbers.length) { throw new IllegalArgumentException( @@ -234,7 +264,9 @@ if (hasClassifier()) { sb.append('-'); sb.append(classifier); - sb.append('-'); + if (!classifierNumberAttached) { + sb.append('-'); + } sb.append(classifierNumber); } if (isSnapshot()) { @@ -261,6 +293,19 @@ return validName; } + /** + * Change the internal state {@link #classifierNumberAttached}. + * + * @param classifierNumberAttached the new value of the classifierNumberAttached state + */ + public void setClassifierNumberAttached(boolean classifierNumberAttached) { + if (version != null) { + // will force + version = null; + } + this.classifierNumberAttached = classifierNumberAttached; + } + @Override public String toString() { String t = getVersion(); @@ -294,7 +339,10 @@ @Override public boolean equals(Object obj) { return obj != null && obj instanceof Version && - getVersion().equals(((Version) obj).getVersion()); + Arrays.equals(numbers, ((Version) obj).numbers) && + ObjectUtils.equals(classifier, ((Version) obj).classifier) && + ObjectUtils.equals(classifierNumber, ((Version) obj).classifierNumber) && + ObjectUtils.equals(snapshot, ((Version) obj).snapshot); } @Override Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java 2012-01-16 16:32:34 UTC (rev 2280) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java 2012-01-16 18:18:43 UTC (rev 2281) @@ -54,9 +54,10 @@ public class VersionUtil { /** - * Pattern pour detecter une version. + * Pattern pour detecter une version (avec si classifier et numéro de + * classifier séparé par un -, par exemple : 1.0-beta-1). * - * Le pattern possède toujours 3 groupes de captures. + * Le pattern possède toujours 4 groupes de captures. * * - Le groupe 1 est le nombre de la version * - Le groupe 2 est le classifier (peut-etre null) @@ -72,6 +73,25 @@ Pattern.compile("^(\\d+(?:\\.(?:\\d+))*)(?:-(\\w+?)-(\\d+?)){0,1}(-SNAPSHOT){0,1}$"); /** + * Pattern pour detecter une version (avec si classifier et numéro de + * classifier collé, par exemple : 1.0-rc1). + * + * Le pattern possède toujours 4 groupes de captures. + * + * - Le groupe 1 est le nombre de la version + * - Le groupe 2 est le classifier (peut-etre null) + * - Le groupe 3 est le numéro de classifier (peut-etre null) + * - Le groupe 4 est le suffix -SNAPSHOT (peut-etre null) + * + * Dans le cas d'une version simple (sans classifier), le groupe 2, 3 et + * 4 sont null. + * + * Dans le cas d'une version non snapshot, le groupe 4 est null. + */ + public static final Pattern VERSION_PATTERN2 = + Pattern.compile("^(\\d+(?:\\.(?:\\d+))*)(?:-(\\w+?)(\\d+?)){0,1}(-SNAPSHOT){0,1}$"); + + /** * Shared instance of default version comparator. * * @see VersionComparator Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java 2012-01-16 16:32:34 UTC (rev 2280) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java 2012-01-16 18:18:43 UTC (rev 2281) @@ -115,6 +115,31 @@ assertPattern("1.2.3.4-classifier-9-SNAPSHOT", true, "1.2.3.4", "classifier", "9", "-SNAPSHOT"); } + @Test + public void testPatterns2() { + + assertPattern2("1-2.3.4", false); + assertPattern2("1.a", false); + assertPattern2("1.alpha", false); + assertPattern2("1.alpha-", false); + assertPattern2("1.alpha4", false); + assertPattern2("1-alpha", false); + assertPattern2("1-alpha-", false); + assertPattern2("1--3", false); + assertPattern2("-alpha1", false); + assertPattern2("a-alpha1", false); + assertPattern2("-alpha1-", false); + + assertPattern2("1.2.3.4", true, "1.2.3.4", null, null, null); + assertPattern2("1.2.3.4-SNAPSHOT", true, "1.2.3.4", null, null, "-SNAPSHOT"); + + assertPattern2("1.2.3.4-alpha1", true, "1.2.3.4", "alpha", "1", null); + assertPattern2("1.2.3.4-alpha1-SNAPSHOT", true, "1.2.3.4", "alpha", "1", "-SNAPSHOT"); + + assertPattern2("1.2.3.4-classifier9", true, "1.2.3.4", "classifier", "9", null); + assertPattern2("1.2.3.4-classifier9-SNAPSHOT", true, "1.2.3.4", "classifier", "9", "-SNAPSHOT"); + } + /** Test of the {@link VersionUtil#DEFAULT_VERSION_COMPARATOR}. */ @Test public void testVersionComparotor() { @@ -331,7 +356,6 @@ // filter [2,Null[ = [2,3,4,5] actual = VersionUtil.filterVersions(versions, v2, null, true, false); assertVersionsEquals(actual, v2, v3, v4, v5); - } @Test @@ -351,7 +375,18 @@ Assert.assertTrue(v4.isSnapshot()); Assert.assertTrue(v4.before(v2)); + } + @Test + public void testAnomalie1629() { + Version v1 = VersionUtil.valueOf("1-beta1"); + Version v2 = VersionUtil.valueOf("1-beta-1"); + Assert.assertEquals(v1, v2); + Assert.assertFalse(v1.toString().equals(v2.toString())); + v1.setClassifierNumberAttached(false); + Assert.assertEquals(v1, v2); + Assert.assertEquals(v1.toString(), v2.toString()); + } protected static void compareVersions(int order, Iterable<Version> versions) { @@ -404,6 +439,28 @@ } } + protected void assertPattern2(String t, boolean match, String... groups) { + if (log.isDebugEnabled()) { + log.debug("convert " + t + ", mustMatch : " + match); + } + Matcher m = VersionUtil.VERSION_PATTERN2.matcher(t); + + assertEquals(match, m.matches()); + + if (match) { + assertEquals(groups.length, m.groupCount()); + for (int i = 1; i <= m.groupCount(); i++) { + String group = m.group(i); + assertEquals(groups[i - 1], group); + if (group != null) { + if (log.isDebugEnabled()) { + log.debug("group " + i + " : " + group); + } + } + } + } + } + private void assertVersionsEquals(List<Version> actual, Version... expected) { assertEquals(expected.length, actual.size()); int i = 0;

1 0

r2280 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org Jan. 16, 2012

Jan. 16, 2012

Author: tchemit Date: 2012-01-16 17:32:34 +0100 (Mon, 16 Jan 2012) New Revision: 2280 Url: http://nuiton.org/repositories/revision/nuiton-utils/2280 Log: Anomalie #1893: VersionUtil should be able to take account of SNAPSHOT Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java 2012-01-16 14:39:04 UTC (rev 2279) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/Version.java 2012-01-16 16:32:34 UTC (rev 2280) @@ -25,74 +25,76 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; - import java.io.Serializable; import java.util.regex.Matcher; +import static org.nuiton.i18n.I18n._; + /** * A class to represent an application version with possible classifier. - * + * * Replace previously org.nuiton.util.VersionNumber class. - * + * * Simple version number is defined like this : * <pre> * 1.0.0 or 1 * </pre> - * + * * A version can be more complex, with a classifier like this : * <pre> * 1.0.0-alpha-1, 1.0.0-beta-2, 1.0.0-rc-1 * </pre> - * + * * A classifier (alpha, beta, rc, ...) must be follwed by a classifier number. - * - * Note : - * + * + * Note : + * * - initial value is 0 - * + * * - the equals order is defined on {@link #getVersion()} property. - * + * * - the class is comparable, using the natural version order : - * - * <pre>0 < 0.1 < 1 < 1.0 < 1.1-alpha-0 < 1.1-alpha-1 < 1.1-beta-0 < + * + * <pre>0 < 0.1 < 1 < 1.0 < 1.1-alpha-0 < 1.1-alpha-1 < 1.1-beta-0 < * 1.1-rc-1 < 1.1 </pre> + * + * - the class is immutable, you should not instanciate directly a Version, + * but prefer use the factory static methods + * <code>VersionUtil.valueOf(...)</code> instead. * - * - the class is immutable, you should not instanciate directly a Version, - * but prefer use the factory static methods - * <code>VersionUtil.valueOf(...)</code> instead. - * * @author tchemit <chemit(a)codelutin.com> * @since 1.1.0 */ public class Version implements Comparable<Version>, Serializable { private static final long serialVersionUID = 1L; - /** - * Version V0 - */ + + /** Version V0 */ public static final Version VZERO = new Version(); - /** - * optional classifier - */ + + /** optional classifier */ protected final String classifier; - /** - * optional classifier number (if no classifier should be null) - */ + + /** optional classifier number (if no classifier should be null) */ protected final Integer classifierNumber; + + /** main numbers of the version */ + protected final int[] numbers; + /** - * main numbers of the version + * boolean to define if version is a snapshot (if so a -SNAPSHOT is + * added at the end of the textual representation of the version). + * + * @since 2.4.3 */ - protected final int[] numbers; + protected final boolean snapshot; /** * representation textuelle de la version (celle utilisee dans le * {@link #toString()}. */ protected transient String version; - /** - * Constructeur par defaut, definit la version par defaut, i.e 0 - */ + /** Constructeur par defaut, definit la version par defaut, i.e 0 */ public Version() { this(0); } @@ -103,23 +105,39 @@ * @param numbers les nombres de la version */ public Version(int... numbers) { - this(null, null, numbers); + this(null, null, false, numbers); } /** * Constructeur d'une version (simple ou avec classifier) * - * @param classifier le classifier (peut-être null) + * @param classifier le classifier (peut-être null) * @param classiferNumber la version du classifier (doit etre null si le * classifier est null) - * @param numbers les nombres de la version + * @param numbers les nombres de la version */ public Version(String classifier, Integer classiferNumber, int... numbers) { + this(classifier, classiferNumber, false, numbers); + } + + /** + * Constructeur d'une version (simple ou avec classifier) + * + * @param classifier le classifier (peut-être null) + * @param classiferNumber la version du classifier (doit etre null si le + * classifier est null) + * @param snapshot boolean pour renseigner le champ {@link #snapshot}. + * @param numbers les nombres de la version + * @since 2.4.3 + */ + public Version(String classifier, Integer classiferNumber, + boolean snapshot, int... numbers) { this.numbers = numbers.length == 0 ? new int[]{0} : numbers; // always keep a lower case classifier this.classifier = classifier == null ? null : - classifier.trim().toLowerCase(); + classifier.trim().toLowerCase(); classifierNumber = classiferNumber; + this.snapshot = snapshot; } /** @@ -146,9 +164,10 @@ String[] strNumbers = matcher.group(1).split("\\."); String strClassifier = matcher.group(2); String strClassifierNumber = matcher.group(3); + String strSnapshot = matcher.group(4); Integer intClassifierNumber = null; - if (matcher.group(2) != null) { + if (strClassifier != null) { // possede un classifier @@ -156,6 +175,8 @@ intClassifierNumber = Integer.valueOf(strClassifierNumber); } + snapshot = strSnapshot != null; + // numbers numbers = new int[strNumbers.length]; @@ -187,6 +208,10 @@ return classifierNumber; } + public boolean isSnapshot() { + return snapshot; + } + public int getNbComponents() { return numbers.length; } @@ -195,7 +220,7 @@ if (level < 0 || level >= numbers.length) { throw new IllegalArgumentException( "not a valid level " + level + " for the VersionNumber " + - this); + this); } return numbers[level]; } @@ -212,6 +237,9 @@ sb.append('-'); sb.append(classifierNumber); } + if (isSnapshot()) { + sb.append(VersionUtil.SNAPSHOT_SUFFIX); + } version = sb.substring(1); } return version; @@ -219,9 +247,10 @@ /** * Convertit la representation textuelle de la version en identifiant java valide : - * - en java : "." interdit - * - en mysql, h2 ... : "." interdit - * @return la valeur ou les carateres interdits sont remplaces par '_' + * - en java : "." interdit + * - en mysql, h2 ... : "." interdit + * + * @return la valeur ou les carateres interdits sont remplaces par '_' */ public String getValidName() { String validName = getVersion(); @@ -265,7 +294,7 @@ @Override public boolean equals(Object obj) { return obj != null && obj instanceof Version && - getVersion().equals(((Version) obj).getVersion()); + getVersion().equals(((Version) obj).getVersion()); } @Override Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java 2012-01-16 14:39:04 UTC (rev 2279) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/VersionUtil.java 2012-01-16 16:32:34 UTC (rev 2280) @@ -61,11 +61,15 @@ * - Le groupe 1 est le nombre de la version * - Le groupe 2 est le classifier (peut-etre null) * - Le groupe 3 est le numéro de classifier (peut-etre null) + * - Le groupe 4 est le suffix -SNAPSHOT (peut-etre null) * - * Dans le cas d'une version simple (sans classifier), le groupe 2 et 3 sont null. + * Dans le cas d'une version simple (sans classifier), le groupe 2, 3 et + * 4 sont null. + * + * Dans le cas d'une version non snapshot, le groupe 4 est null. */ public static final Pattern VERSION_PATTERN = - Pattern.compile("^(\\d+(?:\\.(?:\\d+))*)(?:-(\\w+?)-(\\d+?)){0,1}$"); + Pattern.compile("^(\\d+(?:\\.(?:\\d+))*)(?:-(\\w+?)-(\\d+?)){0,1}(-SNAPSHOT){0,1}$"); /** * Shared instance of default version comparator. @@ -81,11 +85,23 @@ /** * Recuperation d'une instance de version simple (sans classifier). * + * @param numbers les nombres de la version + * @param snapshot boolean pour indiquer que la version es une snapshot ou pas + * @return l'instance de la version requise + */ + public static Version valueOf(boolean snapshot, int... numbers) { + Version version = valueOf(null, null, snapshot, numbers); + return version; + } + + /** + * Recuperation d'une instance de version simple (sans classifier). + * * @param numbers les nombres de la version * @return l'instance de la version requise */ public static Version valueOf(int... numbers) { - Version version = valueOf(null, null, numbers); + Version version = valueOf(null, null, false, numbers); return version; } @@ -100,11 +116,29 @@ */ public static Version valueOf(String classifier, Integer classifierNumber, int... numbers) { - Version v = new Version(classifier, classifierNumber, numbers); + Version v = valueOf(classifier, classifierNumber, false, numbers); return v; } /** + * Recuperation d'une instance de version. + * + * @param classifier le classifier (peut-etre null) + * @param classifierNumber la version du classifier (doit etre null si le + * classifier est null) + * @param snapshot boolean pour indiquer que la version es une snapshot ou pas + * @param numbers les nombres de la version + * @return l'instance de la version requise + */ + public static Version valueOf(String classifier, + Integer classifierNumber, + boolean snapshot, + int... numbers) { + Version v = new Version(classifier, classifierNumber, snapshot, numbers); + return v; + } + + /** * Recuperation d'une instance de version a partir de sa version textuelle. * * @param version la representation textuelle de la version @@ -143,8 +177,10 @@ throw new IllegalArgumentException( "version " + version + "contains already a classifier "); } - - result = valueOf(classifier, classifierNumber, version.getNumbers()); + result = valueOf(classifier, + classifierNumber, + version.isSnapshot(), + version.getNumbers()); return result; } @@ -164,10 +200,28 @@ throw new IllegalArgumentException( "version " + version + "does no contain a classifier "); } - result = valueOf(version.getNumbers()); + result = valueOf(version.isSnapshot(), version.getNumbers()); return result; } + public static Version addSnapshot(Version version) { + if (version.isSnapshot()) { + throw new IllegalArgumentException( + "version " + version + "is already a snapshot"); + } + Version result = valueOf(version.getClassifier(), version.getClassifierNumber(), true, version.getNumbers()); + return result; + } + + public static Version removeSnapshot(Version version) { + if (!version.isSnapshot()) { + throw new IllegalArgumentException( + "version " + version + "is already a snapshot"); + } + Version result = valueOf(version.getClassifier(), version.getClassifierNumber(), false, version.getNumbers()); + return result; + } + /** * Incremente le numero de version donnee, seul le dernier constituant est * incremente: 1.2.3.4 -> 1.2.3.5; null -> 1; 0 -> 1. @@ -191,6 +245,7 @@ } Version result = valueOf(newClassifier, newClassifierNumber, + v.isSnapshot(), newNumbers); return result; } @@ -289,6 +344,7 @@ if (result != 0) { + // compare snapshot return result; } @@ -304,10 +360,19 @@ // classifier are equals - // compre on classifierNumber + // compare on classifierNumber result = compareClassifierNumber(o1, o2); + if (result != 0) { + return result; + } + + // classifierNumber are equals + + // compare on snapshot + result = compareSnapshot(o1, o2); + return result; } @@ -338,6 +403,11 @@ return o1.classifier.compareTo(o2.classifier); } + if (!o1.hasClassifier() && !o2.hasClassifier()) { + // o1 et o2 n'ont un classifier + return 0; + } + if (!o1.hasClassifier()) { // o1 n'a pas de classifier, o1 est donc plus recent return 1; @@ -355,8 +425,27 @@ public int compareClassifierNumber(Version o1, Version o2) { + if (!o1.hasClassifier() && !o2.hasClassifier()) { + // o1 et o2 n'ont un classifier + return 0; + } return o1.classifierNumber - o2.classifierNumber; } + + public int compareSnapshot(Version o1, Version o2) { + + boolean snapshot1 = o1.isSnapshot(); + boolean snapshot2 = o2.isSnapshot(); + if ((snapshot1 && snapshot2) || (!snapshot1 && !snapshot2)) { + // equals + return 0; + } + if (snapshot1) { + // !snapshot2, so v1 est before v2 + return -1; + } + return 1; + } } /** Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java 2012-01-16 14:39:04 UTC (rev 2279) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/VersionUtilTest.java 2012-01-16 16:32:34 UTC (rev 2280) @@ -25,6 +25,11 @@ package org.nuiton.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -33,16 +38,21 @@ import java.util.Set; import java.util.TreeSet; import java.util.regex.Matcher; -import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** - * * @author tchemit <chemit(a)codelutin.com> * @since 1.1.0 */ public class VersionUtilTest { + /** Logger. */ + private static final Log log = LogFactory.getLog(VersionUtilTest.class); + protected static final List<Version> VERSIONS = Collections.unmodifiableList(Arrays.asList( new Version(), new Version(0, 0, 1), @@ -95,15 +105,17 @@ assertPattern("a-alpha-1", false); assertPattern("-alpha-1-", false); - assertPattern("1.2.3.4", true, "1.2.3.4", null, null); + assertPattern("1.2.3.4", true, "1.2.3.4", null, null, null); + assertPattern("1.2.3.4-SNAPSHOT", true, "1.2.3.4", null, null, "-SNAPSHOT"); - assertPattern("1.2.3.4-alpha-1", true, "1.2.3.4", "alpha", "1"); - assertPattern("1.2.3.4-classifier-9", true, "1.2.3.4", "classifier", "9"); + assertPattern("1.2.3.4-alpha-1", true, "1.2.3.4", "alpha", "1", null); + assertPattern("1.2.3.4-alpha-1-SNAPSHOT", true, "1.2.3.4", "alpha", "1", "-SNAPSHOT"); + + assertPattern("1.2.3.4-classifier-9", true, "1.2.3.4", "classifier", "9", null); + assertPattern("1.2.3.4-classifier-9-SNAPSHOT", true, "1.2.3.4", "classifier", "9", "-SNAPSHOT"); } - /** - * Test of the {@link VersionUtil#DEFAULT_VERSION_COMPARATOR}. - */ + /** Test of the {@link VersionUtil#DEFAULT_VERSION_COMPARATOR}. */ @Test public void testVersionComparotor() { @@ -238,9 +250,7 @@ } } - /** - * Test of filterVersions method, of class VersionUtil. - */ + /** Test of filterVersions method, of class VersionUtil. */ @Test public void testFilterVersions() { @@ -324,6 +334,26 @@ } + @Test + public void testSnapshot() { + Version v = VersionUtil.valueOf("1"); + Assert.assertFalse(v.isSnapshot()); + + Version v2 = VersionUtil.addSnapshot(v); + Assert.assertTrue(v2.isSnapshot()); + + Assert.assertTrue(v2.before(v)); + + Version v3 = VersionUtil.removeSnapshot(v2); + Assert.assertFalse(v3.isSnapshot()); + + Version v4 = VersionUtil.addClassifier(v2, "a", 1); + + Assert.assertTrue(v4.isSnapshot()); + Assert.assertTrue(v4.before(v2)); + + } + protected static void compareVersions(int order, Iterable<Version> versions) { Iterator<Version> iterator = versions.iterator(); @@ -340,7 +370,7 @@ assertTrue(order != 0 || result2 == 0); if (order != 0) { assertTrue("not good order : required = " + order + " but find " + result + " between " + previous + " and " + current, order * result > 0); - assertTrue("not good order : required = " + (-order) + " but find " + result2 + " between " + current + " and " + previous, order * result2 < 0); + assertTrue("not good order : required = " + -order + " but find " + result2 + " between " + current + " and " + previous, order * result2 < 0); if (order > 0) { assertTrue(current.before(previous)); } else { @@ -353,7 +383,9 @@ } protected void assertPattern(String t, boolean match, String... groups) { - System.out.println("convert " + t + ", mustMatch : " + match); + if (log.isDebugEnabled()) { + log.debug("convert " + t + ", mustMatch : " + match); + } Matcher m = VersionUtil.VERSION_PATTERN.matcher(t); assertEquals(match, m.matches()); @@ -364,7 +396,9 @@ String group = m.group(i); assertEquals(groups[i - 1], group); if (group != null) { - System.out.println("group " + i + " : " + group); + if (log.isDebugEnabled()) { + log.debug("group " + i + " : " + group); + } } } }

1 0

r2279 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org Jan. 16, 2012

Jan. 16, 2012

Author: tchemit Date: 2012-01-16 15:39:04 +0100 (Mon, 16 Jan 2012) New Revision: 2279 Url: http://nuiton.org/repositories/revision/nuiton-utils/2279 Log: Evolution #1907: Introduce a PagerBean in PagerUtil Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java 2012-01-16 11:33:11 UTC (rev 2278) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java 2012-01-16 14:39:04 UTC (rev 2279) @@ -26,6 +26,7 @@ import org.apache.commons.lang3.tuple.Pair; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -106,4 +107,103 @@ return result; } + + /** + * Given a pagerBean, compute his {@link PagerBean#recordStartIndex}, + * {@link PagerBean#recordEndIndex} and {@link PagerBean#pagesNumber}. + * + * @param bean the pagerBean to fill + * @since 2.4.3 + */ + public static void computeRecordIndexesAndPagesNumber(PagerBean bean) { + int records = bean.getRecords(); + int pageSize = bean.getPageSize(); + + Pair<Integer, Integer> pageBound = + getPageBound(records, bean.getPageIndex(), pageSize); + bean.setRecordStartIndex(pageBound.getLeft()); + bean.setRecordEndIndex(pageBound.getRight()); + bean.setPagesNumber(getTotalPage(records, pageSize)); + } + + public static PagerBean newPagerBean() { + return new PagerBean(); + } + + /** + * Pager bean containing all internal states of a pager. + * + * @since 2.4.3 + */ + public static class PagerBean implements Serializable { + + private static final long serialVersionUID = 1L; + + /** Number of records (says numbers of rows displayable. */ + protected int records; + + /** Index of the first record in this page. */ + protected int recordStartIndex; + + /** Index of the last record in this page. */ + protected int recordEndIndex; + + /** Index of the page. */ + protected int pageIndex; + + /** Page size, says number of records in a page. */ + protected int pageSize; + + /** Number of pages. */ + protected int pagesNumber; + + public int getRecords() { + return records; + } + + public int getRecordStartIndex() { + return recordStartIndex; + } + + public int getRecordEndIndex() { + return recordEndIndex; + } + + public int getPageIndex() { + return pageIndex; + } + + public int getPageSize() { + return pageSize; + } + + public int getPagesNumber() { + return pagesNumber; + } + + public void setRecords(int records) { + this.records = records; + } + + public void setRecordStartIndex(int recordStartIndex) { + this.recordStartIndex = recordStartIndex; + } + + public void setRecordEndIndex(int recordEndIndex) { + this.recordEndIndex = recordEndIndex; + } + + public void setPageIndex(int pageIndex) { + this.pageIndex = pageIndex; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public void setPagesNumber(int pagesNumber) { + this.pagesNumber = pagesNumber; + } + + } }

1 0

r2278 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv
by bleny＠users.nuiton.org Jan. 16, 2012

Jan. 16, 2012

Author: bleny Date: 2012-01-16 12:33:11 +0100 (Mon, 16 Jan 2012) New Revision: 2278 Url: http://nuiton.org/repositories/revision/nuiton-utils/2278 Log: #1906 allow giving a charset in CSV export Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java 2012-01-10 09:15:15 UTC (rev 2277) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java 2012-01-16 11:33:11 UTC (rev 2278) @@ -29,12 +29,14 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.InputStream; -import java.io.StringWriter; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.Charset; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -78,24 +80,39 @@ return new Export<E>(model, data); } + public static <E> void exportToWriter(ExportModel<E> model, + Iterable<E> data, + Writer writer) throws Exception { + Export<E> exporter = newExport(model, data); + exporter.write(writer); + } + public static <E> void exportToFile(ExportModel<E> model, Iterable<E> data, File file) throws Exception { Export<E> exporter = newExport(model, data); - exporter.exportToFile(file); + exporter.write(file); } + public static <E> void exportToFile(ExportModel<E> model, + Iterable<E> data, + File file, + Charset charset) throws Exception { + Export<E> exporter = newExport(model, data); + exporter.write(file, charset); + } + public static <E> String exportToString(ExportModel<E> model, Iterable<E> data) throws Exception { Export<E> exporter = newExport(model, data); - return exporter.startExportAsString(); + return exporter.toString(Charset.defaultCharset()); } - public static <E> void exportToWriter(ExportModel<E> model, - Iterable<E> data, - Writer writer) throws Exception { + public static <E> String exportToString(ExportModel<E> model, + Iterable<E> data, + Charset charset) throws Exception { Export<E> exporter = newExport(model, data); - exporter.startExport(writer); + return exporter.toString(charset); } protected Export(ExportModel<E> model, Iterable<E> data) { @@ -103,16 +120,7 @@ this.data = data; } - public void exportToFile(File file) throws Exception { - Writer writer = new BufferedWriter(new FileWriter(file)); - try { - startExport(writer); - } finally { - writer.close(); - } - } - - public void startExport(Writer writer) throws Exception { + public void write(Writer writer) throws Exception { String separator = String.valueOf(model.getSeparator()); // add headers @@ -152,19 +160,68 @@ } } - public String startExportAsString() throws Exception { - StringWriter writer = new StringWriter(); + public void write(OutputStream outputStream, Charset charset) throws Exception { + Writer writer = new OutputStreamWriter(outputStream, charset); + write(writer); + } + + public void write(OutputStream outputStream) throws Exception { + write(outputStream, Charset.defaultCharset()); + } + + public void write(File file, Charset charset) throws Exception { + FileOutputStream fileOutputStream = new FileOutputStream(file); try { - startExport(writer); - String result = writer.toString(); - return result; + write(fileOutputStream, charset); } finally { - writer.close(); + fileOutputStream.close(); } } + public void write(File file) throws Exception { + write(file, Charset.defaultCharset()); + } + + public String toString(Charset charset) throws Exception { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream, charset); + write(outputStreamWriter); + String result = new String(outputStream.toByteArray(), charset); + return result; + } + + /** + * @deprecated since 2.4.3, use {@link #write(java.io.File)} instead. + */ + @Deprecated + public void exportToFile(File file) throws Exception { + write(file); + } + + /** + * @deprecated since 2.4.3, use {@link #write(java.io.Writer)} instead. + */ + @Deprecated + public void startExport(Writer writer) throws Exception { + write(writer); + } + + /** + * @deprecated since 2.4.3, use {@link #toString(java.nio.charset.Charset)} instead. + */ + @Deprecated + public String startExportAsString() throws Exception { + return toString(Charset.defaultCharset()); + } + + /** + * @deprecated since 2.4.3. It's not the role of the API to give an InputStream + * you can use {@link #toString(java.nio.charset.Charset)} and + * {@link org.apache.commons.io.IOUtils#toInputStream(String)} + */ + @Deprecated public InputStream startExport() throws Exception { - String content = startExportAsString(); + String content = toString(Charset.defaultCharset()); return IOUtils.toInputStream(content); } }

1 0

r2277 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by jcouteau＠users.nuiton.org Jan. 10, 2012

Jan. 10, 2012

Author: jcouteau Date: 2012-01-10 10:15:15 +0100 (Tue, 10 Jan 2012) New Revision: 2277 Url: http://nuiton.org/repositories/revision/nuiton-utils/2277 Log: #1891 : Introduce a utility method/class to open URIs in the user default browser Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java (rev 0) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DesktopUtil.java 2012-01-10 09:15:15 UTC (rev 2277) @@ -0,0 +1,70 @@ +package org.nuiton.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; + +/** + * Utility class for methods to interact with Desktop Environment + * + * @author jcouteau + * @since 2.4.3 + */ +public class DesktopUtil { + + /** Logger. */ + static private Log log = LogFactory.getLog(DesktopUtil.class); + + /** + * Method to open an URI in the user default web browser. It uses the Java + * Desktop API on Windows and Gnome environment and xdg-open on other + * platforms (non-gnome linux distribution for example). + * + * A Bug report have been opened in 2006 so that java.awt.Desktop can + * support all environments but it is not fixed yet : + * http://bugs.sun.com/view_bug.do?bug_id=6486393 this utility method should + * be removed when the bug is fixed. + * + * @param uri the URI to open + */ + public static void browse(URI uri) { + try { + if (Desktop.isDesktopSupported()) { + Desktop desktop = Desktop.getDesktop(); + if (desktop.isSupported(Desktop.Action.BROWSE)) { + + desktop.browse(uri); + + } else { + if (log.isDebugEnabled()) { + log.debug("Browse operation not supported"); + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("Desktop not supported"); + } + } + } catch(IOException ioe) { + if (log.isDebugEnabled()) { + log.debug("Desktop API not supported, launching xdg-open"); + } + + ProcessBuilder pb = new ProcessBuilder("xdg-open", uri.toString()); + try { + pb.start(); + } catch (IOException e) { + if (log.isDebugEnabled()) { + log.debug("Could not launch browser, there is maybe no " + + "default browser configured on the system"); + } + } + + } + + } + +} Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DesktopUtilTest.java 2012-01-10 09:15:15 UTC (rev 2277) @@ -0,0 +1,15 @@ +package org.nuiton.util; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +public class DesktopUtilTest { + + // Test ignored because it can fail on continuous integration server or + // headless environment + //@Test + public void testBrowse() throws IOException, URISyntaxException { + DesktopUtil.browse(new URI("http://localhost")); + } +}

1 0

r2276 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org Jan. 9, 2012

Jan. 9, 2012

Author: echatellier Date: 2012-01-09 15:21:12 +0100 (Mon, 09 Jan 2012) New Revision: 2276 Url: http://nuiton.org/repositories/revision/nuiton-utils/2276 Log: Fix doc Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/CallAnalyse.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/CallAnalyse.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/CallAnalyse.java 2012-01-09 14:18:56 UTC (rev 2275) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/CallAnalyse.java 2012-01-09 14:21:12 UTC (rev 2276) @@ -59,7 +59,7 @@ * <li> la memore utilisé * <li> le nombre d'appels * - * @see TimeTrace + * @see TimeLog */ public class CallAnalyse { // CallAnalyse

1 0