Author: not
Date: Sat Aug 6 14:12:42 2011
New Revision: 1154523
URL: http://svn.apache.org/viewvc?rev=1154523&view=rev
Log:
ARIES-467 Util has gained some new non-NLS enabled messages. GRR. This fixes
them.
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java?rev=1154523&r1=1154522&r2=1154523&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
Sat Aug 6 14:12:42 2011
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.aries.util.filesystem.ICloseableDirectory;
import org.apache.aries.util.filesystem.IDirectory;
import org.apache.aries.util.filesystem.IFile;
+import org.apache.aries.util.internal.MessageUtil;
public class CloseableDirectory implements ICloseableDirectory {
protected IDirectory delegate;
@@ -132,7 +133,7 @@ public class CloseableDirectory implemen
protected void cleanup() {}
protected void checkNotClosed() {
- if (isClosed()) throw new
IllegalStateException("ICloseableDirectory is closed");
+ if (isClosed()) throw new
IllegalStateException(MessageUtil.getMessage("UTIL0018E"));
}
public boolean isClosed() {
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java?rev=1154523&r1=1154522&r2=1154523&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/io/RememberingInputStream.java
Sat Aug 6 14:12:42 2011
@@ -3,6 +3,8 @@ package org.apache.aries.util.io;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.aries.util.internal.MessageUtil;
+
/**
* This class can be used to buffer an arbitrary amount of content from an
input stream and be able to reset to
* the start.
@@ -108,7 +110,7 @@ public class RememberingInputStream exte
@Override
public long skip(long n) throws IOException {
- throw new IOException("Skip is unsupported");
+ throw new IOException(MessageUtil.getMessage("UTIL0017E"));
}
@Override
Modified:
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties?rev=1154523&r1=1154522&r2=1154523&view=diff
==============================================================================
---
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
(original)
+++
aries/trunk/util/src/main/resources/org/apache/aries/util/messages/UTILmessages.properties
Sat Aug 6 14:12:42 2011
@@ -25,3 +25,5 @@ UTIL0013E=UTIL0013E: The resource bundle
UTIL0014E=UTIL0014E: Unable to determine which Bundle was trying to load the
message ResourceBundle {0}.
UTIL0015E=UTIL0015E: Unable to create temporary output directory for file {0}.
UTIL0016E=UTIL0016E: The path {0} does not denote a valid file.
+UTIL0017E=UTIL0017E: This input stream does not support skip.
+UTIL0018E=UTIl0018E: This ICloseableDirectory is already closed.
\ No newline at end of file
