geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r366939 [1/3] - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui: actions/ commands/ editors/ internal/ pages/ sections/ wizards/
Date Sat, 07 Jan 2006 23:08:28 GMT
Author: sppatel
Date: Sat Jan  7 15:07:55 2006
New Revision: 366939

URL: http://svn.apache.org/viewcvs?rev=366939&view=rev
Log:
fix up javadoc, format & organize imports

Added:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java
      - copied, changed from r366929, geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/AbstractTableWizard.java
      - copied, changed from r366883, geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java
Removed:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java
Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/actions/LaunchGeronimoConsoleAction.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetConsoleLogLevelCommand.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetHTTPPortCommand.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetPasswordCommand.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetRMIPortCommand.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetUsernameCommand.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoUIPlugin.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Trace.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AbstractGeronimoFormPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ImportSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/OpenEjbJarGeneralSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecurityRootSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServerEditorLogLevelSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServerEditorSecuritySection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/WebGeneralSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbLocalRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ImportWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceEnvRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/SecurityRoleWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/actions/LaunchGeronimoConsoleAction.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/actions/LaunchGeronimoConsoleAction.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/actions/LaunchGeronimoConsoleAction.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/actions/LaunchGeronimoConsoleAction.java Sat Jan  7 15:07:55 2006
@@ -36,60 +36,64 @@
  */
 public class LaunchGeronimoConsoleAction implements IActionDelegate {
 
-    public static final String serverID = "org.apache.geronimo.generic.server.10";
-    
-    private IServer server;
-
-    public LaunchGeronimoConsoleAction() {
-        super();
-    }
-    
-    public URL getConsoleUrl() throws MalformedURLException {
-    	if(server != null ) {
-    		GeronimoServer gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
-    		return new URL("http://" + server.getHost() + ":" + gs.getHTTPPort() + "/console/");
-    	}
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) {
-
-        try {
-            int style = IWorkbenchBrowserSupport.AS_EDITOR | IWorkbenchBrowserSupport.STATUS;
-            IWebBrowser browser = WorkbenchBrowserSupport.getInstance().createBrowser(style, "console", Messages.console, Messages.consoleTooltip);
-            URL url = getConsoleUrl();
-            if(url != null) 
-            	browser.openURL(url);
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        } catch (PartInitException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-     *      org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) {
-
-        server = (IServer) ((StructuredSelection) selection)
-                .getFirstElement();
-
-        boolean enable = server != null
-                && serverID.equals(server.getServerType().getId())
-                && server.getServerState() == IServer.STATE_STARTED;
+	public static final String serverID = "org.apache.geronimo.generic.server.10";
 
-        action.setEnabled(enable);
+	private IServer server;
 
-    }
+	public LaunchGeronimoConsoleAction() {
+		super();
+	}
+
+	public URL getConsoleUrl() throws MalformedURLException {
+		if (server != null) {
+			GeronimoServer gs = (GeronimoServer) server
+					.getAdapter(GeronimoServer.class);
+			return new URL("http://" + server.getHost() + ":"
+					+ gs.getHTTPPort() + "/console/");
+		}
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+	 */
+	public void run(IAction action) {
+
+		try {
+			int style = IWorkbenchBrowserSupport.AS_EDITOR
+					| IWorkbenchBrowserSupport.STATUS;
+			IWebBrowser browser = WorkbenchBrowserSupport.getInstance()
+					.createBrowser(style, "console", Messages.console,
+							Messages.consoleTooltip);
+			URL url = getConsoleUrl();
+			if (url != null)
+				browser.openURL(url);
+		} catch (MalformedURLException e) {
+			e.printStackTrace();
+		} catch (PartInitException e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
+	 *      org.eclipse.jface.viewers.ISelection)
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+
+		server = (IServer) ((StructuredSelection) selection).getFirstElement();
+
+		boolean enable = server != null
+				&& serverID.equals(server.getServerType().getId())
+				&& server.getServerState() == IServer.STATE_STARTED;
+
+		action.setEnabled(enable);
+
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetConsoleLogLevelCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetConsoleLogLevelCommand.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetConsoleLogLevelCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetConsoleLogLevelCommand.java Sat Jan  7 15:07:55 2006
@@ -68,8 +68,7 @@
 
 	public String getCurrentValue() throws CoreException {
 		return getLaunchConfiguration().getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-				NONE);
+				IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, NONE);
 	}
 
 	/*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetHTTPPortCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetHTTPPortCommand.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetHTTPPortCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetHTTPPortCommand.java Sat Jan  7 15:07:55 2006
@@ -59,8 +59,8 @@
 	 */
 	public void undo() {
 		if (gs != null) {
-            gs.setHTTPPort(oldName);
-        }
+			gs.setHTTPPort(oldName);
+		}
 	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetPasswordCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetPasswordCommand.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetPasswordCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetPasswordCommand.java Sat Jan  7 15:07:55 2006
@@ -26,45 +26,45 @@
  */
 public class SetPasswordCommand extends ServerCommand {
 
-    protected String name;
+	protected String name;
 
-    protected String oldName;
+	protected String oldName;
 
-    GeronimoServer gs;
+	GeronimoServer gs;
 
-    /**
-     * @param server
-     * @param name
-     */
-    public SetPasswordCommand(IServerWorkingCopy server, String name) {
-        super(server, name);
-        this.name = name;
-    }
+	/**
+	 * @param server
+	 * @param name
+	 */
+	public SetPasswordCommand(IServerWorkingCopy server, String name) {
+		super(server, name);
+		this.name = name;
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
-     */
-    public void execute() {
-        gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
-        if (gs == null) {
-            gs = (GeronimoServer) server.loadAdapter(GeronimoServer.class,
-                    new NullProgressMonitor());
-        }
-        oldName = gs.getAdminPassword();
-        gs.setAdminPassword(name);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
+	 */
+	public void execute() {
+		gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+		if (gs == null) {
+			gs = (GeronimoServer) server.loadAdapter(GeronimoServer.class,
+					new NullProgressMonitor());
+		}
+		oldName = gs.getAdminPassword();
+		gs.setAdminPassword(name);
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#undo()
-     */
-    public void undo() {
-        if (gs != null) {
-            gs.setAdminPassword(oldName);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#undo()
+	 */
+	public void undo() {
+		if (gs != null) {
+			gs.setAdminPassword(oldName);
+		}
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetRMIPortCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetRMIPortCommand.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetRMIPortCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetRMIPortCommand.java Sat Jan  7 15:07:55 2006
@@ -63,8 +63,8 @@
 	 */
 	public void undo() {
 		if (gs != null) {
-            gs.setRMINamingPort(oldName);
-        }
+			gs.setRMINamingPort(oldName);
+		}
 	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetUsernameCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetUsernameCommand.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetUsernameCommand.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/commands/SetUsernameCommand.java Sat Jan  7 15:07:55 2006
@@ -26,46 +26,46 @@
  */
 public class SetUsernameCommand extends ServerCommand {
 
-    protected String name;
+	protected String name;
 
-    protected String oldName;
+	protected String oldName;
 
-    GeronimoServer gs;
+	GeronimoServer gs;
 
-    /**
-     * @param server
-     * @param name
-     */
-    public SetUsernameCommand(IServerWorkingCopy server, String name) {
-        super(server, name);
-        this.name = name;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
-     */
-    public void execute() {
-        gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
-        if (gs == null) {
-            gs = (GeronimoServer) server.loadAdapter(GeronimoServer.class,
-                    new NullProgressMonitor());
-        }
-        oldName = gs.getAdminID();
-        gs.setAdminID(name);
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#undo()
-     */
-    public void undo() {
-        if (gs != null) {
-            gs.setAdminID(oldName);
-        }
-    }
+	/**
+	 * @param server
+	 * @param name
+	 */
+	public SetUsernameCommand(IServerWorkingCopy server, String name) {
+		super(server, name);
+		this.name = name;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
+	 */
+	public void execute() {
+		gs = (GeronimoServer) server.getAdapter(GeronimoServer.class);
+		if (gs == null) {
+			gs = (GeronimoServer) server.loadAdapter(GeronimoServer.class,
+					new NullProgressMonitor());
+		}
+		oldName = gs.getAdminID();
+		gs.setAdminID(name);
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.wst.server.ui.internal.command.ServerCommand#undo()
+	 */
+	public void undo() {
+		if (gs != null) {
+			gs.setAdminID(oldName);
+		}
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/AbstractGeronimoDeploymentPlanEditor.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/AbstractGeronimoDeploymentPlanEditor.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/AbstractGeronimoDeploymentPlanEditor.java Sat Jan  7 15:07:55 2006
@@ -53,7 +53,7 @@
 public abstract class AbstractGeronimoDeploymentPlanEditor extends FormEditor {
 
 	private EObject deploymentPlan;
-	
+
 	private ComposedAdapterFactory factory;
 
 	/**
@@ -94,7 +94,8 @@
 						if (deploymentPlan.eResource() != null) {
 							deploymentPlan.eResource().unload();
 						}
-						//TODO not sure if this is the best way to refresh model
+						// TODO not sure if this is the best way to refresh
+						// model
 						IFileEditorInput fei = (IFileEditorInput) input;
 						deploymentPlan = loadDeploymentPlan(fei.getFile());
 					}
@@ -138,8 +139,8 @@
 
 	protected void addSourcePage() throws PartInitException {
 		TextEditor source = new TextEditor();
-        int index = addPage(source, getEditorInput());
-        setPageText(index, Messages.editorTabSource);
+		int index = addPage(source, getEditorInput());
+		setPageText(index, Messages.editorTabSource);
 	}
 
 	/*
@@ -188,8 +189,10 @@
 			IFileEditorInput fei = (IFileEditorInput) input;
 			deploymentPlan = loadDeploymentPlan(fei.getFile());
 			if (deploymentPlan == null) {
-				MessageDialog.openInformation(Display.getDefault()
-						.getActiveShell(), "Error Opening Editor", "Could not open the deployment plan editor.  Opening the default text editor.");
+				MessageDialog
+						.openInformation(Display.getDefault().getActiveShell(),
+								"Error Opening Editor",
+								"Could not open the deployment plan editor.  Opening the default text editor.");
 			}
 		}
 	}

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoUIPlugin.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoUIPlugin.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoUIPlugin.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoUIPlugin.java Sat Jan  7 15:07:55 2006
@@ -24,42 +24,42 @@
  * The main plugin class to be used in the desktop.
  */
 public class GeronimoUIPlugin extends AbstractUIPlugin {
-    protected static final String PLUGIN_ID = "org.apache.geronimo.ui";
+	protected static final String PLUGIN_ID = "org.apache.geronimo.ui";
 
-    private static final String ICONS_DIRECTORY = "icons/";
+	private static final String ICONS_DIRECTORY = "icons/";
 
-    private static String iconLocation;
+	private static String iconLocation;
 
-    private static GeronimoUIPlugin singleton;
+	private static GeronimoUIPlugin singleton;
 
-    /**
-     * The constructor.
-     */
-    public GeronimoUIPlugin() {
-        super();
-        singleton = this;
-    }
-
-    /**
-     * Returns the singleton instance of this plugin.
-     * 
-     * @return org.apache.geronimo.ui.internal.GeronimoUIPlugin
-     */
-    public static GeronimoUIPlugin getInstance() {
-        return singleton;
-    }
-
-    public static String getIconLocation() {
-        if (iconLocation == null) {
-            try {
-                iconLocation = Platform.resolve(
-                        GeronimoUIPlugin.getInstance().getBundle()
-                                .getEntry("/")).getPath()
-                        + ICONS_DIRECTORY;
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return iconLocation;
-    }
+	/**
+	 * The constructor.
+	 */
+	public GeronimoUIPlugin() {
+		super();
+		singleton = this;
+	}
+
+	/**
+	 * Returns the singleton instance of this plugin.
+	 * 
+	 * @return org.apache.geronimo.ui.internal.GeronimoUIPlugin
+	 */
+	public static GeronimoUIPlugin getInstance() {
+		return singleton;
+	}
+
+	public static String getIconLocation() {
+		if (iconLocation == null) {
+			try {
+				iconLocation = Platform.resolve(
+						GeronimoUIPlugin.getInstance().getBundle()
+								.getEntry("/")).getPath()
+						+ ICONS_DIRECTORY;
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return iconLocation;
+	}
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Messages.java Sat Jan  7 15:07:55 2006
@@ -117,9 +117,9 @@
 	public static String editorServiceRefDescription;
 
 	public static String editorServiceRefTitle;
-	
+
 	public static String editorServiceRefName;
-	
+
 	//
 
 	public static String editorResourceEnvRefDescription;
@@ -163,9 +163,9 @@
 	public static String wizardPageTitle_ResRef;
 
 	public static String wizardPageDescription_ResRef;
-	
+
 	//
-	
+
 	public static String wizardNewTitle_GBeanRef;
 
 	public static String wizardEditTitle_GBeanRef;
@@ -175,7 +175,7 @@
 	public static String wizardPageDescription_GBeanRef;
 
 	//
-	
+
 	public static String wizardNewTitle_ServiceRef;
 
 	public static String wizardEditTitle_ServiceRef;
@@ -183,7 +183,7 @@
 	public static String wizardPageTitle_ServiceRef;
 
 	public static String wizardPageDescription_ServiceRef;
-	
+
 	//
 
 	public static String wizardNewTitle_ResEnvRef;
@@ -271,21 +271,21 @@
 	public static String editorSectionSecurityTitle;
 
 	public static String editorSectionSecurityDescription;
-	
+
 	public static String editorSectionPortsTitle;
 
 	public static String editorSectionPortsDescription;
-	
+
 	public static String editorSectionLogLevelTitle;
 
 	public static String editorSectionLogLevelDescription;
-	
+
 	public static String info;
-	
+
 	public static String debug;
-	
+
 	public static String httpPort;
-	
+
 	public static String rmiPort;
 
 	public static String username;

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Trace.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Trace.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Trace.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/Trace.java Sat Jan  7 15:07:55 2006
@@ -19,66 +19,66 @@
  * Helper class to route trace output.
  */
 public class Trace {
-    /**
-     * Config trace event.
-     */
-    public static byte CONFIG = 0;
-
-    /**
-     * Warning trace event.
-     */
-    public static byte WARNING = 1;
-
-    /**
-     * Severe trace event.
-     */
-    public static byte SEVERE = 2;
-
-    /**
-     * Finest trace event.
-     */
-    public static byte FINEST = 3;
-
-    /**
-     * Parsing trace event.
-     */
-    public static byte PARSING = 4;
-
-    /**
-     * Trace constructor comment.
-     */
-    private Trace() {
-        super();
-    }
-
-    /**
-     * Trace the given text.
-     * 
-     * @param level
-     *            the trace level
-     * @param s
-     *            a message
-     */
-    public static void trace(byte level, String s) {
-        trace(level, s, null);
-    }
-
-    /**
-     * Trace the given message and exception.
-     * 
-     * @param level
-     *            the trace level
-     * @param s
-     *            a message
-     * @param t
-     *            a throwable
-     */
-    public static void trace(byte level, String s, Throwable t) {
-        if (!GeronimoUIPlugin.getInstance().isDebugging())
-            return;
-
-        System.out.println(GeronimoUIPlugin.PLUGIN_ID + " " + s);
-        if (t != null)
-            t.printStackTrace();
-    }
+	/**
+	 * Config trace event.
+	 */
+	public static byte CONFIG = 0;
+
+	/**
+	 * Warning trace event.
+	 */
+	public static byte WARNING = 1;
+
+	/**
+	 * Severe trace event.
+	 */
+	public static byte SEVERE = 2;
+
+	/**
+	 * Finest trace event.
+	 */
+	public static byte FINEST = 3;
+
+	/**
+	 * Parsing trace event.
+	 */
+	public static byte PARSING = 4;
+
+	/**
+	 * Trace constructor comment.
+	 */
+	private Trace() {
+		super();
+	}
+
+	/**
+	 * Trace the given text.
+	 * 
+	 * @param level
+	 *            the trace level
+	 * @param s
+	 *            a message
+	 */
+	public static void trace(byte level, String s) {
+		trace(level, s, null);
+	}
+
+	/**
+	 * Trace the given message and exception.
+	 * 
+	 * @param level
+	 *            the trace level
+	 * @param s
+	 *            a message
+	 * @param t
+	 *            a throwable
+	 */
+	public static void trace(byte level, String s, Throwable t) {
+		if (!GeronimoUIPlugin.getInstance().isDebugging())
+			return;
+
+		System.out.println(GeronimoUIPlugin.PLUGIN_ID + " " + s);
+		if (t != null)
+			t.printStackTrace();
+	}
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AbstractGeronimoFormPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AbstractGeronimoFormPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AbstractGeronimoFormPage.java Sat Jan  7 15:07:55 2006
@@ -31,65 +31,65 @@
 
 public abstract class AbstractGeronimoFormPage extends FormPage {
 
-    EObject deploymentPlan;
+	EObject deploymentPlan;
 
-    FormToolkit toolkit;
+	FormToolkit toolkit;
 
-    Composite body;
+	Composite body;
 
-    /**
-     * @param editor
-     * @param id
-     * @param title
-     */
-    public AbstractGeronimoFormPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
-
-    /**
-     * @param id
-     * @param title
-     */
-    public AbstractGeronimoFormPage(String id, String title) {
-        super(id, title);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void createFormContent(IManagedForm managedForm) {
-        deploymentPlan = ((AbstractGeronimoDeploymentPlanEditor) getEditor())
-                .getDeploymentPlan();
-        body = managedForm.getForm().getBody();
-        toolkit = managedForm.getToolkit();
-        ScrolledForm form = managedForm.getForm();
-        //form.setText(getTitle());
-        managedForm.addPart(new BannerPart(form.getBody(), toolkit, SWT.NONE));
-        form.getBody().setLayout(getLayout());
-        fillBody(managedForm);
-        form.reflow(true);
-    }
-
-    protected GridLayout getLayout() {
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 2;
-        layout.horizontalSpacing = 20;
-        layout.makeColumnsEqualWidth = true;
-        return layout;
-    }
-
-    protected int getStyle() {
-        return ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED
-                | ExpandableComposite.TITLE_BAR | Section.DESCRIPTION
-                | ExpandableComposite.FOCUS_TITLE;
-    }
-
-    abstract protected void fillBody(IManagedForm managedForm);
-
-    public EObject getDeploymentPlan() {
-        return deploymentPlan;
-    }
+	/**
+	 * @param editor
+	 * @param id
+	 * @param title
+	 */
+	public AbstractGeronimoFormPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
+
+	/**
+	 * @param id
+	 * @param title
+	 */
+	public AbstractGeronimoFormPage(String id, String title) {
+		super(id, title);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void createFormContent(IManagedForm managedForm) {
+		deploymentPlan = ((AbstractGeronimoDeploymentPlanEditor) getEditor())
+				.getDeploymentPlan();
+		body = managedForm.getForm().getBody();
+		toolkit = managedForm.getToolkit();
+		ScrolledForm form = managedForm.getForm();
+		// form.setText(getTitle());
+		managedForm.addPart(new BannerPart(form.getBody(), toolkit, SWT.NONE));
+		form.getBody().setLayout(getLayout());
+		fillBody(managedForm);
+		form.reflow(true);
+	}
+
+	protected GridLayout getLayout() {
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.horizontalSpacing = 20;
+		layout.makeColumnsEqualWidth = true;
+		return layout;
+	}
+
+	protected int getStyle() {
+		return ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED
+				| ExpandableComposite.TITLE_BAR | Section.DESCRIPTION
+				| ExpandableComposite.FOCUS_TITLE;
+	}
+
+	abstract protected void fillBody(IManagedForm managedForm);
+
+	public EObject getDeploymentPlan() {
+		return deploymentPlan;
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/AppGeneralPage.java Sat Jan  7 15:07:55 2006
@@ -21,31 +21,31 @@
 
 public class AppGeneralPage extends AbstractGeronimoFormPage {
 
-    /**
-     * @param editor
-     * @param id
-     * @param title
-     */
-    public AppGeneralPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
+	/**
+	 * @param editor
+	 * @param id
+	 * @param title
+	 */
+	public AppGeneralPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
 
-    /**
-     * @param id
-     * @param title
-     */
-    public AppGeneralPage(String id, String title) {
-        super(id, title);
-    }
+	/**
+	 * @param id
+	 * @param title
+	 */
+	public AppGeneralPage(String id, String title) {
+		super(id, title);
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(),
-                getDeploymentPlan()));
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(),
+				getDeploymentPlan()));
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/ConnectorOverviewPage.java Sat Jan  7 15:07:55 2006
@@ -21,28 +21,31 @@
 
 public class ConnectorOverviewPage extends AbstractGeronimoFormPage {
 
-    /**
-     * @param editor
-     * @param id
-     * @param title
-     */
-    public ConnectorOverviewPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
+	/**
+	 * @param editor
+	 * @param id
+	 * @param title
+	 */
+	public ConnectorOverviewPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
 
-    /**
-     * @param id
-     * @param title
-     */
-    public ConnectorOverviewPage(String id, String title) {
-        super(id, title);
-    }
+	/**
+	 * @param id
+	 * @param title
+	 */
+	public ConnectorOverviewPage(String id, String title) {
+		super(id, title);
+	}
 
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new ConnectorGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new ConnectorGeneralSection(body, toolkit,
+				getStyle(), getDeploymentPlan()));
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java Sat Jan  7 15:07:55 2006
@@ -24,41 +24,41 @@
 
 public class DeploymentPage extends AbstractGeronimoFormPage {
 
-    public EReference dependencies;
+	public EReference dependencies;
 
-    public EReference imports;
+	public EReference imports;
 
-    public EReference gbeans;
+	public EReference gbeans;
 
-    /**
-     * @param editor
-     * @param id
-     * @param title
-     */
-    public DeploymentPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
+	/**
+	 * @param editor
+	 * @param id
+	 * @param title
+	 */
+	public DeploymentPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
 
-    /**
-     * @param id
-     * @param title
-     */
-    public DeploymentPage(String id, String title) {
-        super(id, title);
-    }
+	/**
+	 * @param id
+	 * @param title
+	 */
+	public DeploymentPage(String id, String title) {
+		super(id, title);
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new DependencySection(getDeploymentPlan(),
-                dependencies, body, toolkit, getStyle()));
-        managedForm.addPart(new ImportSection(getDeploymentPlan(), imports,
-                body, toolkit, getStyle()));
-        managedForm.addPart(new GBeanSection(getDeploymentPlan(), gbeans, body,
-                toolkit, getStyle()));
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new DependencySection(getDeploymentPlan(),
+				dependencies, body, toolkit, getStyle()));
+		managedForm.addPart(new ImportSection(getDeploymentPlan(), imports,
+				body, toolkit, getStyle()));
+		managedForm.addPart(new GBeanSection(getDeploymentPlan(), gbeans, body,
+				toolkit, getStyle()));
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java Sat Jan  7 15:07:55 2006
@@ -21,31 +21,31 @@
 
 public class EjbOverviewPage extends AbstractGeronimoFormPage {
 
-    /**
-     * @param editor
-     * @param id
-     * @param title
-     */
-    public EjbOverviewPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
+	/**
+	 * @param editor
+	 * @param id
+	 * @param title
+	 */
+	public EjbOverviewPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
 
-    /**
-     * @param id
-     * @param title
-     */
-    public EjbOverviewPage(String id, String title) {
-        super(id, title);
-    }
+	/**
+	 * @param id
+	 * @param title
+	 */
+	public EjbOverviewPage(String id, String title) {
+		super(id, title);
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit,
-                getStyle(), getDeploymentPlan()));
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit,
+				getStyle(), getDeploymentPlan()));
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java Sat Jan  7 15:07:55 2006
@@ -29,38 +29,46 @@
 
 public class NamingFormPage extends AbstractGeronimoFormPage {
 
-    public EReference resRef;
+	public EReference resRef;
 
-    public EReference resEnvRef;
+	public EReference resEnvRef;
 
-    public EReference ejbRef;
+	public EReference ejbRef;
 
-    public EReference ejbLocalRef;
-    
-    public EReference gbeanRef;
-    
-    public EReference serviceRef;
-
-    public NamingFormPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
-
-    public NamingFormPage(String id, String title) {
-        super(id, title);
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {        
-    	ComposedAdapterFactory factory = ((AbstractGeronimoDeploymentPlanEditor) getEditor()).getFactory();
-        managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resRef, factory));
-        managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), resEnvRef));
-        managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbRef));
-        managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbLocalRef));
-        managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), gbeanRef));
-        managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), serviceRef));
-    }
+	public EReference ejbLocalRef;
+
+	public EReference gbeanRef;
+
+	public EReference serviceRef;
+
+	public NamingFormPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
+
+	public NamingFormPage(String id, String title) {
+		super(id, title);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		ComposedAdapterFactory factory = ((AbstractGeronimoDeploymentPlanEditor) getEditor())
+				.getFactory();
+		managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), resRef, factory));
+		managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(),
+				body, toolkit, getStyle(), resEnvRef));
+		managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), ejbRef));
+		managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), ejbLocalRef));
+		managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), gbeanRef));
+		managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), serviceRef));
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java Sat Jan  7 15:07:55 2006
@@ -9,33 +9,39 @@
 
 public class SecurityPage extends AbstractGeronimoFormPage {
 
-    public EReference securityERef;
+	public EReference securityERef;
 
-    public SecurityPage(FormEditor editor, String id, String title,
-            EReference securityERef) {
-        super(editor, id, title);
-        this.securityERef = securityERef;
-    }
+	public SecurityPage(FormEditor editor, String id, String title,
+			EReference securityERef) {
+		super(editor, id, title);
+		this.securityERef = securityERef;
+	}
 
-    public SecurityPage(String id, String title) {
-        super(id, title);
-    }
+	public SecurityPage(String id, String title) {
+		super(id, title);
+	}
 
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new SecurityRootSection(body, toolkit, getStyle(), getDeploymentPlan(), securityERef));
-        managedForm.addPart(new SecuritySection(getDeploymentPlan(), body, toolkit, getStyle(), securityERef));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getLayout()
-     */
-    protected GridLayout getLayout() {
-        GridLayout layout = super.getLayout();
-        layout.numColumns = 1;
-        return layout;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new SecurityRootSection(body, toolkit, getStyle(),
+				getDeploymentPlan(), securityERef));
+		managedForm.addPart(new SecuritySection(getDeploymentPlan(), body,
+				toolkit, getStyle(), securityERef));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getLayout()
+	 */
+	protected GridLayout getLayout() {
+		GridLayout layout = super.getLayout();
+		layout.numColumns = 1;
+		return layout;
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java Sat Jan  7 15:07:55 2006
@@ -21,18 +21,21 @@
 
 public class WebGeneralPage extends AbstractGeronimoFormPage {
 
-    public WebGeneralPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
+	public WebGeneralPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
 
-    public WebGeneralPage(String id, String title) {
-        super(id, title);
-    }
+	public WebGeneralPage(String id, String title) {
+		super(id, title);
+	}
 
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(),
+				getDeploymentPlan()));
+	}
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java Sat Jan  7 15:07:55 2006
@@ -22,43 +22,53 @@
 import org.eclipse.ui.forms.widgets.Section;
 
 public abstract class AbstractSectionPart extends SectionPart {
-    
-    protected FormToolkit toolkit;
-    
-    EObject plan;
-
-    /**
-     * @param section
-     */
-    public AbstractSectionPart(Section section) {
-        super(section);
-    }
-
-    /**
-     * @param parent
-     * @param toolkit
-     * @param style
-     */
-    public AbstractSectionPart(Composite parent, FormToolkit toolkit, int style, EObject plan) {
-        super(parent, toolkit, style);
-        this.toolkit = toolkit;
-        this.plan = plan;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.forms.IFormPart#commit(boolean)
-     * 
-     * Overriding this method as a workaround as switching tabs on a dirty
-     * editor commits the page and marks the part as not dirty.
-     */
-    public void commit(boolean onSave) {
-        boolean currentDirtyState = isDirty();
-        super.commit(onSave);
-        if (!onSave && currentDirtyState) {
-            markDirty();
-        }
-    }
+
+	protected FormToolkit toolkit;
+
+	private EObject plan;
+
+	/**
+	 * @param section
+	 */
+	public AbstractSectionPart(Section section) {
+		super(section);
+	}
+
+	/**
+	 * @param parent
+	 * @param toolkit
+	 * @param style
+	 * @param plan
+	 */
+	public AbstractSectionPart(Composite parent, FormToolkit toolkit,
+			int style, EObject plan) {
+		super(parent, toolkit, style);
+		this.toolkit = toolkit;
+		this.plan = plan;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.forms.IFormPart#commit(boolean)
+	 * 
+	 * Overriding this method as a workaround as switching tabs on a dirty
+	 * editor commits the page and marks the part as not dirty.
+	 */
+	public void commit(boolean onSave) {
+		boolean currentDirtyState = isDirty();
+		super.commit(onSave);
+		if (!onSave && currentDirtyState) {
+			markDirty();
+		}
+	}
+
+	public EObject getPlan() {
+		return plan;
+	}
+
+	public FormToolkit getToolkit() {
+		return toolkit;
+	}
 
 }

Copied: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java (from r366929, geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java)
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java?p2=geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java&p1=geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java&r1=366929&r2=366939&rev=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java Sat Jan  7 15:07:55 2006
@@ -19,7 +19,7 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.internal.Trace;
-import org.apache.geronimo.ui.wizards.DynamicAddEditWizard;
+import org.apache.geronimo.ui.wizards.AbstractTableWizard;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
@@ -50,11 +50,11 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
-public abstract class DynamicTableSection extends AbstractSectionPart {
+public abstract class AbstractTableSection extends AbstractSectionPart {
 
 	private Table table;
 
-	protected TableViewer tableViewer;
+	private TableViewer tableViewer;
 
 	Button addButton;
 
@@ -62,7 +62,7 @@
 
 	Button removeButton;
 
-	public DynamicTableSection(Section section) {
+	public AbstractTableSection(Section section) {
 		super(section);
 	}
 
@@ -74,7 +74,7 @@
 	 * 
 	 * Subclasses should call create() in constructor
 	 */
-	public DynamicTableSection(EObject plan, Composite parent,
+	public AbstractTableSection(EObject plan, Composite parent,
 			FormToolkit toolkit, int style) {
 		super(parent, toolkit, style, plan);
 	}
@@ -113,7 +113,8 @@
 		tableViewer.addFilter(new ViewerFilter() {
 			public boolean select(Viewer viewer, Object parentElement,
 					Object element) {
-				return DynamicTableSection.this.filter(viewer, parentElement, element);
+				return AbstractTableSection.this.filter(viewer, parentElement,
+						element);
 			}
 		});
 
@@ -131,15 +132,11 @@
 	protected Object getInput() {
 		return getPlan();
 	}
-	
+
 	protected boolean filter(Viewer viewer, Object parentElement, Object element) {
 		return getTableEntryObjectType().isInstance(element);
 	}
 
-	abstract public List getFactories();
-
-	abstract public EClass getTableEntryObjectType();
-
 	protected Composite createTableComposite(Composite parent) {
 		Composite composite = toolkit.createComposite(parent);
 		composite.setLayout(getSectionCompositeLayout());
@@ -185,7 +182,7 @@
 			TableColumn tableColumn = new TableColumn(table, SWT.NONE);
 			tableColumn.setText(getTableColumnNames()[i]);
 		}
-		
+
 		return table;
 	}
 
@@ -256,8 +253,8 @@
 				if (o != null) {
 					Wizard wizard = getWizard();
 					if (wizard != null) {
-						if (wizard instanceof DynamicAddEditWizard) {
-							((DynamicAddEditWizard) wizard)
+						if (wizard instanceof AbstractTableWizard) {
+							((AbstractTableWizard) wizard)
 									.setEObject((EObject) o);
 						}
 						WizardDialog dialog = new WizardDialog(Display
@@ -280,42 +277,26 @@
 		return tableViewer;
 	}
 
-	public EObject getPlan() {
-		return plan;
+	protected boolean isHeaderVisible() {
+		return true;
 	}
 
-	public boolean isHeaderVisible() {
-		return true;
+	protected Table getTable() {
+		return table;
 	}
 
-	/**
-	 * @return
-	 */
 	abstract public String getTitle();
 
-	/**
-	 * @return
-	 */
 	abstract public String getDescription();
 
-	/**
-	 * @deprecated
-	 * @return
-	 */
-	abstract public EReference getEReference();
-
-	/**
-	 * @return
-	 */
 	abstract public String[] getTableColumnNames();
 
-	/**
-	 * @return
-	 */
 	abstract public Wizard getWizard();
 
-	protected Table getTable() {
-		return table;
-	}
+	abstract public EReference getEReference();
+
+	abstract public List getFactories();
+
+	abstract public EClass getTableEntryObjectType();
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java Sat Jan  7 15:07:55 2006
@@ -24,35 +24,40 @@
 
 public class AppGeneralSection extends CommonGeneralSection {
 
-    ApplicationType plan;
+	ApplicationType plan;
 
-    public AppGeneralSection(Composite parent, FormToolkit toolkit, int style,
-            EObject plan) {
-        super(parent, toolkit, style, plan);
-        this.plan = (ApplicationType) plan;
-        createClient();
-    }
-    
-    protected void createClient() {
-        super.createClient();
-    }
+	public AppGeneralSection(Composite parent, FormToolkit toolkit, int style,
+			EObject plan) {
+		super(parent, toolkit, style, plan);
+		this.plan = (ApplicationType) plan;
+		createClient();
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getConfigIdEAttribute()
-     */
-    protected EAttribute getConfigIdEAttribute() {
-        return ApplicationPackage.eINSTANCE.getApplicationType_ConfigId();
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#createClient()
+	 */
+	protected void createClient() {
+		super.createClient();
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getParentIdEAttribute()
-     */
-    protected EAttribute getParentIdEAttribute() {
-        return ApplicationPackage.eINSTANCE.getApplicationType_ParentId();
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getConfigIdEAttribute()
+	 */
+	protected EAttribute getConfigIdEAttribute() {
+		return ApplicationPackage.eINSTANCE.getApplicationType_ConfigId();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getParentIdEAttribute()
+	 */
+	protected EAttribute getParentIdEAttribute() {
+		return ApplicationPackage.eINSTANCE.getApplicationType_ParentId();
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java Sat Jan  7 15:07:55 2006
@@ -28,38 +28,37 @@
 import org.eclipse.ui.forms.widgets.Section;
 
 public class BannerPart extends SectionPart {
-	
+
 	FormToolkit toolkit;
-	
+
 	ImageDescriptor defaultImgDesc = GeronimoUIPlugin
-	.imageDescriptorFromPlugin("org.apache.geronimo.ui",
-			"icons/Geronimo_Welcome4.gif");
+			.imageDescriptorFromPlugin("org.apache.geronimo.ui",
+					"icons/Geronimo_Welcome4.gif");
 
 	public BannerPart(Composite parent, FormToolkit toolkit, int style) {
 		super(parent, toolkit, style);
 		this.toolkit = toolkit;
 		create();
 	}
-	
+
 	private void create() {
 		Section section = getSection();
 		GridData gd = new GridData();
 		gd.horizontalSpan = 2;
-        section.setLayoutData(gd);
-        section.setText("");
+		section.setLayoutData(gd);
+		section.setText("");
+
+		Composite composite = toolkit.createComposite(section);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 1;
+		layout.marginHeight = 1;
+		layout.marginWidth = 1;
+		layout.verticalSpacing = 5;
+		layout.horizontalSpacing = 10;
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+		section.setClient(composite);
 
-        Composite composite = toolkit.createComposite(section);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 1;
-        layout.marginHeight = 1;
-        layout.marginWidth = 1;
-        layout.verticalSpacing = 5;
-        layout.horizontalSpacing = 10;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-        section.setClient(composite);             
-		
-	
 		Label label = toolkit.createLabel(composite, "");
 		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
 		label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java Sat Jan  7 15:07:55 2006
@@ -26,64 +26,84 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.openejb.xml.ns.openejb.jar.JarPackage;
 
-public class BeansSection extends DynamicTableSection {
-
-    /**
-     * @param plan
-     * @param parent
-     * @param toolkit
-     * @param style
-     */
-    public BeansSection(EObject plan, Composite parent, FormToolkit toolkit,
-            int style) {
-        super(plan, parent, toolkit, style);
-        create();
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTitle()
-     */
-    public String getTitle() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getDescription()
-     */
-    public String getDescription() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
-     */
-    public EReference getEReference() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnNames()
-     */
-    public String[] getTableColumnNames() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard()
-     */
-    public Wizard getWizard() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-    
-    public List getFactories() {
-    	return Collections.EMPTY_LIST;
-    }
+public class BeansSection extends AbstractTableSection {
 
+	/**
+	 * @param plan
+	 * @param parent
+	 * @param toolkit
+	 * @param style
+	 */
+	public BeansSection(EObject plan, Composite parent, FormToolkit toolkit,
+			int style) {
+		super(plan, parent, toolkit, style);
+		create();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
+	 */
+	public String getTitle() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
+	 */
+	public String getDescription() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
+	 */
+	public EReference getEReference() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableColumnNames()
+	 */
+	public String[] getTableColumnNames() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getWizard()
+	 */
+	public Wizard getWizard() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getFactories()
+	 */
+	public List getFactories() {
+		return Collections.EMPTY_LIST;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
+	 */
 	public EClass getTableEntryObjectType() {
 		return JarPackage.eINSTANCE.getEnterpriseBeansType();
 	}

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java Sat Jan  7 15:07:55 2006
@@ -32,98 +32,98 @@
 
 public abstract class CommonGeneralSection extends AbstractSectionPart {
 
-    protected Text configId;
+	protected Text configId;
 
-    protected Text parentId;
-    
-    public CommonGeneralSection(Composite parent, FormToolkit toolkit, int style, EObject plan) {
-        super(parent, toolkit, style, plan);
-    }
-
-    protected void createClient() {
-        
-        Section section = getSection();
-
-        section.setText(Messages.editorSectionGeneralTitle);
-        section.setDescription(Messages.editorSectionGeneralDescription);
-        section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-
-        Composite composite = toolkit.createComposite(section);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 2;
-        layout.marginHeight = 5;
-        layout.marginWidth = 10;
-        layout.verticalSpacing = 5;
-        layout.horizontalSpacing = 15;
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-        section.setClient(composite);
-
-        // ------- Label and text field for the config Id -------
-        createLabel(composite, Messages.editorConfigId, toolkit);
-
-        configId = toolkit.createText(composite, getConfigID(), SWT.BORDER);
-        configId.setLayoutData(createTextFieldGridData());
-        configId.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                setConfigID(configId.getText());
-                markDirty();
-            }
-        });
-
-        // ------- Label and text field for the parent Id -------
-        createLabel(composite, Messages.editorParentId, toolkit);
-
-        parentId = toolkit.createText(composite, getParentID(), SWT.BORDER);
-        parentId
-                .setLayoutData(createTextFieldGridData());
-        parentId.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                setParentID(parentId.getText());
-                markDirty();
-            }
-        });
-    }
-
-    protected Label createLabel(Composite parent, String text,
-            FormToolkit toolkit) {
-        Label label = toolkit.createLabel(parent, text);
-        label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-        label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-        return label;
-    }
-    
-    protected GridData createTextFieldGridData() {
-        GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);
-        data.widthHint = 150;
-        return data;
-    }
-
-    protected String getConfigID() {
-        return getID(getConfigIdEAttribute());
-    }
-
-    protected String getParentID() {
-        return getID(getParentIdEAttribute());
-    }
-
-    protected void setConfigID(String id) {
-        plan.eSet(getConfigIdEAttribute(), id);
-    }
-
-    protected void setParentID(String id) {
-        plan.eSet(getParentIdEAttribute(), id);
-    }
-    
-    private String getID(EAttribute configIdAttribute) {
-        if (configIdAttribute != null && plan.eIsSet(configIdAttribute)) {
-            return plan.eGet(configIdAttribute).toString();
-        }
-        return "";
-    }
+	protected Text parentId;
 
-    protected abstract EAttribute getConfigIdEAttribute();
+	public CommonGeneralSection(Composite parent, FormToolkit toolkit,
+			int style, EObject plan) {
+		super(parent, toolkit, style, plan);
+	}
+
+	protected void createClient() {
+
+		Section section = getSection();
+
+		section.setText(Messages.editorSectionGeneralTitle);
+		section.setDescription(Messages.editorSectionGeneralDescription);
+		section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+
+		Composite composite = toolkit.createComposite(section);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.marginHeight = 5;
+		layout.marginWidth = 10;
+		layout.verticalSpacing = 5;
+		layout.horizontalSpacing = 15;
+		composite.setLayout(layout);
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+		section.setClient(composite);
+
+		// ------- Label and text field for the config Id -------
+		createLabel(composite, Messages.editorConfigId, toolkit);
+
+		configId = toolkit.createText(composite, getConfigID(), SWT.BORDER);
+		configId.setLayoutData(createTextFieldGridData());
+		configId.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				setConfigID(configId.getText());
+				markDirty();
+			}
+		});
+
+		// ------- Label and text field for the parent Id -------
+		createLabel(composite, Messages.editorParentId, toolkit);
+
+		parentId = toolkit.createText(composite, getParentID(), SWT.BORDER);
+		parentId.setLayoutData(createTextFieldGridData());
+		parentId.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				setParentID(parentId.getText());
+				markDirty();
+			}
+		});
+	}
+
+	protected Label createLabel(Composite parent, String text,
+			FormToolkit toolkit) {
+		Label label = toolkit.createLabel(parent, text);
+		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
+		label.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+		return label;
+	}
+
+	protected GridData createTextFieldGridData() {
+		GridData data = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		data.widthHint = 150;
+		return data;
+	}
+
+	protected String getConfigID() {
+		return getID(getConfigIdEAttribute());
+	}
+
+	protected String getParentID() {
+		return getID(getParentIdEAttribute());
+	}
+
+	protected void setConfigID(String id) {
+		getPlan().eSet(getConfigIdEAttribute(), id);
+	}
+
+	protected void setParentID(String id) {
+		getPlan().eSet(getParentIdEAttribute(), id);
+	}
+
+	private String getID(EAttribute configIdAttribute) {
+		if (configIdAttribute != null && getPlan().eIsSet(configIdAttribute)) {
+			return getPlan().eGet(configIdAttribute).toString();
+		}
+		return "";
+	}
+
+	protected abstract EAttribute getConfigIdEAttribute();
+
+	protected abstract EAttribute getParentIdEAttribute();
 
-    protected abstract EAttribute getParentIdEAttribute();
-    
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java Sat Jan  7 15:07:55 2006
@@ -24,35 +24,35 @@
 
 public class ConnectorGeneralSection extends CommonGeneralSection {
 
-    ConnectorType plan;
+	ConnectorType plan;
 
-    public ConnectorGeneralSection(Composite parent, FormToolkit toolkit,
-            int style, EObject plan) {
-        super(parent, toolkit, style, plan);
-        this.plan = (ConnectorType) plan;
-        createClient();
-    }
-    
-    protected void createClient() {
-        super.createClient();
-    }
+	public ConnectorGeneralSection(Composite parent, FormToolkit toolkit,
+			int style, EObject plan) {
+		super(parent, toolkit, style, plan);
+		this.plan = (ConnectorType) plan;
+		createClient();
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getConfigIdEAttribute()
-     */
-    protected EAttribute getConfigIdEAttribute() {
-        return ConnectorPackage.eINSTANCE.getConnectorType_ConfigId();
-    }
+	protected void createClient() {
+		super.createClient();
+	}
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getParentIdEAttribute()
-     */
-    protected EAttribute getParentIdEAttribute() {
-        return ConnectorPackage.eINSTANCE.getConnectorType_ParentId();
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getConfigIdEAttribute()
+	 */
+	protected EAttribute getConfigIdEAttribute() {
+		return ConnectorPackage.eINSTANCE.getConnectorType_ConfigId();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.CommonGeneralSection#getParentIdEAttribute()
+	 */
+	protected EAttribute getParentIdEAttribute() {
+		return ConnectorPackage.eINSTANCE.getConnectorType_ParentId();
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java?rev=366939&r1=366938&r2=366939&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java Sat Jan  7 15:07:55 2006
@@ -29,110 +29,105 @@
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
 
-public class DependencySection extends DynamicTableSection {
+public class DependencySection extends AbstractTableSection {
 
-    /**
-     * Must be a set to a ERef type of XPackage.eINSTANCE.getXType_Dependency();
-     */
-    private EReference dependenciesERef;
-
-    /**
-     * @param plan
-     * @param parent
-     * @param toolkit
-     * @param style
-     */
-    public DependencySection(EObject plan, EReference dependenciesERef,
-            Composite parent, FormToolkit toolkit, int style) {
-        super(plan, parent, toolkit, style);
-        this.dependenciesERef = dependenciesERef;
-        create();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTitle()
-     */
-    public String getTitle() {
-        return Messages.editorSectionDependenciesTitle;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getDescription()
-     */
-    public String getDescription() {
-        return Messages.editorSectionDependenciesDescription;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
-     */
-    public EReference getEReference() {
-        return dependenciesERef;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnNames()
-     */
-    public String[] getTableColumnNames() {
-        return new String[] {};
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard()
-     */
-    public Wizard getWizard() {
-        return new DependencyWizard(this);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#configureSection(org.eclipse.ui.forms.widgets.Section)
-     */
-    protected void configureSection(Section section) {
-        section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#showTableColumNames()
-     */
-    public boolean isHeaderVisible() {
-        return false;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
-     */
-    public ImageDescriptor getImageDescriptor() {
-        return GeronimoUIPlugin.imageDescriptorFromPlugin(
-                "org.eclipse.jdt.ui", "icons/full/obj16/jar_obj.gif");
-    }
-    
-    public List getFactories() {
-    	List factories = new ArrayList();
+	/**
+	 * Must be a set to a ERef type of XPackage.eINSTANCE.getXType_Dependency();
+	 */
+	private EReference dependenciesERef;
+
+	/**
+	 * @param plan
+	 * @param parent
+	 * @param toolkit
+	 * @param style
+	 */
+	public DependencySection(EObject plan, EReference dependenciesERef,
+			Composite parent, FormToolkit toolkit, int style) {
+		super(plan, parent, toolkit, style);
+		this.dependenciesERef = dependenciesERef;
+		create();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
+	 */
+	public String getTitle() {
+		return Messages.editorSectionDependenciesTitle;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
+	 */
+	public String getDescription() {
+		return Messages.editorSectionDependenciesDescription;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getEReference()
+	 */
+	public EReference getEReference() {
+		return dependenciesERef;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableColumnNames()
+	 */
+	public String[] getTableColumnNames() {
+		return new String[] {};
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getWizard()
+	 */
+	public Wizard getWizard() {
+		return new DependencyWizard(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#isHeaderVisible()
+	 */
+	public boolean isHeaderVisible() {
+		return false;
+	}
+
+	public ImageDescriptor getImageDescriptor() {
+		return GeronimoUIPlugin.imageDescriptorFromPlugin("org.eclipse.jdt.ui",
+				"icons/full/obj16/jar_obj.gif");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getFactories()
+	 */
+	public List getFactories() {
+		List factories = new ArrayList();
 		factories.add(new WebItemProviderAdapterFactory());
 		factories.add(new DeploymentItemProviderAdapterFactory());
 		return factories;
-    }
+	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
+	 */
 	public EClass getTableEntryObjectType() {
 		return DeploymentPackage.eINSTANCE.getDependencyType();
 	}



Mime
View raw message