You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/09/30 14:32:34 UTC
svn commit: r292715 - in
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui:
./ src/org/apache/geronimo/ui/editors/ src/org/apache/geronimo/ui/pages/
Author: sppatel
Date: Fri Sep 30 05:32:29 2005
New Revision: 292715
URL: http://svn.apache.org/viewcvs?rev=292715&view=rev
Log:
Refactor DPEditor to WebEditor
Added:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
Removed:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/DPEditor.java
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.properties
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.properties?rev=292715&r1=292714&r2=292715&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.properties (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.properties Fri Sep 30 05:32:29 2005
@@ -1,6 +1,6 @@
pluginName=Geronimo server UI support
providerName=Apache Software Foundation
-editorName=Geronimo Web Deployment Plan Editor
+webEditorName=Geronimo Web Deployment Plan Editor
PopupMenus.launchconsole=Launch Geronimo Console
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.xml?rev=292715&r1=292714&r2=292715&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/plugin.xml Fri Sep 30 05:32:29 2005
@@ -26,12 +26,12 @@
<extension point="org.eclipse.ui.editors">
<editor
- class="org.apache.geronimo.ui.editors.DPEditor"
+ class="org.apache.geronimo.ui.editors.WebEditor"
default="true"
filenames="geronimo-web.xml"
icon="icons/obj16/geronimo.gif"
- id="org.apache.geronimo.ui.editors.DPEditor"
- name="%editorName">
+ id="org.apache.geronimo.ui.editors.WebEditor"
+ name="%webEditorName">
</editor>
</extension>
Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java?rev=292715&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/editors/WebEditor.java Fri Sep 30 05:32:29 2005
@@ -0,0 +1,46 @@
+/**
+ * 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.editors;
+
+import org.apache.geronimo.core.internal.GeronimoUtils;
+import org.apache.geronimo.ui.internal.Messages;
+import org.apache.geronimo.ui.pages.NamingFormPage;
+import org.apache.geronimo.ui.pages.SecurityPage;
+import org.apache.geronimo.ui.pages.WebGeneralPage;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.ui.PartInitException;
+
+public class WebEditor extends AbstractGeronimoDeploymentPlanEditor {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
+ */
+ public void doAddPages() throws PartInitException {
+ addPage(new WebGeneralPage(this, "generalpage",
+ Messages.editorTabGeneral));
+ addPage(new NamingFormPage(this, "namingpage", Messages.editorTabNaming));
+ addPage(new SecurityPage(this, "securitypage",
+ Messages.editorTabSecurity));
+ }
+
+ public EObject loadDeploymentPlan(IFile file) {
+ return GeronimoUtils.getWebDeploymentPlan(file);
+ }
+
+}
\ No newline at end of file
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java?rev=292715&r1=292714&r2=292715&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/NamingFormPage.java Fri Sep 30 05:32:29 2005
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.ui.pages;
-import org.apache.geronimo.ui.editors.DPEditor;
+import org.apache.geronimo.ui.editors.WebEditor;
import org.apache.geronimo.ui.sections.EjbLocalRefSection;
import org.apache.geronimo.ui.sections.EjbRefSection;
import org.apache.geronimo.ui.sections.ResourceEnvRefSection;
@@ -63,7 +63,7 @@
private void fillBody(IManagedForm managedForm) {
- WebAppType plan = (WebAppType) ((DPEditor) getEditor()).getDeploymentPlan();
+ WebAppType plan = (WebAppType) ((WebEditor) getEditor()).getDeploymentPlan();
Composite body = managedForm.getForm().getBody();
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java?rev=292715&r1=292714&r2=292715&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/SecurityPage.java Fri Sep 30 05:32:29 2005
@@ -1,6 +1,6 @@
package org.apache.geronimo.ui.pages;
-import org.apache.geronimo.ui.editors.DPEditor;
+import org.apache.geronimo.ui.editors.WebEditor;
import org.apache.geronimo.ui.sections.SecuritySection;
import org.apache.geronimo.xml.ns.web.WebAppType;
import org.eclipse.swt.layout.GridLayout;
@@ -47,7 +47,7 @@
private void fillBody(IManagedForm managedForm) {
- WebAppType plan = (WebAppType) ((DPEditor) getEditor()).getDeploymentPlan();
+ WebAppType plan = (WebAppType) ((WebEditor) getEditor()).getDeploymentPlan();
Composite body = managedForm.getForm().getBody();
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java?rev=292715&r1=292714&r2=292715&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/pages/WebGeneralPage.java Fri Sep 30 05:32:29 2005
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.ui.pages;
-import org.apache.geronimo.ui.editors.DPEditor;
+import org.apache.geronimo.ui.editors.WebEditor;
import org.apache.geronimo.ui.sections.WebGeneralSection;
import org.apache.geronimo.xml.ns.web.WebAppType;
import org.eclipse.swt.layout.GridLayout;
@@ -43,7 +43,7 @@
*/
protected void createFormContent(IManagedForm managedForm) {
- WebAppType plan = (WebAppType) ((DPEditor) getEditor()).getDeploymentPlan();
+ WebAppType plan = (WebAppType) ((WebEditor) getEditor()).getDeploymentPlan();
ScrolledForm form = managedForm.getForm();
form.setText(getTitle());