geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r669175 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/
Date Wed, 18 Jun 2008 14:16:01 GMT
Author: mcconne
Date: Wed Jun 18 07:16:00 2008
New Revision: 669175

URL: http://svn.apache.org/viewvc?rev=669175&view=rev
Log:
GERONIMODEVTOOLS-386 Various fixes to GEP deployment plan editors -- Thanks to BJ Reed for this patch !!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java?rev=669175&r1=669174&r2=669175&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java Wed Jun 18 07:16:00 2008
@@ -25,223 +25,226 @@
  * @version $Rev$ $Date$
  */
 public class Messages extends NLS {
-	
-	public static String editorTabSource;
-	
-	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 editorSectionVMArgsTitle;
-	public static String editorSectionVMArgsDescription;
-	public static String editorSectionStartupTitle;
-	public static String editorSectionStartupDescription;
-	
-	public static String editorSectionTestEnvTitle;
-	public static String editorSectionTestEnvDescription;
-	public static String editorSectionRunFromWorkspace;
-	public static String editorSectionSharedLibrariesInPlace;
-	public static String editorSectionSelectClasspathContainers;
-	
-	public static String info;
-	public static String debug;
-	public static String httpPort;
-	public static String rmiPort;
-	public static String username;
-	public static String password;
-	public static String console;
-	public static String consoleTooltip;
-	public static String pingDelay;
-	public static String pingInterval;
-	public static String maxPings;
-	public static String pingDelayTooltip;
-	public static String pingIntervalTooltip;
-	public static String maxPingsTooltip;
-	
-	public static String newServerWizardTitle;
-	public static String newServerWizardDescription;
-	
-	public static String installedJRE;
-	public static String installedJREs;
-	public static String runtimeDefaultJRE;
-	public static String runtimeWizardTitle;	
-	public static String runtimeWizardDescription;
-	public static String browse;
-	public static String installDir;
-	public static String installDirInfo;
-	public static String noSuchDir;
-	public static String noImageFound;
-	public static String cannotInstallAtLocation;
-	public static String downloadOptions;
-	public static String chooseWebContainer;
-	public static String gWithTomcat;
-	public static String gWithJetty;
-	public static String install;
-	public static String jvmWarning;
-	public static String installTitle;
-	public static String installMessage;
-	public static String tooltipLoc;
-	public static String tooltipInstall;
-	public static String tooltipJetty;
-	public static String tooltipTomcat;
-	
-	public static String sourceLocWizTitle;
-	public static String sourceLocWizDescription;
-	public static String sourceZipFile;
-	public static String browseSrcDialog;
-	
-	public static String hostName;
-	public static String adminId;
-	public static String adminPassword;
-	public static String specifyPorts;
-	public static String portName;
-	public static String portValue;
+    
+    public static String editorTabSource;
+    
+    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 editorSectionVMArgsTitle;
+    public static String editorSectionVMArgsDescription;
+    public static String editorSectionStartupTitle;
+    public static String editorSectionStartupDescription;
+    
+    public static String editorSectionTestEnvTitle;
+    public static String editorSectionTestEnvDescription;
+    public static String editorSectionRunFromWorkspace;
+    public static String editorSectionSharedLibrariesInPlace;
+    public static String editorSectionSelectClasspathContainers;
+    
+    public static String info;
+    public static String debug;
+    public static String httpPort;
+    public static String rmiPort;
+    public static String username;
+    public static String password;
+    public static String console;
+    public static String consoleTooltip;
+    public static String pingDelay;
+    public static String pingInterval;
+    public static String maxPings;
+    public static String pingDelayTooltip;
+    public static String pingIntervalTooltip;
+    public static String maxPingsTooltip;
+    
+    public static String newServerWizardTitle;
+    public static String newServerWizardDescription;
+    
+    public static String installedJRE;
+    public static String installedJREs;
+    public static String runtimeDefaultJRE;
+    public static String runtimeWizardTitle;    
+    public static String runtimeWizardDescription;
+    public static String browse;
+    public static String installDir;
+    public static String installDirInfo;
+    public static String noSuchDir;
+    public static String noImageFound;
+    public static String cannotInstallAtLocation;
+    public static String downloadOptions;
+    public static String chooseWebContainer;
+    public static String gWithTomcat;
+    public static String gWithJetty;
+    public static String install;
+    public static String jvmWarning;
+    public static String installTitle;
+    public static String installMessage;
+    public static String tooltipLoc;
+    public static String tooltipInstall;
+    public static String tooltipJetty;
+    public static String tooltipTomcat;
+    
+    public static String sourceLocWizTitle;
+    public static String sourceLocWizDescription;
+    public static String sourceZipFile;
+    public static String browseSrcDialog;
+    
+    public static String hostName;
+    public static String adminId;
+    public static String adminPassword;
+    public static String specifyPorts;
+    public static String portName;
+    public static String portValue;
 
-	static {
-		NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
-	}
-	
-	public static String appGeneralPageTitle;
-        public static String appClientGeneralPageTitle;
-	public static String connectorOverViewPageTitle;
-	public static String deploymentPageTitle;
-	public static String namingFormPageTitle;
-	public static String securityPageTitle;
-	public static String webGeneralPageTitle;
-	public static String editorTabGeneral;
-	public static String editorTabNaming;
-	public static String editorTabSecurity;
-	public static String editorTabDeployment;
-	public static String errorCouldNotOpenFile;
-	public static String editorTitle;
-	public static String editorSectionGeneralTitle;
-	public static String editorSectionGeneralDescription;
-	public static String editorContextRoot;
-	public static String editorApplicationName;
-	public static String editorCallbackHandler;
-	public static String editorRealmName;
-        public static String editorSectionServerTitle;
-        public static String editorSectionServerDescription;
-        public static String editorSectionClientTitle;
-        public static String editorSectionClientDescription;
-	//
-	public static String editorSectionSecurityRolesTitle;
-	public static String editorSectionSecurityRolesDescription;
-	public static String name;
-	public static String description;
-	//
-	public static String editorSectionDependenciesTitle;
-	public static String editorSectionDependenciesDescription;
-	public static String editorSectionClientDependenciesTitle;
-	public static String editorSectionClientDependenciesDescription;
-	public static String editorSectionServerDependenciesTitle;
-	public static String editorSectionServerDependenciesDescription;
-	//
-	public static String editorSectionImportTitle;
-	public static String editorSectionImportDescription;
-	//
-	public static String editorSectionGBeanTitle;
-	public static String editorSectionGBeanDescription;
-	public static String className;
-	public static String GbeanName;
-	//
-	public static String editorResourceRefDescription;
-	public static String editorResourceRefTitle;
-	public static String editorResRefTargetNameTitle;
-	public static String editorResRefLinkTitle;
-	public static String editorResRefNameTitle;
-	//
-	public static String editorGBeanRefTitle;
-	public static String editorGBeanRefDescription;
-	public static String editorGBeanRefName;
-	public static String editorGBeanRefType;
-	public static String editorGBeanRefTargetName;
-	public static String editorGBeanRefProxyType;
-	//
-	public static String editorServiceRefDescription;
-	public static String editorServiceRefTitle;
-	public static String editorServiceRefName;
-	//
-	public static String editorResourceEnvRefDescription;
-	public static String editorResourceEnvRefTitle;
-	public static String editorResEnvRefMsgDestTitle;
-	public static String editorResEnvRefNameTitle;
-	//
-	public static String editorEjbLocalRefDescription;
-	public static String editorEjbLocalRefTitle;
-	public static String editorEjbRefTargetName;
-	public static String editorEjbRefEjbLink;
-	//
-	public static String editorEjbRefDescription;
-	public static String editorEjbRefTitle;
-	// Buttons
-	public static String add;
-	public static String remove;
-	public static String edit;
-	// Wizard/Wizard Pages
-	public static String wizardNewTitle_ResRef;
-	public static String wizardEditTitle_ResRef;
-	public static String wizardPageTitle_ResRef;
-	public static String wizardPageDescription_ResRef;
-	//
-	public static String wizardNewTitle_GBeanRef;
-	public static String wizardEditTitle_GBeanRef;
-	public static String wizardPageTitle_GBeanRef;
-	public static String wizardPageDescription_GBeanRef;
-	//
-	public static String wizardNewTitle_ServiceRef;
-	public static String wizardEditTitle_ServiceRef;
-	public static String wizardPageTitle_ServiceRef;
-	public static String wizardPageDescription_ServiceRef;
-	//
-	public static String wizardNewTitle_ResEnvRef;
-	public static String wizardEditTitle_ResEnvRef;
-	public static String wizardPageTitle_ResEnvRef;
-	public static String wizardPageDescription_ResEnvRef;
-	//
-	public static String wizardNewTitle_EjbRef;
-	public static String wizardEditTitle_EjbRef;
-	public static String wizardPageTitle_EjbRef;
-	public static String wizardPageDescription_EjbRef;
-	//
-	public static String wizardNewTitle_EjbLocalRef;
-	public static String wizardEditTitle_EjbLocalRef;
-	public static String wizardPageTitle_EjbLocalRef;
-	public static String wizardPageDescription_EjbLocalRef;
-	//
-	public static String wizardNewTitle_Dependency;
-	public static String wizardEditTitle_Dependency;
-	public static String wizardPageTitle_Dependency;
-	public static String wizardPageDescription_Dependency;
-	public static String dependencyGroupLabel;
+    static {
+        NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
+    }
+    
+    public static String appGeneralPageTitle;
+    public static String appClientGeneralPageTitle;
+    public static String connectorOverViewPageTitle;
+    public static String deploymentPageTitle;
+    public static String namingFormPageTitle;
+    public static String securityPageTitle;
+    public static String webGeneralPageTitle;
+    public static String editorTabGeneral;
+    public static String editorTabNaming;
+    public static String editorTabSecurity;
+    public static String editorTabDeployment;
+    public static String errorCouldNotOpenFile;
+    public static String editorTitle;
+    public static String editorSectionGeneralTitle;
+    public static String editorSectionGeneralDescription;
+    public static String editorContextRoot;
+    public static String editorApplicationName;
+    public static String editorCallbackHandler;
+    public static String editorRealmName;
+    public static String editorejbqlCompilerFactory;
+    public static String editordbSyntaxFactory;
+	public static String enforceForeignKeyConstraints;
+    public static String editorSectionServerTitle;
+    public static String editorSectionServerDescription;
+    public static String editorSectionClientTitle;
+    public static String editorSectionClientDescription;
+    //
+    public static String editorSectionSecurityRolesTitle;
+    public static String editorSectionSecurityRolesDescription;
+    public static String name;
+    public static String description;
+    //
+    public static String editorSectionDependenciesTitle;
+    public static String editorSectionDependenciesDescription;
+    public static String editorSectionClientDependenciesTitle;
+    public static String editorSectionClientDependenciesDescription;
+    public static String editorSectionServerDependenciesTitle;
+    public static String editorSectionServerDependenciesDescription;
+    //
+    public static String editorSectionImportTitle;
+    public static String editorSectionImportDescription;
+    //
+    public static String editorSectionGBeanTitle;
+    public static String editorSectionGBeanDescription;
+    public static String className;
+    public static String GbeanName;
+    //
+    public static String editorResourceRefDescription;
+    public static String editorResourceRefTitle;
+    public static String editorResRefTargetNameTitle;
+    public static String editorResRefLinkTitle;
+    public static String editorResRefNameTitle;
+    //
+    public static String editorGBeanRefTitle;
+    public static String editorGBeanRefDescription;
+    public static String editorGBeanRefName;
+    public static String editorGBeanRefType;
+    public static String editorGBeanRefTargetName;
+    public static String editorGBeanRefProxyType;
+    //
+    public static String editorServiceRefDescription;
+    public static String editorServiceRefTitle;
+    public static String editorServiceRefName;
+    //
+    public static String editorResourceEnvRefDescription;
+    public static String editorResourceEnvRefTitle;
+    public static String editorResEnvRefMsgDestTitle;
+    public static String editorResEnvRefNameTitle;
+    //
+    public static String editorEjbLocalRefDescription;
+    public static String editorEjbLocalRefTitle;
+    public static String editorEjbRefTargetName;
+    public static String editorEjbRefEjbLink;
+    //
+    public static String editorEjbRefDescription;
+    public static String editorEjbRefTitle;
+    // Buttons
+    public static String add;
+    public static String remove;
+    public static String edit;
+    // Wizard/Wizard Pages
+    public static String wizardNewTitle_ResRef;
+    public static String wizardEditTitle_ResRef;
+    public static String wizardPageTitle_ResRef;
+    public static String wizardPageDescription_ResRef;
+    //
+    public static String wizardNewTitle_GBeanRef;
+    public static String wizardEditTitle_GBeanRef;
+    public static String wizardPageTitle_GBeanRef;
+    public static String wizardPageDescription_GBeanRef;
+    //
+    public static String wizardNewTitle_ServiceRef;
+    public static String wizardEditTitle_ServiceRef;
+    public static String wizardPageTitle_ServiceRef;
+    public static String wizardPageDescription_ServiceRef;
+    //
+    public static String wizardNewTitle_ResEnvRef;
+    public static String wizardEditTitle_ResEnvRef;
+    public static String wizardPageTitle_ResEnvRef;
+    public static String wizardPageDescription_ResEnvRef;
+    //
+    public static String wizardNewTitle_EjbRef;
+    public static String wizardEditTitle_EjbRef;
+    public static String wizardPageTitle_EjbRef;
+    public static String wizardPageDescription_EjbRef;
+    //
+    public static String wizardNewTitle_EjbLocalRef;
+    public static String wizardEditTitle_EjbLocalRef;
+    public static String wizardPageTitle_EjbLocalRef;
+    public static String wizardPageDescription_EjbLocalRef;
+    //
+    public static String wizardNewTitle_Dependency;
+    public static String wizardEditTitle_Dependency;
+    public static String wizardPageTitle_Dependency;
+    public static String wizardPageDescription_Dependency;
+    public static String dependencyGroupLabel;
 
-	public static String groupId;
-	public static String artifactId;
-	public static String version;
-	public static String type;
-	//
-	public static String wizardNewTitle_Import;
-	public static String wizardEditTitle_Import;
-	public static String wizardPageTitle_Import;
-	public static String wizardPageDescription_Import;
-	//
-	public static String wizardNewTitle_GBean;
-	public static String wizardEditTitle_GBean;
-	public static String wizardPageTitle_GBean;
-	public static String wizardPageDescription_GBean;
-	//
-	public static String wizardNewTitle_SecurityRole;
-	public static String wizardEditTitle_SecurityRole;
-	public static String wizardPageTitle_SecurityRole;
-	public static String wizardPageDescription_SecurityRole;
-	//
-	public static String doasCurrentCaller;
-	public static String useContextHandler;
-	public static String defaultRole;
-	
-	public static String editorCorrect;
-	public static String editorDefault;
-	public static String errorOpenDialog;
+    public static String groupId;
+    public static String artifactId;
+    public static String version;
+    public static String type;
+    //
+    public static String wizardNewTitle_Import;
+    public static String wizardEditTitle_Import;
+    public static String wizardPageTitle_Import;
+    public static String wizardPageDescription_Import;
+    //
+    public static String wizardNewTitle_GBean;
+    public static String wizardEditTitle_GBean;
+    public static String wizardPageTitle_GBean;
+    public static String wizardPageDescription_GBean;
+    //
+    public static String wizardNewTitle_SecurityRole;
+    public static String wizardEditTitle_SecurityRole;
+    public static String wizardPageTitle_SecurityRole;
+    public static String wizardPageDescription_SecurityRole;
+    //
+    public static String doasCurrentCaller;
+    public static String useContextHandler;
+    public static String defaultRole;
+    
+    public static String editorCorrect;
+    public static String editorDefault;
+    public static String errorOpenDialog;
 }
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties?rev=669175&r1=669174&r2=669175&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties Wed Jun 18 07:16:00 2008
@@ -85,6 +85,9 @@
 editorCallbackHandler=Callback Handler:
 editorRealmName=Realm Name:
 editorApplicationName=Application Name:
+editorejbqlCompilerFactory=EJB QL Compiler Factory:
+editordbSyntaxFactory=DB Syntax Factory:
+enforceForeignKeyConstraints=Enforce Foreign Key Constraints
 
 editorResourceRefTitle=Resource References
 editorResourceRefDescription=The following resource references are defined:

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java?rev=669175&r1=669174&r2=669175&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java Wed Jun 18 07:16:00 2008
@@ -1,43 +1,99 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.st.v21.ui.sections;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.geronimo.jee.openejb.OpenejbJar;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class OpenEjbJarGeneralSection extends CommonGeneralSection {
-
-	OpenejbJar plan;
-
-	public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
-		super(parent, toolkit, style, plan);
-		this.plan = (OpenejbJar) plan.getValue();
-		createClient();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.st.v21.ui.sections.CommonGeneralSection#getEnvironmentEReference()
-	 */
-	protected JAXBElement getEnvironmentEReference() {
-		return null; //JarPackage.eINSTANCE.getOpenejbJarType_Environment();
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.st.v21.ui.sections;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.jee.openejb.OpenejbJar;
+import org.apache.geronimo.jee.openejb.ObjectFactory;
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class OpenEjbJarGeneralSection extends CommonGeneralSection {
+
+    protected Text ejbqlCompilerFactory;
+
+    protected Text dbSyntaxFactory;
+
+    protected Button enforceForeignKeyConstraints;
+    
+    OpenejbJar plan;
+
+    public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+        super(parent, toolkit, style, plan);
+        this.plan = (OpenejbJar) plan.getValue();
+        createClient();
+    }
+
+    protected void createClient() {
+        super.createClient();
+        Composite composite = (Composite) getSection().getClient();
+
+        createLabel(composite, CommonMessages.editorejbqlCompilerFactory);
+
+        ejbqlCompilerFactory = toolkit.createText(composite, plan.getEjbQlCompilerFactory(), SWT.BORDER);
+        ejbqlCompilerFactory.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        ejbqlCompilerFactory.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                plan.setEjbQlCompilerFactory(ejbqlCompilerFactory.getText());
+                markDirty();
+            }
+        });
+
+        createLabel(composite, CommonMessages.editordbSyntaxFactory);
+
+        dbSyntaxFactory = toolkit.createText(composite, plan.getDbSyntaxFactory(), SWT.BORDER);
+        dbSyntaxFactory.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        dbSyntaxFactory.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                plan.setDbSyntaxFactory(dbSyntaxFactory.getText());
+                markDirty();
+            }
+        });
+
+        enforceForeignKeyConstraints = toolkit.createButton(composite, CommonMessages.enforceForeignKeyConstraints, SWT.CHECK);
+        enforceForeignKeyConstraints.setSelection(plan.getEnforceForeignKeyConstraints() != null);
+        GridData data = new GridData();
+        data.horizontalSpan = 2;
+        enforceForeignKeyConstraints.setLayoutData(data);
+
+        enforceForeignKeyConstraints.addSelectionListener(new SelectionListener() {
+            public void widgetDefaultSelected(SelectionEvent e) {
+            }
+
+            public void widgetSelected(SelectionEvent e) {
+            	if (enforceForeignKeyConstraints.getSelection()) {
+            		ObjectFactory objFactory = new ObjectFactory();
+            		plan.setEnforceForeignKeyConstraints(objFactory.createEmpty());
+            	}
+            	else {
+            		plan.setEnforceForeignKeyConstraints(null);
+            	}
+                markDirty();
+            }
+        });
+    }
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java?rev=669175&r1=669174&r2=669175&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java Wed Jun 18 07:16:00 2008
@@ -1,286 +1,256 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.st.v21.ui.sections;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.geronimo.jee.web.WebApp;
-import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-import org.apache.geronimo.st.v21.ui.internal.Messages;
-import org.apache.geronimo.jee.deployment.Pattern;
-import org.apache.geronimo.jee.naming.GbeanLocator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-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.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.IFormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class WebContainerSection extends AbstractSectionPart {
-
-	protected Text gBeanLink;
-
-	protected Text artifact;
-
-	protected Text group;
-
-	protected Text module;
-
-	protected Text name;
-
-	protected Text version;
-
-	protected Button specifyAsLink;
-
-	protected Button specifyAsPattern;
-
-	WebApp plan;
-
-	/**
-	 * @param parent
-	 * @param toolkit
-	 * @param style
-	 * @param plan
-	 */
-	public WebContainerSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
-		super(parent, toolkit, style, plan);
-		this.plan = (WebApp) plan.getValue();
-		createClient();
-	}
-
-	protected void createClient() {
-		Section section = getSection();
-
-		section.setText(Messages.webContainerSection);
-		section.setDescription(Messages.webContainerSectionDescription);
-		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);
-
-		specifyAsLink = toolkit.createButton(composite, Messages.useGBeanLink, SWT.RADIO);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		specifyAsLink.setLayoutData(data);
-
-		GbeanLocator wc = plan.getWebContainer();
-
-		createLabel(composite, Messages.gBeanLink);
-		String value = wc != null ? wc.getGbeanLink() : null;
-		gBeanLink = toolkit.createText(composite, value, SWT.BORDER);
-		gBeanLink.setLayoutData(createTextFieldGridData());
-		gBeanLink.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				getGBeanLocator().setGbeanLink(gBeanLink.getText());
-				markDirty();
-			}
-		});
-
-		specifyAsPattern = toolkit.createButton(composite, Messages.useGBeanPattern, SWT.RADIO);
-		specifyAsPattern.setLayoutData(data);
-
-		createLabel(composite, Messages.groupId);
-		value = wc != null && wc.getPattern() != null ? wc.getPattern().getGroupId()
-				: null;
-		group = toolkit.createText(composite, value, SWT.BORDER);
-		group.setLayoutData(createTextFieldGridData());
-		group.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-//				setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_GroupId(), group.getText());
-				markDirty();
-			}
-		});
-
-		createLabel(composite, Messages.artifactId);
-		value = wc != null && wc.getPattern() != null ? wc.getPattern().getArtifactId()
-				: null;
-		artifact = toolkit.createText(composite, value, SWT.BORDER);
-		artifact.setLayoutData(createTextFieldGridData());
-		artifact.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-//				setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_ArtifactId(), artifact.getText());
-				markDirty();
-			}
-		});
-
-		createLabel(composite, Messages.moduleId);
-		value = wc != null && wc.getPattern() != null ? wc.getPattern().getModule()
-				: null;
-		module = toolkit.createText(composite, value, SWT.BORDER);
-		module.setLayoutData(createTextFieldGridData());
-		module.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-//				setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Module(), module.getText());
-				markDirty();
-			}
-		});
-
-		createLabel(composite, Messages.name);
-		value = wc != null && wc.getPattern() != null ? wc.getPattern().getName()
-				: null;
-		name = toolkit.createText(composite, value, SWT.BORDER);
-		name.setLayoutData(createTextFieldGridData());
-		name.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-//				setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Name(), name.getText());
-				markDirty();
-			}
-		});
-
-		createLabel(composite, Messages.version);
-		value = wc != null && wc.getPattern() != null ? wc.getPattern().getVersion()
-				: null;
-		version = toolkit.createText(composite, value, SWT.BORDER);
-		version.setLayoutData(createTextFieldGridData());
-		version.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-//				setPatternTypeAttribute(NamingPackage.eINSTANCE.getPatternType_Version(), version.getText());
-				markDirty();
-			}
-		});
-
-		specifyAsLink.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (specifyAsLink.getSelection()) {
-//					if (plan.getWebContainer() != null
-//							&& plan.getWebContainer().eIsSet(NamingPackage.eINSTANCE.getGbeanLocatorType_Pattern())) {
-//						plan.getWebContainer().eUnset(NamingPackage.eINSTANCE.getGbeanLocatorType_Pattern());
-//						markDirty();
-//					}
-					if (gBeanLink.getText().length() > 0) {
-						plan.getWebContainer().setGbeanLink(gBeanLink.getText());
-						markDirty();
-					}
-					toggle();
-				}
-			}
-		});
- 
-		specifyAsPattern.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (specifyAsPattern.getSelection()) {
-//					if (plan.getWebContainer() != null
-//							&& plan.getWebContainer().eIsSet(NamingPackage.eINSTANCE.getGbeanLocatorType_GbeanLink())) {
-//						plan.getWebContainer().eUnset(NamingPackage.eINSTANCE.getGbeanLocatorType_GbeanLink());
-//						markDirty();
-//					}
-					if (group.getText().length() > 0) {
-						getPattern().setGroupId(group.getText());
-						markDirty();
-					}
-					if (artifact.getText().length() > 0) {
-						getPattern().setArtifactId(artifact.getText());
-						markDirty();
-					}
-					if (module.getText().length() > 0) {
-						getPattern().setModule(module.getText());
-						markDirty();
-					}
-					if (name.getText().length() > 0) {
-//						getPatternType().setName(name.getText());
-//						markDirty();
-					}
-					if (version.getText().length() > 0) {
-						getPattern().setVersion(version.getText());
-						markDirty();
-					}
-					toggle();
-				}
-			}
-		});
-
-		if (wc != null) {
-			if (wc.getGbeanLink() != null) {
-				specifyAsLink.setSelection(true);
-			} else if (wc.getPattern() != null) {
-				specifyAsPattern.setSelection(true);
-			}
-		}
-	}
-
-	public void toggle() {
-		gBeanLink.setEnabled(specifyAsLink.getSelection());
-		artifact.setEnabled(specifyAsPattern.getSelection());
-		group.setEnabled(specifyAsPattern.getSelection());
-		module.setEnabled(specifyAsPattern.getSelection());
-		name.setEnabled(specifyAsPattern.getSelection());
-		version.setEnabled(specifyAsPattern.getSelection());
-	}
-
-	/**
-	 * @return
-	 */
-	private GbeanLocator getGBeanLocator() {
-		GbeanLocator wc = plan.getWebContainer();
-		if (wc == null) {
-//			wc = NamingFactory.eINSTANCE.createGbeanLocatorType();
-			plan.setWebContainer(wc);
-		}
-		return wc;
-	}
-
-	/**
-	 * @return
-	 */
-	private Pattern getPattern() {
-		GbeanLocator locator = getGBeanLocator();
-//		PatternType pattern = locator.getPattern();
-//		if (pattern == null) {
-//			pattern = NamingFactory.eINSTANCE.createPatternType();
-//			locator.setPattern(pattern);
-//		}
-		return null;//pattern;
-	}
-
-//	/**
-//	 * @param feature
-//	 * @param value
-//	 */
-//	private void setPatternTypeAttribute(EStructuralFeature feature, String value) {
-//		getPatternType().eSet(feature, value);
-//	}
-
-	protected Label createLabel(Composite parent, String text) {
-		Label label = toolkit.createLabel(parent, text);
-		label.setForeground(toolkit.getColors().getColor(IFormColors.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;
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.st.v21.ui.sections;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.jee.naming.GbeanLocator;
+import org.apache.geronimo.jee.naming.ObjectFactory;
+import org.apache.geronimo.jee.naming.Pattern;
+import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
+import org.apache.geronimo.st.v21.ui.internal.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+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.Text;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+public class WebContainerSection extends AbstractSectionPart {
+
+    protected Text gBeanLink;
+
+    protected Text artifact;
+
+    protected Text group;
+
+    protected Text module;
+
+    protected Text name;
+
+    protected Text version;
+
+    protected Button specifyAsLink;
+
+    protected Button specifyAsPattern;
+
+    WebApp plan;
+    
+    private ObjectFactory namingFactory;
+
+    /**
+     * @param parent
+     * @param toolkit
+     * @param style
+     * @param plan
+     */
+    public WebContainerSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+        super(parent, toolkit, style, plan);
+        this.plan = (WebApp) plan.getValue();
+        namingFactory = new ObjectFactory();
+        createClient();
+    }
+
+    protected void createClient() {
+        Section section = getSection();
+
+        section.setText(Messages.webContainerSection);
+        section.setDescription(Messages.webContainerSectionDescription);
+        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);
+
+        specifyAsLink = toolkit.createButton(composite, Messages.useGBeanLink, SWT.RADIO);
+        GridData data = new GridData();
+        data.horizontalSpan = 2;
+        specifyAsLink.setLayoutData(data);
+
+        GbeanLocator wc = plan.getWebContainer();
+
+        toolkit.createLabel(composite, Messages.gBeanLink);
+        String value = wc != null ? wc.getGbeanLink() : null;
+        gBeanLink = toolkit.createText(composite, value, SWT.BORDER);
+        gBeanLink.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        gBeanLink.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                getGBeanLocator().setGbeanLink(gBeanLink.getText());
+                markDirty();
+            }
+        });
+
+        specifyAsPattern = toolkit.createButton(composite, Messages.useGBeanPattern, SWT.RADIO);
+        specifyAsPattern.setLayoutData(data);
+
+        toolkit.createLabel(composite, Messages.groupId);
+        value = wc != null && wc.getPattern() != null ? wc.getPattern().getGroupId()
+                : null;
+        group = toolkit.createText(composite, value, SWT.BORDER);
+        group.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        group.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                getPattern().setGroupId(group.getText());
+                markDirty();
+            }
+        });
+
+        toolkit.createLabel(composite, Messages.artifactId);
+        value = wc != null && wc.getPattern() != null ? wc.getPattern().getArtifactId()
+                : null;
+        artifact = toolkit.createText(composite, value, SWT.BORDER);
+        artifact.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        artifact.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                getPattern().setArtifactId(artifact.getText());
+                markDirty();
+            }
+        });
+
+        toolkit.createLabel(composite, Messages.moduleId);
+        value = wc != null && wc.getPattern() != null ? wc.getPattern().getModule()
+                : null;
+        module = toolkit.createText(composite, value, SWT.BORDER);
+        module.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        module.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                getPattern().setModule(module.getText());
+                markDirty();
+            }
+        });
+
+        toolkit.createLabel(composite, Messages.name);
+        value = wc != null && wc.getPattern() != null ? wc.getPattern().getName()
+                : null;
+        name = toolkit.createText(composite, value, SWT.BORDER);
+        name.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        name.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                getPattern().setName(name.getText());
+                markDirty();
+            }
+        });
+
+        toolkit.createLabel(composite, Messages.version);
+        value = wc != null && wc.getPattern() != null ? wc.getPattern().getVersion()
+                : null;
+        version = toolkit.createText(composite, value, SWT.BORDER);
+        version.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        version.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                getPattern().setVersion(version.getText());
+                markDirty();
+            }
+        });
+
+        specifyAsLink.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                if (specifyAsLink.getSelection()) {
+                    getGBeanLocator().setPattern(null);
+                    if (gBeanLink.getText().length() > 0) {
+                        plan.getWebContainer().setGbeanLink(gBeanLink.getText());
+                    }
+                    markDirty();
+                    toggle();
+                }
+            }
+        });
+ 
+        specifyAsPattern.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                if (specifyAsPattern.getSelection()) {
+                	plan.getWebContainer().setGbeanLink (null);
+                    if (group.getText().length() > 0) {
+                        getPattern().setGroupId(group.getText());
+                    }
+                    if (artifact.getText().length() > 0) {
+                        getPattern().setArtifactId(artifact.getText());
+                    }
+                    if (module.getText().length() > 0) {
+                        getPattern().setModule(module.getText());
+                    }
+                    if (name.getText().length() > 0) {
+                        getPattern().setName(name.getText());
+                    }
+                    if (version.getText().length() > 0) {
+                        getPattern().setVersion(version.getText());
+                    }
+                    markDirty();
+                    toggle();
+                }
+            }
+        });
+
+        if (wc != null) {
+            if (wc.getGbeanLink() != null) {
+                specifyAsLink.setSelection(true);
+            } else if (wc.getPattern() != null) {
+                specifyAsPattern.setSelection(true);
+            }
+        }
+
+        toggle();
+    }
+
+    public void toggle() {
+        gBeanLink.setEnabled(specifyAsLink.getSelection());
+        artifact.setEnabled(specifyAsPattern.getSelection());
+        group.setEnabled(specifyAsPattern.getSelection());
+        module.setEnabled(specifyAsPattern.getSelection());
+        name.setEnabled(specifyAsPattern.getSelection());
+        version.setEnabled(specifyAsPattern.getSelection());
+    }
+
+    /**
+     * @return
+     */
+    private GbeanLocator getGBeanLocator() {
+        GbeanLocator wc = plan.getWebContainer();
+        if (wc == null) {
+            wc = namingFactory.createGbeanLocator();
+            plan.setWebContainer(wc);
+        }
+        return wc;
+    }
+
+    /**
+     * @return
+     */
+    private Pattern getPattern() {
+        GbeanLocator locator = getGBeanLocator();
+        Pattern pattern = locator.getPattern();
+        if (pattern == null) {
+            pattern = namingFactory.createPattern();
+            locator.setPattern(pattern);
+        }
+        return pattern;
+    }
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java?rev=669175&r1=669174&r2=669175&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java Wed Jun 18 07:16:00 2008
@@ -1,67 +1,58 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.st.v21.ui.sections;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.geronimo.jee.web.WebApp;
-import org.apache.geronimo.st.ui.CommonMessages;
-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.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class WebGeneralSection extends CommonGeneralSection {
-
-	protected Text contextRoot;
-
-	WebApp plan;
-
-	public WebGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
-		super(parent, toolkit, style, plan);
-		this.plan = (WebApp) plan.getValue();
-		createClient();
-	}
-
-	protected void createClient() {
-		super.createClient();
-		Composite composite = (Composite) getSection().getClient();
-
-		createLabel(composite, CommonMessages.editorContextRoot);
-
-		contextRoot = toolkit.createText(composite, plan.getContextRoot(), SWT.BORDER);
-		contextRoot.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		contextRoot.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				plan.setContextRoot(contextRoot.getText());
-				markDirty();
-			}
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.st.v21.ui.sections.CommonGeneralSection#getEnvironmentEReference()
-	 */
-	protected JAXBElement getEnvironmentEReference() {
-		return null; //WebPackage.eINSTANCE.getWebAppType_Environment();
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.st.v21.ui.sections;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.st.ui.CommonMessages;
+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.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class WebGeneralSection extends CommonGeneralSection {
+
+	protected Text contextRoot;
+
+	WebApp plan;
+
+	public WebGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+		super(parent, toolkit, style, plan);
+		this.plan = (WebApp) plan.getValue();
+		createClient();
+	}
+
+	protected void createClient() {
+		super.createClient();
+		Composite composite = (Composite) getSection().getClient();
+
+		createLabel(composite, CommonMessages.editorContextRoot);
+
+		contextRoot = toolkit.createText(composite, plan.getContextRoot(), SWT.BORDER);
+		contextRoot.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+		contextRoot.addModifyListener(new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				plan.setContextRoot(contextRoot.getText());
+				markDirty();
+			}
+		});
+	}
+}



Mime
View raw message