Skip to content

Remove deprecated and unused method #3993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2018
Merged

Remove deprecated and unused method #3993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b9d651
Remove deprecated and unused method
stefan-kolb Apr 27, 2018
2681219
Imports
stefan-kolb Apr 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/org/jabref/logic/bibtexkeypattern/BracketedPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]";
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
38 changes: 0 additions & 38 deletions src/main/java/org/jabref/logic/util/io/FileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
*
Expand Down
67 changes: 0 additions & 67 deletions src/test/java/org/jabref/logic/util/io/FileUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 = "";
Expand All @@ -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 = "";
Expand All @@ -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
Expand All @@ -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
Expand Down