[commons-vfs] 02/02: Rename lame package-private methods.

[gg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git

commit a0a0a1218512025e8973c18588ffcefa701aa76b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jan 18 11:09:16 2021 -0500

    Rename lame package-private methods.
---
 .../apache/commons/vfs2/provider/DefaultFileContent.java   | 14 +++++++-------
 .../commons/vfs2/provider/FileContentThreadData.java       |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
index f58abf7..1797b51 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/DefaultFileContent.java
@@ -374,7 +374,7 @@ public final class DefaultFileContent implements FileContent {
 
         final FileRandomAccessContent rac = new FileRandomAccessContent(fileObject, rastr);
 
-        getFileContentThreadData().addRastr(rac);
+        getFileContentThreadData().add(rac);
         streamOpened();
 
         return rac;
@@ -470,9 +470,9 @@ public final class DefaultFileContent implements FileContent {
             }
 
             // Close the output stream
-            final FileContentOutputStream outputStream = threadData.getOutstr();
+            final FileContentOutputStream outputStream = threadData.getFileContentOutputStream();
             if (outputStream != null) {
-                threadData.setOutstr(null);
+                threadData.setFileContentOutputStream(null);
                 try {
                     outputStream.close();
                 } catch (final FileSystemException ex) {
@@ -517,7 +517,7 @@ public final class DefaultFileContent implements FileContent {
                     : new FileContentInputStream(fileObject, inputStream, bufferSize);
             // @formatter:on
         }
-        getFileContentThreadData().addInstr(wrappedInputStream);
+        getFileContentThreadData().add(wrappedInputStream);
         streamOpened();
 
         return wrappedInputStream;
@@ -529,7 +529,7 @@ public final class DefaultFileContent implements FileContent {
          */
         final FileContentThreadData threadData = getFileContentThreadData();
 
-        if (threadData.getOutstr() != null) {
+        if (threadData.getFileContentOutputStream() != null) {
             throw new FileSystemException("vfs.provider/write-in-use.error", fileObject);
         }
 
@@ -540,7 +540,7 @@ public final class DefaultFileContent implements FileContent {
         final FileContentOutputStream wrapped = bufferSize == 0 ?
             new FileContentOutputStream(fileObject, outstr) :
             new FileContentOutputStream(fileObject, outstr, bufferSize);
-        threadData.setOutstr(wrapped);
+        threadData.setFileContentOutputStream(wrapped);
         streamOpened();
 
         return wrapped;
@@ -582,7 +582,7 @@ public final class DefaultFileContent implements FileContent {
     private void endOutput() throws Exception {
         final FileContentThreadData fileContentThreadData = threadLocal.get();
         if (fileContentThreadData != null) {
-            fileContentThreadData.setOutstr(null);
+            fileContentThreadData.setFileContentOutputStream(null);
         }
         if (fileContentThreadData == null || !fileContentThreadData.hasStreams()) {
             // remove even when no value is set to remove key
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
index f53c592..c874b13 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/FileContentThreadData.java
@@ -42,14 +42,14 @@ class FileContentThreadData {
      * void setState(int state) { this.state = state; }
      */
 
-    void addInstr(final InputStream inputStream) {
+    void add(final InputStream inputStream) {
         if (this.inputStreamList == null) {
             this.inputStreamList = new ArrayList<>();
         }
         this.inputStreamList.add(inputStream);
     }
 
-    void addRastr(final RandomAccessContent randomAccessContent) {
+    void add(final RandomAccessContent randomAccessContent) {
         if (this.randomAccessContentList == null) {
             this.randomAccessContentList = new ArrayList<>();
         }
@@ -61,7 +61,7 @@ class FileContentThreadData {
         outputStream = null;
     }
 
-    DefaultFileContent.FileContentOutputStream getOutstr() {
+    DefaultFileContent.FileContentOutputStream getFileContentOutputStream() {
         return this.outputStream;
     }
 
@@ -97,7 +97,7 @@ class FileContentThreadData {
         this.randomAccessContentList.remove(randomAccessContent);
     }
 
-    void setOutstr(final DefaultFileContent.FileContentOutputStream outputStream) {
+    void setFileContentOutputStream(final DefaultFileContent.FileContentOutputStream outputStream) {
         this.outputStream = outputStream;
     }
 }