From 5961bc70995637bebeda176add3f786aca5e0dc1 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Tue, 4 Feb 2014 18:28:48 +0100 Subject: [PATCH] Normalize copyright header. --- .settings/com.wdev91.eclipse.copyright.xml | 59 ++++++++++++ src/fr/devinsy/util/DataFile.java | 19 +++- src/fr/devinsy/util/DataFiles.java | 19 +++- src/fr/devinsy/util/DateHelper.java | 19 +++- src/fr/devinsy/util/DateTimeHelper.java | 19 +++- src/fr/devinsy/util/Digester.java | 22 ++++- src/fr/devinsy/util/FileCopier.java | 18 ++++ src/fr/devinsy/util/FileIterator.java | 20 +++- src/fr/devinsy/util/FileIteratorState.java | 20 +++- src/fr/devinsy/util/FileTools.java | 24 ++++- src/fr/devinsy/util/Fraction.java | 25 +++-- .../util/InternetProxyConfiguration.java | 19 +++- src/fr/devinsy/util/SimpleAveragemeter.java | 29 ++++-- src/fr/devinsy/util/SimpleChronometer.java | 19 +++- src/fr/devinsy/util/StacktraceWriter.java | 18 ++++ src/fr/devinsy/util/StringConcatenator.java | 21 ++++- src/fr/devinsy/util/StringList.java | 19 +++- .../devinsy/util/StringListCharPosition.java | 25 +++-- src/fr/devinsy/util/StringListWriter.java | 19 +++- src/fr/devinsy/util/ToolBox.java | 25 +++-- src/fr/devinsy/util/cmdexec/CmdExec.java | 44 +++++++-- .../devinsy/util/cmdexec/StreamGobbler.java | 24 ++++- src/fr/devinsy/util/cmdexec/Wrapper.java | 23 ++++- src/fr/devinsy/util/rss/RSSCache.java | 23 ++++- src/fr/devinsy/util/rss/RSSElement.java | 29 ++++-- src/fr/devinsy/util/rss/RSSWriter.java | 27 ++++-- src/fr/devinsy/util/unix/CachedFile.java | 20 +++- src/fr/devinsy/util/unix/EtcGroupFile.java | 22 ++++- .../devinsy/util/unix/EtcGroupFileReader.java | 18 ++++ src/fr/devinsy/util/unix/EtcPasswdFile.java | 18 ++++ .../util/unix/EtcPasswdFileReader.java | 18 ++++ src/fr/devinsy/util/unix/Group.java | 18 ++++ src/fr/devinsy/util/unix/Groups.java | 18 ++++ src/fr/devinsy/util/unix/Unix.java | 18 ++++ src/fr/devinsy/util/unix/User.java | 19 +++- src/fr/devinsy/util/unix/Users.java | 18 ++++ src/fr/devinsy/util/unix/acl/Acl.java | 18 ++++ src/fr/devinsy/util/unix/acl/AclEntries.java | 18 ++++ src/fr/devinsy/util/unix/acl/AclEntry.java | 21 ++++- src/fr/devinsy/util/unix/acl/AclManager.java | 18 ++++ src/fr/devinsy/util/xml/XMLAttributes.java | 63 ++++++++++--- .../util/xml/XMLBadFormatException.java | 27 +++++- src/fr/devinsy/util/xml/XMLReader.java | 18 ++++ src/fr/devinsy/util/xml/XMLTag.java | 91 +++++++++++++------ src/fr/devinsy/util/xml/XMLTools.java | 18 ++++ src/fr/devinsy/util/xml/XMLWriter.java | 18 ++++ src/fr/devinsy/util/xml/XMLZipReader.java | 27 +++++- src/fr/devinsy/util/xml/XMLZipWriter.java | 54 +++++++---- 48 files changed, 1037 insertions(+), 169 deletions(-) create mode 100644 .settings/com.wdev91.eclipse.copyright.xml diff --git a/.settings/com.wdev91.eclipse.copyright.xml b/.settings/com.wdev91.eclipse.copyright.xml new file mode 100644 index 0000000..68d37d6 --- /dev/null +++ b/.settings/com.wdev91.eclipse.copyright.xml @@ -0,0 +1,59 @@ + + + + ]]> +
+
+
+
+
+
+ + + ]]> + ]]> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+ diff --git a/src/fr/devinsy/util/DataFile.java b/src/fr/devinsy/util/DataFile.java index 6c101c8..5176313 100755 --- a/src/fr/devinsy/util/DataFile.java +++ b/src/fr/devinsy/util/DataFile.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, June 2008. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2008-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/DataFiles.java b/src/fr/devinsy/util/DataFiles.java index e4d380d..51a7c26 100755 --- a/src/fr/devinsy/util/DataFiles.java +++ b/src/fr/devinsy/util/DataFiles.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, June 2008. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2008-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/DateHelper.java b/src/fr/devinsy/util/DateHelper.java index a298c82..a84a2d9 100755 --- a/src/fr/devinsy/util/DateHelper.java +++ b/src/fr/devinsy/util/DateHelper.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, June 2010. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/DateTimeHelper.java b/src/fr/devinsy/util/DateTimeHelper.java index c43e80e..fa566e4 100755 --- a/src/fr/devinsy/util/DateTimeHelper.java +++ b/src/fr/devinsy/util/DateTimeHelper.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, June 2010. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/Digester.java b/src/fr/devinsy/util/Digester.java index 6daf118..214c829 100644 --- a/src/fr/devinsy/util/Digester.java +++ b/src/fr/devinsy/util/Digester.java @@ -1,8 +1,20 @@ -/* - * @author Christian Momon, 2006-2010 - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. - * +/** + * Copyright (C) 2006, 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/FileCopier.java b/src/fr/devinsy/util/FileCopier.java index 6d6050e..eade174 100644 --- a/src/fr/devinsy/util/FileCopier.java +++ b/src/fr/devinsy/util/FileCopier.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util; import java.io.File; diff --git a/src/fr/devinsy/util/FileIterator.java b/src/fr/devinsy/util/FileIterator.java index f18e664..a47b6c6 100644 --- a/src/fr/devinsy/util/FileIterator.java +++ b/src/fr/devinsy/util/FileIterator.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util; import java.io.File; @@ -163,7 +181,7 @@ public class FileIterator extends Vector implements Iterator< { String result; - if (pattern == null) + if (this.pattern == null) { result = ".*"; } diff --git a/src/fr/devinsy/util/FileIteratorState.java b/src/fr/devinsy/util/FileIteratorState.java index b0cab74..b0f3b69 100644 --- a/src/fr/devinsy/util/FileIteratorState.java +++ b/src/fr/devinsy/util/FileIteratorState.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util; import java.io.File; @@ -139,6 +157,6 @@ public class FileIteratorState implements Iterator */ public void reset() { - currentIndex = 0; + this.currentIndex = 0; } } diff --git a/src/fr/devinsy/util/FileTools.java b/src/fr/devinsy/util/FileTools.java index 021ba80..40b55d6 100644 --- a/src/fr/devinsy/util/FileTools.java +++ b/src/fr/devinsy/util/FileTools.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2008-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util; import java.io.BufferedReader; @@ -15,11 +33,7 @@ import java.net.URL; /** * - @author christian.momon@devinsy.fr, 2008-2013 copyright. - * - * This file is free software under the terms of the GNU Library General - * Public License as published by the Free Software Foundation version 3 - * or any later version. + * @author cpm * */ public class FileTools diff --git a/src/fr/devinsy/util/Fraction.java b/src/fr/devinsy/util/Fraction.java index 351ddce..93fd093 100644 --- a/src/fr/devinsy/util/Fraction.java +++ b/src/fr/devinsy/util/Fraction.java @@ -1,15 +1,28 @@ /** - * Fraction class. Useful for display beautiful percentage value as string. + * Copyright (C) 2009-2010, 2013-2014 Christian Pierre MOMON * - * @author Christian Momon, September 2009. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; /** - * - * */ + * Useful for display beautiful percentage value as string. + * + * @author cpm + */ public class Fraction { protected long numerator; diff --git a/src/fr/devinsy/util/InternetProxyConfiguration.java b/src/fr/devinsy/util/InternetProxyConfiguration.java index 63134ad..1cbf413 100755 --- a/src/fr/devinsy/util/InternetProxyConfiguration.java +++ b/src/fr/devinsy/util/InternetProxyConfiguration.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, September 2009. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2009-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/SimpleAveragemeter.java b/src/fr/devinsy/util/SimpleAveragemeter.java index 7168fae..16cc624 100755 --- a/src/fr/devinsy/util/SimpleAveragemeter.java +++ b/src/fr/devinsy/util/SimpleAveragemeter.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, September 2009. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2009-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; @@ -30,16 +43,16 @@ public class SimpleAveragemeter synchronized public void add(final long value) { // Manage the sum limit. - if ((this.sum > Long.MAX_VALUE / 2) && (cardinal % 2 == 0)) + if ((this.sum > Long.MAX_VALUE / 2) && (this.cardinal % 2 == 0)) { this.sum = this.sum / 2; this.cardinal = this.cardinal / 2; } // Add the new value. - if (this.sum > MAX_ADD) + if (this.sum > this.MAX_ADD) { - this.sum += MAX_ADD; + this.sum += this.MAX_ADD; this.cardinal += 1; } else @@ -56,13 +69,13 @@ public class SimpleAveragemeter { long result; - if (cardinal == 0) + if (this.cardinal == 0) { result = 0; } else { - result = sum / cardinal; + result = this.sum / this.cardinal; } // diff --git a/src/fr/devinsy/util/SimpleChronometer.java b/src/fr/devinsy/util/SimpleChronometer.java index ae31976..5d34637 100755 --- a/src/fr/devinsy/util/SimpleChronometer.java +++ b/src/fr/devinsy/util/SimpleChronometer.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, in June 2008. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2008-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/StacktraceWriter.java b/src/fr/devinsy/util/StacktraceWriter.java index 38d9e34..550dc22 100644 --- a/src/fr/devinsy/util/StacktraceWriter.java +++ b/src/fr/devinsy/util/StacktraceWriter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util; import java.io.ByteArrayOutputStream; diff --git a/src/fr/devinsy/util/StringConcatenator.java b/src/fr/devinsy/util/StringConcatenator.java index 8a9b895..a51970b 100755 --- a/src/fr/devinsy/util/StringConcatenator.java +++ b/src/fr/devinsy/util/StringConcatenator.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, June 2008. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2008-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; @@ -87,7 +100,7 @@ public class StringConcatenator extends ArrayList { StringConcatenator result; - this.add(LINE_SEPARATOR); + this.add(this.LINE_SEPARATOR); result = this; diff --git a/src/fr/devinsy/util/StringList.java b/src/fr/devinsy/util/StringList.java index dbce24f..22dc006 100755 --- a/src/fr/devinsy/util/StringList.java +++ b/src/fr/devinsy/util/StringList.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, June 2008. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2008-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/StringListCharPosition.java b/src/fr/devinsy/util/StringListCharPosition.java index c80fe66..2a14d0d 100644 --- a/src/fr/devinsy/util/StringListCharPosition.java +++ b/src/fr/devinsy/util/StringListCharPosition.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, 2013. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; @@ -25,17 +38,17 @@ public class StringListCharPosition public int getCharIndex() { - return charIndex; + return this.charIndex; } public int getLocalCharIndex() { - return localCharIndex; + return this.localCharIndex; } public int getStringIndex() { - return stringIndex; + return this.stringIndex; } public void setCharIndex(final int charIndex) diff --git a/src/fr/devinsy/util/StringListWriter.java b/src/fr/devinsy/util/StringListWriter.java index 75c8e18..5f4c3b5 100755 --- a/src/fr/devinsy/util/StringListWriter.java +++ b/src/fr/devinsy/util/StringListWriter.java @@ -1,7 +1,20 @@ /** - * @author Christian Momon, March 2010. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see */ package fr.devinsy.util; diff --git a/src/fr/devinsy/util/ToolBox.java b/src/fr/devinsy/util/ToolBox.java index e1c9fb6..33a649c 100644 --- a/src/fr/devinsy/util/ToolBox.java +++ b/src/fr/devinsy/util/ToolBox.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2008-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util; import java.util.Arrays; @@ -8,12 +26,7 @@ import org.apache.commons.lang3.StringUtils; /** * - @author christian.momon@devinsy.fr, June 2008, copyright. - * - * This file is free software under the terms of the GNU Library General - * Public License as published by the Free Software Foundation version 3 - * or any later version. - * + * @author christian.momon@devinsy.fr */ public class ToolBox { diff --git a/src/fr/devinsy/util/cmdexec/CmdExec.java b/src/fr/devinsy/util/cmdexec/CmdExec.java index 806c7fe..7eab93a 100644 --- a/src/fr/devinsy/util/cmdexec/CmdExec.java +++ b/src/fr/devinsy/util/cmdexec/CmdExec.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2005-2010, 2013 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.cmdexec; import org.slf4j.Logger; @@ -8,6 +26,7 @@ import fr.devinsy.util.StringConcatenator; /** * We must use the isOver method on Gobblers because with short tasks the * waitFor ends before the Gobbler read. + * */ public class CmdExec { @@ -161,7 +180,15 @@ public class CmdExec } /** - * Command: not a shell command, it must be a executable program. + * Note: this code is inspired by an article of Michael C. Daconta published + * in JavaWorld Dec 29, 2000 (http://www.javaworld.com/article/2071275 + * /core-java/when-runtime-exec---won -t.html?page=2). + * + * @param command + * not a shell command, it must be a executable program. + * @param outputGobbler + * @param errorGobbler + * @return */ public int run(final String[] command, final StreamGobbler outputGobbler, final StreamGobbler errorGobbler) { @@ -176,19 +203,19 @@ public class CmdExec Process proc = rt.exec(command); - // Any error message? + // Set a collector for error message. errorGobbler.setInputStream(proc.getErrorStream()); - // Any output? + // Set a collector for output message. outputGobbler.setInputStream(proc.getInputStream()); - // Kick them off + // Collect messages. errorGobbler.start(); outputGobbler.start(); - // Any error??? + // Wait and manage the exit value. this.exitValue = proc.waitFor(); - logger.info("ExitValue: " + exitValue); + logger.info("ExitValue: " + this.exitValue); // Sometimes, process ends before Gobblers read its outpout, so we // must wait them. @@ -197,8 +224,9 @@ public class CmdExec Thread.sleep(2); } - out = outputGobbler.getStream(); - err = errorGobbler.getStream(); + // Store messsages. + this.out = outputGobbler.getStream(); + this.err = errorGobbler.getStream(); } catch (Exception exception) { diff --git a/src/fr/devinsy/util/cmdexec/StreamGobbler.java b/src/fr/devinsy/util/cmdexec/StreamGobbler.java index 7c4f716..513b693 100644 --- a/src/fr/devinsy/util/cmdexec/StreamGobbler.java +++ b/src/fr/devinsy/util/cmdexec/StreamGobbler.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2005-2008, 2010, 2013 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.cmdexec; import java.io.BufferedReader; @@ -124,7 +142,7 @@ public class StreamGobbler extends Thread { try { - InputStreamReader isr = new InputStreamReader(is); + InputStreamReader isr = new InputStreamReader(this.is); BufferedReader buffer = new BufferedReader(isr); String line = null; if (this.streamWay == NONE) @@ -138,14 +156,14 @@ public class StreamGobbler extends Thread { while ((line = buffer.readLine()) != null) { - System.out.println(type + ">" + line); + System.out.println(this.type + ">" + line); } } else if (this.streamWay == BUFFER) { while ((line = buffer.readLine()) != null) { - stream.append(line + "\n"); + this.stream.append(line + "\n"); } } else diff --git a/src/fr/devinsy/util/cmdexec/Wrapper.java b/src/fr/devinsy/util/cmdexec/Wrapper.java index f672c3c..df5060b 100644 --- a/src/fr/devinsy/util/cmdexec/Wrapper.java +++ b/src/fr/devinsy/util/cmdexec/Wrapper.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2005-2008, 2010, 2013 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.cmdexec; import java.io.BufferedReader; @@ -9,8 +27,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * + * @deprecated */ +@Deprecated public class Wrapper { static private final Wrapper instance = new Wrapper(); @@ -64,4 +83,4 @@ public class Wrapper } } -// //////////////////////////////////////////////////////////////////////// \ No newline at end of file +// //////////////////////////////////////////////////////////////////////// diff --git a/src/fr/devinsy/util/rss/RSSCache.java b/src/fr/devinsy/util/rss/RSSCache.java index cd6ef51..fcff04d 100644 --- a/src/fr/devinsy/util/rss/RSSCache.java +++ b/src/fr/devinsy/util/rss/RSSCache.java @@ -1,14 +1,29 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.rss; import java.util.HashMap; import java.util.Locale; /** - * @author christian.momon@devinsy.fr, 2013, copyright. * - * This file is free software under the terms of the GNU Library General - * Public License as published by the Free Software Foundation version 3 - * or any later version. + * @author christian.momon@devinsy.fr */ public class RSSCache { diff --git a/src/fr/devinsy/util/rss/RSSElement.java b/src/fr/devinsy/util/rss/RSSElement.java index 7b8b73f..a9b5394 100644 --- a/src/fr/devinsy/util/rss/RSSElement.java +++ b/src/fr/devinsy/util/rss/RSSElement.java @@ -1,13 +1,28 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.rss; import org.joda.time.DateTime; /** - * @author christian.momon@devinsy.fr, 2013, copyright. * - * This file is free software under the terms of the GNU Library General - * Public License as published by the Free Software Foundation version 3 - * or any later version. + * @author christian.momon@devinsy.fr */ public class RSSElement { @@ -85,7 +100,7 @@ public class RSSElement public String[] getAttributes() { - return attributes; + return this.attributes; } /** @@ -94,7 +109,7 @@ public class RSSElement */ public String getName() { - return name; + return this.name; } /** @@ -103,7 +118,7 @@ public class RSSElement */ public String getValue() { - return value; + return this.value; } public void setAttributes(final String[] attributes) diff --git a/src/fr/devinsy/util/rss/RSSWriter.java b/src/fr/devinsy/util/rss/RSSWriter.java index 8c60ffb..f8c0d43 100644 --- a/src/fr/devinsy/util/rss/RSSWriter.java +++ b/src/fr/devinsy/util/rss/RSSWriter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.rss; import java.io.File; @@ -10,11 +28,8 @@ import java.io.Writer; import fr.devinsy.util.xml.XMLWriter; /** - * @author christian.momon@devinsy.fr, 2013, copyright. * - * This file is free software under the terms of the GNU Library General - * Public License as published by the Free Software Foundation version 3 - * or any later version. + * @author christian.momon@devinsy.fr */ public class RSSWriter { @@ -96,7 +111,7 @@ public class RSSWriter { for (RSSElement element : elements) { - out.writeTag(element.getName(), element.getValue(), element.getAttributes()); + this.out.writeTag(element.getName(), element.getValue(), element.getAttributes()); } } } @@ -138,7 +153,7 @@ public class RSSWriter { for (RSSElement element : elements) { - out.writeTag(element.getName(), element.getValue(), element.getAttributes()); + this.out.writeTag(element.getName(), element.getValue(), element.getAttributes()); } } diff --git a/src/fr/devinsy/util/unix/CachedFile.java b/src/fr/devinsy/util/unix/CachedFile.java index 6b331b6..a12140d 100644 --- a/src/fr/devinsy/util/unix/CachedFile.java +++ b/src/fr/devinsy/util/unix/CachedFile.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.io.File; @@ -112,4 +130,4 @@ public class CachedFile } } -// //////////////////////////////////////////////////////////////////////// \ No newline at end of file +// //////////////////////////////////////////////////////////////////////// diff --git a/src/fr/devinsy/util/unix/EtcGroupFile.java b/src/fr/devinsy/util/unix/EtcGroupFile.java index 54d2c74..c93141d 100644 --- a/src/fr/devinsy/util/unix/EtcGroupFile.java +++ b/src/fr/devinsy/util/unix/EtcGroupFile.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.util.Vector; @@ -110,9 +128,9 @@ public class EtcGroupFile extends CachedFile { String result; - groups = updatedGroups(); + this.groups = updatedGroups(); - result = groups.getLoginGroupsString(login); + result = this.groups.getLoginGroupsString(login); // return (result); diff --git a/src/fr/devinsy/util/unix/EtcGroupFileReader.java b/src/fr/devinsy/util/unix/EtcGroupFileReader.java index 2d7b5f6..29f85fe 100644 --- a/src/fr/devinsy/util/unix/EtcGroupFileReader.java +++ b/src/fr/devinsy/util/unix/EtcGroupFileReader.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.io.BufferedReader; diff --git a/src/fr/devinsy/util/unix/EtcPasswdFile.java b/src/fr/devinsy/util/unix/EtcPasswdFile.java index 6c2e49d..ab98f03 100644 --- a/src/fr/devinsy/util/unix/EtcPasswdFile.java +++ b/src/fr/devinsy/util/unix/EtcPasswdFile.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import org.slf4j.Logger; diff --git a/src/fr/devinsy/util/unix/EtcPasswdFileReader.java b/src/fr/devinsy/util/unix/EtcPasswdFileReader.java index 7ef43e1..9c9c360 100644 --- a/src/fr/devinsy/util/unix/EtcPasswdFileReader.java +++ b/src/fr/devinsy/util/unix/EtcPasswdFileReader.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.io.BufferedReader; diff --git a/src/fr/devinsy/util/unix/Group.java b/src/fr/devinsy/util/unix/Group.java index b237d8b..0ff7b13 100644 --- a/src/fr/devinsy/util/unix/Group.java +++ b/src/fr/devinsy/util/unix/Group.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.util.Vector; diff --git a/src/fr/devinsy/util/unix/Groups.java b/src/fr/devinsy/util/unix/Groups.java index b98d9f3..066563a 100644 --- a/src/fr/devinsy/util/unix/Groups.java +++ b/src/fr/devinsy/util/unix/Groups.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.util.Iterator; diff --git a/src/fr/devinsy/util/unix/Unix.java b/src/fr/devinsy/util/unix/Unix.java index b95972c..b887dc5 100644 --- a/src/fr/devinsy/util/unix/Unix.java +++ b/src/fr/devinsy/util/unix/Unix.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.io.File; diff --git a/src/fr/devinsy/util/unix/User.java b/src/fr/devinsy/util/unix/User.java index ddb56bc..dec8b63 100644 --- a/src/fr/devinsy/util/unix/User.java +++ b/src/fr/devinsy/util/unix/User.java @@ -1,6 +1,23 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; - /** * */ diff --git a/src/fr/devinsy/util/unix/Users.java b/src/fr/devinsy/util/unix/Users.java index 8bbf878..a9a3aff 100644 --- a/src/fr/devinsy/util/unix/Users.java +++ b/src/fr/devinsy/util/unix/Users.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix; import java.util.Iterator; diff --git a/src/fr/devinsy/util/unix/acl/Acl.java b/src/fr/devinsy/util/unix/acl/Acl.java index 7b521c0..15bfcba 100644 --- a/src/fr/devinsy/util/unix/acl/Acl.java +++ b/src/fr/devinsy/util/unix/acl/Acl.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix.acl; /** diff --git a/src/fr/devinsy/util/unix/acl/AclEntries.java b/src/fr/devinsy/util/unix/acl/AclEntries.java index 6360eec..0239d8d 100644 --- a/src/fr/devinsy/util/unix/acl/AclEntries.java +++ b/src/fr/devinsy/util/unix/acl/AclEntries.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix.acl; import java.util.Iterator; diff --git a/src/fr/devinsy/util/unix/acl/AclEntry.java b/src/fr/devinsy/util/unix/acl/AclEntry.java index b9771fa..cfadba3 100644 --- a/src/fr/devinsy/util/unix/acl/AclEntry.java +++ b/src/fr/devinsy/util/unix/acl/AclEntry.java @@ -1,6 +1,23 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix.acl; - /** * */ @@ -72,7 +89,7 @@ public class AclEntry { String result; - result = permission; + result = this.permission; // return (result); diff --git a/src/fr/devinsy/util/unix/acl/AclManager.java b/src/fr/devinsy/util/unix/acl/AclManager.java index 5619926..2d12e9e 100644 --- a/src/fr/devinsy/util/unix/acl/AclManager.java +++ b/src/fr/devinsy/util/unix/acl/AclManager.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010, 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.unix.acl; import java.io.File; diff --git a/src/fr/devinsy/util/xml/XMLAttributes.java b/src/fr/devinsy/util/xml/XMLAttributes.java index 9b982fa..a594e3f 100644 --- a/src/fr/devinsy/util/xml/XMLAttributes.java +++ b/src/fr/devinsy/util/xml/XMLAttributes.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import java.util.ArrayList; @@ -16,31 +34,37 @@ import javax.xml.stream.events.Attribute; * Public License as published by the Free Software Foundation version 3 * or any later version. */ -public class XMLAttributes extends HashMap implements Iterable { +public class XMLAttributes extends HashMap implements Iterable +{ private static final long serialVersionUID = 8456469741805779474L; /** * */ - public XMLAttributes() { + public XMLAttributes() + { super(); } /** * */ - public XMLAttributes(final int capacity) { + public XMLAttributes(final int capacity) + { super(capacity); } /** * */ - public XMLAttributes(final Iterator source) { + public XMLAttributes(final Iterator source) + { super(); - if (source != null) { - while (source.hasNext()) { + if (source != null) + { + while (source.hasNext()) + { Attribute attribute = source.next(); add(attribute); @@ -51,7 +75,8 @@ public class XMLAttributes extends HashMap implements Iterabl /** * */ - public XMLAttributes(final XMLAttributes source) { + public XMLAttributes(final XMLAttributes source) + { super(); addAll(source); } @@ -60,8 +85,10 @@ public class XMLAttributes extends HashMap implements Iterabl * * @param attribute */ - public void add(final Attribute attribute) { - if (attribute != null) { + public void add(final Attribute attribute) + { + if (attribute != null) + { put(attribute.getName().getLocalPart(), attribute); } } @@ -70,8 +97,10 @@ public class XMLAttributes extends HashMap implements Iterabl * * @param source */ - public void addAll(final XMLAttributes source) { - for (Attribute attribute : source) { + public void addAll(final XMLAttributes source) + { + for (Attribute attribute : source) + { this.add(attribute); } } @@ -81,7 +110,8 @@ public class XMLAttributes extends HashMap implements Iterabl * @param label * @return */ - public Attribute getByLabel(final String label) { + public Attribute getByLabel(final String label) + { Attribute result; result = get(label); @@ -94,7 +124,8 @@ public class XMLAttributes extends HashMap implements Iterabl * */ @Override - public Iterator iterator() { + public Iterator iterator() + { Iterator result; result = this.values().iterator(); @@ -107,7 +138,8 @@ public class XMLAttributes extends HashMap implements Iterabl * * @return */ - public Set labels() { + public Set labels() + { Set result; result = this.keySet(); @@ -120,7 +152,8 @@ public class XMLAttributes extends HashMap implements Iterabl * * @return */ - public List toList() { + public List toList() + { List result; result = new ArrayList(values()); diff --git a/src/fr/devinsy/util/xml/XMLBadFormatException.java b/src/fr/devinsy/util/xml/XMLBadFormatException.java index e360fbc..e79d451 100644 --- a/src/fr/devinsy/util/xml/XMLBadFormatException.java +++ b/src/fr/devinsy/util/xml/XMLBadFormatException.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; /** @@ -7,7 +25,8 @@ package fr.devinsy.util.xml; * Public License as published by the Free Software Foundation version 3 * or any later version. */ -public class XMLBadFormatException extends Exception { +public class XMLBadFormatException extends Exception +{ private static final long serialVersionUID = 768256303984176512L; @@ -16,7 +35,8 @@ public class XMLBadFormatException extends Exception { * @param code * @param message */ - public XMLBadFormatException(final String message) { + public XMLBadFormatException(final String message) + { super(message); } @@ -26,7 +46,8 @@ public class XMLBadFormatException extends Exception { * @param message * @param exception */ - public XMLBadFormatException(final String message, final Exception exception) { + public XMLBadFormatException(final String message, final Exception exception) + { super(message, exception); } } diff --git a/src/fr/devinsy/util/xml/XMLReader.java b/src/fr/devinsy/util/xml/XMLReader.java index 3258252..0c376fc 100644 --- a/src/fr/devinsy/util/xml/XMLReader.java +++ b/src/fr/devinsy/util/xml/XMLReader.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import java.io.File; diff --git a/src/fr/devinsy/util/xml/XMLTag.java b/src/fr/devinsy/util/xml/XMLTag.java index b92f1b6..4a0c70a 100644 --- a/src/fr/devinsy/util/xml/XMLTag.java +++ b/src/fr/devinsy/util/xml/XMLTag.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import javax.xml.namespace.QName; @@ -10,15 +28,12 @@ import javax.xml.namespace.QName; * Public License as published by the Free Software Foundation version 3 * or any later version. */ -public class XMLTag { +public class XMLTag +{ - public enum TagType { - HEADER, - START, - END, - EMPTY, - CONTENT, - FOOTER + public enum TagType + { + HEADER, START, END, EMPTY, CONTENT, FOOTER } private QName name; @@ -29,31 +44,38 @@ public class XMLTag { /** * */ - public XMLTag(final QName name, final TagType type, final XMLAttributes attributes) { + public XMLTag(final QName name, final TagType type, final XMLAttributes attributes) + { this.name = name; this.type = type; this.attributes = attributes; this.content = null; } - public XMLAttributes attributes() { + public XMLAttributes attributes() + { return this.attributes; } - public String getContent() { - return content; + public String getContent() + { + return this.content; } /** * * @return */ - public String getLabel() { + public String getLabel() + { String result; - if (this.name == null) { + if (this.name == null) + { result = ""; - } else { + } + else + { result = this.name.getLocalPart(); } @@ -61,20 +83,25 @@ public class XMLTag { return result; } - public QName getName() { - return name; + public QName getName() + { + return this.name; } /** * * @return */ - public String getNamespaceURI() { + public String getNamespaceURI() + { String result; - if (this.name == null) { + if (this.name == null) + { result = ""; - } else { + } + else + { result = this.name.getNamespaceURI(); } @@ -86,12 +113,16 @@ public class XMLTag { * * @return */ - public String getPrefix() { + public String getPrefix() + { String result; - if (this.name == null) { + if (this.name == null) + { result = ""; - } else { + } + else + { result = this.name.getPrefix(); } @@ -99,19 +130,23 @@ public class XMLTag { return result; } - public TagType getType() { - return type; + public TagType getType() + { + return this.type; } - public void setContent(final String content) { + public void setContent(final String content) + { this.content = content; } - public void setName(final QName name) { + public void setName(final QName name) + { this.name = name; } - public void setType(final TagType type) { + public void setType(final TagType type) + { this.type = type; } } diff --git a/src/fr/devinsy/util/xml/XMLTools.java b/src/fr/devinsy/util/xml/XMLTools.java index 116a9ce..a914864 100644 --- a/src/fr/devinsy/util/xml/XMLTools.java +++ b/src/fr/devinsy/util/xml/XMLTools.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import java.io.BufferedReader; diff --git a/src/fr/devinsy/util/xml/XMLWriter.java b/src/fr/devinsy/util/xml/XMLWriter.java index 5cd6d5f..550d72a 100644 --- a/src/fr/devinsy/util/xml/XMLWriter.java +++ b/src/fr/devinsy/util/xml/XMLWriter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import java.io.File; diff --git a/src/fr/devinsy/util/xml/XMLZipReader.java b/src/fr/devinsy/util/xml/XMLZipReader.java index b5f10aa..2d03956 100644 --- a/src/fr/devinsy/util/xml/XMLZipReader.java +++ b/src/fr/devinsy/util/xml/XMLZipReader.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import java.io.File; @@ -17,7 +35,8 @@ import javax.xml.stream.XMLStreamException; * Public License as published by the Free Software Foundation version 3 * or any later version. */ -public class XMLZipReader extends XMLReader { +public class XMLZipReader extends XMLReader +{ /** * @@ -25,7 +44,8 @@ public class XMLZipReader extends XMLReader { * @throws IOException * @throws XMLStreamException */ - public XMLZipReader(final File file) throws IOException, XMLStreamException { + public XMLZipReader(final File file) throws IOException, XMLStreamException + { super(); XMLInputFactory factory = XMLInputFactory.newInstance(); @@ -40,7 +60,8 @@ public class XMLZipReader extends XMLReader { * @throws IOException * @throws XMLStreamException */ - public XMLZipReader(final InputStream source) throws IOException, XMLStreamException { + public XMLZipReader(final InputStream source) throws IOException, XMLStreamException + { super(); XMLInputFactory factory = XMLInputFactory.newInstance(); diff --git a/src/fr/devinsy/util/xml/XMLZipWriter.java b/src/fr/devinsy/util/xml/XMLZipWriter.java index 51c0148..9f1727f 100644 --- a/src/fr/devinsy/util/xml/XMLZipWriter.java +++ b/src/fr/devinsy/util/xml/XMLZipWriter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2013-2014 Christian Pierre MOMON + * + * This file is part of Devinsy-utils. + * + * Devinsy-utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Devinsy-utils 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Devinsy-utils. If not, see + */ package fr.devinsy.util.xml; import java.io.File; @@ -34,11 +52,11 @@ public class XMLZipWriter extends XMLWriter super(); this.zos = new ZipOutputStream(new FileOutputStream(file)); - zos.setLevel(Deflater.BEST_COMPRESSION); - zos.setMethod(ZipOutputStream.DEFLATED); - zos.setComment("Generated by XMLZipWriter"); - zos.putNextEntry(new ZipEntry(FileTools.setExtension(file, ".xml").getName())); - this.out = new PrintWriter(new OutputStreamWriter(zos, "UTF-8")); + this.zos.setLevel(Deflater.BEST_COMPRESSION); + this.zos.setMethod(ZipOutputStream.DEFLATED); + this.zos.setComment("Generated by XMLZipWriter"); + this.zos.putNextEntry(new ZipEntry(FileTools.setExtension(file, ".xml").getName())); + this.out = new PrintWriter(new OutputStreamWriter(this.zos, "UTF-8")); } /** @@ -51,11 +69,11 @@ public class XMLZipWriter extends XMLWriter super(); this.zos = new ZipOutputStream(new FileOutputStream(file)); - zos.setLevel(Deflater.BEST_COMPRESSION); - zos.setMethod(ZipOutputStream.DEFLATED); - zos.setComment(generator); - zos.putNextEntry(new ZipEntry(FileTools.setExtension(file, ".xml").getName())); - this.out = new PrintWriter(new OutputStreamWriter(zos, "UTF-8")); + this.zos.setLevel(Deflater.BEST_COMPRESSION); + this.zos.setMethod(ZipOutputStream.DEFLATED); + this.zos.setComment(generator); + this.zos.putNextEntry(new ZipEntry(FileTools.setExtension(file, ".xml").getName())); + this.out = new PrintWriter(new OutputStreamWriter(this.zos, "UTF-8")); } /** @@ -67,13 +85,13 @@ public class XMLZipWriter extends XMLWriter { super(); this.zos = new ZipOutputStream(target); - zos.setLevel(Deflater.BEST_COMPRESSION); - zos.setMethod(ZipOutputStream.DEFLATED); + this.zos.setLevel(Deflater.BEST_COMPRESSION); + this.zos.setMethod(ZipOutputStream.DEFLATED); if (generator != null) { - zos.setComment(generator); + this.zos.setComment(generator); } - this.out = new PrintWriter(new OutputStreamWriter(zos, "UTF-8")); + this.out = new PrintWriter(new OutputStreamWriter(this.zos, "UTF-8")); } /** @@ -85,14 +103,14 @@ public class XMLZipWriter extends XMLWriter { super(); this.zos = new ZipOutputStream(target); - zos.setLevel(Deflater.BEST_COMPRESSION); - zos.setMethod(ZipOutputStream.DEFLATED); + this.zos.setLevel(Deflater.BEST_COMPRESSION); + this.zos.setMethod(ZipOutputStream.DEFLATED); if (generator != null) { - zos.setComment(generator); + this.zos.setComment(generator); } openEntry(fileName); - this.out = new PrintWriter(new OutputStreamWriter(zos, "UTF-8")); + this.out = new PrintWriter(new OutputStreamWriter(this.zos, "UTF-8")); } /**