From 64617c5e46dec799949fdb750a7394e75a0e3995 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Thu, 31 May 2018 09:15:08 +0200 Subject: [PATCH] Migrated package from fr.devinsy.util to fr.devinsy --- src/fr/devinsy/{util => }/xml/XMLAttribute.java | 2 +- src/fr/devinsy/{util => }/xml/XMLAttributes.java | 2 +- .../{util => }/xml/XMLBadFormatException.java | 2 +- src/fr/devinsy/{util => }/xml/XMLReader.java | 4 ++-- src/fr/devinsy/{util => }/xml/XMLTag.java | 2 +- src/fr/devinsy/{util => }/xml/XMLTools.java | 2 +- src/fr/devinsy/{util => }/xml/XMLWriter.java | 2 +- src/fr/devinsy/{util => }/xml/XMLZipReader.java | 2 +- src/fr/devinsy/{util => }/xml/XMLZipWriter.java | 2 +- src/fr/devinsy/{util => }/xml/demo/XMLDemo.java | 12 ++++++------ test/foo/Foo.java | 2 +- test/fr/devinsy/{util => }/xml/XMLReaderTest.java | 5 ++++- test/fr/devinsy/{util => }/xml/XMLWriterTest.java | 6 +++--- test/fr/devinsy/{util => }/xml/foo01.xml | 0 test/fr/devinsy/{util => }/xml/foo02.xml | 0 15 files changed, 24 insertions(+), 21 deletions(-) rename src/fr/devinsy/{util => }/xml/XMLAttribute.java (99%) rename src/fr/devinsy/{util => }/xml/XMLAttributes.java (99%) rename src/fr/devinsy/{util => }/xml/XMLBadFormatException.java (98%) rename src/fr/devinsy/{util => }/xml/XMLReader.java (99%) rename src/fr/devinsy/{util => }/xml/XMLTag.java (99%) rename src/fr/devinsy/{util => }/xml/XMLTools.java (99%) rename src/fr/devinsy/{util => }/xml/XMLWriter.java (99%) rename src/fr/devinsy/{util => }/xml/XMLZipReader.java (98%) rename src/fr/devinsy/{util => }/xml/XMLZipWriter.java (99%) rename src/fr/devinsy/{util => }/xml/demo/XMLDemo.java (92%) rename test/fr/devinsy/{util => }/xml/XMLReaderTest.java (96%) rename test/fr/devinsy/{util => }/xml/XMLWriterTest.java (95%) rename test/fr/devinsy/{util => }/xml/foo01.xml (100%) rename test/fr/devinsy/{util => }/xml/foo02.xml (100%) diff --git a/src/fr/devinsy/util/xml/XMLAttribute.java b/src/fr/devinsy/xml/XMLAttribute.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLAttribute.java rename to src/fr/devinsy/xml/XMLAttribute.java index 8d39c1b..2518587 100644 --- a/src/fr/devinsy/util/xml/XMLAttribute.java +++ b/src/fr/devinsy/xml/XMLAttribute.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import org.apache.commons.lang3.StringUtils; diff --git a/src/fr/devinsy/util/xml/XMLAttributes.java b/src/fr/devinsy/xml/XMLAttributes.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLAttributes.java rename to src/fr/devinsy/xml/XMLAttributes.java index 4c36166..66f0752 100644 --- a/src/fr/devinsy/util/xml/XMLAttributes.java +++ b/src/fr/devinsy/xml/XMLAttributes.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/fr/devinsy/util/xml/XMLBadFormatException.java b/src/fr/devinsy/xml/XMLBadFormatException.java similarity index 98% rename from src/fr/devinsy/util/xml/XMLBadFormatException.java rename to src/fr/devinsy/xml/XMLBadFormatException.java index c434ce7..32de940 100644 --- a/src/fr/devinsy/util/xml/XMLBadFormatException.java +++ b/src/fr/devinsy/xml/XMLBadFormatException.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import org.slf4j.helpers.MessageFormatter; diff --git a/src/fr/devinsy/util/xml/XMLReader.java b/src/fr/devinsy/xml/XMLReader.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLReader.java rename to src/fr/devinsy/xml/XMLReader.java index dd250b4..c5cf4a8 100644 --- a/src/fr/devinsy/util/xml/XMLReader.java +++ b/src/fr/devinsy/xml/XMLReader.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.ByteArrayInputStream; import java.io.File; @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import fr.devinsy.util.strings.StringList; -import fr.devinsy.util.xml.XMLTag.TagType; +import fr.devinsy.xml.XMLTag.TagType; /** * The Class XMLReader. diff --git a/src/fr/devinsy/util/xml/XMLTag.java b/src/fr/devinsy/xml/XMLTag.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLTag.java rename to src/fr/devinsy/xml/XMLTag.java index caceddd..9708bf0 100644 --- a/src/fr/devinsy/util/xml/XMLTag.java +++ b/src/fr/devinsy/xml/XMLTag.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import javax.xml.namespace.QName; diff --git a/src/fr/devinsy/util/xml/XMLTools.java b/src/fr/devinsy/xml/XMLTools.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLTools.java rename to src/fr/devinsy/xml/XMLTools.java index 8c8f96a..6f19bd3 100644 --- a/src/fr/devinsy/util/xml/XMLTools.java +++ b/src/fr/devinsy/xml/XMLTools.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.BufferedReader; import java.io.File; diff --git a/src/fr/devinsy/util/xml/XMLWriter.java b/src/fr/devinsy/xml/XMLWriter.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLWriter.java rename to src/fr/devinsy/xml/XMLWriter.java index 0d75048..a9fe933 100644 --- a/src/fr/devinsy/util/xml/XMLWriter.java +++ b/src/fr/devinsy/xml/XMLWriter.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/fr/devinsy/util/xml/XMLZipReader.java b/src/fr/devinsy/xml/XMLZipReader.java similarity index 98% rename from src/fr/devinsy/util/xml/XMLZipReader.java rename to src/fr/devinsy/xml/XMLZipReader.java index 6c48d5e..417dfb5 100644 --- a/src/fr/devinsy/util/xml/XMLZipReader.java +++ b/src/fr/devinsy/xml/XMLZipReader.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.File; import java.io.FileInputStream; diff --git a/src/fr/devinsy/util/xml/XMLZipWriter.java b/src/fr/devinsy/xml/XMLZipWriter.java similarity index 99% rename from src/fr/devinsy/util/xml/XMLZipWriter.java rename to src/fr/devinsy/xml/XMLZipWriter.java index b70acc2..aa94734 100644 --- a/src/fr/devinsy/util/xml/XMLZipWriter.java +++ b/src/fr/devinsy/xml/XMLZipWriter.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.File; import java.io.FileOutputStream; diff --git a/src/fr/devinsy/util/xml/demo/XMLDemo.java b/src/fr/devinsy/xml/demo/XMLDemo.java similarity index 92% rename from src/fr/devinsy/util/xml/demo/XMLDemo.java rename to src/fr/devinsy/xml/demo/XMLDemo.java index c1c6a89..8e6c079 100644 --- a/src/fr/devinsy/util/xml/demo/XMLDemo.java +++ b/src/fr/devinsy/xml/demo/XMLDemo.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml.demo; +package fr.devinsy.xml.demo; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,11 +27,11 @@ import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import fr.devinsy.util.xml.XMLBadFormatException; -import fr.devinsy.util.xml.XMLReader; -import fr.devinsy.util.xml.XMLTag; -import fr.devinsy.util.xml.XMLTools; -import fr.devinsy.util.xml.XMLWriter; +import fr.devinsy.xml.XMLBadFormatException; +import fr.devinsy.xml.XMLReader; +import fr.devinsy.xml.XMLTag; +import fr.devinsy.xml.XMLTools; +import fr.devinsy.xml.XMLWriter; /** * The Class XmlDemo. diff --git a/test/foo/Foo.java b/test/foo/Foo.java index 6be0df7..11795b1 100644 --- a/test/foo/Foo.java +++ b/test/foo/Foo.java @@ -22,7 +22,7 @@ import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.events.XMLEvent; -import fr.devinsy.util.xml.XMLTools; +import fr.devinsy.xml.XMLTools; /** * The Class Foo contains study code. diff --git a/test/fr/devinsy/util/xml/XMLReaderTest.java b/test/fr/devinsy/xml/XMLReaderTest.java similarity index 96% rename from test/fr/devinsy/util/xml/XMLReaderTest.java rename to test/fr/devinsy/xml/XMLReaderTest.java index 55c7f5a..7f02e59 100644 --- a/test/fr/devinsy/util/xml/XMLReaderTest.java +++ b/test/fr/devinsy/xml/XMLReaderTest.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.File; import java.io.FileNotFoundException; @@ -29,6 +29,9 @@ import org.apache.log4j.Logger; import org.junit.Before; import fr.devinsy.util.strings.StringList; +import fr.devinsy.xml.XMLBadFormatException; +import fr.devinsy.xml.XMLReader; +import fr.devinsy.xml.XMLTag; /** * The Class XMLReaderTest. diff --git a/test/fr/devinsy/util/xml/XMLWriterTest.java b/test/fr/devinsy/xml/XMLWriterTest.java similarity index 95% rename from test/fr/devinsy/util/xml/XMLWriterTest.java rename to test/fr/devinsy/xml/XMLWriterTest.java index 117bbc9..8967dc8 100644 --- a/test/fr/devinsy/util/xml/XMLWriterTest.java +++ b/test/fr/devinsy/xml/XMLWriterTest.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ -package fr.devinsy.util.xml; +package fr.devinsy.xml; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -62,10 +62,10 @@ public class XMLWriterTest @Test public void testtFoo01() throws XMLStreamException, XMLBadFormatException, IOException { - logger.debug(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/util/xml/foo01.xml")).length); + logger.debug(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/xml/foo01.xml")).length); // - String source = new String(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/util/xml/foo01.xml"))); + String source = new String(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/xml/foo01.xml"))); System.out.println("source=\n" + source); diff --git a/test/fr/devinsy/util/xml/foo01.xml b/test/fr/devinsy/xml/foo01.xml similarity index 100% rename from test/fr/devinsy/util/xml/foo01.xml rename to test/fr/devinsy/xml/foo01.xml diff --git a/test/fr/devinsy/util/xml/foo02.xml b/test/fr/devinsy/xml/foo02.xml similarity index 100% rename from test/fr/devinsy/util/xml/foo02.xml rename to test/fr/devinsy/xml/foo02.xml