Move CardDialog and ErrorMessageDialog to new package

mikekucera · mikekucera · commit c5806abf1816 · 2020-02-24T09:47:29.000-05:00
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/ApplicationModule.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/ApplicationModule.java
@@ -24,7 +24,6 @@
 import org.baderlab.csplugins.enrichmentmap.task.string.QueryStringTask;
 import org.baderlab.csplugins.enrichmentmap.view.control.DataSetColorSelectorDialog;
 import org.baderlab.csplugins.enrichmentmap.view.creation.DetailDataSetPanel;
-import org.baderlab.csplugins.enrichmentmap.view.creation.ErrorMessageDialog;
 import org.baderlab.csplugins.enrichmentmap.view.creation.PathTextField;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.AddRanksDialog;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.ClusterRankingOption;
@@ -34,6 +33,7 @@
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PADialogPage;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PADialogParameters;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PAWeightPanel;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.ErrorMessageDialog;
 import org.cytoscape.application.swing.CySwingApplication;
 import org.cytoscape.property.CyProperty;
 import org.osgi.framework.BundleContext;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CreationDialogParameters.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CreationDialogParameters.java
@@ -9,9 +9,9 @@
 import javax.swing.AbstractButton;
 import javax.swing.JButton;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogParameters;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogParameters;
 import org.cytoscape.service.util.CyServiceRegistrar;
 
 import com.google.inject.Inject;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CreationDialogShowAction.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CreationDialogShowAction.java
@@ -1,6 +1,6 @@
 package org.baderlab.csplugins.enrichmentmap.view.creation;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogShowAction;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogShowAction;
 
 import com.google.inject.Singleton;
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/DetailCommonPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/DetailCommonPanel.java
@@ -13,6 +13,7 @@
 import org.baderlab.csplugins.enrichmentmap.AfterInjection;
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.Message;
 import org.cytoscape.util.swing.IconManager;
 import org.cytoscape.util.swing.LookAndFeelUtil;
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/DetailDataSetPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/DetailDataSetPanel.java
@@ -28,6 +28,7 @@
 import org.baderlab.csplugins.enrichmentmap.view.util.ComboItem;
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.Message;
 import org.cytoscape.util.swing.IconManager;
 import org.cytoscape.util.swing.LookAndFeelUtil;
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/DetailPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/DetailPanel.java
@@ -5,6 +5,7 @@
 import javax.swing.JPanel;
 
 import org.baderlab.csplugins.enrichmentmap.model.DataSetParameters;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.Message;
 
 public interface DetailPanel {
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/MasterDetailDialogPage.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/MasterDetailDialogPage.java
@@ -69,12 +69,14 @@
 import org.baderlab.csplugins.enrichmentmap.task.InitializeGenesetsOfInterestTask.MissingGenesetStrategy;
 import org.baderlab.csplugins.enrichmentmap.task.MissingGenesetsException;
 import org.baderlab.csplugins.enrichmentmap.util.TaskUtil;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogCallback;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
 import org.baderlab.csplugins.enrichmentmap.view.util.GBCFactory;
 import org.baderlab.csplugins.enrichmentmap.view.util.IterableListModel;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogCallback;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.ErrorMessageDialog;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.Message;
 import org.cytoscape.util.swing.IconManager;
 import org.cytoscape.work.FinishStatus;
 import org.cytoscape.work.ObservableTask;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/genemania/GenemaniaDialogPage.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/genemania/GenemaniaDialogPage.java
@@ -2,8 +2,8 @@
 
 import javax.swing.JPanel;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogCallback;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogCallback;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
 
 public class GenemaniaDialogPage implements CardDialogPage {
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/genemania/GenemaniaDialogParameters.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/genemania/GenemaniaDialogParameters.java
@@ -3,8 +3,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogParameters;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogParameters;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/genemania/GenemaniaDialogShowAction.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/genemania/GenemaniaDialogShowAction.java
@@ -1,6 +1,6 @@
 package org.baderlab.csplugins.enrichmentmap.view.creation.genemania;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogShowAction;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogShowAction;
 
 import com.google.inject.Singleton;
 
@@ -11,5 +11,10 @@ public class GenemaniaDialogShowAction extends CardDialogShowAction {
 	public GenemaniaDialogShowAction() {
 		super(GenemaniaDialogParameters.class, "Create from Genemania...");
 	}
+	
+	@Override
+	public void showDialog() {
+		
+	}
 
 }
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/string/StringDialogPage.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/string/StringDialogPage.java
@@ -2,8 +2,8 @@
 
 import javax.swing.JPanel;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogCallback;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogCallback;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
 
 public class StringDialogPage implements CardDialogPage {
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/string/StringDialogParameters.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/string/StringDialogParameters.java
@@ -3,8 +3,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogParameters;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogParameters;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/string/StringDialogShowAction.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/string/StringDialogShowAction.java
@@ -1,6 +1,6 @@
 package org.baderlab.csplugins.enrichmentmap.view.creation.string;
 
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogShowAction;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogShowAction;
 
 import com.google.inject.Singleton;
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PADialogMediator.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PADialogMediator.java
@@ -13,7 +13,7 @@
 import org.baderlab.csplugins.enrichmentmap.task.postanalysis.CreatePANetworkTaskResult;
 import org.baderlab.csplugins.enrichmentmap.task.postanalysis.PATaskFactory;
 import org.baderlab.csplugins.enrichmentmap.view.control.ControlPanelMediator;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialog;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialog;
 import org.cytoscape.model.CyEdge;
 import org.cytoscape.model.CyNetwork;
 import org.cytoscape.view.model.CyNetworkView;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PADialogPage.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PADialogPage.java
@@ -35,12 +35,12 @@
 import org.baderlab.csplugins.enrichmentmap.view.creation.NamePanel;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.web.DialogParameters;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.web.DownloadGMTFileTask;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialog;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogCallback;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
 import org.baderlab.csplugins.enrichmentmap.view.util.GBCFactory;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialog;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogCallback;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
 import org.cytoscape.util.swing.FileUtil;
 import org.cytoscape.util.swing.LookAndFeelUtil;
 import org.cytoscape.view.model.CyNetworkView;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PADialogParameters.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PADialogParameters.java
@@ -10,9 +10,9 @@
 import javax.swing.JButton;
 
 import org.baderlab.csplugins.enrichmentmap.model.EnrichmentMap;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogParameters;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogParameters;
 import org.cytoscape.service.util.CyServiceRegistrar;
 import org.cytoscape.view.model.CyNetworkView;
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/web/BaderlabDialogPage.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/web/BaderlabDialogPage.java
@@ -21,10 +21,10 @@
 import javax.swing.SwingWorker;
 
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PADialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogCallback;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
 import org.baderlab.csplugins.enrichmentmap.view.util.ComboItem;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogCallback;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
 import org.cytoscape.util.swing.LookAndFeelUtil;
 
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/web/DialogParameters.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/web/DialogParameters.java
@@ -5,8 +5,8 @@
 import java.util.List;
 
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PADialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogParameters;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogPage;
+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogParameters;
 
 public class DialogParameters implements CardDialogParameters {
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialog.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialog.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.util;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import static javax.swing.GroupLayout.DEFAULT_SIZE;
 import static javax.swing.GroupLayout.PREFERRED_SIZE;
@@ -25,6 +25,8 @@
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 
+import org.baderlab.csplugins.enrichmentmap.view.util.ComboItem;
+import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
 import org.cytoscape.util.swing.LookAndFeelUtil;
 import org.cytoscape.work.AbstractTask;
 import org.cytoscape.work.FinishStatus;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogCallback.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogCallback.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.util;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import javax.swing.AbstractButton;
 import javax.swing.JDialog;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogPage.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogPage.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.util;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import javax.swing.AbstractButton;
 import javax.swing.JPanel;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogParameters.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogParameters.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.util;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import java.awt.Dimension;
 import java.util.List;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogShowAction.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/CardDialogShowAction.java
@@ -1,9 +1,10 @@
-package org.baderlab.csplugins.enrichmentmap.view.util;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import java.awt.event.ActionEvent;
 
 import javax.swing.JFrame;
 
+import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
 import org.cytoscape.application.swing.AbstractCyAction;
 
 import com.google.inject.Inject;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/ErrorMessageDialog.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/ErrorMessageDialog.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.creation;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -18,6 +18,7 @@
 import javax.swing.WindowConstants;
 
 import org.baderlab.csplugins.enrichmentmap.AfterInjection;
+import org.baderlab.csplugins.enrichmentmap.view.creation.DetailPanel;
 import org.baderlab.csplugins.enrichmentmap.view.util.GBCFactory;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
 import org.cytoscape.util.swing.IconManager;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/Message.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/dialog/Message.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.creation;
+package org.baderlab.csplugins.enrichmentmap.view.util.dialog;
 
 import java.util.Objects;
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.baderlab.csplugins.enrichmentmap.view.creation.genemania;`
`2`	`2`
`3`		`-import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogShowAction;`
	`3`	`+import org.baderlab.csplugins.enrichmentmap.view.util.dialog.CardDialogShowAction;`
`4`	`4`
`5`	`5`	`import com.google.inject.Singleton;`
`6`	`6`
`@@ -11,5 +11,10 @@ public class GenemaniaDialogShowAction extends CardDialogShowAction {`
`11`	`11`	`public GenemaniaDialogShowAction() {`
`12`	`12`	`super(GenemaniaDialogParameters.class, "Create from Genemania...");`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+ @Override`
	`16`	`+ public void showDialog() {`
	`17`	`+`
	`18`	`+ }`
`14`	`19`
`15`	`20`	`}`