geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r382997 [5/7] - in /geronimo/devtools/eclipse-plugin/trunk: ./ assembly/ etc/ features/org.apache.geronimo.feature.source/ features/org.apache.geronimo.feature/ features/org.apache.geronimo.installableruntime.tomcat.feature/ geronimo-emf/ m...
Date Sat, 04 Mar 2006 01:30:47 GMT
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java Fri Mar  3 17:30:38 2006
@@ -1,72 +1,72 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.pages;
-
-import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.ui.sections.DependencySection;
-import org.apache.geronimo.ui.sections.GBeanSection;
-import org.apache.geronimo.ui.sections.ImportSection;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-public class DeploymentPage extends AbstractGeronimoFormPage {
-
-	public EReference dependencies;
-
-	public EReference imports;
-
-	public EReference gbeans;
-
-	/**
-	 * @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);
-	}
-
-	/*
-	 * (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#getFormTitle()
-	 */
-	public String getFormTitle() {
-		return Messages.deploymentPageTitle;
-	}
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.pages;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.sections.DependencySection;
+import org.apache.geronimo.ui.sections.GBeanSection;
+import org.apache.geronimo.ui.sections.ImportSection;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+public class DeploymentPage extends AbstractGeronimoFormPage {
+
+	public EReference dependencies;
+
+	public EReference imports;
+
+	public EReference gbeans;
+
+	/**
+	 * @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);
+	}
+
+	/*
+	 * (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#getFormTitle()
+	 */
+	public String getFormTitle() {
+		return Messages.deploymentPageTitle;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/DeploymentPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/EjbOverviewPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java Fri Mar  3 17:30:38 2006
@@ -1,78 +1,78 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.pages;
-
-import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.ui.sections.EjbLocalRefSection;
-import org.apache.geronimo.ui.sections.EjbRefSection;
-import org.apache.geronimo.ui.sections.GBeanRefSection;
-import org.apache.geronimo.ui.sections.ResourceEnvRefSection;
-import org.apache.geronimo.ui.sections.ResourceRefSection;
-import org.apache.geronimo.ui.sections.ServiceRefSection;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-public class NamingFormPage extends AbstractGeronimoFormPage {
-
-	public EReference resRef;
-
-	public EReference resEnvRef;
-
-	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) {
-		managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body,
-				toolkit, getStyle(), resRef));
-		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));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
-	 */
-	public String getFormTitle() {
-		return Messages.namingFormPageTitle;
-	}
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.pages;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.sections.EjbLocalRefSection;
+import org.apache.geronimo.ui.sections.EjbRefSection;
+import org.apache.geronimo.ui.sections.GBeanRefSection;
+import org.apache.geronimo.ui.sections.ResourceEnvRefSection;
+import org.apache.geronimo.ui.sections.ResourceRefSection;
+import org.apache.geronimo.ui.sections.ServiceRefSection;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+public class NamingFormPage extends AbstractGeronimoFormPage {
+
+	public EReference resRef;
+
+	public EReference resEnvRef;
+
+	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) {
+		managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), resRef));
+		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));
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
+	 */
+	public String getFormTitle() {
+		return Messages.namingFormPageTitle;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java Fri Mar  3 17:30:38 2006
@@ -1,55 +1,55 @@
-package org.apache.geronimo.ui.pages;
-
-import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.ui.sections.SecurityRootSection;
-import org.apache.geronimo.ui.sections.SecuritySection;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-public class SecurityPage extends AbstractGeronimoFormPage {
-
-	public EReference 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);
-	}
-
-	/*
-	 * (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#getFormTitle()
-	 */
-	public String getFormTitle() {
-		return Messages.securityPageTitle;
-	}
-
-}
+package org.apache.geronimo.ui.pages;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.sections.SecurityRootSection;
+import org.apache.geronimo.ui.sections.SecuritySection;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+public class SecurityPage extends AbstractGeronimoFormPage {
+
+	public EReference 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);
+	}
+
+	/*
+	 * (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#getFormTitle()
+	 */
+	public String getFormTitle() {
+		return Messages.securityPageTitle;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java Fri Mar  3 17:30:38 2006
@@ -1,49 +1,49 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.pages;
-
-import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.ui.sections.WebGeneralSection;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-public class WebGeneralPage extends AbstractGeronimoFormPage {
-
-	public WebGeneralPage(FormEditor editor, String id, String title) {
-		super(editor, 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#getFormTitle()
-	 */
-	public String getFormTitle() {
-		return Messages.webGeneralPageTitle;
-	}
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.pages;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.sections.WebGeneralSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+public class WebGeneralPage extends AbstractGeronimoFormPage {
+
+	public WebGeneralPage(FormEditor editor, String id, String title) {
+		super(editor, 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#getFormTitle()
+	 */
+	public String getFormTitle() {
+		return Messages.webGeneralPageTitle;
+	}
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java Fri Mar  3 17:30:38 2006
@@ -1,74 +1,74 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.sections;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public abstract class AbstractSectionPart extends SectionPart {
-
-	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;
-	}
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.sections;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.SectionPart;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+public abstract class AbstractSectionPart extends SectionPart {
+
+	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;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractSectionPart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java Fri Mar  3 17:30:38 2006
@@ -1,316 +1,316 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.sections;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.xml.ns.deployment.provider.DeploymentItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.application.client.provider.ClientItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.application.provider.ApplicationItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.connector.provider.ConnectorItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.openejb.xml.ns.openejb.jar.provider.JarItemProviderAdapterFactory;
-import org.openejb.xml.ns.pkgen.provider.PkgenItemProviderAdapterFactory;
-
-public abstract class AbstractTableSection extends AbstractSectionPart {
-
-	private static final String[] COLUMN_NAMES = new String[]{};
-
-	private Table table;
-
-	private TableViewer tableViewer;
-
-	private static ComposedAdapterFactory factory;
-
-	Button addButton;
-
-	Button editButton;
-
-	Button removeButton;
-
-	static {
-		List factories = new ArrayList();
-		factories.add(new DeploymentItemProviderAdapterFactory());
-		factories.add(new ClientItemProviderAdapterFactory());
-		factories.add(new ApplicationItemProviderAdapterFactory());
-		factories.add(new ConnectorItemProviderAdapterFactory());
-		factories.add(new WebItemProviderAdapterFactory());
-		factories.add(new NamingItemProviderAdapterFactory());
-		factories.add(new SecurityItemProviderAdapterFactory());
-		factories.add(new JarItemProviderAdapterFactory());
-		factories.add(new PkgenItemProviderAdapterFactory());
-		factory = new ComposedAdapterFactory(factories);
-	}
-
-	public AbstractTableSection(Section section) {
-		super(section);
-	}
-
-	/**
-	 * @param plan
-	 * @param parent
-	 * @param toolkit
-	 * @param style
-	 * 
-	 * Subclasses should call createClient() in constructor
-	 */
-	public AbstractTableSection(EObject plan, Composite parent,
-			FormToolkit toolkit, int style) {
-		super(parent, toolkit, style, plan);
-	}
-
-	public void createClient() {
-
-		if (getTableEntryObjectType() == null)
-			throw new NullPointerException();
-
-		getSection().setText(getTitle());
-		getSection().setDescription(getDescription());
-		getSection().setLayoutData(getSectionLayoutData());
-		Composite composite = createTableComposite(getSection());
-		getSection().setClient(composite);
-		table = createTable(composite);
-
-		tableViewer = new TableViewer(getTable());
-		tableViewer.setContentProvider(new AdapterFactoryContentProvider(
-				factory));
-		tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(factory));
-		tableViewer.setInput(getInput());
-
-		tableViewer.addFilter(new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement,
-					Object element) {
-				return AbstractTableSection.this.filter(viewer, parentElement,
-						element);
-			}
-		});
-
-		if (getTableColumnNames().length > 0) {
-			tableViewer.setColumnProperties(getTableColumnNames());
-		}
-
-		Composite buttonComp = createButtonComposite(composite);
-		createAddButton(toolkit, buttonComp);
-		createRemoveButton(toolkit, buttonComp);
-		createEditButton(toolkit, buttonComp);
-
-	}
-
-	public Object getInput() {
-		return getPlan();
-	}
-
-	protected boolean filter(Viewer viewer, Object parentElement, Object element) {
-		return getTableEntryObjectType().isInstance(element);
-	}
-
-	protected Composite createTableComposite(Composite parent) {
-		Composite composite = toolkit.createComposite(parent);
-		composite.setLayout(getSectionCompositeLayout());
-		composite.setLayoutData(getTableCompositeLayoutData());
-		return composite;
-	}
-
-	protected GridData getSectionLayoutData() {
-		return new GridData(SWT.FILL, SWT.FILL, false, false);
-	}
-
-	protected GridData getTableCompositeLayoutData() {
-		return new GridData(SWT.FILL, SWT.FILL, false, false);
-	}
-
-	protected GridLayout getSectionCompositeLayout() {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 5;
-		layout.marginWidth = 10;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 15;
-		return layout;
-	}
-
-	protected Table createTable(Composite composite) {
-		Table table = new Table(composite, SWT.BORDER | SWT.FULL_SELECTION
-				| SWT.V_SCROLL | SWT.SINGLE);
-		if (isHeaderVisible()) {
-			table.setHeaderVisible(true);
-		}
-
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		data.heightHint = 60;
-		data.widthHint = 400;
-		table.setLayoutData(data);
-
-		TableLayout tableLayout = new TableLayout();
-		table.setLayout(tableLayout);
-
-		for (int i = 0; i < getTableColumnNames().length; i++) {
-			tableLayout.addColumnData(new ColumnWeightData(35));
-			TableColumn tableColumn = new TableColumn(table, SWT.NONE);
-			tableColumn.setText(getTableColumnNames()[i]);
-		}
-
-		return table;
-	}
-
-	protected Composite createButtonComposite(Composite parent) {
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.horizontalSpacing = 2;
-		layout.verticalSpacing = 2;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.numColumns = 1;
-		buttonComp.setLayout(layout);
-		buttonComp.setBackground(toolkit.getColors().getBackground());
-		buttonComp
-				.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-		return buttonComp;
-	}
-
-	protected void createRemoveButton(FormToolkit toolkit, Composite buttonComp) {
-		removeButton = toolkit.createButton(buttonComp, Messages.remove,
-				SWT.NONE);
-		removeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				int[] selectedIndices = table.getSelectionIndices();
-				for (int i = 0; i < selectedIndices.length; i++) {
-					TableItem tableItem = table.getItem(selectedIndices[i]);
-					EObject type = (EObject) (tableItem.getData());
-					table.remove(selectedIndices[i]);
-					EcoreUtil.remove(type);
-					markDirty();
-				}
-			}
-		});
-		removeButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
-				false));
-	}
-
-	protected void createAddButton(FormToolkit toolkit, Composite buttonComp) {
-		addButton = toolkit.createButton(buttonComp, Messages.add, SWT.NONE);
-
-		addButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				Wizard wizard = getWizard();
-				if (wizard != null) {
-					WizardDialog dialog = new WizardDialog(Display.getCurrent()
-							.getActiveShell(), wizard);
-
-					dialog.open();
-
-					if (dialog.getReturnCode() == Dialog.OK) {
-						markDirty();
-					}
-				}
-			}
-		});
-
-		addButton
-				.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-	}
-
-	protected void createEditButton(FormToolkit toolkit, Composite buttonComp) {
-		editButton = toolkit.createButton(buttonComp, Messages.edit, SWT.NONE);
-
-		editButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				Object o = ((StructuredSelection) getTableViewer()
-						.getSelection()).getFirstElement();
-				if (o != null) {
-					Wizard wizard = getWizard();
-					if (wizard != null) {
-						if (wizard instanceof AbstractTableWizard) {
-							((AbstractTableWizard) wizard)
-									.setEObject((EObject) o);
-						}
-						WizardDialog dialog = new WizardDialog(Display
-								.getCurrent().getActiveShell(), wizard);
-						dialog.open();
-						if (dialog.getReturnCode() == Dialog.OK) {
-							markDirty();
-							// TODO notify listeners
-						}
-					}
-				}
-			}
-		});
-
-		editButton
-				.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-	}
-
-	public TableViewer getTableViewer() {
-		return tableViewer;
-	}
-
-	protected boolean isHeaderVisible() {
-		return true;
-	}
-
-	protected Table getTable() {
-		return table;
-	}
-
-	public String[] getTableColumnNames() {
-		return COLUMN_NAMES;
-	}
-
-	abstract public String getTitle();
-
-	abstract public String getDescription();
-
-	abstract public Wizard getWizard();
-
-	abstract public EReference getEReference();
-
-	abstract public EClass getTableEntryObjectType();
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.sections;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.wizards.AbstractTableWizard;
+import org.apache.geronimo.xml.ns.deployment.provider.DeploymentItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.application.client.provider.ClientItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.application.provider.ApplicationItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.connector.provider.ConnectorItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.openejb.xml.ns.openejb.jar.provider.JarItemProviderAdapterFactory;
+import org.openejb.xml.ns.pkgen.provider.PkgenItemProviderAdapterFactory;
+
+public abstract class AbstractTableSection extends AbstractSectionPart {
+
+	private static final String[] COLUMN_NAMES = new String[]{};
+
+	private Table table;
+
+	private TableViewer tableViewer;
+
+	private static ComposedAdapterFactory factory;
+
+	Button addButton;
+
+	Button editButton;
+
+	Button removeButton;
+
+	static {
+		List factories = new ArrayList();
+		factories.add(new DeploymentItemProviderAdapterFactory());
+		factories.add(new ClientItemProviderAdapterFactory());
+		factories.add(new ApplicationItemProviderAdapterFactory());
+		factories.add(new ConnectorItemProviderAdapterFactory());
+		factories.add(new WebItemProviderAdapterFactory());
+		factories.add(new NamingItemProviderAdapterFactory());
+		factories.add(new SecurityItemProviderAdapterFactory());
+		factories.add(new JarItemProviderAdapterFactory());
+		factories.add(new PkgenItemProviderAdapterFactory());
+		factory = new ComposedAdapterFactory(factories);
+	}
+
+	public AbstractTableSection(Section section) {
+		super(section);
+	}
+
+	/**
+	 * @param plan
+	 * @param parent
+	 * @param toolkit
+	 * @param style
+	 * 
+	 * Subclasses should call createClient() in constructor
+	 */
+	public AbstractTableSection(EObject plan, Composite parent,
+			FormToolkit toolkit, int style) {
+		super(parent, toolkit, style, plan);
+	}
+
+	public void createClient() {
+
+		if (getTableEntryObjectType() == null)
+			throw new NullPointerException();
+
+		getSection().setText(getTitle());
+		getSection().setDescription(getDescription());
+		getSection().setLayoutData(getSectionLayoutData());
+		Composite composite = createTableComposite(getSection());
+		getSection().setClient(composite);
+		table = createTable(composite);
+
+		tableViewer = new TableViewer(getTable());
+		tableViewer.setContentProvider(new AdapterFactoryContentProvider(
+				factory));
+		tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(factory));
+		tableViewer.setInput(getInput());
+
+		tableViewer.addFilter(new ViewerFilter() {
+			public boolean select(Viewer viewer, Object parentElement,
+					Object element) {
+				return AbstractTableSection.this.filter(viewer, parentElement,
+						element);
+			}
+		});
+
+		if (getTableColumnNames().length > 0) {
+			tableViewer.setColumnProperties(getTableColumnNames());
+		}
+
+		Composite buttonComp = createButtonComposite(composite);
+		createAddButton(toolkit, buttonComp);
+		createRemoveButton(toolkit, buttonComp);
+		createEditButton(toolkit, buttonComp);
+
+	}
+
+	public Object getInput() {
+		return getPlan();
+	}
+
+	protected boolean filter(Viewer viewer, Object parentElement, Object element) {
+		return getTableEntryObjectType().isInstance(element);
+	}
+
+	protected Composite createTableComposite(Composite parent) {
+		Composite composite = toolkit.createComposite(parent);
+		composite.setLayout(getSectionCompositeLayout());
+		composite.setLayoutData(getTableCompositeLayoutData());
+		return composite;
+	}
+
+	protected GridData getSectionLayoutData() {
+		return new GridData(SWT.FILL, SWT.FILL, false, false);
+	}
+
+	protected GridData getTableCompositeLayoutData() {
+		return new GridData(SWT.FILL, SWT.FILL, false, false);
+	}
+
+	protected GridLayout getSectionCompositeLayout() {
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
+		layout.marginHeight = 5;
+		layout.marginWidth = 10;
+		layout.verticalSpacing = 5;
+		layout.horizontalSpacing = 15;
+		return layout;
+	}
+
+	protected Table createTable(Composite composite) {
+		Table table = new Table(composite, SWT.BORDER | SWT.FULL_SELECTION
+				| SWT.V_SCROLL | SWT.SINGLE);
+		if (isHeaderVisible()) {
+			table.setHeaderVisible(true);
+		}
+
+		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
+		data.heightHint = 60;
+		data.widthHint = 400;
+		table.setLayoutData(data);
+
+		TableLayout tableLayout = new TableLayout();
+		table.setLayout(tableLayout);
+
+		for (int i = 0; i < getTableColumnNames().length; i++) {
+			tableLayout.addColumnData(new ColumnWeightData(35));
+			TableColumn tableColumn = new TableColumn(table, SWT.NONE);
+			tableColumn.setText(getTableColumnNames()[i]);
+		}
+
+		return table;
+	}
+
+	protected Composite createButtonComposite(Composite parent) {
+		Composite buttonComp = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.horizontalSpacing = 2;
+		layout.verticalSpacing = 2;
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+		layout.numColumns = 1;
+		buttonComp.setLayout(layout);
+		buttonComp.setBackground(toolkit.getColors().getBackground());
+		buttonComp
+				.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+		return buttonComp;
+	}
+
+	protected void createRemoveButton(FormToolkit toolkit, Composite buttonComp) {
+		removeButton = toolkit.createButton(buttonComp, Messages.remove,
+				SWT.NONE);
+		removeButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				int[] selectedIndices = table.getSelectionIndices();
+				for (int i = 0; i < selectedIndices.length; i++) {
+					TableItem tableItem = table.getItem(selectedIndices[i]);
+					EObject type = (EObject) (tableItem.getData());
+					table.remove(selectedIndices[i]);
+					EcoreUtil.remove(type);
+					markDirty();
+				}
+			}
+		});
+		removeButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
+				false));
+	}
+
+	protected void createAddButton(FormToolkit toolkit, Composite buttonComp) {
+		addButton = toolkit.createButton(buttonComp, Messages.add, SWT.NONE);
+
+		addButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				Wizard wizard = getWizard();
+				if (wizard != null) {
+					WizardDialog dialog = new WizardDialog(Display.getCurrent()
+							.getActiveShell(), wizard);
+
+					dialog.open();
+
+					if (dialog.getReturnCode() == Dialog.OK) {
+						markDirty();
+					}
+				}
+			}
+		});
+
+		addButton
+				.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+	}
+
+	protected void createEditButton(FormToolkit toolkit, Composite buttonComp) {
+		editButton = toolkit.createButton(buttonComp, Messages.edit, SWT.NONE);
+
+		editButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				Object o = ((StructuredSelection) getTableViewer()
+						.getSelection()).getFirstElement();
+				if (o != null) {
+					Wizard wizard = getWizard();
+					if (wizard != null) {
+						if (wizard instanceof AbstractTableWizard) {
+							((AbstractTableWizard) wizard)
+									.setEObject((EObject) o);
+						}
+						WizardDialog dialog = new WizardDialog(Display
+								.getCurrent().getActiveShell(), wizard);
+						dialog.open();
+						if (dialog.getReturnCode() == Dialog.OK) {
+							markDirty();
+							// TODO notify listeners
+						}
+					}
+				}
+			}
+		});
+
+		editButton
+				.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+	}
+
+	public TableViewer getTableViewer() {
+		return tableViewer;
+	}
+
+	protected boolean isHeaderVisible() {
+		return true;
+	}
+
+	protected Table getTable() {
+		return table;
+	}
+
+	public String[] getTableColumnNames() {
+		return COLUMN_NAMES;
+	}
+
+	abstract public String getTitle();
+
+	abstract public String getDescription();
+
+	abstract public Wizard getWizard();
+
+	abstract public EReference getEReference();
+
+	abstract public EClass getTableEntryObjectType();
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AbstractTableSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java Fri Mar  3 17:30:38 2006
@@ -1,63 +1,63 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.sections;
-
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
-import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class AppGeneralSection extends CommonGeneralSection {
-
-	ApplicationType plan;
-
-	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#createClient()
-	 */
-	protected void createClient() {
-		super.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#getParentIdEAttribute()
-	 */
-	protected EAttribute getParentIdEAttribute() {
-		return ApplicationPackage.eINSTANCE.getApplicationType_ParentId();
-	}
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.sections;
+
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class AppGeneralSection extends CommonGeneralSection {
+
+	ApplicationType plan;
+
+	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#createClient()
+	 */
+	protected void createClient() {
+		super.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#getParentIdEAttribute()
+	 */
+	protected EAttribute getParentIdEAttribute() {
+		return ApplicationPackage.eINSTANCE.getApplicationType_ParentId();
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/AppGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BannerPart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java Fri Mar  3 17:30:38 2006
@@ -1,129 +1,129 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.sections;
-
-import org.apache.geronimo.ui.internal.Messages;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public abstract class CommonGeneralSection extends AbstractSectionPart {
-
-	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) {
-		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();
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.sections;
+
+import org.apache.geronimo.ui.internal.Messages;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.FormColors;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+public abstract class CommonGeneralSection extends AbstractSectionPart {
+
+	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) {
+		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();
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/CommonGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java Fri Mar  3 17:30:38 2006
@@ -1,58 +1,58 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.sections;
-
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
-import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class ConnectorGeneralSection extends CommonGeneralSection {
-
-	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();
-	}
-
-	/*
-	 * (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();
-	}
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.sections;
+
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class ConnectorGeneralSection extends CommonGeneralSection {
+
+	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();
+	}
+
+	/*
+	 * (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();
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ConnectorGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java?rev=382997&r1=382996&r2=382997&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java Fri Mar  3 17:30:38 2006
@@ -1,121 +1,121 @@
-/**
- * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.ui.sections;
-
-import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
-import org.apache.geronimo.ui.internal.Messages;
-import org.apache.geronimo.ui.wizards.DependencyWizard;
-import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-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;
-		createClient();
-	}
-
-	/*
-	 * (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#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#getTableEntryObjectType()
-	 */
-	public EClass getTableEntryObjectType() {
-		return DeploymentPackage.eINSTANCE.getDependencyType();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#filter(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	protected boolean filter(Viewer viewer, Object parentElement, Object element) {
-		if(super.filter(viewer, parentElement, element)) {
-			return ((EList) getPlan().eGet(getEReference())).contains(element);
-		}
-		return false;
-	}
-
-}
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.sections;
+
+import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.wizards.DependencyWizard;
+import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+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;
+		createClient();
+	}
+
+	/*
+	 * (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#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#getTableEntryObjectType()
+	 */
+	public EClass getTableEntryObjectType() {
+		return DeploymentPackage.eINSTANCE.getDependencyType();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#filter(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	protected boolean filter(Viewer viewer, Object parentElement, Object element) {
+		if(super.filter(viewer, parentElement, element)) {
+			return ((EList) getPlan().eGet(getEReference())).contains(element);
+		}
+		return false;
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message