JabRef · simonharrer · May 19, 2015 · May 19, 2015 · May 19, 2015
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 [master]
     - Feature: Ability to reorder the panels in the side pane
+	- Feature: Option to save selected entries as plain BibTex without JabRef metadata
 2.11 beta
     - Some UI updates (mainly removing unnecessary boundaries)
     - Feature: Gridlines are now optional (and disabled by default)

diff --git a/src/main/java/net/sf/jabref/BasePanel.java b/src/main/java/net/sf/jabref/BasePanel.java
@@ -70,6 +70,7 @@
 import net.sf.jabref.export.SaveDatabaseAction;
 import net.sf.jabref.export.SaveException;
 import net.sf.jabref.export.SaveSession;
+import net.sf.jabref.export.FileActions.DatabaseSaveType;
 import net.sf.jabref.export.layout.Layout;
 import net.sf.jabref.export.layout.LayoutHelper;
 import net.sf.jabref.external.AttachFileAction;
@@ -411,30 +412,10 @@ public void action() throws Throwable {
             }
         });
 
-        actions.put("saveSelectedAs", new BaseAction () {
-                public void action() throws Throwable {
-
-                  String chosenFile = FileDialogs.getNewFile(frame, new File(Globals.prefs.get("workingDirectory")), ".bib",
-                                                         JFileChooser.SAVE_DIALOG, false);
-                  if (chosenFile != null) {
-                    File expFile = new File(chosenFile);
-                    if (!expFile.exists() ||
-                        (JOptionPane.showConfirmDialog
-                         (frame, "'"+expFile.getName()+"' "+
-                          Globals.lang("exists. Overwrite file?"),
-                          Globals.lang("Save database"), JOptionPane.OK_CANCEL_OPTION)
-                         == JOptionPane.OK_OPTION)) {
-
-                      saveDatabase(expFile, true, Globals.prefs.get("defaultEncoding"));
-                      //runCommand("save");
-                      frame.getFileHistory().newFile(expFile.getPath());
-                      frame.output(Globals.lang("Saved selected to")+" '"
-                                   +expFile.getPath()+"'.");
-                        }
-                    }
-                }
-            });
-
+        actions.put("saveSelectedAs", new SaveSelectedAction(FileActions.DatabaseSaveType.DEFAULT));
+
+        actions.put("saveSelectedAsPlain", new SaveSelectedAction(FileActions.DatabaseSaveType.PLAIN_BIBTEX));
+
         // The action for copying selected entries.
         actions.put("copy", new BaseAction() {
                 public void action() {
@@ -1716,7 +1697,7 @@ public void runCommand(String _command) {
       //}).start();
     }
 
-    private boolean saveDatabase(File file, boolean selectedOnly, String encoding) throws SaveException {
+    private boolean saveDatabase(File file, boolean selectedOnly, String encoding, FileActions.DatabaseSaveType saveType) throws SaveException {
         SaveSession session;
         frame.block();
         try {
@@ -1725,7 +1706,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, String encoding) t
                                            Globals.prefs, false, false, encoding, false);
             else
                 session = FileActions.savePartOfDatabase(database, metaData, file,
-                                               Globals.prefs, mainTable.getSelectedEntries(), encoding);
+                                               Globals.prefs, mainTable.getSelectedEntries(), encoding, saveType);
 
         } catch (UnsupportedCharsetException ex2) {
             JOptionPane.showMessageDialog(frame, Globals.lang("Could not save file. "
@@ -1775,7 +1756,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, String encoding) t
                         JOptionPane.QUESTION_MESSAGE, null, Globals.ENCODINGS, encoding);
                 if (choice != null) {
                     String newEncoding = (String)choice;
-                    return saveDatabase(file, selectedOnly, newEncoding);
+                    return saveDatabase(file, selectedOnly, newEncoding, saveType);
                 } else
                     commit = false;
             } else if (answer == JOptionPane.CANCEL_OPTION)
@@ -3096,5 +3077,34 @@ public void setBackAndForwardEnabledState() {
         frame.forward.setEnabled(nextEntries.size() > 0);
     }
 
-
+    private class SaveSelectedAction extends BaseAction {
+
+    	private DatabaseSaveType saveType;
+
+    	public SaveSelectedAction(DatabaseSaveType saveType) {
+    		this.saveType = saveType;
+    	}
+
+        public void action() throws Throwable {
+
+            String chosenFile = FileDialogs.getNewFile(frame, new File(Globals.prefs.get("workingDirectory")), ".bib",
+                                                   JFileChooser.SAVE_DIALOG, false);
+            if (chosenFile != null) {
+              File expFile = new File(chosenFile);
+              if (!expFile.exists() ||
+                  (JOptionPane.showConfirmDialog
+                   (frame, "'"+expFile.getName()+"' "+
+                    Globals.lang("exists. Overwrite file?"),
+                    Globals.lang("Save database"), JOptionPane.OK_CANCEL_OPTION)
+                   == JOptionPane.OK_OPTION)) {
+
+                saveDatabase(expFile, true, Globals.prefs.get("defaultEncoding"), saveType);
+                //runCommand("save");
+                frame.getFileHistory().newFile(expFile.getPath());
+                frame.output(Globals.lang("Saved selected to")+" '"
+                             +expFile.getPath()+"'.");
+                  }
+              }
+          }
+      }
 }
diff --git a/src/main/java/net/sf/jabref/JabRefFrame.java b/src/main/java/net/sf/jabref/JabRefFrame.java
@@ -186,6 +186,10 @@ void addAction(Action a) {
                                          "Save selected as ...",
                                          Globals.lang("Save selected as ..."),
                                          GUIGlobals.getIconUrl("saveAs")),
+      saveSelectedAsPlain = new GeneralAction("saveSelectedAsPlain",
+                                                 "Save selected as plain BibTeX ...",
+                                                 Globals.lang("Save selected as plain BibTeX ..."),
+                                                 GUIGlobals.getIconUrl("saveAs")),
       exportAll = ExportFormats.getExportAction(this, false),
       exportSelected = ExportFormats.getExportAction(this, true),
       importCurrent = ImportFormats.getImportAction(this, false),
@@ -1291,6 +1295,7 @@ private void fillMenu() {
       file.add(saveAs);
       file.add(saveAll);
       file.add(saveSelectedAs);
+      file.add(saveSelectedAsPlain);
       file.addSeparator();
       //file.add(importMenu);
       //file.add(importNewMenu);

diff --git a/src/main/java/net/sf/jabref/export/FileActions.java b/src/main/java/net/sf/jabref/export/FileActions.java
@@ -55,7 +55,11 @@
 import ca.odell.glazedlists.SortedList;
 
 public class FileActions {
-
+
+	public enum DatabaseSaveType {
+		DEFAULT, PLAIN_BIBTEX
+	}
+
     private static Pattern refPat = Pattern.compile("(#[A-Za-z]+#)"); // Used to detect string references in strings
     private static BibtexString.Type previousStringType;
 
@@ -357,7 +361,7 @@ private static List<Comparator<BibtexEntry>> getSaveComparators(boolean isSaveOp
      * @return A List containing warnings, if any.
      */
     public static SaveSession savePartOfDatabase(BibtexDatabase database, MetaData metaData,
-            File file, JabRefPreferences prefs, BibtexEntry[] bes, String encoding) throws SaveException {
+            File file, JabRefPreferences prefs, BibtexEntry[] bes, String encoding, DatabaseSaveType saveType) throws SaveException {
 
         TreeMap<String, BibtexEntryType> types = new TreeMap<String, BibtexEntryType>(); // Map
         // to
@@ -382,9 +386,11 @@ public static SaveSession savePartOfDatabase(BibtexDatabase database, MetaData m
             // Define our data stream.
             VerifyingWriter fw = session.getWriter();
 
-            // Write signature.
-            writeBibFileHeader(fw, encoding);
-
+            if (saveType != DatabaseSaveType.PLAIN_BIBTEX) {
+            	// Write signature.
+            	writeBibFileHeader(fw, encoding);
+            }
+
             // Write preamble if there is one.
             writePreamble(fw, database.getPreamble());
 
@@ -423,7 +429,7 @@ public static SaveSession savePartOfDatabase(BibtexDatabase database, MetaData m
             }
 
             // Write meta data.
-            if (metaData != null) {
+            if (saveType != DatabaseSaveType.PLAIN_BIBTEX && metaData != null) {
                 metaData.writeMetaData(fw);
             }
 

diff --git a/src/main/java/net/sf/jabref/export/SaveDatabaseAction.java b/src/main/java/net/sf/jabref/export/SaveDatabaseAction.java
@@ -218,7 +218,7 @@ private boolean saveDatabase(File file, boolean selectedOnly, String encoding) t
                         Globals.prefs, false, false, encoding, false);
             else
                 session = FileActions.savePartOfDatabase(panel.database(), panel.metaData(), file,
-                        Globals.prefs, panel.getSelectedEntries(), encoding);
+                        Globals.prefs, panel.getSelectedEntries(), encoding, FileActions.DatabaseSaveType.DEFAULT);
 
         } catch (UnsupportedCharsetException ex2) {
             JOptionPane.showMessageDialog(frame, Globals.lang("Could not save file. "