Revert "Add a temporary patch (revert an upstream commit) to build with the old JGood...
authorgregor herrmann <gregoa@debian.org>
Tue, 20 Nov 2012 17:18:27 +0000 (18:18 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 20 Nov 2012 17:18:27 +0000 (18:18 +0100)
This reverts commit a4b34d55e45a4798e55bd8c250b3088f3c662b12.

We now have JGoodies Forms 1.6.0 in experimental

Git-Dch: Ignore

debian/patches/jgoodies-forms-old.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/jgoodies-forms-old.patch b/debian/patches/jgoodies-forms-old.patch
deleted file mode 100644 (file)
index 5cdb910..0000000
+++ /dev/null
@@ -1,843 +0,0 @@
-Description: revert switch JGoodies Forms 1.6.0
- can be dropped after the package is updated in Debian.
- This is basically "git revert c34489a8f345ecc5decc664c" minus the removed files.
-Origin: vendor
-Forwarded: not-needed
-Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2012-11-19
-
---- a/src/java/net/sf/jabref/ContentSelectorDialog2.java
-+++ b/src/java/net/sf/jabref/ContentSelectorDialog2.java
-@@ -26,7 +26,7 @@
- import javax.swing.event.ListSelectionEvent;
- import javax.swing.event.ListSelectionListener;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- public class ContentSelectorDialog2 extends JDialog {
-@@ -474,7 +474,7 @@
-       wordEditPan.add(wordEditField);
-       // Add buttons:
--        ButtonBarBuilder bsb = new ButtonBarBuilder(buttonPan);
-+        ButtonBarBuilder2 bsb = new ButtonBarBuilder2(buttonPan);
-         bsb.addGlue();
-         bsb.addButton(ok);
-           bsb.addButton(apply);
---- a/src/java/net/sf/jabref/EntryTypeDialog.java
-+++ b/src/java/net/sf/jabref/EntryTypeDialog.java
-@@ -26,7 +26,7 @@
- import javax.swing.*;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- public class EntryTypeDialog extends JDialog implements ActionListener {
-@@ -79,7 +79,7 @@
-       cancel.getActionMap().put("close", cancelAction);
-       //buttons.add(ok);
--    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-     //buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-     bb.addGlue();
-     bb.addButton(cancel);
---- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-+++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-@@ -55,7 +55,7 @@
- import javax.swing.tree.TreeNode;
- import javax.swing.tree.TreePath;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import net.sf.jabref.imports.EntryFromFileCreator;
- import net.sf.jabref.imports.EntryFromFileCreatorManager;
-@@ -872,7 +872,7 @@
-               addComponent(gbl, getContentPane(), panelButtons, GridBagConstraints.HORIZONTAL, GridBagConstraints.CENTER, new Insets(10, 6, 10, 6),
-                               0, 3, 1, 1, 0, 0, 0, 0);
-               
--          ButtonBarBuilder bb = new ButtonBarBuilder();
-+          ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(buttonApply);
-         bb.addButton(buttonClose);
---- a/src/java/net/sf/jabref/PrefsDialog3.java
-+++ b/src/java/net/sf/jabref/PrefsDialog3.java
-@@ -34,7 +34,7 @@
- import net.sf.jabref.gui.MainTable;
- import net.sf.jabref.gui.FileDialogs;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- /**
-  * Preferences dialog. Contains a TabbedPane, and tabs will be defined in
-@@ -137,7 +137,7 @@
-               CancelAction cancelAction = new CancelAction();
-               cancel.addActionListener(cancelAction);
-               lower.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
--              ButtonBarBuilder bb = new ButtonBarBuilder(lower);
-+              ButtonBarBuilder2 bb = new ButtonBarBuilder2(lower);
-               bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/export/CustomExportDialog.java
-+++ b/src/java/net/sf/jabref/export/CustomExportDialog.java
-@@ -30,7 +30,7 @@
- import net.sf.jabref.Util;
- import net.sf.jabref.gui.FileDialogs;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- /**
-  * Dialog for creating or modifying custom exports.
-@@ -176,7 +176,7 @@
-     gbl.setConstraints(extension, con);
-     main.add(extension);
--    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-     buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-     bb.addGlue();
-     bb.addButton(ok);
---- a/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
-+++ b/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
-@@ -27,7 +27,7 @@
- import net.sf.jabref.*;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import ca.odell.glazedlists.gui.TableFormat;
- import ca.odell.glazedlists.swing.EventTableModel;
-@@ -137,7 +137,7 @@
-     //am.put("close", closeAction);
-     main.setLayout(new BorderLayout());
-     main.add(sp, BorderLayout.CENTER);
--    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-     buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-     bb.addGlue();
-     bb.addButton(addExport);
---- a/src/java/net/sf/jabref/external/AutoSetExternalFileForEntries.java
-+++ b/src/java/net/sf/jabref/external/AutoSetExternalFileForEntries.java
-@@ -28,7 +28,7 @@
- import net.sf.jabref.undo.NamedCompound;
- import net.sf.jabref.undo.UndoableFieldChange;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -280,7 +280,7 @@
-             JPanel main = builder.getPanel();
-             main.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
--            ButtonBarBuilder bb = new ButtonBarBuilder();
-+            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-             bb.addGlue();
-             bb.addButton(ok);
-             bb.addButton(cancel);
---- a/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
-+++ b/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
-@@ -33,7 +33,7 @@
- import net.sf.jabref.JabRefFrame;
- import net.sf.jabref.MnemonicAwareAction;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.ButtonStackBuilder;
- /**
-@@ -156,7 +156,7 @@
-         bs.addButton(toDefaults);
-         upper.add(bs.getPanel(), BorderLayout.EAST);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
-+++ b/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
-@@ -29,7 +29,7 @@
- import net.sf.jabref.Globals;
- import net.sf.jabref.gui.FileDialogs;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -110,7 +110,7 @@
-             builder.append(application);
-             builder.append(browseBut);
-         }
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/external/IconSelection.java
-+++ b/src/java/net/sf/jabref/external/IconSelection.java
-@@ -28,7 +28,7 @@
- import net.sf.jabref.GUIGlobals;
- import net.sf.jabref.Globals;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- /**
-  * Dialog box for choosing an icon for an external file type.
-@@ -128,7 +128,7 @@
-         icons.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-         icons.setLayoutOrientation(JList.HORIZONTAL_WRAP);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/external/PushToApplicationButton.java
-+++ b/src/java/net/sf/jabref/external/PushToApplicationButton.java
-@@ -15,7 +15,7 @@
- */
- package net.sf.jabref.external;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import net.sf.jabref.GUIGlobals;
- import net.sf.jabref.Globals;
- import net.sf.jabref.JabRefFrame;
-@@ -216,7 +216,7 @@
-         final JDialog diag = dg;
-         options.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-         diag.getContentPane().add(options, BorderLayout.CENTER);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         JButton ok = new JButton(Globals.lang("Ok"));
-         JButton cancel = new JButton(Globals.lang("Cancel"));
-         bb.addGlue();
---- a/src/java/net/sf/jabref/external/SynchronizeFileField.java
-+++ b/src/java/net/sf/jabref/external/SynchronizeFileField.java
-@@ -15,7 +15,7 @@
- */
- package net.sf.jabref.external;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import net.sf.jabref.*;
-@@ -367,7 +367,7 @@
-             JPanel main = builder.getPanel();
-             main.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
--            ButtonBarBuilder bb = new ButtonBarBuilder();
-+            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-             bb.addGlue();
-             bb.addButton(ok);
-             bb.addButton(cancel);
---- a/src/java/net/sf/jabref/external/WriteXMPAction.java
-+++ b/src/java/net/sf/jabref/external/WriteXMPAction.java
-@@ -31,7 +31,7 @@
- import net.sf.jabref.gui.FileListEntry;
- import net.sf.jabref.util.XMPUtil;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- /**
-  * 
-@@ -244,7 +244,7 @@
-                       // progressArea.setPreferredSize(new Dimension(300, 300));
--                      ButtonBarBuilder bb = new ButtonBarBuilder();
-+                      ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-                       bb.addGlue();
-                       bb.addButton(okButton);
-                       bb.addRelatedGap();
---- a/src/java/net/sf/jabref/groups/AutoGroupDialog.java
-+++ b/src/java/net/sf/jabref/groups/AutoGroupDialog.java
-@@ -36,7 +36,7 @@
- import net.sf.jabref.Util;
- import net.sf.jabref.undo.NamedCompound;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.layout.FormLayout;
- /**
-@@ -181,7 +181,7 @@
-         b.append(editors, 5);
-         b.nextLine();
-         
--        ButtonBarBuilder bb = new ButtonBarBuilder(opt);
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2(opt);
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/groups/GroupDialog.java
-+++ b/src/java/net/sf/jabref/groups/GroupDialog.java
-@@ -43,7 +43,7 @@
- import net.sf.jabref.search.SearchExpressionParser;
- import antlr.collections.AST;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -178,7 +178,7 @@
-                 // ... for buttons panel
-                 FormLayout layoutBP = new FormLayout("pref, 4dlu, pref", "p");
-                 layoutBP.setColumnGroups(new int[][] { { 1, 3 } });
--                ButtonBarBuilder builderBP = new ButtonBarBuilder();
-+                ButtonBarBuilder2 builderBP = new ButtonBarBuilder2();
-                 builderBP.addGlue();
-                 builderBP.addButton(m_ok);
-                 builderBP.addButton(m_cancel);
---- a/src/java/net/sf/jabref/gui/AttachFileDialog.java
-+++ b/src/java/net/sf/jabref/gui/AttachFileDialog.java
-@@ -26,7 +26,7 @@
- import net.sf.jabref.*;
- import net.sf.jabref.external.ExternalFilePanel;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -132,7 +132,7 @@
-         builder.append(editor.getTextComponent());
-         builder.append(browse);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addButton(download);
-         bb.addButton(auto);
-         builder.nextLine();
-@@ -144,7 +144,7 @@
-         main.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
--        bb = new ButtonBarBuilder();
-+        bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java
-+++ b/src/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java
-@@ -40,7 +40,7 @@
- import net.sf.jabref.labelPattern.LabelPattern;
- import net.sf.jabref.labelPattern.LabelPatternPanel;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- public class BibtexKeyPatternDialog extends JDialog {
-       private MetaData metaData;
-@@ -75,7 +75,7 @@
-               
-               JPanel lower = new JPanel();
-               lower.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
--              ButtonBarBuilder bb = new ButtonBarBuilder(lower);
-+              ButtonBarBuilder2 bb = new ButtonBarBuilder2(lower);
-               bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/gui/DatabasePropertiesDialog.java
-+++ b/src/java/net/sf/jabref/gui/DatabasePropertiesDialog.java
-@@ -24,7 +24,7 @@
- import net.sf.jabref.*;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -100,7 +100,7 @@
-         builder.appendSeparator(Globals.lang("Database protection"));
-         builder.nextLine();
-         builder.append(protect,3);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
-+++ b/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
-@@ -28,7 +28,7 @@
- import net.sf.jabref.*;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- public class EntryCustomizationDialog2 extends JDialog implements ListSelectionListener, ActionListener {
-@@ -107,7 +107,7 @@
-         ok.addActionListener(this);
-         apply.addActionListener(this);
-         cancel.addActionListener(this);
--        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-         buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-         bb.addGlue();
-         bb.addButton(ok);
---- a/src/java/net/sf/jabref/gui/FetcherPreviewDialog.java
-+++ b/src/java/net/sf/jabref/gui/FetcherPreviewDialog.java
-@@ -5,7 +5,7 @@
- import ca.odell.glazedlists.gui.TableFormat;
- import ca.odell.glazedlists.swing.EventSelectionModel;
- import ca.odell.glazedlists.swing.EventTableModel;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.ButtonStackBuilder;
- import net.sf.jabref.*;
-@@ -79,7 +79,7 @@
-         builder.addButton(deselectAll);
-         builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/gui/FieldWeightDialog.java
-+++ b/src/java/net/sf/jabref/gui/FieldWeightDialog.java
-@@ -29,7 +29,7 @@
- import net.sf.jabref.Globals;
- import net.sf.jabref.JabRefFrame;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -110,7 +110,7 @@
-             }
-         });
--        ButtonBarBuilder builder = new ButtonBarBuilder();
-+        ButtonBarBuilder2 builder = new ButtonBarBuilder2();
-         builder.addGlue();
-         builder.addButton(ok);
-         builder.addButton(cancel);
---- a/src/java/net/sf/jabref/gui/FileListEntryEditor.java
-+++ b/src/java/net/sf/jabref/gui/FileListEntryEditor.java
-@@ -35,7 +35,7 @@
- import net.sf.jabref.external.ExternalFileType;
- import net.sf.jabref.external.UnknownExternalFileType;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -125,7 +125,7 @@
-             builder.append(prog, 3);
-         }
-         
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         //bb.addButton(open);
-         //bb.addRelatedGap();
---- a/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
-+++ b/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
-@@ -24,7 +24,7 @@
- import net.sf.jabref.*;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.layout.Sizes;
- /**
-@@ -92,7 +92,7 @@
-     revert.setText(Globals.lang("Default"));
-     revert.addActionListener(new GenFieldsCustomizer_revert_actionAdapter(this));
-     this.getContentPane().add(buttons, BorderLayout.SOUTH);
--    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-     buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-     bb.addGlue();
-     bb.addButton(ok);
---- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-@@ -67,7 +67,7 @@
- import ca.odell.glazedlists.swing.EventTableModel;
- import ca.odell.glazedlists.swing.TableComparatorChooser;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.ButtonStackBuilder;
- import com.jgoodies.uif_lite.component.UIFSplitPane;
-@@ -274,7 +274,7 @@
-         popup.add(new AttachUrl());
-         getContentPane().add(centerPan, BorderLayout.CENTER);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(stop);
---- a/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
-+++ b/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
-@@ -15,7 +15,7 @@
- */
- package net.sf.jabref.gui;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import net.sf.jabref.Globals;
- import net.sf.jabref.JabRefFrame;
-@@ -45,7 +45,7 @@
-         prog.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-         diag = new JDialog(frame, Globals.lang("Please wait"), true);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(cancel);
-         bb.addGlue();
---- a/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
-+++ b/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
-@@ -42,7 +42,7 @@
- import net.sf.jabref.*;
- import net.sf.jabref.gui.FileDialogs;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- /**
-  * Dialog to manage custom importers.
-@@ -244,7 +244,7 @@
-     am.put("close", closeAction);
-     mainPanel.setLayout(new BorderLayout());
-     mainPanel.add(sp, BorderLayout.CENTER);
--    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-     buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-     bb.addGlue();
-     bb.addButton(addFromFolderButton);
---- a/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
-+++ b/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
-@@ -36,7 +36,7 @@
- import net.sf.jabref.gui.FileDialogs;
- import net.sf.jabref.net.URLDownload;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.ButtonStackBuilder;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.CellConstraints;
-@@ -138,7 +138,7 @@
-         builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));//createMatteBorder(1,1,1,1,Color.green));
-         add(builder.getPanel(), BorderLayout.NORTH);
-         add(externalFilesPanel, BorderLayout.CENTER);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/labelPattern/ResolveDuplicateLabelDialog.java
-+++ b/src/java/net/sf/jabref/labelPattern/ResolveDuplicateLabelDialog.java
-@@ -15,7 +15,7 @@
- */
- package net.sf.jabref.labelPattern;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import net.sf.jabref.*;
-@@ -81,7 +81,7 @@
-         }
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/oo/AdvancedCiteDialog.java
-+++ b/src/java/net/sf/jabref/oo/AdvancedCiteDialog.java
-@@ -15,7 +15,7 @@
- */
- package net.sf.jabref.oo;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import net.sf.jabref.Globals;
-@@ -72,7 +72,7 @@
-         b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-         diag.getContentPane().add(b.getPanel(), BorderLayout.CENTER);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/oo/CitationManager.java
-+++ b/src/java/net/sf/jabref/oo/CitationManager.java
-@@ -20,7 +20,7 @@
- import ca.odell.glazedlists.SortedList;
- import ca.odell.glazedlists.gui.TableFormat;
- import ca.odell.glazedlists.swing.EventTableModel;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import com.sun.star.container.XNameAccess;
-@@ -66,7 +66,7 @@
-         table = new JTable(tableModel);
-         diag.add(new JScrollPane(table), BorderLayout.CENTER);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
-@@ -216,7 +216,7 @@
-             b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-             diag.getContentPane().add(b.getPanel(), BorderLayout.CENTER);
--            ButtonBarBuilder bb = new ButtonBarBuilder();
-+            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-             bb.addGlue();
-             bb.addButton(ok);
-             bb.addButton(cancel);
---- a/src/java/net/sf/jabref/oo/OpenOfficePanel.java
-+++ b/src/java/net/sf/jabref/oo/OpenOfficePanel.java
-@@ -15,7 +15,7 @@
- */
- package net.sf.jabref.oo;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import net.sf.jabref.*;
-@@ -384,7 +384,7 @@
-                 //"p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu"));
-                 "p,p,p,p,p,p,p,p,p,p"));
--        //ButtonBarBuilder bb = new ButtonBarBuilder();
-+        //ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         DefaultFormBuilder bb = new DefaultFormBuilder(new FormLayout
-                 ("fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref:grow, "
-                         +"1dlu, fill:pref:grow, 1dlu, fill:pref:grow", ""));
-@@ -668,7 +668,7 @@
-             builder.nextLine();
-         }
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         JButton ok = new JButton(Globals.lang("Ok"));
-         JButton cancel = new JButton(Globals.lang("Cancel"));
-         //JButton auto = new JButton(Globals.lang("Autodetect"));
---- a/src/java/net/sf/jabref/oo/StyleSelectDialog.java
-+++ b/src/java/net/sf/jabref/oo/StyleSelectDialog.java
-@@ -23,7 +23,7 @@
- import ca.odell.glazedlists.gui.TableFormat;
- import ca.odell.glazedlists.swing.EventSelectionModel;
- import ca.odell.glazedlists.swing.EventTableModel;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import com.jgoodies.uif_lite.component.UIFSplitPane;
-@@ -277,7 +277,7 @@
-         };
-         cancel.addActionListener(cancelListener);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
-@@ -515,7 +515,7 @@
-             sp.setPreferredSize(new Dimension(700,500));
-             dd.getContentPane().add(sp, BorderLayout.CENTER);
-             JButton ok = new JButton(Globals.lang("Ok"));
--            ButtonBarBuilder bb = new ButtonBarBuilder();
-+            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-             bb.addGlue();
-             bb.addButton(ok);
-             bb.addGlue();
---- a/src/java/net/sf/jabref/plugin/ManagePluginsDialog.java
-+++ b/src/java/net/sf/jabref/plugin/ManagePluginsDialog.java
-@@ -20,7 +20,7 @@
- import ca.odell.glazedlists.BasicEventList;
- import ca.odell.glazedlists.gui.TableFormat;
- import ca.odell.glazedlists.swing.EventTableModel;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import java.awt.*;
- import java.awt.event.ActionEvent;
-@@ -92,7 +92,7 @@
-         diag.getContentPane().add(pan, BorderLayout.CENTER);
-         
--        ButtonBarBuilder b = new ButtonBarBuilder();
-+        ButtonBarBuilder2 b = new ButtonBarBuilder2();
-         b.addGlue();
-         b.addButton(install);
-         b.addButton(download);
---- a/src/java/net/sf/jabref/sql/DBConnectDialog.java
-+++ b/src/java/net/sf/jabref/sql/DBConnectDialog.java
-@@ -25,7 +25,7 @@
- import net.sf.jabref.Globals;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -142,7 +142,7 @@
-         getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
-         // add buttons are added in a similar way:
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(btnConnect);
-         bb.addButton(btnCancel);
---- a/src/java/net/sf/jabref/sql/DBImportExportDialog.java
-+++ b/src/java/net/sf/jabref/sql/DBImportExportDialog.java
-@@ -47,7 +47,7 @@
- import net.sf.jabref.Globals;
- import net.sf.jabref.JabRefFrame;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- /**
-  * 
-@@ -159,7 +159,7 @@
-               diag.getContentPane().add(pan, BorderLayout.CENTER);
--              ButtonBarBuilder b = new ButtonBarBuilder();
-+              ButtonBarBuilder2 b = new ButtonBarBuilder2();
-               b.addGlue();
-               if (dialogType.equals(DialogType.IMPORTER))
-                       b.addButton(importButton);
---- a/src/java/net/sf/jabref/util/ManageKeywordsAction.java
-+++ b/src/java/net/sf/jabref/util/ManageKeywordsAction.java
-@@ -59,7 +59,7 @@
- import net.sf.jabref.specialfields.SpecialFieldsUtils;
- import net.sf.jabref.undo.NamedCompound;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
- import com.sun.star.bridge.oleautomation.Date;
-@@ -141,7 +141,7 @@
-         builder.append(add);
-         builder.nextLine();
-         
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/util/MassSetFieldAction.java
-+++ b/src/java/net/sf/jabref/util/MassSetFieldAction.java
-@@ -28,7 +28,7 @@
- import net.sf.jabref.*;
- import net.sf.jabref.undo.NamedCompound;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- import com.jgoodies.forms.builder.DefaultFormBuilder;
- import com.jgoodies.forms.layout.FormLayout;
-@@ -121,7 +121,7 @@
-         builder.append(overwrite, 3);
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         bb.addGlue();
-         bb.addButton(ok);
-         bb.addButton(cancel);
---- a/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
-+++ b/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
-@@ -78,7 +78,7 @@
- import net.sf.jabref.gui.FileDialogs;
- import net.sf.jabref.wizard.auximport.AuxSubGenerator;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- public class FromAuxDialog
-         extends JDialog {
-@@ -134,7 +134,7 @@
-         initPanels(parent);
-         // insert the buttons
--        ButtonBarBuilder bb = new ButtonBarBuilder();
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
-         JPanel buttonPanel = bb.getPanel();
-         buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
---- a/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
-+++ b/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
-@@ -73,7 +73,7 @@
- import net.sf.jabref.wizard.integrity.gui.IntegrityMessagePanel;
- import net.sf.jabref.wizard.text.TagToMarkedTextStore;
--import com.jgoodies.forms.builder.ButtonBarBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
- public class TextInputDialog
-     extends JDialog implements ActionListener
-@@ -363,7 +363,7 @@
-     cancelButton.setText( Globals.lang( "Cancel" ) ) ;
-     cancelButton.addActionListener( this ) ;
--    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
-+    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
-     buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-     bb.addGlue();
-     bb.addButton(okButton);
---- a/src/java/spl/gui/ImportDialog.java
-+++ b/src/java/spl/gui/ImportDialog.java
-@@ -1,6 +1,6 @@
- package spl.gui;\r
\r
--import com.jgoodies.forms.builder.ButtonBarBuilder;\r
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;\r
- import com.jgoodies.forms.builder.DefaultFormBuilder;\r
- import com.jgoodies.forms.layout.FormLayout;\r
- import net.sf.jabref.Globals;\r
-@@ -81,7 +81,7 @@
-         b.append(checkBoxDoNotShowAgain);\r
-         b.append(useDefaultPDFImportStyle);\r
-         b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));\r
--        ButtonBarBuilder bb = new ButtonBarBuilder();\r
-+        ButtonBarBuilder2 bb = new ButtonBarBuilder2();\r
-         bb.addGlue();\r
-         bb.addButton(buttonOK);\r
-         bb.addButton(buttonCancel);\r
index d411692..3716cb1 100644 (file)
@@ -1,3 +1,2 @@
 debian_libs.patch
 mrDlib_jayatana.patch
-jgoodies-forms-old.patch