Rename package view.mastermap to view.creation

mikekucera · mikekucera · commit 4c94c277ec55 · 2017-04-27T15:32:56.000-04: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
@@ -13,16 +13,16 @@
 import org.baderlab.csplugins.enrichmentmap.task.CreateEMViewTask;
 import org.baderlab.csplugins.enrichmentmap.task.CreateEnrichmentMapTaskFactory;
 import org.baderlab.csplugins.enrichmentmap.task.RemoveSignatureDataSetsTask;
+import org.baderlab.csplugins.enrichmentmap.view.creation.EditDataSetPanel;
+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;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.ExportPDFAction;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.ExportTXTAction;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.HeatMapMainPanel;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.HeatMapParentPanel;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.table.ColumnHeaderRankOptionRenderer;
-import org.baderlab.csplugins.enrichmentmap.view.mastermap.EditDataSetPanel;
-import org.baderlab.csplugins.enrichmentmap.view.mastermap.ErrorMessageDialog;
-import org.baderlab.csplugins.enrichmentmap.view.mastermap.PathTextField;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PostAnalysisInputPanel;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PostAnalysisKnownSignaturePanel;
 import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PostAnalysisSignatureDiscoveryPanel;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/actions/ShowEnrichmentMapDialogAction.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/actions/ShowEnrichmentMapDialogAction.java
@@ -4,7 +4,7 @@
 
 import javax.swing.AbstractAction;
 
-import org.baderlab.csplugins.enrichmentmap.view.mastermap.MasterMapDialogParameters;
+import org.baderlab.csplugins.enrichmentmap.view.creation.CreationDialogParameters;
 import org.baderlab.csplugins.enrichmentmap.view.util.CardDialog;
 import org.cytoscape.application.swing.CySwingApplication;
 
@@ -14,7 +14,7 @@
 @SuppressWarnings("serial")
 public class ShowEnrichmentMapDialogAction extends AbstractAction {
 
-	@Inject private Provider<MasterMapDialogParameters> dialogParametersProvider;
+	@Inject private Provider<CreationDialogParameters> dialogParametersProvider;
 	@Inject private CySwingApplication application;
 	
 	private CardDialog masterMapDialog;
@@ -26,7 +26,7 @@ public ShowEnrichmentMapDialogAction() {
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		if (masterMapDialog == null) {
-			MasterMapDialogParameters params = dialogParametersProvider.get();
+			CreationDialogParameters params = dialogParametersProvider.get();
 			masterMapDialog = new CardDialog(application.getJFrame(), params);
 		}
 		
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CombinedConstantSlider.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CombinedConstantSlider.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import java.awt.BorderLayout;
 
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
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import java.awt.Dimension;
 import java.util.Arrays;
@@ -13,7 +13,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
-public class MasterMapDialogParameters implements CardDialogParameters {
+public class CreationDialogParameters implements CardDialogParameters {
 
 	static final String RESET_BUTTON_ACTION_COMMAND = "reset";
 	
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CutoffPropertiesPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/CutoffPropertiesPanel.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import static javax.swing.GroupLayout.PREFERRED_SIZE;
 
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
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import java.util.List;
 
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/EditCommonPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/EditCommonPanel.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/EditDataSetPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/EditDataSetPanel.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static javax.swing.GroupLayout.DEFAULT_SIZE;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/EditNothingPanel.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/EditNothingPanel.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import static javax.swing.GroupLayout.DEFAULT_SIZE;
 import static javax.swing.GroupLayout.PREFERRED_SIZE;
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/ErrorMessageDialog.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/ErrorMessageDialog.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
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
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 
@@ -42,7 +42,7 @@
 import org.baderlab.csplugins.enrichmentmap.resolver.DataSetParameters;
 import org.baderlab.csplugins.enrichmentmap.resolver.ResolverTask;
 import org.baderlab.csplugins.enrichmentmap.task.CreateEnrichmentMapTaskFactory;
-import org.baderlab.csplugins.enrichmentmap.view.mastermap.ErrorMessageDialog.MessageType;
+import org.baderlab.csplugins.enrichmentmap.view.creation.ErrorMessageDialog.MessageType;
 import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogCallback;
 import org.baderlab.csplugins.enrichmentmap.view.util.CardDialogPage;
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
@@ -306,7 +306,7 @@ private void updateButtonEnablement() {
 	
 	@Override
 	public void extraButtonClicked(String actionCommand) {
-		if(MasterMapDialogParameters.RESET_BUTTON_ACTION_COMMAND.equals(actionCommand)) {
+		if(CreationDialogParameters.RESET_BUTTON_ACTION_COMMAND.equals(actionCommand)) {
 			reset();
 		}
 	}
diff --git a/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/PathTextField.java b/EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/PathTextField.java
@@ -1,4 +1,4 @@
-package org.baderlab.csplugins.enrichmentmap.view.mastermap;
+package org.baderlab.csplugins.enrichmentmap.view.creation;
 
 import static org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil.makeSmall;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.baderlab.csplugins.enrichmentmap.view.mastermap;`
	`1`	`+package org.baderlab.csplugins.enrichmentmap.view.creation;`
`2`	`2`
`3`	`3`	`import java.awt.BorderLayout;`
`4`	`4`