1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -Nru /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/JabRefPreferences.java src/java/net/sf/jabref/JabRefPreferences.java
--- /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/JabRefPreferences.java 2012-06-30 00:13:05.000000000 +0300
+++ src/java/net/sf/jabref/JabRefPreferences.java 2012-08-04 09:42:45.945241502 +0300
@@ -441,9 +441,6 @@
//defaults.put("keyPattern", new LabelPattern(KEY_PATTERN));
- defaults.put(ImportSettingsTab.PREF_IMPORT_ALWAYSUSE, Boolean.FALSE);
- defaults.put(ImportSettingsTab.PREF_IMPORT_DEFAULT_PDF_IMPORT_STYLE, ImportSettingsTab.DEFAULT_STYLE);
- defaults.put(ImportSettingsTab.PREF_IMPORT_FILENAMEPATTERN, ImportSettingsTab.DEFAULT_FILENAMEPATTERNS[0]);
restoreKeyBindings();
diff -Nru /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/PrefsDialog3.java src/java/net/sf/jabref/PrefsDialog3.java
--- /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/PrefsDialog3.java 2012-06-30 00:13:05.000000000 +0300
+++ src/java/net/sf/jabref/PrefsDialog3.java 2012-08-04 09:42:45.946241489 +0300
@@ -87,7 +87,6 @@
tabs.add(new TabLabelPattern(prefs, parent.helpDiag));
tabs.add(new PreviewPrefsTab(prefs));
tabs.add(new NameFormatterTab(parent.helpDiag));
- tabs.add(new ImportSettingsTab());
tabs.add(new XmpPrefsTab());
tabs.add(new AdvancedTab(prefs, parent.helpDiag));
diff -Nru /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/Util.java src/java/net/sf/jabref/Util.java
--- /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/Util.java 2012-06-30 00:13:05.000000000 +0300
+++ src/java/net/sf/jabref/Util.java 2012-08-04 09:43:20.273809935 +0300
@@ -2949,7 +2949,15 @@
public static String getLinkedFileName(BibtexDatabase database, BibtexEntry entry) {
String targetName = entry.getCiteKey() == null ? "default" : entry.getCiteKey();
- StringReader sr = new StringReader(Globals.prefs.get(ImportSettingsTab.PREF_IMPORT_FILENAMEPATTERN));
+ //StringReader sr = new StringReader(Globals.prefs.get(ImportSettingsTab.PREF_IMPORT_FILENAMEPATTERN));
+ /*
+ public final static String[] DEFAULT_FILENAMEPATTERNS = new String[] {
+ "\\bibtexkey",
+ "\\bibtexkey\\begin{title} - \\format[RemoveBrackets]{\\title}\\end{title}"
+ };
+ defaults.put(ImportSettingsTab.PREF_IMPORT_FILENAMEPATTERN, ImportSettingsTab.DEFAULT_FILENAMEPATTERNS[0]);
+ */
+ StringReader sr = new StringReader("\\bibtexkey");
Layout layout = null;
try {
layout = new LayoutHelper(sr).getLayoutFromText(Globals.FORMATTER_PACKAGE);
diff -Nru /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/groups/EntryTableTransferHandler.java src/java/net/sf/jabref/groups/EntryTableTransferHandler.java
--- /tmp/jabref-2.8.1.orig/src/java/net/sf/jabref/groups/EntryTableTransferHandler.java 2012-06-30 00:13:05.000000000 +0300
+++ src/java/net/sf/jabref/groups/EntryTableTransferHandler.java 2012-08-04 09:42:45.947241477 +0300
@@ -45,8 +45,6 @@
import net.sf.jabref.imports.OpenDatabaseAction;
import net.sf.jabref.imports.ParserResult;
import net.sf.jabref.net.URLDownload;
-import spl.PdfImporter;
-import spl.Tools;
public class EntryTableTransferHandler extends TransferHandler {
@@ -379,7 +377,7 @@
new Thread(new Runnable() {
public void run() {
// Done by MrDlib
- final String[] newfileNames = new PdfImporter(frame, panel, entryTable, dropRow).importPdfFiles(fileNames, frame);
+ final String[] newfileNames = new String[]{};
if(newfileNames.length > 0){
loadOrImportFiles(newfileNames, dropRow);
}
|
GitWeb
