use JSplitPane on mastermap dialog

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/mastermap/MasterDetailDialogPage.java

@@ -6,6 +6,7 @@
 import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.FlowLayout;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -24,6 +25,8 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.LayoutStyle;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
@@ -199,35 +202,27 @@ private JPanel createDataSetPanel() {
 		distinctEdgesCheckbox = new JCheckBox("Create separate edges for each dataset");
 		SwingUtil.makeSmall(distinctEdgesCheckbox);
 
-		JPanel panel = new JPanel();
-		GroupLayout layout = new GroupLayout(panel);
-		panel.setLayout(layout);
-		layout.setAutoCreateGaps(true);
-		layout.setAutoCreateContainerGaps(true);
-		
-		layout.setHorizontalGroup(
-			layout.createSequentialGroup()
-				.addGroup(layout.createParallelGroup()
-					.addComponent(titlePanel)
-					.addComponent(scrollPane, 250, 250, 250)
-				)
-				.addGroup(layout.createParallelGroup()
-					.addComponent(distinctEdgesCheckbox, Alignment.TRAILING)
-					.addComponent(dataSetDetailPanel, 0, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE)
-				)
-		);
+		JPanel checkboxPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0));
+		checkboxPanel.add(distinctEdgesCheckbox);
 
-		layout.setVerticalGroup(
-			layout.createSequentialGroup()
-				.addGroup(layout.createParallelGroup(Alignment.TRAILING)
-					.addComponent(titlePanel)
-					.addComponent(distinctEdgesCheckbox)
-				)
-				.addGroup(layout.createParallelGroup()
-					.addComponent(scrollPane)
-					.addComponent(dataSetDetailPanel)
-				)
-		);
+		// Make the NORTH area of both panels the same size
+		titlePanel.doLayout();
+		checkboxPanel.setPreferredSize(titlePanel.getPreferredSize());
+		
+		JPanel leftPanel = new JPanel(new BorderLayout());
+		leftPanel.add(titlePanel, BorderLayout.NORTH);
+		leftPanel.add(scrollPane, BorderLayout.CENTER);
+		
+		JPanel rightPanel = new JPanel(new BorderLayout());
+		rightPanel.add(checkboxPanel, BorderLayout.NORTH);
+		rightPanel.add(dataSetDetailPanel, BorderLayout.CENTER);
+		
+		JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel, rightPanel);
+		splitPane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+		splitPane.setResizeWeight(0.3);
+		
+		JPanel panel = new JPanel(new BorderLayout());
+		panel.add(splitPane, BorderLayout.CENTER);
 
 		return panel;
 	}
@@ -253,6 +248,7 @@ private JPanel createTitlePanel() {
 
 		layout.setHorizontalGroup(layout.createSequentialGroup()
 			.addComponent(label)
+			.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
 			.addComponent(scanButton)
 			.addComponent(addButton)
 			.addComponent(deleteButton)

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/mastermap/MasterMapDialogParameters.java

@@ -52,6 +52,11 @@ public Dimension getPreferredSize() {
 		return new Dimension(750, 700);
 	}
 
+	@Override
+	public Dimension getMinimumSize() {
+		return new Dimension(650, 500);
+	}
+	
 	@Override
 	public Icon getIcon() {
 		URL iconURL = AboutDialog.class.getResource("enrichmentmap_logo.png");

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/CardDialog.java

@@ -5,6 +5,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.util.List;
 
@@ -60,6 +61,10 @@ public boolean isVisible() {
 	private void createComponents() {
 		dialog.setLayout(new BorderLayout());
 		dialog.setPreferredSize(params.getPreferredSize());
+		Dimension minimumSize = params.getMinimumSize();
+		if(minimumSize != null) {
+			dialog.setMinimumSize(minimumSize);
+		}
 		dialog.setTitle(params.getTitle());
 
 		// Create message and button panel first because the controller can call callbacks from inside createBodyPanel()

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/CardDialogParameters.java

@@ -28,6 +28,10 @@ default Dimension getPreferredSize() {
 		return new Dimension(400, 300);
 	}
 
+	default Dimension getMinimumSize() {
+		return null;
+	}
+	
 	/** 
 	 * Return a list of extra buttons, that will go in the bottom left area of the button bar. 
 	 * An ActionListener will be attached to each button that will call