Remove deprecated and unused method (#3993)

* Remove deprecated and unused method * Imports
JabRef · Apr 29, 2018 · f703f3e · f703f3e
1 parent 8fa6af0
commit f703f3e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 107 deletions.
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java
@@ -35,7 +35,6 @@
  * BibTeX entry "@Article{ authors = {O. Kitsune}, year = {2017}, pages={123-6}}".
  */
 public class BracketedPattern {
-
     private static final Logger LOGGER = LoggerFactory.getLogger(BracketedPattern.class);
 
     private static final String STARTING_CAPITAL_PATTERN = "[^A-Z]";

diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 public class RenamePdfCleanup implements CleanupJob {
-
     private static final Logger LOGGER = LoggerFactory.getLogger(RenamePdfCleanup.class);
 
     private final BibDatabaseContext databaseContext;

diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.UncheckedIOException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -23,9 +22,6 @@
 import java.util.stream.Stream;
 
 import org.jabref.logic.bibtexkeypattern.BracketedPattern;
-import org.jabref.logic.layout.Layout;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.layout.LayoutHelper;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.OptionalUtil;
@@ -250,40 +246,6 @@ public static List<Path> getListOfLinkedFiles(List<BibEntry> bes, List<Path> fil
                 .collect(Collectors.toList());
     }
 
-    /**
-     * Determines filename provided by an entry in a database
-     *
-     * @param database        the database, where the entry is located
-     * @param entry           the entry to which the file should be linked to
-     * @param fileNamePattern the filename pattern
-     * @param prefs           the layout preferences
-     * @return a suggested fileName
-     * @deprecated use String createFileNameFromPattern(BibDatabase database, BibEntry entry, String fileNamePattern ) instead.
-     */
-    @Deprecated
-    public static String createFileNameFromPattern(BibDatabase database, BibEntry entry, String fileNamePattern,
-                                                   LayoutFormatterPreferences prefs) {
-        String targetName = null;
-
-        StringReader sr = new StringReader(fileNamePattern);
-        Layout layout = null;
-        try {
-            layout = new LayoutHelper(sr, prefs).getLayoutFromText();
-        } catch (IOException e) {
-            LOGGER.info("Wrong format " + e.getMessage(), e);
-        }
-        if (layout != null) {
-            targetName = layout.doLayout(entry, database);
-        }
-
-        if ((targetName == null) || targetName.isEmpty()) {
-            targetName = entry.getCiteKeyOptional().orElse("default");
-        }
-        //Removes illegal characters from filename
-        targetName = FileNameCleaner.cleanFileName(targetName);
-        return targetName;
-    }
-
     /**
      * Determines filename provided by an entry in a database
      *

diff --git a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -58,18 +58,6 @@ public void extensionBakAddedCorrectlyToAFileContainedInTmpDirectory() {
                 FileUtil.addExtension(Paths.get("tmp", "demo.bib"), ".bak"));
     }
 
-    @Test
-    public void testGetLinkedFileNameDefaultWithLayout() {
-        // bibkey - title
-        String fileNamePattern = "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}";
-        BibEntry entry = new BibEntry();
-        entry.setCiteKey("1234");
-        entry.setField("title", "mytitle");
-
-        assertEquals("1234 - mytitle",
-                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern, layoutFormatterPreferences));
-    }
-
     @Test
     public void testGetLinkedFileNameDefaultFullTitle() {
         // bibkey - title
@@ -94,19 +82,6 @@ public void testGetLinkedFileNameDefaultWithLowercaseTitle() {
                 FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
-    @Test
-    public void testGetLinkedFileNameBibTeXKeyWithLayout() {
-        // bibkey
-        String fileNamePattern = "\\bibtexkey";
-        BibEntry entry = new BibEntry();
-        entry.setCiteKey("1234");
-        entry.setField("title", "mytitle");
-
-        assertEquals("1234",
-                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern,
-                        layoutFormatterPreferences));
-    }
-
     @Test
     public void testGetLinkedFileNameBibTeXKey() {
         // bibkey
@@ -119,17 +94,6 @@ public void testGetLinkedFileNameBibTeXKey() {
                 FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
-    @Test
-    public void testGetLinkedFileNameNoPatternWithLayout() {
-        String fileNamePattern = "";
-        BibEntry entry = new BibEntry();
-        entry.setCiteKey("1234");
-        entry.setField("title", "mytitle");
-
-        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern,
-                layoutFormatterPreferences));
-    }
-
     @Test
     public void testGetLinkedFileNameNoPattern() {
         String fileNamePattern = "";
@@ -140,16 +104,6 @@ public void testGetLinkedFileNameNoPattern() {
         assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
-    @Test
-    public void testGetDefaultFileNameNoPatternNoBibTeXKeyWithLayout() {
-        String fileNamePattern = "";
-        BibEntry entry = new BibEntry();
-        entry.setField("title", "mytitle");
-
-        assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern,
-                layoutFormatterPreferences));
-    }
-
     @Test
     public void testGetDefaultFileNameNoPatternNoBibTeXKey() {
         String fileNamePattern = "";
@@ -159,17 +113,6 @@ public void testGetDefaultFileNameNoPatternNoBibTeXKey() {
         assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
-    @Test
-    public void testGetLinkedFileNameGetKeyIfEmptyFieldWithLayout() {
-        // bibkey - title
-        String fileNamePattern = "\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}";
-        BibEntry entry = new BibEntry();
-        entry.setCiteKey("1234");
-
-        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern,
-                layoutFormatterPreferences));
-    }
-
     @Test
     public void testGetLinkedFileNameGetKeyIfEmptyField() {
         // bibkey - title
@@ -180,16 +123,6 @@ public void testGetLinkedFileNameGetKeyIfEmptyField() {
         assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
-    @Test
-    public void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKeyWithLayout() {
-        // bibkey - title
-        String fileNamePattern = "\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}";
-        BibEntry entry = new BibEntry();
-
-        assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern,
-                layoutFormatterPreferences));
-    }
-
     @Test
     public void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKey() {
         // bibkey - title