update changelog
[debian/jabref.git] / debian / patches / jgoodies-forms-old.patch
1 Description: revert switch JGoodies Forms 1.6.0
2  can be dropped after the package is updated in Debian.
3  This is basically "git revert c34489a8f345ecc5decc664c" minus the removed files.
4 Origin: vendor
5 Forwarded: not-needed
6 Author: gregor herrmann <gregoa@debian.org>
7 Last-Update: 2012-11-19
8
9 --- a/src/java/net/sf/jabref/ContentSelectorDialog2.java
10 +++ b/src/java/net/sf/jabref/ContentSelectorDialog2.java
11 @@ -26,7 +26,7 @@
12  import javax.swing.event.ListSelectionEvent;
13  import javax.swing.event.ListSelectionListener;
14  
15 -import com.jgoodies.forms.builder.ButtonBarBuilder;
16 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
17  
18  public class ContentSelectorDialog2 extends JDialog {
19  
20 @@ -474,7 +474,7 @@
21         wordEditPan.add(wordEditField);
22  
23         // Add buttons:
24 -        ButtonBarBuilder bsb = new ButtonBarBuilder(buttonPan);
25 +        ButtonBarBuilder2 bsb = new ButtonBarBuilder2(buttonPan);
26          bsb.addGlue();
27          bsb.addButton(ok);
28             bsb.addButton(apply);
29 --- a/src/java/net/sf/jabref/EntryTypeDialog.java
30 +++ b/src/java/net/sf/jabref/EntryTypeDialog.java
31 @@ -26,7 +26,7 @@
32  
33  import javax.swing.*;
34  
35 -import com.jgoodies.forms.builder.ButtonBarBuilder;
36 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
37  
38  public class EntryTypeDialog extends JDialog implements ActionListener {
39  
40 @@ -79,7 +79,7 @@
41         cancel.getActionMap().put("close", cancelAction);
42  
43         //buttons.add(ok);
44 -    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
45 +    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
46      //buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
47      bb.addGlue();
48      bb.addButton(cancel);
49 --- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
50 +++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
51 @@ -55,7 +55,7 @@
52  import javax.swing.tree.TreeNode;
53  import javax.swing.tree.TreePath;
54  
55 -import com.jgoodies.forms.builder.ButtonBarBuilder;
56 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
57  
58  import net.sf.jabref.imports.EntryFromFileCreator;
59  import net.sf.jabref.imports.EntryFromFileCreatorManager;
60 @@ -872,7 +872,7 @@
61                 addComponent(gbl, getContentPane(), panelButtons, GridBagConstraints.HORIZONTAL, GridBagConstraints.CENTER, new Insets(10, 6, 10, 6),
62                                 0, 3, 1, 1, 0, 0, 0, 0);
63                 
64 -           ButtonBarBuilder bb = new ButtonBarBuilder();
65 +           ButtonBarBuilder2 bb = new ButtonBarBuilder2();
66          bb.addGlue();
67          bb.addButton(buttonApply);
68          bb.addButton(buttonClose);
69 --- a/src/java/net/sf/jabref/PrefsDialog3.java
70 +++ b/src/java/net/sf/jabref/PrefsDialog3.java
71 @@ -34,7 +34,7 @@
72  import net.sf.jabref.gui.MainTable;
73  import net.sf.jabref.gui.FileDialogs;
74  
75 -import com.jgoodies.forms.builder.ButtonBarBuilder;
76 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
77  
78  /**
79   * Preferences dialog. Contains a TabbedPane, and tabs will be defined in
80 @@ -137,7 +137,7 @@
81                 CancelAction cancelAction = new CancelAction();
82                 cancel.addActionListener(cancelAction);
83                 lower.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
84 -               ButtonBarBuilder bb = new ButtonBarBuilder(lower);
85 +               ButtonBarBuilder2 bb = new ButtonBarBuilder2(lower);
86                 bb.addGlue();
87          bb.addButton(ok);
88          bb.addButton(cancel);
89 --- a/src/java/net/sf/jabref/export/CustomExportDialog.java
90 +++ b/src/java/net/sf/jabref/export/CustomExportDialog.java
91 @@ -30,7 +30,7 @@
92  import net.sf.jabref.Util;
93  import net.sf.jabref.gui.FileDialogs;
94  
95 -import com.jgoodies.forms.builder.ButtonBarBuilder;
96 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
97  
98  /**
99   * Dialog for creating or modifying custom exports.
100 @@ -176,7 +176,7 @@
101      gbl.setConstraints(extension, con);
102      main.add(extension);
103  
104 -    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
105 +    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
106      buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
107      bb.addGlue();
108      bb.addButton(ok);
109 --- a/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
110 +++ b/src/java/net/sf/jabref/export/ExportCustomizationDialog.java
111 @@ -27,7 +27,7 @@
112  
113  import net.sf.jabref.*;
114  
115 -import com.jgoodies.forms.builder.ButtonBarBuilder;
116 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
117  import ca.odell.glazedlists.gui.TableFormat;
118  import ca.odell.glazedlists.swing.EventTableModel;
119  
120 @@ -137,7 +137,7 @@
121      //am.put("close", closeAction);
122      main.setLayout(new BorderLayout());
123      main.add(sp, BorderLayout.CENTER);
124 -    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
125 +    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
126      buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
127      bb.addGlue();
128      bb.addButton(addExport);
129 --- a/src/java/net/sf/jabref/external/AutoSetExternalFileForEntries.java
130 +++ b/src/java/net/sf/jabref/external/AutoSetExternalFileForEntries.java
131 @@ -28,7 +28,7 @@
132  import net.sf.jabref.undo.NamedCompound;
133  import net.sf.jabref.undo.UndoableFieldChange;
134  
135 -import com.jgoodies.forms.builder.ButtonBarBuilder;
136 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
137  import com.jgoodies.forms.builder.DefaultFormBuilder;
138  import com.jgoodies.forms.layout.FormLayout;
139  
140 @@ -280,7 +280,7 @@
141              JPanel main = builder.getPanel();
142              main.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
143  
144 -            ButtonBarBuilder bb = new ButtonBarBuilder();
145 +            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
146              bb.addGlue();
147              bb.addButton(ok);
148              bb.addButton(cancel);
149 --- a/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
150 +++ b/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
151 @@ -33,7 +33,7 @@
152  import net.sf.jabref.JabRefFrame;
153  import net.sf.jabref.MnemonicAwareAction;
154  
155 -import com.jgoodies.forms.builder.ButtonBarBuilder;
156 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
157  import com.jgoodies.forms.builder.ButtonStackBuilder;
158  
159  /**
160 @@ -156,7 +156,7 @@
161          bs.addButton(toDefaults);
162          upper.add(bs.getPanel(), BorderLayout.EAST);
163  
164 -        ButtonBarBuilder bb = new ButtonBarBuilder();
165 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
166          bb.addGlue();
167          bb.addButton(ok);
168          bb.addButton(cancel);
169 --- a/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
170 +++ b/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
171 @@ -29,7 +29,7 @@
172  import net.sf.jabref.Globals;
173  import net.sf.jabref.gui.FileDialogs;
174  
175 -import com.jgoodies.forms.builder.ButtonBarBuilder;
176 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
177  import com.jgoodies.forms.builder.DefaultFormBuilder;
178  import com.jgoodies.forms.layout.FormLayout;
179  
180 @@ -110,7 +110,7 @@
181              builder.append(application);
182              builder.append(browseBut);
183          }
184 -        ButtonBarBuilder bb = new ButtonBarBuilder();
185 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
186          bb.addGlue();
187          bb.addButton(ok);
188          bb.addButton(cancel);
189 --- a/src/java/net/sf/jabref/external/IconSelection.java
190 +++ b/src/java/net/sf/jabref/external/IconSelection.java
191 @@ -28,7 +28,7 @@
192  import net.sf.jabref.GUIGlobals;
193  import net.sf.jabref.Globals;
194  
195 -import com.jgoodies.forms.builder.ButtonBarBuilder;
196 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
197  
198  /**
199   * Dialog box for choosing an icon for an external file type.
200 @@ -128,7 +128,7 @@
201          icons.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
202          icons.setLayoutOrientation(JList.HORIZONTAL_WRAP);
203  
204 -        ButtonBarBuilder bb = new ButtonBarBuilder();
205 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
206          bb.addGlue();
207          bb.addButton(ok);
208          bb.addButton(cancel);
209 --- a/src/java/net/sf/jabref/external/PushToApplicationButton.java
210 +++ b/src/java/net/sf/jabref/external/PushToApplicationButton.java
211 @@ -15,7 +15,7 @@
212  */
213  package net.sf.jabref.external;
214  
215 -import com.jgoodies.forms.builder.ButtonBarBuilder;
216 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
217  import net.sf.jabref.GUIGlobals;
218  import net.sf.jabref.Globals;
219  import net.sf.jabref.JabRefFrame;
220 @@ -216,7 +216,7 @@
221          final JDialog diag = dg;
222          options.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
223          diag.getContentPane().add(options, BorderLayout.CENTER);
224 -        ButtonBarBuilder bb = new ButtonBarBuilder();
225 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
226          JButton ok = new JButton(Globals.lang("Ok"));
227          JButton cancel = new JButton(Globals.lang("Cancel"));
228          bb.addGlue();
229 --- a/src/java/net/sf/jabref/external/SynchronizeFileField.java
230 +++ b/src/java/net/sf/jabref/external/SynchronizeFileField.java
231 @@ -15,7 +15,7 @@
232  */
233  package net.sf.jabref.external;
234  
235 -import com.jgoodies.forms.builder.ButtonBarBuilder;
236 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
237  import com.jgoodies.forms.builder.DefaultFormBuilder;
238  import com.jgoodies.forms.layout.FormLayout;
239  import net.sf.jabref.*;
240 @@ -367,7 +367,7 @@
241              JPanel main = builder.getPanel();
242              main.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
243  
244 -            ButtonBarBuilder bb = new ButtonBarBuilder();
245 +            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
246              bb.addGlue();
247              bb.addButton(ok);
248              bb.addButton(cancel);
249 --- a/src/java/net/sf/jabref/external/WriteXMPAction.java
250 +++ b/src/java/net/sf/jabref/external/WriteXMPAction.java
251 @@ -31,7 +31,7 @@
252  import net.sf.jabref.gui.FileListEntry;
253  import net.sf.jabref.util.XMPUtil;
254  
255 -import com.jgoodies.forms.builder.ButtonBarBuilder;
256 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
257  
258  /**
259   * 
260 @@ -244,7 +244,7 @@
261  
262                         // progressArea.setPreferredSize(new Dimension(300, 300));
263  
264 -                       ButtonBarBuilder bb = new ButtonBarBuilder();
265 +                       ButtonBarBuilder2 bb = new ButtonBarBuilder2();
266                         bb.addGlue();
267                         bb.addButton(okButton);
268                         bb.addRelatedGap();
269 --- a/src/java/net/sf/jabref/groups/AutoGroupDialog.java
270 +++ b/src/java/net/sf/jabref/groups/AutoGroupDialog.java
271 @@ -36,7 +36,7 @@
272  import net.sf.jabref.Util;
273  import net.sf.jabref.undo.NamedCompound;
274  import com.jgoodies.forms.builder.DefaultFormBuilder;
275 -import com.jgoodies.forms.builder.ButtonBarBuilder;
276 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
277  import com.jgoodies.forms.layout.FormLayout;
278  
279  /**
280 @@ -181,7 +181,7 @@
281          b.append(editors, 5);
282          b.nextLine();
283          
284 -        ButtonBarBuilder bb = new ButtonBarBuilder(opt);
285 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2(opt);
286          bb.addGlue();
287          bb.addButton(ok);
288          bb.addButton(cancel);
289 --- a/src/java/net/sf/jabref/groups/GroupDialog.java
290 +++ b/src/java/net/sf/jabref/groups/GroupDialog.java
291 @@ -43,7 +43,7 @@
292  import net.sf.jabref.search.SearchExpressionParser;
293  import antlr.collections.AST;
294  
295 -import com.jgoodies.forms.builder.ButtonBarBuilder;
296 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
297  import com.jgoodies.forms.builder.DefaultFormBuilder;
298  import com.jgoodies.forms.layout.FormLayout;
299  
300 @@ -178,7 +178,7 @@
301                  // ... for buttons panel
302                  FormLayout layoutBP = new FormLayout("pref, 4dlu, pref", "p");
303                  layoutBP.setColumnGroups(new int[][] { { 1, 3 } });
304 -                ButtonBarBuilder builderBP = new ButtonBarBuilder();
305 +                ButtonBarBuilder2 builderBP = new ButtonBarBuilder2();
306                  builderBP.addGlue();
307                  builderBP.addButton(m_ok);
308                  builderBP.addButton(m_cancel);
309 --- a/src/java/net/sf/jabref/gui/AttachFileDialog.java
310 +++ b/src/java/net/sf/jabref/gui/AttachFileDialog.java
311 @@ -26,7 +26,7 @@
312  import net.sf.jabref.*;
313  import net.sf.jabref.external.ExternalFilePanel;
314  
315 -import com.jgoodies.forms.builder.ButtonBarBuilder;
316 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
317  import com.jgoodies.forms.builder.DefaultFormBuilder;
318  import com.jgoodies.forms.layout.FormLayout;
319  
320 @@ -132,7 +132,7 @@
321          builder.append(editor.getTextComponent());
322          builder.append(browse);
323  
324 -        ButtonBarBuilder bb = new ButtonBarBuilder();
325 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
326          bb.addButton(download);
327          bb.addButton(auto);
328          builder.nextLine();
329 @@ -144,7 +144,7 @@
330  
331          main.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
332  
333 -        bb = new ButtonBarBuilder();
334 +        bb = new ButtonBarBuilder2();
335          bb.addGlue();
336          bb.addButton(ok);
337          bb.addButton(cancel);
338 --- a/src/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java
339 +++ b/src/java/net/sf/jabref/gui/BibtexKeyPatternDialog.java
340 @@ -40,7 +40,7 @@
341  import net.sf.jabref.labelPattern.LabelPattern;
342  import net.sf.jabref.labelPattern.LabelPatternPanel;
343  
344 -import com.jgoodies.forms.builder.ButtonBarBuilder;
345 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
346  
347  public class BibtexKeyPatternDialog extends JDialog {
348         private MetaData metaData;
349 @@ -75,7 +75,7 @@
350                 
351                 JPanel lower = new JPanel();
352                 lower.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
353 -               ButtonBarBuilder bb = new ButtonBarBuilder(lower);
354 +               ButtonBarBuilder2 bb = new ButtonBarBuilder2(lower);
355                 bb.addGlue();
356          bb.addButton(ok);
357          bb.addButton(cancel);
358 --- a/src/java/net/sf/jabref/gui/DatabasePropertiesDialog.java
359 +++ b/src/java/net/sf/jabref/gui/DatabasePropertiesDialog.java
360 @@ -24,7 +24,7 @@
361  
362  import net.sf.jabref.*;
363  
364 -import com.jgoodies.forms.builder.ButtonBarBuilder;
365 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
366  import com.jgoodies.forms.builder.DefaultFormBuilder;
367  import com.jgoodies.forms.layout.FormLayout;
368  
369 @@ -100,7 +100,7 @@
370          builder.appendSeparator(Globals.lang("Database protection"));
371          builder.nextLine();
372          builder.append(protect,3);
373 -        ButtonBarBuilder bb = new ButtonBarBuilder();
374 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
375          bb.addGlue();
376          bb.addButton(ok);
377          bb.addButton(cancel);
378 --- a/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
379 +++ b/src/java/net/sf/jabref/gui/EntryCustomizationDialog2.java
380 @@ -28,7 +28,7 @@
381  
382  import net.sf.jabref.*;
383  
384 -import com.jgoodies.forms.builder.ButtonBarBuilder;
385 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
386  
387  public class EntryCustomizationDialog2 extends JDialog implements ListSelectionListener, ActionListener {
388  
389 @@ -107,7 +107,7 @@
390          ok.addActionListener(this);
391          apply.addActionListener(this);
392          cancel.addActionListener(this);
393 -        ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
394 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
395          buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
396          bb.addGlue();
397          bb.addButton(ok);
398 --- a/src/java/net/sf/jabref/gui/FetcherPreviewDialog.java
399 +++ b/src/java/net/sf/jabref/gui/FetcherPreviewDialog.java
400 @@ -5,7 +5,7 @@
401  import ca.odell.glazedlists.gui.TableFormat;
402  import ca.odell.glazedlists.swing.EventSelectionModel;
403  import ca.odell.glazedlists.swing.EventTableModel;
404 -import com.jgoodies.forms.builder.ButtonBarBuilder;
405 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
406  import com.jgoodies.forms.builder.ButtonStackBuilder;
407  import net.sf.jabref.*;
408  
409 @@ -79,7 +79,7 @@
410          builder.addButton(deselectAll);
411          builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
412  
413 -        ButtonBarBuilder bb = new ButtonBarBuilder();
414 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
415          bb.addGlue();
416          bb.addButton(ok);
417          bb.addButton(cancel);
418 --- a/src/java/net/sf/jabref/gui/FieldWeightDialog.java
419 +++ b/src/java/net/sf/jabref/gui/FieldWeightDialog.java
420 @@ -29,7 +29,7 @@
421  import net.sf.jabref.Globals;
422  import net.sf.jabref.JabRefFrame;
423  
424 -import com.jgoodies.forms.builder.ButtonBarBuilder;
425 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
426  import com.jgoodies.forms.builder.DefaultFormBuilder;
427  import com.jgoodies.forms.layout.FormLayout;
428  
429 @@ -110,7 +110,7 @@
430              }
431          });
432  
433 -        ButtonBarBuilder builder = new ButtonBarBuilder();
434 +        ButtonBarBuilder2 builder = new ButtonBarBuilder2();
435          builder.addGlue();
436          builder.addButton(ok);
437          builder.addButton(cancel);
438 --- a/src/java/net/sf/jabref/gui/FileListEntryEditor.java
439 +++ b/src/java/net/sf/jabref/gui/FileListEntryEditor.java
440 @@ -35,7 +35,7 @@
441  import net.sf.jabref.external.ExternalFileType;
442  import net.sf.jabref.external.UnknownExternalFileType;
443  
444 -import com.jgoodies.forms.builder.ButtonBarBuilder;
445 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
446  import com.jgoodies.forms.builder.DefaultFormBuilder;
447  import com.jgoodies.forms.layout.FormLayout;
448  
449 @@ -125,7 +125,7 @@
450              builder.append(prog, 3);
451          }
452          
453 -        ButtonBarBuilder bb = new ButtonBarBuilder();
454 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
455          bb.addGlue();
456          //bb.addButton(open);
457          //bb.addRelatedGap();
458 --- a/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
459 +++ b/src/java/net/sf/jabref/gui/GenFieldsCustomizer.java
460 @@ -24,7 +24,7 @@
461  
462  import net.sf.jabref.*;
463  
464 -import com.jgoodies.forms.builder.ButtonBarBuilder;
465 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
466  import com.jgoodies.forms.layout.Sizes;
467  
468  /**
469 @@ -92,7 +92,7 @@
470      revert.setText(Globals.lang("Default"));
471      revert.addActionListener(new GenFieldsCustomizer_revert_actionAdapter(this));
472      this.getContentPane().add(buttons, BorderLayout.SOUTH);
473 -    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
474 +    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
475      buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
476      bb.addGlue();
477      bb.addButton(ok);
478 --- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
479 +++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
480 @@ -67,7 +67,7 @@
481  import ca.odell.glazedlists.swing.EventTableModel;
482  import ca.odell.glazedlists.swing.TableComparatorChooser;
483  
484 -import com.jgoodies.forms.builder.ButtonBarBuilder;
485 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
486  import com.jgoodies.forms.builder.ButtonStackBuilder;
487  import com.jgoodies.uif_lite.component.UIFSplitPane;
488  
489 @@ -274,7 +274,7 @@
490          popup.add(new AttachUrl());
491          getContentPane().add(centerPan, BorderLayout.CENTER);
492  
493 -        ButtonBarBuilder bb = new ButtonBarBuilder();
494 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
495          bb.addGlue();
496          bb.addButton(ok);
497          bb.addButton(stop);
498 --- a/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
499 +++ b/src/java/net/sf/jabref/gui/WaitForSaveOperation.java
500 @@ -15,7 +15,7 @@
501  */
502  package net.sf.jabref.gui;
503  
504 -import com.jgoodies.forms.builder.ButtonBarBuilder;
505 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
506  import net.sf.jabref.Globals;
507  import net.sf.jabref.JabRefFrame;
508  
509 @@ -45,7 +45,7 @@
510          prog.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
511          diag = new JDialog(frame, Globals.lang("Please wait"), true);
512  
513 -        ButtonBarBuilder bb = new ButtonBarBuilder();
514 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
515          bb.addGlue();
516          bb.addButton(cancel);
517          bb.addGlue();
518 --- a/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
519 +++ b/src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
520 @@ -42,7 +42,7 @@
521  import net.sf.jabref.*;
522  import net.sf.jabref.gui.FileDialogs;
523  
524 -import com.jgoodies.forms.builder.ButtonBarBuilder;
525 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
526  
527  /**
528   * Dialog to manage custom importers.
529 @@ -244,7 +244,7 @@
530      am.put("close", closeAction);
531      mainPanel.setLayout(new BorderLayout());
532      mainPanel.add(sp, BorderLayout.CENTER);
533 -    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
534 +    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
535      buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
536      bb.addGlue();
537      bb.addButton(addFromFolderButton);
538 --- a/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
539 +++ b/src/java/net/sf/jabref/journals/ManageJournalsPanel.java
540 @@ -36,7 +36,7 @@
541  import net.sf.jabref.gui.FileDialogs;
542  import net.sf.jabref.net.URLDownload;
543  
544 -import com.jgoodies.forms.builder.ButtonBarBuilder;
545 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
546  import com.jgoodies.forms.builder.ButtonStackBuilder;
547  import com.jgoodies.forms.builder.DefaultFormBuilder;
548  import com.jgoodies.forms.layout.CellConstraints;
549 @@ -138,7 +138,7 @@
550          builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));//createMatteBorder(1,1,1,1,Color.green));
551          add(builder.getPanel(), BorderLayout.NORTH);
552          add(externalFilesPanel, BorderLayout.CENTER);
553 -        ButtonBarBuilder bb = new ButtonBarBuilder();
554 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
555          bb.addGlue();
556          bb.addButton(ok);
557          bb.addButton(cancel);
558 --- a/src/java/net/sf/jabref/labelPattern/ResolveDuplicateLabelDialog.java
559 +++ b/src/java/net/sf/jabref/labelPattern/ResolveDuplicateLabelDialog.java
560 @@ -15,7 +15,7 @@
561  */
562  package net.sf.jabref.labelPattern;
563  
564 -import com.jgoodies.forms.builder.ButtonBarBuilder;
565 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
566  import com.jgoodies.forms.builder.DefaultFormBuilder;
567  import com.jgoodies.forms.layout.FormLayout;
568  import net.sf.jabref.*;
569 @@ -81,7 +81,7 @@
570          }
571  
572  
573 -        ButtonBarBuilder bb = new ButtonBarBuilder();
574 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
575          bb.addGlue();
576          bb.addButton(ok);
577          bb.addButton(cancel);
578 --- a/src/java/net/sf/jabref/oo/AdvancedCiteDialog.java
579 +++ b/src/java/net/sf/jabref/oo/AdvancedCiteDialog.java
580 @@ -15,7 +15,7 @@
581  */
582  package net.sf.jabref.oo;
583  
584 -import com.jgoodies.forms.builder.ButtonBarBuilder;
585 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
586  import com.jgoodies.forms.builder.DefaultFormBuilder;
587  import com.jgoodies.forms.layout.FormLayout;
588  import net.sf.jabref.Globals;
589 @@ -72,7 +72,7 @@
590          b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
591          diag.getContentPane().add(b.getPanel(), BorderLayout.CENTER);
592  
593 -        ButtonBarBuilder bb = new ButtonBarBuilder();
594 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
595          bb.addGlue();
596          bb.addButton(ok);
597          bb.addButton(cancel);
598 --- a/src/java/net/sf/jabref/oo/CitationManager.java
599 +++ b/src/java/net/sf/jabref/oo/CitationManager.java
600 @@ -20,7 +20,7 @@
601  import ca.odell.glazedlists.SortedList;
602  import ca.odell.glazedlists.gui.TableFormat;
603  import ca.odell.glazedlists.swing.EventTableModel;
604 -import com.jgoodies.forms.builder.ButtonBarBuilder;
605 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
606  import com.jgoodies.forms.builder.DefaultFormBuilder;
607  import com.jgoodies.forms.layout.FormLayout;
608  import com.sun.star.container.XNameAccess;
609 @@ -66,7 +66,7 @@
610          table = new JTable(tableModel);
611          diag.add(new JScrollPane(table), BorderLayout.CENTER);
612  
613 -        ButtonBarBuilder bb = new ButtonBarBuilder();
614 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
615          bb.addGlue();
616          bb.addButton(ok);
617          bb.addButton(cancel);
618 @@ -216,7 +216,7 @@
619              b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
620              diag.getContentPane().add(b.getPanel(), BorderLayout.CENTER);
621  
622 -            ButtonBarBuilder bb = new ButtonBarBuilder();
623 +            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
624              bb.addGlue();
625              bb.addButton(ok);
626              bb.addButton(cancel);
627 --- a/src/java/net/sf/jabref/oo/OpenOfficePanel.java
628 +++ b/src/java/net/sf/jabref/oo/OpenOfficePanel.java
629 @@ -15,7 +15,7 @@
630  */
631  package net.sf.jabref.oo;
632  
633 -import com.jgoodies.forms.builder.ButtonBarBuilder;
634 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
635  import com.jgoodies.forms.builder.DefaultFormBuilder;
636  import com.jgoodies.forms.layout.FormLayout;
637  import net.sf.jabref.*;
638 @@ -384,7 +384,7 @@
639                  //"p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu,p,0dlu"));
640                  "p,p,p,p,p,p,p,p,p,p"));
641  
642 -        //ButtonBarBuilder bb = new ButtonBarBuilder();
643 +        //ButtonBarBuilder2 bb = new ButtonBarBuilder2();
644          DefaultFormBuilder bb = new DefaultFormBuilder(new FormLayout
645                  ("fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref:grow, "
646                          +"1dlu, fill:pref:grow, 1dlu, fill:pref:grow", ""));
647 @@ -668,7 +668,7 @@
648              builder.nextLine();
649          }
650  
651 -        ButtonBarBuilder bb = new ButtonBarBuilder();
652 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
653          JButton ok = new JButton(Globals.lang("Ok"));
654          JButton cancel = new JButton(Globals.lang("Cancel"));
655          //JButton auto = new JButton(Globals.lang("Autodetect"));
656 --- a/src/java/net/sf/jabref/oo/StyleSelectDialog.java
657 +++ b/src/java/net/sf/jabref/oo/StyleSelectDialog.java
658 @@ -23,7 +23,7 @@
659  import ca.odell.glazedlists.gui.TableFormat;
660  import ca.odell.glazedlists.swing.EventSelectionModel;
661  import ca.odell.glazedlists.swing.EventTableModel;
662 -import com.jgoodies.forms.builder.ButtonBarBuilder;
663 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
664  import com.jgoodies.forms.builder.DefaultFormBuilder;
665  import com.jgoodies.forms.layout.FormLayout;
666  import com.jgoodies.uif_lite.component.UIFSplitPane;
667 @@ -277,7 +277,7 @@
668          };
669          cancel.addActionListener(cancelListener);
670  
671 -        ButtonBarBuilder bb = new ButtonBarBuilder();
672 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
673          bb.addGlue();
674          bb.addButton(ok);
675          bb.addButton(cancel);
676 @@ -515,7 +515,7 @@
677              sp.setPreferredSize(new Dimension(700,500));
678              dd.getContentPane().add(sp, BorderLayout.CENTER);
679              JButton ok = new JButton(Globals.lang("Ok"));
680 -            ButtonBarBuilder bb = new ButtonBarBuilder();
681 +            ButtonBarBuilder2 bb = new ButtonBarBuilder2();
682              bb.addGlue();
683              bb.addButton(ok);
684              bb.addGlue();
685 --- a/src/java/net/sf/jabref/plugin/ManagePluginsDialog.java
686 +++ b/src/java/net/sf/jabref/plugin/ManagePluginsDialog.java
687 @@ -20,7 +20,7 @@
688  import ca.odell.glazedlists.BasicEventList;
689  import ca.odell.glazedlists.gui.TableFormat;
690  import ca.odell.glazedlists.swing.EventTableModel;
691 -import com.jgoodies.forms.builder.ButtonBarBuilder;
692 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
693  
694  import java.awt.*;
695  import java.awt.event.ActionEvent;
696 @@ -92,7 +92,7 @@
697  
698          diag.getContentPane().add(pan, BorderLayout.CENTER);
699          
700 -        ButtonBarBuilder b = new ButtonBarBuilder();
701 +        ButtonBarBuilder2 b = new ButtonBarBuilder2();
702          b.addGlue();
703          b.addButton(install);
704          b.addButton(download);
705 --- a/src/java/net/sf/jabref/sql/DBConnectDialog.java
706 +++ b/src/java/net/sf/jabref/sql/DBConnectDialog.java
707 @@ -25,7 +25,7 @@
708  
709  import net.sf.jabref.Globals;
710  
711 -import com.jgoodies.forms.builder.ButtonBarBuilder;
712 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
713  import com.jgoodies.forms.builder.DefaultFormBuilder;
714  import com.jgoodies.forms.layout.FormLayout;
715  
716 @@ -142,7 +142,7 @@
717          getContentPane().add(builder.getPanel(), BorderLayout.CENTER);
718  
719          // add buttons are added in a similar way:
720 -        ButtonBarBuilder bb = new ButtonBarBuilder();
721 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
722          bb.addGlue();
723          bb.addButton(btnConnect);
724          bb.addButton(btnCancel);
725 --- a/src/java/net/sf/jabref/sql/DBImportExportDialog.java
726 +++ b/src/java/net/sf/jabref/sql/DBImportExportDialog.java
727 @@ -47,7 +47,7 @@
728  import net.sf.jabref.Globals;
729  import net.sf.jabref.JabRefFrame;
730  
731 -import com.jgoodies.forms.builder.ButtonBarBuilder;
732 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
733  
734  /**
735   * 
736 @@ -159,7 +159,7 @@
737  
738                 diag.getContentPane().add(pan, BorderLayout.CENTER);
739  
740 -               ButtonBarBuilder b = new ButtonBarBuilder();
741 +               ButtonBarBuilder2 b = new ButtonBarBuilder2();
742                 b.addGlue();
743                 if (dialogType.equals(DialogType.IMPORTER))
744                         b.addButton(importButton);
745 --- a/src/java/net/sf/jabref/util/ManageKeywordsAction.java
746 +++ b/src/java/net/sf/jabref/util/ManageKeywordsAction.java
747 @@ -59,7 +59,7 @@
748  import net.sf.jabref.specialfields.SpecialFieldsUtils;
749  import net.sf.jabref.undo.NamedCompound;
750  
751 -import com.jgoodies.forms.builder.ButtonBarBuilder;
752 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
753  import com.jgoodies.forms.builder.DefaultFormBuilder;
754  import com.jgoodies.forms.layout.FormLayout;
755  import com.sun.star.bridge.oleautomation.Date;
756 @@ -141,7 +141,7 @@
757          builder.append(add);
758          builder.nextLine();
759          
760 -        ButtonBarBuilder bb = new ButtonBarBuilder();
761 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
762          bb.addGlue();
763          bb.addButton(ok);
764          bb.addButton(cancel);
765 --- a/src/java/net/sf/jabref/util/MassSetFieldAction.java
766 +++ b/src/java/net/sf/jabref/util/MassSetFieldAction.java
767 @@ -28,7 +28,7 @@
768  import net.sf.jabref.*;
769  import net.sf.jabref.undo.NamedCompound;
770  
771 -import com.jgoodies.forms.builder.ButtonBarBuilder;
772 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
773  import com.jgoodies.forms.builder.DefaultFormBuilder;
774  import com.jgoodies.forms.layout.FormLayout;
775  
776 @@ -121,7 +121,7 @@
777          builder.append(overwrite, 3);
778  
779  
780 -        ButtonBarBuilder bb = new ButtonBarBuilder();
781 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
782          bb.addGlue();
783          bb.addButton(ok);
784          bb.addButton(cancel);
785 --- a/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
786 +++ b/src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
787 @@ -78,7 +78,7 @@
788  import net.sf.jabref.gui.FileDialogs;
789  import net.sf.jabref.wizard.auximport.AuxSubGenerator;
790  
791 -import com.jgoodies.forms.builder.ButtonBarBuilder;
792 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
793  
794  public class FromAuxDialog
795          extends JDialog {
796 @@ -134,7 +134,7 @@
797          initPanels(parent);
798  
799          // insert the buttons
800 -        ButtonBarBuilder bb = new ButtonBarBuilder();
801 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();
802          JPanel buttonPanel = bb.getPanel();
803          buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
804  
805 --- a/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
806 +++ b/src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
807 @@ -73,7 +73,7 @@
808  import net.sf.jabref.wizard.integrity.gui.IntegrityMessagePanel;
809  import net.sf.jabref.wizard.text.TagToMarkedTextStore;
810  
811 -import com.jgoodies.forms.builder.ButtonBarBuilder;
812 +import com.jgoodies.forms.builder.ButtonBarBuilder2;
813  
814  public class TextInputDialog
815      extends JDialog implements ActionListener
816 @@ -363,7 +363,7 @@
817      cancelButton.setText( Globals.lang( "Cancel" ) ) ;
818      cancelButton.addActionListener( this ) ;
819  
820 -    ButtonBarBuilder bb = new ButtonBarBuilder(buttons);
821 +    ButtonBarBuilder2 bb = new ButtonBarBuilder2(buttons);
822      buttons.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
823      bb.addGlue();
824      bb.addButton(okButton);
825 --- a/src/java/spl/gui/ImportDialog.java
826 +++ b/src/java/spl/gui/ImportDialog.java
827 @@ -1,6 +1,6 @@
828  package spl.gui;\r
829  \r
830 -import com.jgoodies.forms.builder.ButtonBarBuilder;\r
831 +import com.jgoodies.forms.builder.ButtonBarBuilder2;\r
832  import com.jgoodies.forms.builder.DefaultFormBuilder;\r
833  import com.jgoodies.forms.layout.FormLayout;\r
834  import net.sf.jabref.Globals;\r
835 @@ -81,7 +81,7 @@
836          b.append(checkBoxDoNotShowAgain);\r
837          b.append(useDefaultPDFImportStyle);\r
838          b.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));\r
839 -        ButtonBarBuilder bb = new ButtonBarBuilder();\r
840 +        ButtonBarBuilder2 bb = new ButtonBarBuilder2();\r
841          bb.addGlue();\r
842          bb.addButton(buttonOK);\r
843          bb.addButton(buttonCancel);\r