git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be6f678
)
fix namespace from master merge
author
Niki Roo
<niki@nikiroo.be>
Sat, 27 Apr 2019 16:59:46 +0000
(18:59 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Sat, 27 Apr 2019 16:59:46 +0000
(18:59 +0200)
src/be/nikiroo/utils/serial/CustomSerializer.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/utils/serial/Importer.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/utils/serial/SerialUtils.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/utils/serial/CustomSerializer.java
b/src/be/nikiroo/utils/serial/CustomSerializer.java
index e29e8cf93969e950a096ece9d48d14a9a81576be..36a6c214c02576deb012316e2d6338477554d6e5 100644
(file)
--- a/
src/be/nikiroo/utils/serial/CustomSerializer.java
+++ b/
src/be/nikiroo/utils/serial/CustomSerializer.java
@@
-5,8
+5,8
@@
import java.io.InputStream;
import java.io.OutputStream;
import be.nikiroo.utils.IOUtils;
import java.io.OutputStream;
import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.NextableInputStream;
-import be.nikiroo.utils.NextableInputStreamStep;
+import be.nikiroo.utils.
streams.
NextableInputStream;
+import be.nikiroo.utils.
streams.
NextableInputStreamStep;
public abstract class CustomSerializer {
public abstract class CustomSerializer {
diff --git
a/src/be/nikiroo/utils/serial/Importer.java
b/src/be/nikiroo/utils/serial/Importer.java
index 6531cdba99f420c8778b3c2d990854b667b7d387..ad2d284904790214b2360fbee0bb35cbae66f29e 100644
(file)
--- a/
src/be/nikiroo/utils/serial/Importer.java
+++ b/
src/be/nikiroo/utils/serial/Importer.java
@@
-7,8
+7,8
@@
import java.util.HashMap;
import java.util.Map;
import be.nikiroo.utils.IOUtils;
import java.util.Map;
import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.NextableInputStream;
-import be.nikiroo.utils.NextableInputStreamStep;
+import be.nikiroo.utils.
streams.
NextableInputStream;
+import be.nikiroo.utils.
streams.
NextableInputStreamStep;
import be.nikiroo.utils.StringUtils;
/**
import be.nikiroo.utils.StringUtils;
/**
diff --git
a/src/be/nikiroo/utils/serial/SerialUtils.java
b/src/be/nikiroo/utils/serial/SerialUtils.java
index b083e3461e2b63d3c6d2a6e702d8cf60ef5d32b0..204d1d95a0ab22418a74fd540368fa183c38c460 100644
(file)
--- a/
src/be/nikiroo/utils/serial/SerialUtils.java
+++ b/
src/be/nikiroo/utils/serial/SerialUtils.java
@@
-19,8
+19,8
@@
import java.util.UnknownFormatConversionException;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.utils.Image;
-import be.nikiroo.utils.NextableInputStream;
-import be.nikiroo.utils.NextableInputStreamStep;
+import be.nikiroo.utils.
streams.
NextableInputStream;
+import be.nikiroo.utils.
streams.
NextableInputStreamStep;
import be.nikiroo.utils.StringUtils;
/**
import be.nikiroo.utils.StringUtils;
/**