From d96869c870a14eead6233f93b99014259de45c0f Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 18 Nov 2021 13:17:24 +0000 Subject: [PATCH] some incorrect uses of git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1895151 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java | 2 +- .../main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java | 4 ++-- .../main/java/org/apache/poi/hslf/usermodel/HSLFShape.java | 2 +- .../main/java/org/apache/poi/hwpf/model/PicturesTable.java | 2 +- poi/src/main/java/org/apache/poi/ddf/EscherRecord.java | 2 +- .../org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java | 2 +- .../org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java index 8f43ef150a..98347ef578 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java +++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java @@ -111,7 +111,7 @@ import org.w3c.dom.events.MutationEvent; * * 
  * // loading the keystore - pkcs12 is used here, but of course jks & co are also valid
- * // the keystore needs to contain a private key and it's certificate having a
+ * // the keystore needs to contain a private key and its certificate having a
  * // 'digitalSignature' key usage
  * char password[] = "test".toCharArray();
  * File file = new File("test.pfx");
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
index 95084e2ed9..92eff36c9c 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
@@ -931,7 +931,7 @@ public class XDGFShape extends XDGFSheet {
     }
 
     /**
-     * The visitor will first visit this shape, then it's children
+     * The visitor will first visit this shape, then its children
      *
      * This is useful because exceptions will be marked with the shapes as it
      * propagates up the shape hierarchy.
@@ -959,7 +959,7 @@ public class XDGFShape extends XDGFSheet {
     }
 
     /**
-     * The visitor will first visit this shape, then it's children. No transform
+     * The visitor will first visit this shape, then its children. No transform
      * is calculated for this visit
      *
      * This is useful because exceptions will be marked with the shapes as it
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
index 36c53d32a2..1c6f6c3945 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
@@ -402,7 +402,7 @@ public abstract class HSLFShape implements Shape {
     }
 
     /**
-     * @return  The shape container and it's children that can represent this
+     * @return  The shape container and its children that can represent this
      *          shape.
      */
     public EscherContainerRecord getSpContainer(){
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
index f1325081e3..45e726e564 100644
--- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
@@ -98,7 +98,7 @@ public final class PicturesTable {
         }
 
         if (run.isSpecialCharacter() && !run.isObj() && !run.isOle2() && !run.isData()) {
-            // Image should be in it's own run, or in a run with the end-of-special marker
+            // Image should be in its own run, or in a run with the end-of-special marker
             if ("\u0001".equals(run.text()) || "\u0001\u0015".equals(run.text())) {
                 return isBlockContainsImage(run.getPicOffset());
             }
diff --git a/poi/src/main/java/org/apache/poi/ddf/EscherRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherRecord.java
index 85ebea3740..eec8d49046 100644
--- a/poi/src/main/java/org/apache/poi/ddf/EscherRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherRecord.java
@@ -73,7 +73,7 @@ public abstract class EscherRecord implements Duplicatable, GenericRecord {
 
     /**
      * The contract of this method is to deserialize an escher record including
-     * it's children.
+     * its children.
      *
      * @param data      The byte array containing the serialized escher
      *                  records.
diff --git a/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
index c845d93b1d..a1c7cd4984 100644
--- a/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
@@ -203,7 +203,7 @@ public abstract class ChunkedCipherInputStream extends LittleEndianInputStream {
 
     /**
      * Helper function for overriding the cipher invocation, i.e. XOR doesn't use a cipher
-     * and uses it's own implementation
+     * and uses its own implementation
      */
     protected int invokeCipher(int totalBytes, boolean doFinal) throws GeneralSecurityException {
         if (doFinal) {
diff --git a/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
index b600b20073..ffdec5ab5d 100644
--- a/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
@@ -207,7 +207,7 @@ public abstract class ChunkedCipherOutputStream extends FilterOutputStream {
 
     /**
      * Helper function for overriding the cipher invocation, i.e. XOR doesn't use a cipher
-     * and uses it's own implementation
+     * and uses its own implementation
      */
     protected int invokeCipher(int posInChunk, boolean doFinal) throws GeneralSecurityException, IOException {
         byte[] plain = (plainByteFlags.isEmpty()) ? null : chunk.clone();
-- 
2.39.5