PDFSamples(Android) - 1.修改示例描述文案 2.部分日志调整，文档名称调整

samples/src/main/java/com/compdfkit/samples/SampleListActivity.java

@@ -29,6 +29,9 @@ public class SampleListActivity extends AppCompatActivity {
         File file = getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS);
         FileUtils.deleteFile(file);
         RecyclerView recyclerView = findViewById(R.id.rv_sample_list);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setTitle(R.string.samples);
+        }
 
         SampleListAdapter listAdapter = new SampleListAdapter();
         recyclerView.setLayoutManager(new LinearLayoutManager(this));

samples/src/main/java/com/compdfkit/samples/samples/AnnotationImportExportTest.java

@@ -32,7 +32,6 @@ public class AnnotationImportExportTest extends PDFSamples {
      */
     private void exportAnnotation(){
         printDividingLine();
-        outputListener.println("Samples 1: export pdf document annotations");
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "Annotations.pdf"));
         File exportFile = new File(outputDir(), "AnnotationImportExportTest/ExportAnnotationTest.xfdf");
@@ -45,13 +44,11 @@ public class AnnotationImportExportTest extends PDFSamples {
         if (exportFile.exists()){
             getOutputFileList().add(exportFile.getAbsolutePath());
         }
+        outputListener.println("Done.");
         outputListener.println("Done. Results saved in ExportAnnotationTest.xfdf");
-        printDividingLine();
     }
 
     private void importAnnotation(){
-        outputListener.println("Samples 2: import pdf document annotation");
-
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
         File exportFile = new File(outputDir(), "AnnotationImportExportTest/ExportAnnotationTest.xfdf");
@@ -62,7 +59,7 @@ public class AnnotationImportExportTest extends PDFSamples {
         File file = new File(outputDir(), "AnnotationImportExportTest/ImportAnnotationTest.pdf");
         saveSamplePDF(document, file, true);
 
+        outputListener.println("Done.");
         outputListener.println("Done. Results saved in ImportAnnotationTest.pdf");
-        printDividingLine();
     }
 }

samples/src/main/java/com/compdfkit/samples/samples/AnnotationTest.java

@@ -67,7 +67,6 @@ public class AnnotationTest extends PDFSamples {
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
 
         printDividingLine();
-        outputListener.println("Samples 1 : create test annotation");
         //------------------------------------------
         //Samples 1 : add freetext annotation
         addFreeText(document);
@@ -110,7 +109,9 @@ public class AnnotationTest extends PDFSamples {
 
         File file = new File(outputDir(), "AnnotationTest/CreateAnnotationTest.pdf");
         saveSamplePDF(document, file, true);
+        outputListener.println("Done.");
         outputListener.println("\nDone. Result saved in CreateAnnotationTest.pdf");
+        printDividingLine();
 
         //------------------------------------------
         //Samples 10 : print annotation list info
@@ -366,74 +367,23 @@ public class AnnotationTest extends PDFSamples {
      * @param document
      */
     private void addHighlight(CPDFDocument document) {
-        CPDFReaderView readerView = new CPDFReaderView(context);
-        readerView.setPDFDocument(document);
-        readerView.reloadPages();
         //Also search for the `Page` keyword in the 3rd of the document
-        List<CPDFTextRange> list = startSearch(readerView, "Page");
-        if (list != null && list.size() > 0) {
-            CPDFTextRange textRange = list.get(0);
-            CPDFPage pdfPage = document.pageAtIndex(3);
-            CPDFTextPage pdfTextPage = pdfPage.getTextPage();
-            CPDFTextSelection[] textSelectionArr = pdfTextPage.getSelectionsByTextForRange(textRange);
-            //Then, add a highlight annotation for the specific area.
-            RectF annotRect = new RectF();
-            CPDFHighlightAnnotation highlightAnnotation = (CPDFHighlightAnnotation) pdfPage.addAnnot(CPDFAnnotation.Type.HIGHLIGHT);
-            highlightAnnotation.setColor(Color.YELLOW);
-            highlightAnnotation.setAlpha((255 / 2));
-            RectF[] quadRects = new RectF[textSelectionArr.length];
-            StringBuilder markedTextSb = new StringBuilder();
-            int len = textSelectionArr.length;
-            for (int i = 0; i < len; i++) {
-                CPDFTextSelection textSelection = textSelectionArr[i];
-                if (textSelection == null) {
-                    continue;
-                }
-                //Get the position of the keyword `Page` in the page
-                RectF rect = new RectF(textSelection.getRectF());
-                if (annotRect.isEmpty()) {
-                    annotRect.set(rect);
-                } else {
-                    annotRect.union(rect);
-                }
-                quadRects[i] = new RectF(textSelection.getRectF());
-                String text = pdfTextPage.getText(textSelection.getTextRange());
-                if (!TextUtils.isEmpty(text)) {
-                    markedTextSb.append(text);
-                }
-            }
-            highlightAnnotation.setQuadRects(quadRects);
-            highlightAnnotation.setMarkedText(markedTextSb.toString());
-            highlightAnnotation.setRect(annotRect);
-            highlightAnnotation.updateAp();
-            outputListener.println(annotRect.toString());
-        }
+        CPDFPage pdfPage = document.pageAtIndex(3);
+        CPDFTextPage pdfTextPage = pdfPage.getTextPage();
+        //Then, add a highlight annotation for the specific area.
+        RectF annotRect = new RectF(315, 258, 372, 288);
+        annotRect = pdfPage.convertRectToPage(false, pdfPage.getSize().width(), pdfPage.getSize().height(), annotRect);
+        CPDFHighlightAnnotation highlightAnnotation = (CPDFHighlightAnnotation) pdfPage.addAnnot(CPDFAnnotation.Type.HIGHLIGHT);
+        highlightAnnotation.setColor(Color.YELLOW);
+        highlightAnnotation.setAlpha((255 / 2));
+
+        highlightAnnotation.setQuadRects(new RectF[]{annotRect});
+        highlightAnnotation.setMarkedText("Page");
+        highlightAnnotation.setRect(annotRect);
+        highlightAnnotation.updateAp();
+        outputListener.println(annotRect.toString());
     }
 
-    public static List<CPDFTextRange> startSearch(CPDFReaderView readerView, String keywords) {
-        ITextSearcher textSearcher = readerView.getTextSearcher();
-        if (null == textSearcher) {
-            return null;
-        }
-        CPDFDocument document = readerView.getPDFDocument();
-        if (null == document) {
-            return null;
-        }
-        textSearcher.setSearchConfig(keywords, CPDFTextSearcher.PDFSearchOptions.PDFSearchCaseInsensitive);
-        List<CPDFTextRange> searchTextInfoList = new ArrayList<>();
-
-        CPDFPage page = document.pageAtIndex(3);
-        CPDFTextPage textPage = page.getTextPage();
-        if ((null == textPage) || !textPage.isValid()) {
-            return null;
-        }
-        final List<CPDFTextRange> searchPageContent = textSearcher.searchKeyword(3);
-        if (searchPageContent.size() > 0) {
-            searchTextInfoList.addAll(searchPageContent);
-        }
-        page.close();
-        return searchTextInfoList;
-    }
 
     /**
      * Samples 7 : add link annotation
@@ -535,7 +485,7 @@ public class AnnotationTest extends PDFSamples {
         RectF insertRect = stampAnnotation.getRect();
         insertRect.set(page.convertRectFromPage(false, pageSize.width(), pageSize.height(), insertRect));
         float defaultWidth = 150f;
-        PointF vertex = new PointF(300,50);
+        PointF vertex = new PointF(300, 50);
         insertRect.set(vertex.x, vertex.y, vertex.x + defaultWidth, vertex.y + defaultWidth * Math.abs(insertRect.height() / insertRect.width()));
         stampAnnotation.setRect(page.convertRectToPage(false, pageSize.width(), pageSize.height(), insertRect));
         stampAnnotation.updateAp();
@@ -544,7 +494,7 @@ public class AnnotationTest extends PDFSamples {
         CPDFStampAnnotation standard = (CPDFStampAnnotation) page.addAnnot(CPDFAnnotation.Type.STAMP);
         String imagePath = FileUtils.getAssetsTempFile(context, "ComPDFKit.png");
         float imageDefaultWidth = 100F;
-        PointF imageVertex = new PointF(300,300);
+        PointF imageVertex = new PointF(300, 300);
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
         BitmapFactory.decodeFile(imagePath, options);
@@ -552,13 +502,13 @@ public class AnnotationTest extends PDFSamples {
         RectF pageSize1 = page.getSize();
         imageInsertRect.set(page.convertRectToPage(false, pageSize1.width(), pageSize1.height(), imageInsertRect));
         standard.setRect(imageInsertRect);
-        if (imagePath.endsWith("png")){
+        if (imagePath.endsWith("png")) {
             BitmapFactory.Options tmpOptions = new BitmapFactory.Options();
             tmpOptions.inMutable = true;
             Bitmap bitmap = BitmapFactory.decodeFile(imagePath, tmpOptions);
             standard.updateApWithBitmap(bitmap);
             bitmap.recycle();
-        }else {
+        } else {
             standard.setImageStamp(imagePath);
             standard.updateAp();
         }
@@ -574,7 +524,6 @@ public class AnnotationTest extends PDFSamples {
      */
     private void printAnnotationList() {
         printDividingLine();
-        outputListener.println("Samples 2 : print annotation list");
         File sampleFile = new File(outputDir(), "AnnotationTest/CreateAnnotationTest.pdf");
         CPDFDocument document = new CPDFDocument(context);
         document.open(sampleFile.getAbsolutePath());
@@ -588,7 +537,7 @@ public class AnnotationTest extends PDFSamples {
                         document.getPageSize(i).height(), widgetRect);
                 outputListener.println(String.format("Position: %d, %d, %d, %d", (int) position.left, (int) position.top,
                         (int) position.right, (int) position.bottom));
-                outputListener.println("--------------------------------------------");
+                printDividingLine();
             }
         }
         document.close();
@@ -598,7 +547,6 @@ public class AnnotationTest extends PDFSamples {
      * Samples 11 : delete annotation
      */
     private void deleteAnnotation() {
-        outputListener.println("Samples 3: delete annotation");
         File sampleFile = new File(outputDir(), "AnnotationTest/CreateAnnotationTest.pdf");
         CPDFDocument document = new CPDFDocument(context);
         document.open(sampleFile.getAbsolutePath());
@@ -613,6 +561,7 @@ public class AnnotationTest extends PDFSamples {
 
         File file = new File(outputDir(), "AnnotationTest/DeleteAnnotationTest.pdf");
         saveSamplePDF(document, file, true);
+        outputListener.println("Done.");
         outputListener.println("Done. Results saved in DeleteAnnotationTest.pdf");
     }
 }

samples/src/main/java/com/compdfkit/samples/samples/BackgroundTest.java

@@ -49,33 +49,33 @@ public class BackgroundTest extends PDFSamples {
         CPDFBackground background = document.getBackground();
         background.setType(CPDFBackground.Type.Color);
         background.setColor(Color.RED);
-        background.setOpacity(0.5F);
-        background.setPages("0,1,2,3");
+        background.setOpacity(1F);
+        background.setPages("0,1,2,3,4");
         printBackgroundInfo(background);
         background.update();
         background.release();
-        File file = new File(outputDir(), "backgroundTest/Add_Color_Background.pdf");
+        File file = new File(outputDir(), "backgroundTest/AddColorBackgroundTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nAdd_Color_Background.pdf");
+        outputListener.println("Done. Result saved in AddColorBackgroundTest.pdf");
         printDividingLine();
     }
 
     private void addImageBackground(){
-        outputListener.println("Samples 1 : Set the document background image");
+        outputListener.println("Samples 2 : Set the document background image");
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
         CPDFBackground background = document.getBackground();
         background.setType(CPDFBackground.Type.Image);
         Bitmap backgroundImage = BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher_foreground);
         background.setImage(backgroundImage, CPDFImageScaleType.SCALETYPE_center);
-        background.setOpacity(0.5F);
-        background.setPages("0,1,2,3");
+        background.setOpacity(1F);
+        background.setPages("0,1,2,3,4");
         printBackgroundInfo(background);
         background.update();
         background.release();
-        File file = new File(outputDir(), "backgroundTest/Add_Image_Background.pdf");
+        File file = new File(outputDir(), "backgroundTest/AddImageBackgroundTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nAdd_Image_Background.pdf");
+        outputListener.println("Done. Result saved in AddImageBackgroundTest.pdf");
         printDividingLine();
     }
 
@@ -86,7 +86,7 @@ public class BackgroundTest extends PDFSamples {
         outputListener.println("Samples 3 : Delete document background");
         CPDFDocument document = new CPDFDocument(context);
         File sampleFile = new File(outputDir(),
-                "backgroundTest/Add_Color_Background.pdf");
+                "backgroundTest/AddColorBackgroundTest.pdf");
         document.open(sampleFile.getAbsolutePath());
         CPDFBackground background = document.getBackground();
         //remove all pages background
@@ -95,9 +95,9 @@ public class BackgroundTest extends PDFSamples {
 //        background.setPages("0,2,3,4");
 //        background.update();
 //        background.release();
-        File file = new File(outputDir(), "backgroundTest/Delete_Background.pdf");
+        File file = new File(outputDir(), "backgroundTest/DeleteBackgroundTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nDelete_Background.pdf");
+        outputListener.println("Done. Result saved in DeleteBackgroundTest.pdf");
     }
 
     private void printBackgroundInfo(CPDFBackground background){

samples/src/main/java/com/compdfkit/samples/samples/BookmarkTest.java

@@ -48,6 +48,7 @@ public class BookmarkTest extends PDFSamples {
             }
         }
         File file = new File(outputDir(), "BookmarkTest/CreateBookmarkTest.pdf");
+        outputListener.println("Done.");
         outputListener.println("Done. Result saved in CreateBookmarkTest.pdf");
         saveSamplePDF(document, file, true);
         printFooter();

samples/src/main/java/com/compdfkit/samples/samples/FlattenTest.java

@@ -30,7 +30,7 @@ public class FlattenTest extends PDFSamples {
     protected void run(OutputListener outputListener) {
         super.run(outputListener);
         printHead();
-        outputListener.println("Samples 1 : convert to flatten");
+        outputListener.println();
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "Annotations.pdf"));
         int annotationCount = 0;

samples/src/main/java/com/compdfkit/samples/samples/HeaderFooterTest.java

@@ -42,8 +42,8 @@ public class HeaderFooterTest extends PDFSamples {
      * samples 1 : add header
      */
     private void addCommonHeaderFooter() {
-        outputListener.println("--------------------------------------------");
-        outputListener.println("Samples 1 : Add header");
+        printDividingLine();
+        outputListener.println("Samples 1 : Insert common header footer");
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
         CPDFHeaderFooter headerFooter = document.getHeaderFooter();
@@ -61,6 +61,7 @@ public class HeaderFooterTest extends PDFSamples {
             } else {
                 outputListener.println("Location: Top Right");
             }
+            outputListener.println();
         }
         headerFooter.setPages("0,1,2,3,4");
         headerFooter.update();
@@ -71,7 +72,7 @@ public class HeaderFooterTest extends PDFSamples {
     }
 
     private void addPageHeaderFooter() {
-        outputListener.println("Samples 2 : Add header and footer");
+        outputListener.println("Samples 2 : Insert page header footer");
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
         CPDFHeaderFooter headerFooter = document.getHeaderFooter();
@@ -140,9 +141,9 @@ public class HeaderFooterTest extends PDFSamples {
         CPDFHeaderFooter headerFooter = document.getHeaderFooter();
         outputListener.println("");
         headerFooter.clear();
-        File resultsFile = new File(outputDir(), "HeaderFooterTest/ClearHeaderFooter.pdf");
+        File resultsFile = new File(outputDir(), "HeaderFooterTest/ClearHeaderFooterTest.pdf");
         saveSamplePDF(document, resultsFile, false);
-        outputListener.println("Done. Results saved in ClearHeaderFooter.pdf");
+        outputListener.println("Done. Results saved in ClearHeaderFooterTest.pdf");
         printDividingLine();
     }
 }

samples/src/main/java/com/compdfkit/samples/samples/InteractiveFormsTest.java

@@ -62,7 +62,6 @@ public class InteractiveFormsTest extends PDFSamples {
     }
 
     private void createTestForms(CPDFDocument document) {
-        outputListener.println("Samples 1 : Create test forms");
         // create new Form Fields and Widget Annotations.
         int pageNumber = 0;
         RectF pageSize = document.getPageSize(pageNumber);
@@ -221,13 +220,13 @@ public class InteractiveFormsTest extends PDFSamples {
         radiobuttonWidget3.setChecked(false);
         radiobuttonWidget3.setFieldName("RadioButton1");
         radiobuttonWidget3.updateAp();
+        outputListener.println("Done.");
         outputListener.println("Done. Result saved in Create_Form_Test.pdf");
         printDividingLine();
     }
 
 
     private void deleteForm(){
-        outputListener.println("Samples 3 : delete first form");
         File file = new File(outputDir(), "forms/Create_From_Test.pdf");
         CPDFDocument document = new CPDFDocument(SampleApplication.getInstance());
         document.open(file.getAbsolutePath());
@@ -240,11 +239,11 @@ public class InteractiveFormsTest extends PDFSamples {
         }
         File resultsForms = new File(outputDir(), "forms/Delete_Form_Test.pdf");
         saveSamplePDF(document, resultsForms,true);
+        outputListener.println("Done.");
         outputListener.println("Done. Result saved in Delete_Form_Test.pdf");
     }
 
     private void printFormsMessage(CPDFDocument document) {
-        outputListener.println("Samples 2 : print forms message");
         for (int i = 0; i < document.getPageCount(); i++) {
             CPDFPage page = document.pageAtIndex(i);
             for (CPDFAnnotation annotation : page.getAnnotations()) {

samples/src/main/java/com/compdfkit/samples/samples/OutlineTest.java

@@ -40,8 +40,7 @@ public class OutlineTest extends PDFSamples {
      * Sample 1 : create outline test
      */
     private void createOutline(){
-        printDividingLine();
-        outputListener.println("Samples 1 : Create Outline Test");
+        outputListener.println();
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
         CPDFOutline rootOutline;
@@ -61,8 +60,8 @@ public class OutlineTest extends PDFSamples {
         insertOutline(rootOutline, "5. page5", 4);
         File file = new File(outputDir(), "OutlineTest/CreateOutlineTest.pdf");
         saveSamplePDF(document, file, true);
+        outputListener.println("Done.");
         outputListener.println("Done. Results saved in CreateOutlineTest.pdf");
-        printDividingLine();
     }
 
     /**
@@ -81,7 +80,7 @@ public class OutlineTest extends PDFSamples {
     }
 
     private void printOutline(){
-        outputListener.println("Samples 2 : Print outline Info");
+        outputListener.println();
         CPDFDocument document = new CPDFDocument(context);
         File sampleFile = new File(outputDir(), "OutlineTest/CreateOutlineTest.pdf");
         document.open(sampleFile.getAbsolutePath());

samples/src/main/java/com/compdfkit/samples/samples/PDFPageTest.java

@@ -129,7 +129,7 @@ public class PDFPageTest extends PDFSamples {
         outputListener.println("Opening the Samples PDF File");
         CPDFDocument document = new CPDFDocument(context);
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
-        int[] evenNumbers = getEvenNumbers(0, document.getPageCount() - 1);
+        int[] evenNumbers = getEvenNumbers(1, document.getPageCount() - 1);
         document.removePages(evenNumbers);
         File file = new File(outputDir(), "pdfPage/Remove_Page.pdf");
         saveSamplePDF(document, file, true);
@@ -194,7 +194,7 @@ public class PDFPageTest extends PDFSamples {
         document.open(FileUtils.getAssetsTempFile(context, "CommonFivePage.pdf"));
         CPDFDocument newDocument = CPDFDocument.createDocument(context);
         newDocument.importPages(document, new int[]{1}, 0);
-        File file = new File(outputDir(), "pdfPage/CommonFivePage_Extract_Page_1.pdf");
+        File file = new File(outputDir(), "pdfPage/ExtractPages.pdf");
         outputListener.println("Done. Result saved in \nCommonFivePage_Extract_Page_1.pdf");
         saveSamplePDF(newDocument, file, true);
         document.close();

samples/src/main/java/com/compdfkit/samples/samples/PDFToImageTest.java

@@ -34,6 +34,7 @@ public class PDFToImageTest extends PDFSamples {
     protected void run(OutputListener outputListener) {
         super.run(outputListener);
         printHead();
+        outputListener.println();
         CPDFDocument document = new CPDFDocument(context);
         String assetsName = "CommonFivePage.pdf";
         document.open(FileUtils.getAssetsTempFile(context, assetsName));
@@ -62,6 +63,7 @@ public class PDFToImageTest extends PDFSamples {
                 file.getParentFile().mkdirs();
                 // save bitmap
                 CPDFBitmapUtils.saveBitmap(bitmap, file.getAbsolutePath());
+                outputListener.println("Done.");
                 if (file.exists()) {
                     outputListener.println("Done. Results saved in " + file.getName());
                     addFileList(file.getAbsolutePath());

samples/src/main/java/com/compdfkit/samples/samples/TextSearchTest.java

@@ -94,8 +94,9 @@ public class TextSearchTest extends PDFSamples {
                 highlightAnnotation.updateAp();
             }
             outputListener.println("the key `" + keywords + "` have " + list.size() + " results");
-            File file = new File(outputDir(), "TextSearchTest/Text_Search_Results.pdf");
+            File file = new File(outputDir(), "TextSearchTest/TextSearchResults.pdf");
             saveSamplePDF(document, file, false);
+            outputListener.println("Done. Results saved in TextSearchResults.pdf");
             printFooter();
         });
     }

samples/src/main/java/com/compdfkit/samples/samples/WatermarkTest.java

@@ -63,9 +63,9 @@ public class WatermarkTest extends PDFSamples {
         printWatermarkInfo(watermark);
         watermark.update();
         watermark.release();
-        File file = new File(outputDir(), "watermarkTest/Text_Watermark_Test.pdf");
+        File file = new File(outputDir(), "watermarkTest/AddTextWatermarkTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nText_Watermark_Test.pdf");
+        outputListener.println("Done. Result saved in AddTextWatermarkTest.pdf");
         printDividingLine();
     }
 
@@ -89,9 +89,9 @@ public class WatermarkTest extends PDFSamples {
         printWatermarkInfo(watermark);
         watermark.update();
         watermark.release();
-        File file = new File(outputDir(), "watermarkTest/Image_Watermark_Test.pdf");
+        File file = new File(outputDir(), "watermarkTest/AddImageWatermarkTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nImage_Watermark_Test.pdf");
+        outputListener.println("Done. Result saved in AddImageWatermarkTest.pdf");
         printDividingLine();
     }
 
@@ -119,16 +119,16 @@ public class WatermarkTest extends PDFSamples {
         printWatermarkInfo(watermark);
         watermark.update();
         watermark.release();
-        File file = new File(outputDir(), "watermarkTest/Text_Tiles_Watermark_Test.pdf");
+        File file = new File(outputDir(), "watermarkTest/AddTilesWatermarkTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nText_Tiles_Watermark_Test.pdf");
+        outputListener.println("Done. Result saved in AddTilesWatermarkTest.pdf");
         printDividingLine();
     }
 
     private void deleteWatermark() {
         outputListener.println("Sample 4 : Delete Watermark");
         CPDFDocument document = new CPDFDocument(context);
-        File sampleFile = new File(outputDir(), "watermarkTest/Text_Watermark_Test.pdf");
+        File sampleFile = new File(outputDir(), "watermarkTest/AddTextWatermarkTest.pdf");
         document.open(sampleFile.getAbsolutePath());
         CPDFWatermark watermark = document.getWatermark(0);
         if (watermark != null) {
@@ -140,9 +140,9 @@ public class WatermarkTest extends PDFSamples {
 //            watermark.update();
 //            watermark.release();
         }
-        File file = new File(outputDir(), "watermarkTest/Delete_Watermark_Test.pdf");
+        File file = new File(outputDir(), "watermarkTest/DeleteWatermarkTest.pdf");
         saveSamplePDF(document, file, true);
-        outputListener.println("Done. Result saved in\nDelete_Watermark_Test.pdf");
+        outputListener.println("Done. Result saved in DeleteWatermarkTest.pdf");
         printDividingLine();
     }