Post Analysis dialog (Signature Discovery) is not closed anymore when clicking "Add" and it is not ready. Fixes a few "genesets" labels.

Author: chrtannus

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PostAnalysisInputPanel.java

@@ -314,7 +314,7 @@ boolean isReady() {
 		if (knownSignatureRadio.isSelected())
 			return getKnownSignaturePanel().isReady();
 		else
-			return true;
+			return getSignatureDiscoveryPanel().isReady();
 	}
 
 	/**

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PostAnalysisKnownSignaturePanel.java

@@ -131,7 +131,7 @@ public boolean isReady() {
 		String filePath = (String) knownSignatureGMTFileNameTextField.getValue();
 
 		if (!EnrichmentMapParameters.checkFile(filePath)) {
-			String message = "Signature GMT file name not valid.\n";
+			String message = "Signature GMT file name not valid.";
 			knownSignatureGMTFileNameTextField.setForeground(Color.RED);
 			JOptionPane.showMessageDialog(application.getJFrame(), message, "Post Analysis Known Signature", JOptionPane.WARNING_MESSAGE);
 

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PostAnalysisSignatureDiscoveryPanel.java

@@ -205,7 +205,7 @@ private JPanel createSignatureGenesetsPanel() {
 		availSigSetsField.addListSelectionListener(this);
 		selectedSigSetsField.addListSelectionListener(this);
 
-		JButton clearButton = new JButton("Clear Signature Genesets");
+		JButton clearButton = new JButton("Clear Signature Gene Sets");
 
 		clearButton.addActionListener(e -> {
 			availSigSetsModel.clear();
@@ -222,7 +222,7 @@ private JPanel createSignatureGenesetsPanel() {
 		makeSmall(addSelectedButton, removeSelectedButton, clearButton);
 
 		JPanel panel = new JPanel();
-        panel.setBorder(LookAndFeelUtil.createTitledBorder("Signature Genesets"));
+        panel.setBorder(LookAndFeelUtil.createTitledBorder("Signature Gene Sets"));
 
         final GroupLayout layout = new GroupLayout(panel);
 		panel.setLayout(layout);
@@ -329,7 +329,7 @@ private JPanel createSignatureDiscoveryGMTPanel() {
 
         //TODO: Maybe move loading SigGMT to File-selection Event add load button
 		JButton loadButton = new JButton();
-		loadButton.setText("Load Genesets");
+		loadButton.setText("Load Gene Sets");
 		loadButton.addActionListener(e -> {
 			String filePath = (String) signatureDiscoveryGMTFileNameTextField.getValue();
 
@@ -502,4 +502,16 @@ public void setAvSigCount(int count) {
 	public void setSelSigCount(int count) {
 		selectedLabel.setText(String.format(SELECTED_FORMAT, count));
 	}
+
+	public boolean isReady() {
+		if (selectedSigSetsField == null || selectedSigSetsField.getModel().getSize() == 0) {
+			String msg = "Please load and select gene sets first.";
+			JOptionPane.showMessageDialog(
+					application.getJFrame(), msg, "Post Analysis Signature Discovery", JOptionPane.WARNING_MESSAGE);
+			
+			return false;
+		}
+		
+		return true;
+	}
 }