Merge 8c9dd83 into 0818875

CHANGELOG.md

@@ -15,9 +15,10 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 ### Changed
 
 ### Fixed
+- Fixed [#666](https://github.com/JabRef/jabref/issues/666): MS Office 2007 export is working again
 
 ### Removed
-
+- Fixed [#627](https://github.com/JabRef/jabref/issues/627): The pdf field is removed from the export formats, use the file field
 
 
 
@@ -45,9 +46,6 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 
 ### Fixed
 - Changes in customized entry types are now directly reflected in the table when clicking "Apply" or "OK"
-- Fixed [#593](https://github.com/JabRef/jabref/issues/593): Reference list generation works for OpenOffice/LibreOffice again
-- Fixed [#545](https://github.com/JabRef/jabref/issues/545): ACM fetcher works again
-- Fixed [#598](https://github.com/JabRef/jabref/issues/598): Use default file icon for custom external file types
 - Fixed [#608](https://github.com/JabRef/jabref/issues/608): Export works again
 - Fixed [#417](https://github.com/JabRef/jabref/issues/417): Table now updates when switching groups
 - Fixed [#534](https://github.com/JabRef/jabref/issues/534): No OpenOffice setup panel in preferences

src/main/java/net/sf/jabref/exporter/ExportFormat.java

@@ -201,7 +201,7 @@ public void performExport(final BibDatabase database,
             // Set a global field, so all layouts have access to the custom name formatters:
             Globals.prefs.customExportNameFormatters = readFormatterFile(lfFileName);
 
-            ArrayList<String> missingFormatters = new ArrayList<>(1);
+            List<String> missingFormatters = new ArrayList<>(1);
 
             // Print header
             try (Reader reader = getReader(lfFileName + ".begin.layout")) {
@@ -235,7 +235,9 @@ public void performExport(final BibDatabase database,
             }
             if (defLayout != null) {
                 missingFormatters.addAll(defLayout.getMissingFormatters());
-                LOGGER.warn(defLayout.getMissingFormatters());
+                if (!missingFormatters.isEmpty()) {
+                    LOGGER.warn(missingFormatters);
+                }
             }
             HashMap<String, Layout> layouts = new HashMap<>();
             Layout layout;

src/main/java/net/sf/jabref/exporter/MSBibExportFormat.java

@@ -61,13 +61,9 @@ public void performExport(final BibDatabase database, final MetaData metaData, f
             } catch (Exception e) {
                 throw new Error(e);
             }
-        }
-        try {
             finalizeSaveSession(ss);
-        } catch (SaveException ex) {
+        } catch (Exception ex) {
             throw new IOException(ex.getMessage());
-        } catch (Exception e) {
-            throw new IOException(e.getMessage());
         }
     }
 }

src/main/java/net/sf/jabref/exporter/ModsExportFormat.java

@@ -45,25 +45,21 @@ public void performExport(final BibDatabase database, final MetaData metaData,
  final String file,
             final Charset encoding, Set<String> keySet) throws IOException {
         SaveSession ss = getSaveSession(StandardCharsets.UTF_8, new File(file));
-        VerifyingWriter ps = ss.getWriter();
-        MODSDatabase md = new MODSDatabase(database, keySet);
+        try (VerifyingWriter ps = ss.getWriter()) {
+            MODSDatabase md = new MODSDatabase(database, keySet);
 
-        try {
-            DOMSource source = new DOMSource(md.getDOMrepresentation());
-            StreamResult result = new StreamResult(ps);
-            Transformer trans = TransformerFactory.newInstance().newTransformer();
-            trans.setOutputProperty(OutputKeys.INDENT, "yes");
-            trans.transform(source, result);
-        } catch (Exception e) {
-            throw new Error(e);
-        }
-
-        try {
+            try {
+                DOMSource source = new DOMSource(md.getDOMrepresentation());
+                StreamResult result = new StreamResult(ps);
+                Transformer trans = TransformerFactory.newInstance().newTransformer();
+                trans.setOutputProperty(OutputKeys.INDENT, "yes");
+                trans.transform(source, result);
+            } catch (Exception e) {
+                throw new Error(e);
+            }
             finalizeSaveSession(ss);
-        } catch (SaveException ex) {
+        } catch (Exception ex) {
             throw new IOException(ex.getMessage());
-        } catch (Exception e) {
-            throw new IOException(e.getMessage());
         }
     }
 }

src/main/java/net/sf/jabref/exporter/OpenDocumentSpreadsheetCreator.java

@@ -104,19 +104,16 @@ private static void exportOpenDocumentSpreadsheet(File file, BibDatabase databas
     private static void exportOpenDocumentSpreadsheetXML(File tmpFile, BibDatabase database, Set<String> keySet) {
         OpenDocumentRepresentation od = new OpenDocumentRepresentation(database, keySet);
 
-        try {
-            try (Writer ps = new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
-
-                DOMSource source = new DOMSource(od.getDOMrepresentation());
-                StreamResult result = new StreamResult(ps);
-                Transformer trans = TransformerFactory.newInstance().newTransformer();
-                trans.setOutputProperty(OutputKeys.INDENT, "yes");
-                trans.transform(source, result);
-            }
+        try (Writer ps = new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
+
+            DOMSource source = new DOMSource(od.getDOMrepresentation());
+            StreamResult result = new StreamResult(ps);
+            Transformer trans = TransformerFactory.newInstance().newTransformer();
+            trans.setOutputProperty(OutputKeys.INDENT, "yes");
+            trans.transform(source, result);
         } catch (Exception e) {
             throw new Error(e);
         }
-
     }
 
     private static void addResourceFile(String name, String resource, ZipOutputStream out) throws IOException {

src/main/resources/resource/layout/bibtexml.layout

@@ -23,7 +23,6 @@
 \begin{url}    <bibtex:url>\format[XMLChars]{\url}</bibtex:url>\end{url}
 \begin{doi}    <bibtex:doi>\format[XMLChars]{\doi}</bibtex:doi>\end{doi}
 \begin{eid}    <bibtex:eid>\format[XMLChars]{\eid}</bibtex:eid>\end{eid}
-\begin{pdf}    <bibtex:pdf>\format[ResolvePDF,XMLChars]{\pdf}</bibtex:pdf>\end{pdf}
 \begin{type}    <bibtex:type>\format[XMLChars]{\type}</bibtex:type>\end{type}
 \begin{crossref}    <bibtex:crossref>\format[XMLChars]{\crossref}</bibtex:crossref>\end{crossref}
 \begin{annote}    <bibtex:annote>\format[XMLChars]{\annote}</bibtex:annote>\end{annote}

src/main/resources/resource/layout/endnote/EndNote.article.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 article

src/main/resources/resource/layout/endnote/EndNote.book.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 book

src/main/resources/resource/layout/endnote/EndNote.booklet.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 booklet

src/main/resources/resource/layout/endnote/EndNote.inbook.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 inbook

src/main/resources/resource/layout/endnote/EndNote.incollection.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 incollection

src/main/resources/resource/layout/endnote/EndNote.inproceedings.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 inproceedings

src/main/resources/resource/layout/endnote/EndNote.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 \entrytype

src/main/resources/resource/layout/endnote/EndNote.manual.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 manual

src/main/resources/resource/layout/endnote/EndNote.mastersthesis.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 mastersthesis

src/main/resources/resource/layout/endnote/EndNote.misc.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 misc

src/main/resources/resource/layout/endnote/EndNote.other.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 other

src/main/resources/resource/layout/endnote/EndNote.phdthesis.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 phdthesis

src/main/resources/resource/layout/endnote/EndNote.proceedings.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 proceedings

src/main/resources/resource/layout/endnote/EndNote.techreport.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 techreport

src/main/resources/resource/layout/endnote/EndNote.unpublished.layout

@@ -26,7 +26,6 @@
 %*
 %L
 %M
-\format[ResolvePDF,WrapContent(%1 ,)]{\pdf}
 \format[FileLink(pdf),WrapContent(%1 ,)]{\file}
 %2 \comment
 %3 unpublished

src/main/resources/resource/layout/html.book.layout

@@ -11,12 +11,6 @@
 		</div>
 		\end{file}
 
-		\begin{pdf}
-		<div class="bibtex_pdf">
-			<a href="\format[ResolvePDF]{\pdf}">pdf</a>
-		</div>
-		\end{pdf}
-
 		\begin{url}
 		<div class="bibtex_url">
 			<a href="\url">url</a>

src/main/resources/resource/layout/html.inbook.layout

@@ -23,12 +23,6 @@
 		</div>
 		\end{file}
 
-		\begin{pdf}
-		<div class="bibtex_pdf">
-			<a href="\format[ResolvePDF]{\pdf}">pdf</a>
-		</div>
-		\end{pdf}
-
 		\begin{url}
 		<div class="bibtex_url">
 			<a href="\url">url</a>

src/main/resources/resource/layout/html.inproceedings.layout

@@ -23,12 +23,6 @@
 		</div>
 		\end{file}
 
-		\begin{pdf}
-		<div class="bibtex_pdf">
-			<a href="\format[ResolvePDF]{\pdf}">pdf</a>
-		</div>
-		\end{pdf}
-
 		\begin{url}
 		<div class="bibtex_url">
 			<a href="\url">url</a>

src/main/resources/resource/layout/html.layout

@@ -29,12 +29,6 @@
 		</div>
 		\end{file}
 
-		\begin{pdf}
-		<div class="bibtex_pdf">
-			<a href="\format[ResolvePDF]{\pdf}">pdf</a>
-		</div>
-		\end{pdf}
-
 		\begin{url}
 		<div class="bibtex_url">
 			<a href="\url">url</a>

src/main/resources/resource/layout/html.mastersthesis.layout

@@ -11,12 +11,6 @@
 		</div>
 		\end{file}
 
-		\begin{pdf}
-		<div class="bibtex_pdf">
-			<a href="\format[ResolvePDF]{\pdf}">pdf</a>
-		</div>
-		\end{pdf}
-
 		\begin{url}
 		<div class="bibtex_url">
 			<a href="\url">url</a>

src/main/resources/resource/layout/html.phdthesis.layout

@@ -11,12 +11,6 @@
 		</div>
 		\end{file}
 
-		\begin{pdf}
-		<div class="bibtex_pdf">
-			<a href="\format[ResolvePDF]{\pdf}">pdf</a>
-		</div>
-		\end{pdf}
-
 		\begin{url}
 		<div class="bibtex_url">
 			<a href="\url">url</a>

src/main/resources/resource/layout/openoffice/openoffice-csv.layout

@@ -1 +1 @@
-\format[GetOpenOfficeType]{\bibtextype},"\begin{isbn}\isbn\end{isbn}","\bibtexkey","\format[AuthorLastFirst,AuthorAndsReplacer]{\author}","\format[RemoveBrackets,RemoveWhitespace]{\title}","\journal",\volume,\number,"\month","\pages",\year,"\address","\note","\url","\booktitle","\chapter","\edition","\series","\format[AuthorLastFirst,AuthorAndsReplacer]{\editor}","\publisher","\begin{reporttype}\reporttype\end{reporttype}","\howpublished","\institution","\organization","\school","\annote","\format[Replace(\n, )]{\abstract}","\comment","\keywords","\format[ResolvePDF]{\pdf}","\key"
+\format[GetOpenOfficeType]{\bibtextype},"\begin{isbn}\isbn\end{isbn}","\bibtexkey","\format[AuthorLastFirst,AuthorAndsReplacer]{\author}","\format[RemoveBrackets,RemoveWhitespace]{\title}","\journal",\volume,\number,"\month","\pages",\year,"\address","\note","\url","\booktitle","\chapter","\edition","\series","\format[AuthorLastFirst,AuthorAndsReplacer]{\editor}","\publisher","\begin{reporttype}\reporttype\end{reporttype}","\howpublished","\institution","\organization","\school","\annote","\format[Replace(\n, )]{\abstract}","\comment","\keywords","\format[FileLink(pdf)]{\file}","\key"