Merge pull request #3 from delftswa2017/resizeCleanupWindow

Cleanup dialog has a scroll bar now.
delftswa2017 · Mar 5, 2017 · c8b2472 · c8b2472
2 parents 07d7076 + cfd7cdb
commit c8b2472
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/org/jabref/gui/actions/CleanupAction.java b/src/main/java/org/jabref/gui/actions/CleanupAction.java
@@ -4,7 +4,6 @@
 import java.util.Objects;
 
 import javax.swing.JOptionPane;
-
 import org.jabref.Globals;
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.JabRefFrame;
@@ -133,8 +132,7 @@ public void update() {
 
     private int showDialog(CleanupPresetPanel presetPanel) {
         String dialogTitle = Localization.lang("Cleanup entries");
-
-        Object[] messages = {Localization.lang("What would you like to clean up?"), presetPanel.getPanel()};
+        Object[] messages = {Localization.lang("What would you like to clean up?"), presetPanel.getScrollPane()};
         return JOptionPane.showConfirmDialog(frame, messages, dialogTitle, JOptionPane.OK_CANCEL_OPTION,
                 JOptionPane.QUESTION_MESSAGE);
     }

diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -7,7 +7,7 @@
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-
+import javax.swing.JScrollPane;
 import org.jabref.Globals;
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.cleanup.Cleanups;
@@ -33,6 +33,7 @@ public class CleanupPresetPanel {
     private FieldFormatterCleanupsPanel cleanUpFormatters;
 
     private JPanel panel;
+    private JScrollPane scrollPane;
     private CleanupPreset cleanupPreset;
 
 
@@ -90,6 +91,10 @@ private void init() {
         builder.add(cleanUpISSN).xyw(1, 9, 2);
         builder.add(cleanUpFormatters).xyw(1, 10, 2);
         panel = builder.build();
+        scrollPane = new JScrollPane(panel);
+        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+        scrollPane.setVisible(true);
+        scrollPane.setBorder(null);
     }
 
     private void updateDisplay(CleanupPreset preset) {
@@ -111,6 +116,10 @@ public JPanel getPanel() {
         return panel;
     }
 
+    public JScrollPane getScrollPane() {
+        return scrollPane;
+    }
+
     public CleanupPreset getCleanupPreset() {
 
         Set<CleanupPreset.CleanupStep> activeJobs = EnumSet.noneOf(CleanupPreset.CleanupStep.class);