geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r588508 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards: DependencyWizard.java FacetInstallPage.java
Date Fri, 26 Oct 2007 04:11:03 GMT
Author: mcconne
Date: Thu Oct 25 21:11:01 2007
New Revision: 588508

URL: http://svn.apache.org/viewvc?rev=588508&view=rev
Log:
Use unique action across all wizards

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java?rev=588508&r1=588507&r2=588508&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/DependencyWizard.java
Thu Oct 25 21:11:01 2007
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v20.ui.wizards;
 
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.v20.ui.internal.Trace;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
 import org.apache.geronimo.xml.ns.deployment.ArtifactType;
@@ -68,6 +69,7 @@
 	 */
 	public DependencyWizard(AbstractTableSection section) {
 		super(section);
+        Trace.trace("Constructor Entry/Exit", "DependencyWizard");
 	}
 
 	/*
@@ -130,11 +132,15 @@
 	 * @see org.apache.geronimo.ui.wizards.AbstractTableWizard#processEAttributes(org.eclipse.jface.wizard.IWizardPage)
 	 */
 	public void processEAttributes(IWizardPage page) {
+//              Trace.trace("Entry", "DependencyWizard.processEAttributes", page);
+		
 		ArtifactType dt = (ArtifactType) eObject;
 		dt.setArtifactId(artifactIdText.getText());
 		dt.setGroupId(groupIdText.getText());
 		dt.setVersion(versionText.getText());
 		dt.setType(typeText.getText());
+		
+//              Trace.trace("Exit", "DependencyWizard.processEAttributes");
 	}
 
 	/*
@@ -143,23 +149,34 @@
 	 * @see org.eclipse.jface.wizard.IWizard#addPages()
 	 */
 	public void addPages() {
+//              Trace.trace("Entry", "DependencyWizard.addPages");
+		
 		WizardPage page = new DependencyWizardPage("Page0");
 		addPage(page);
+		
+//              Trace.trace("Exit", "DependencyWizard.addPages");
 	}
 
 	public class DependencyWizardPage extends WizardPage {
-
+		
 		public DependencyWizardPage(String pageName) {
 			super(pageName);
+           	Trace.trace("Constructor Entry", "DependencyWizardPage", pageName);
+			
 			setTitle(getWizardFirstPageTitle());
 			setDescription(getWizardFirstPageDescription());
+			
+           	Trace.trace("Constructor Exit", "DependencyWizardPage");
 		}
 
 		public DependencyWizardPage(String pageName, String title, ImageDescriptor titleImage)
{
 			super(pageName, title, titleImage);
+			Trace.trace("Constructor Entry/Exit", "DependencyWizardPage", pageName, title, titleImage);
 		}
 
 		public void createControl(Composite parent) {
+//			Trace.trace("Entry", "DependencyWizardPage.createControl", parent);			
+			
 			Composite composite = new Composite(parent, SWT.NULL);
 
 			GridLayout layout = new GridLayout();
@@ -216,11 +233,14 @@
 			}
 
 			setControl(composite);
-
+//			Trace.trace("Exit", "DependencyWizardPage.createControl");
 		}
 	}
 
 	public GridData createLabelGridData() {
+//		Trace.trace("Entry", "DependencyWizard.createLabelGridData");
+//		Trace.trace("Exit", "DependencyWizard.createLabelGridData", new GridData(GridData.HORIZONTAL_ALIGN_FILL));
+
 		return new GridData(GridData.HORIZONTAL_ALIGN_FILL);
 	}
 	
@@ -228,8 +248,9 @@
 	/* (non-Javadoc)
 	 * @see org.apache.geronimo.st.ui.wizards.AbstractTableWizard#performFinish()
 	 */
-	public boolean performFinish() {
-
+	public boolean performFinish() {		
+//		Trace.trace("Entry", "DependencyWizard.performFinish");
+		
 		if (eObject == null) {
 			eObject = getEFactory().create(section.getTableEntryObjectType());
 			EObject plan = section.getPlan();
@@ -247,6 +268,7 @@
 			section.getTableViewer().setInput(section.getInput());
 		}
 
+//		Trace.trace("Exit", "DependencyWizard.performFinish", true);
 		return true;
 	}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java?rev=588508&r1=588507&r2=588508&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/wizards/FacetInstallPage.java
Thu Oct 25 21:11:01 2007
@@ -18,6 +18,7 @@
 
 import org.apache.geronimo.st.v20.core.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.v20.ui.internal.Messages;
+import org.apache.geronimo.st.v20.ui.internal.Trace;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -38,9 +39,13 @@
 	private Button sharedLib;
 
 	public FacetInstallPage() {
-		super("geronimo.plan.install");
+		super("geronimo.plan.install.v20");
+		Trace.trace("Constructor Entry", "FacetInstallPage");
+		
 		setTitle("Geronimo Deployment Plan");
 		setDescription("Configure the geronimo deployment plan.");
+		
+		Trace.trace("Constructor Exit", "FacetInstallPage");
 	}
 
 	/*
@@ -49,7 +54,11 @@
 	 * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
 	 */
 	public void setConfig(Object config) {
+		Trace.trace("Entry", "FacetInstallPage.setConfig", config);
+
 		this.config = (DeploymentPlanInstallConfig) config;
+		
+		Trace.trace("Exit", "FacetInstallPage.setConfig");
 	}
 
 	/*
@@ -58,6 +67,7 @@
 	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
 	 */
 	public void createControl(Composite parent) {
+		Trace.trace("Entry", "FacetInstallPage.createControl", parent);
 		
 		Composite composite = new Composite(parent, SWT.NONE);
 		composite.setLayout(new GridLayout(2, false));
@@ -97,6 +107,8 @@
 		sharedLib.setText(Messages.addSharedLib);
 		
 		setControl(composite);
+		
+		Trace.trace("Exit", "FacetInstallPage.createControl");		
 	}
 
 	/*
@@ -105,11 +117,15 @@
 	 * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
 	 */
 	public void transferStateToConfig() {
+		Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");		
+	
 		config.setGroupId(groupText.getText());
 		config.setArtifactId(artifactText.getText());
 		config.setVersion(versionText.getText());
 		config.setType(typeText.getText());
 		config.setSharedLib(sharedLib.getSelection());
+		
+		Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");		
 	}
 
 	private static GridData createGridData() {



Mime
View raw message