PDFBOX-5660: use more accurate names

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1931354 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java

@@ -62,26 +62,26 @@ public static void main( String[] args ) throws IOException
         }
 
         File pdfFile = new File(args[0]);
-        String filePath = pdfFile.getParent() + FileSystems.getDefault().getSeparator();
+        String directoryPath = pdfFile.getParent() + FileSystems.getDefault().getSeparator();
         try (PDDocument document = Loader.loadPDF(pdfFile))
         {
             PDDocumentNameDictionary namesDictionary =
                     new PDDocumentNameDictionary(document.getDocumentCatalog());
             PDEmbeddedFilesNameTreeNode efTree = namesDictionary.getEmbeddedFiles();
             if (efTree != null)
             {
-                extractFilesFromEFTree(efTree, filePath);
+                extractFilesFromEFTree(efTree, directoryPath);
             }
 
             // extract files from page annotations
             for (PDPage page : document.getPages())
             {
-                extractFilesFromPage(page, filePath);
+                extractFilesFromPage(page, directoryPath);
             }
         }
     }
 
-    private static void extractFilesFromPage(PDPage page, String filePath) throws IOException
+    private static void extractFilesFromPage(PDPage page, String directoryPath) throws IOException
     {
         for (PDAnnotation annotation : page.getAnnotations())
         {
@@ -95,19 +95,19 @@ private static void extractFilesFromPage(PDPage page, String filePath) throws IO
                     PDEmbeddedFile embeddedFile = getEmbeddedFile(complexFileSpec);
                     if (embeddedFile != null)
                     {
-                        extractFile(filePath, complexFileSpec.getFilename(), embeddedFile);
+                        extractFile(complexFileSpec.getFilename(), embeddedFile, directoryPath);
                     }
                 }
             }
         }
     }
 
-    private static void extractFilesFromEFTree(PDNameTreeNode<PDComplexFileSpecification> efTree, String filePath) throws IOException
+    private static void extractFilesFromEFTree(PDNameTreeNode<PDComplexFileSpecification> efTree, String directoryPath) throws IOException
     {
         Map<String, PDComplexFileSpecification> names = efTree.getNames();
         if (names != null)
         {
-            extractFiles(names, filePath);
+            extractFiles(names, directoryPath);
         }
         else
         {
@@ -118,29 +118,29 @@ private static void extractFilesFromEFTree(PDNameTreeNode<PDComplexFileSpecifica
             }
             for (PDNameTreeNode<PDComplexFileSpecification> node : kids)
             {
-                extractFilesFromEFTree(node, filePath);
+                extractFilesFromEFTree(node, directoryPath);
             }
         }
     }
 
-    private static void extractFiles(Map<String, PDComplexFileSpecification> names, String filePath) 
+    private static void extractFiles(Map<String, PDComplexFileSpecification> names, String directoryPath) 
             throws IOException
     {
         for (Entry<String, PDComplexFileSpecification> entry : names.entrySet())
         {
-            PDComplexFileSpecification fileSpec = entry.getValue();
-            PDEmbeddedFile embeddedFile = getEmbeddedFile(fileSpec);
+            PDComplexFileSpecification complexFileSpec = entry.getValue();
+            PDEmbeddedFile embeddedFile = getEmbeddedFile(complexFileSpec);
             if (embeddedFile != null)
             {
-                extractFile(filePath, fileSpec.getFilename(), embeddedFile);
+                extractFile(complexFileSpec.getFilename(), embeddedFile, directoryPath);
             }
         }
     }
 
-    private static void extractFile(String filePath, String filename, PDEmbeddedFile embeddedFile)
+    private static void extractFile(String filename, PDEmbeddedFile embeddedFile, String directoryPath)
             throws IOException
     {
-        String embeddedFilename = filePath + filename;
+        String embeddedFilename = directoryPath + filename;
         File file = new File(embeddedFilename);
         File parentDir = file.getParentFile();
         if (!parentDir.exists())