You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/09/13 16:40:09 UTC
svn commit: r996559 [3/4] - in
/geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/
org.apache.geronimo.runtime.common/
org.apache.geronimo.runtime.common/META-INF/
org.apache.geronimo.st.ui/src/main/java/or...
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferenceListPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferenceListPage.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferenceListPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferenceListPage.java Mon Sep 13 14:40:05 2010
@@ -0,0 +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.v30.ui.pages.blueprint;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintDescriptionSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintGeneralSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.TypeConverterSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public class ReferenceListPage extends AbstractBlueprintFormPage {
+
+ public ReferenceListPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ @Override
+ protected void triggerGeronimoServerInfoUpdate() {
+ //do nothing
+ }
+
+ @Override
+ protected void fillBody(IManagedForm managedForm) {
+ JAXBElement blueprint = getRootElement();
+ if (blueprint!=null && Tblueprint.class.isInstance(blueprint.getValue()))
+ managedForm.addPart(new BlueprintGeneralSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new BlueprintDescriptionSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new TypeConverterSection(body, toolkit, getStyle(),blueprint));
+
+ }
+
+ public String getFormTitle() {
+ return CommonMessages.blueprintGeneralPageTitle;
+ }
+
+
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferencePage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferencePage.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferencePage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/ReferencePage.java Mon Sep 13 14:40:05 2010
@@ -0,0 +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.v30.ui.pages.blueprint;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintDescriptionSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintGeneralSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.TypeConverterSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public class ReferencePage extends AbstractBlueprintFormPage {
+
+ public ReferencePage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ @Override
+ protected void triggerGeronimoServerInfoUpdate() {
+ //do nothing
+ }
+
+ @Override
+ protected void fillBody(IManagedForm managedForm) {
+ JAXBElement blueprint = getRootElement();
+ if (blueprint!=null && Tblueprint.class.isInstance(blueprint.getValue()))
+ managedForm.addPart(new BlueprintGeneralSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new BlueprintDescriptionSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new TypeConverterSection(body, toolkit, getStyle(),blueprint));
+
+ }
+
+ public String getFormTitle() {
+ return CommonMessages.blueprintGeneralPageTitle;
+ }
+
+
+}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.java Mon Sep 13 14:40:05 2010
@@ -73,6 +73,8 @@ public abstract class AbstractListSectio
protected Button removeButton;
protected List objectContainer;
+
+ protected boolean isEditing;
public AbstractListSection(Section section) {
super(section);
@@ -218,6 +220,7 @@ public abstract class AbstractListSectio
editButton = toolkit.createButton(buttonComp, CommonMessages.edit, SWT.NONE);
editButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
+ isEditing = true;
Object selectedObject = ((StructuredSelection) getViewer().getSelection()).getFirstElement();
if (selectedObject != null) {
Wizard wizard = getWizard();
@@ -234,12 +237,17 @@ public abstract class AbstractListSectio
}
}
}
+ isEditing = false;
activateButtons();
}
});
editButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
}
+ public boolean isEditing(){
+ return isEditing;
+ }
+
/**
* Implemented by subclass if need to notify other component to refresh
*/
@@ -287,7 +295,7 @@ public abstract class AbstractListSectio
}
public Object getInput() {
- return getPlan();
+ return getRootElement();
}
public class ContentProvider implements IStructuredContentProvider, ITreeContentProvider {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractSectionPart.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractSectionPart.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractSectionPart.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractSectionPart.java Mon Sep 13 14:40:05 2010
@@ -35,7 +35,7 @@ public abstract class AbstractSectionPar
protected FormToolkit toolkit;
- private JAXBElement plan;
+ private JAXBElement root;
private AbstractDeploymentDescriptor descriptor;
@@ -43,17 +43,17 @@ public abstract class AbstractSectionPar
super(section);
}
- public AbstractSectionPart(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+ public AbstractSectionPart(Composite parent, FormToolkit toolkit, int style, JAXBElement rootElement) {
super(parent, toolkit, style);
this.toolkit = toolkit;
- this.plan = plan;
+ this.root = rootElement;
}
- public AbstractSectionPart(Composite parent, FormToolkit toolkit, int style, JAXBElement plan,
+ public AbstractSectionPart(Composite parent, FormToolkit toolkit, int style, JAXBElement rootElement,
AbstractDeploymentDescriptor descriptor) {
super(parent, toolkit, style);
this.toolkit = toolkit;
- this.plan = plan;
+ this.root = rootElement;
this.descriptor = descriptor;
}
@@ -77,8 +77,8 @@ public abstract class AbstractSectionPar
return toolkit;
}
- public JAXBElement getPlan() {
- return plan;
+ public JAXBElement getRootElement() {
+ return root;
}
public AbstractDeploymentDescriptor getDescriptor() {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractTreeSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractTreeSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractTreeSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractTreeSection.java Mon Sep 13 14:40:05 2010
@@ -66,7 +66,7 @@ public abstract class AbstractTreeSectio
tree.setLayout(new TableLayout());
tree.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- activateButtons();
+ activateButtons();
}
});
viewer = new TreeViewer(tree);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AdminObjectSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AdminObjectSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AdminObjectSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AdminObjectSection.java Mon Sep 13 14:40:05 2010
@@ -23,9 +23,8 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.connector.Adminobject;
import org.apache.geronimo.jee.connector.AdminobjectInstance;
import org.apache.geronimo.jee.connector.ConfigPropertySetting;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.AdminObjectWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientClientGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientClientGeneralSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientClientGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientClientGeneralSection.java Mon Sep 13 14:40:05 2010
@@ -73,7 +73,7 @@ public class AppClientClientGeneralSecti
protected Environment getEnvironment(boolean create) {
Environment type = null;
- Object plan = getPlan().getValue();
+ Object plan = getRootElement().getValue();
if (ApplicationClient.class.isInstance(plan)) {
type = ((ApplicationClient) plan).getClientEnvironment();
if (type == null && create) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientSecuritySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientSecuritySection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientSecuritySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientSecuritySection.java Mon Sep 13 14:40:05 2010
@@ -23,7 +23,6 @@ import org.apache.geronimo.jee.security.
import org.apache.geronimo.jee.security.ObjectFactory;
import org.apache.geronimo.jee.security.SubjectInfo;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractSectionPart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -113,7 +112,7 @@ public class AppClientSecuritySection ex
}
private SubjectInfo getDefaultSubject () {
- ApplicationClient client = (ApplicationClient)getPlan().getValue();
+ ApplicationClient client = (ApplicationClient)getRootElement().getValue();
SubjectInfo subjectInfo = client.getDefaultSubject();
if (subjectInfo == null) {
subjectInfo = securityFactory.createSubjectInfo();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientServerGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientServerGeneralSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientServerGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AppClientServerGeneralSection.java Mon Sep 13 14:40:05 2010
@@ -39,7 +39,7 @@ public class AppClientServerGeneralSecti
protected Environment getEnvironment(boolean create) {
Environment type = null;
- Object plan = getPlan().getValue();
+ Object plan = getRootElement().getValue();
if (ApplicationClient.class.isInstance(plan)) {
type = ((ApplicationClient) plan).getServerEnvironment();
if (type == null && create) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ClassFilterSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ClassFilterSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ClassFilterSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ClassFilterSection.java Mon Sep 13 14:40:05 2010
@@ -22,10 +22,9 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.deployment.ClassFilter;
import org.apache.geronimo.jee.deployment.Environment;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.ClassFilterWizard;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IContentProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/CommonGeneralSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/CommonGeneralSection.java Mon Sep 13 14:40:05 2010
@@ -21,17 +21,16 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.jee.application.Application;
+import org.apache.geronimo.jee.connector.Connector;
import org.apache.geronimo.jee.deployment.Artifact;
import org.apache.geronimo.jee.deployment.Dependencies;
import org.apache.geronimo.jee.deployment.Dependency;
import org.apache.geronimo.jee.deployment.Environment;
import org.apache.geronimo.jee.deployment.ObjectFactory;
-import org.apache.geronimo.jee.application.Application;
-import org.apache.geronimo.jee.connector.Connector;
import org.apache.geronimo.jee.openejb.OpenejbJar;
+import org.apache.geronimo.jee.web.WebApp;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractSectionPart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -290,7 +289,7 @@ public abstract class CommonGeneralSecti
protected Environment getEnvironment(boolean create) {
Environment type = null;
- Object plan = getPlan().getValue();
+ Object plan = getRootElement().getValue();
if (WebApp.class.isInstance(plan)) {
type = ((WebApp) plan).getEnvironment();
if (type == null && create) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java Mon Sep 13 14:40:05 2010
@@ -24,20 +24,13 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.application.ExtModule;
import org.apache.geronimo.jee.connector.Connector;
-import org.apache.geronimo.jee.deployment.Gbean;
import org.apache.geronimo.jee.deployment.Pattern;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v30.ui.sections.AbstractListSection.ContentProvider;
-import org.apache.geronimo.st.v30.ui.sections.AbstractListSection.LabelProvider;
import org.apache.geronimo.st.v30.ui.pages.ConnectorPage;
import org.apache.geronimo.st.v30.ui.wizards.DBPoolWizard;
-import org.apache.geronimo.st.v30.ui.wizards.ExtModuleWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TableItem;
import org.eclipse.ui.forms.IFormPart;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DependencySection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DependencySection.java Mon Sep 13 14:40:05 2010
@@ -23,9 +23,8 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.deployment.Dependencies;
import org.apache.geronimo.jee.deployment.Dependency;
import org.apache.geronimo.jee.deployment.Environment;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.DependencyWizard;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IContentProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbLocalRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbLocalRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbLocalRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbLocalRefSection.java Mon Sep 13 14:40:05 2010
@@ -21,9 +21,8 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.EjbLocalRef;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.EjbLocalRefWizard;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRefSection.java Mon Sep 13 14:40:05 2010
@@ -21,9 +21,8 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.EjbRef;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.EjbRefWizard;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.java Mon Sep 13 14:40:05 2010
@@ -23,9 +23,8 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.openejb.EjbRelation;
import org.apache.geronimo.jee.openejb.EjbRelationshipRole;
import org.apache.geronimo.jee.openejb.Relationships;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.EjbRelationWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ExtModuleSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ExtModuleSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ExtModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ExtModuleSection.java Mon Sep 13 14:40:05 2010
@@ -22,14 +22,11 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.application.ExtModule;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v30.ui.pages.ConnectorPage;
import org.apache.geronimo.st.v30.ui.pages.DeploymentPage;
import org.apache.geronimo.st.v30.ui.wizards.ExtModuleWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TableItem;
import org.eclipse.ui.forms.IFormPart;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.java Mon Sep 13 14:40:05 2010
@@ -23,11 +23,9 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.GbeanRef;
import org.apache.geronimo.jee.naming.Pattern;
-import org.apache.geronimo.jee.web.WebApp;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.GBeanRefWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -116,7 +114,7 @@ public class GBeanRefSection extends Abs
public void removeItem(Object anItem) {
if (GbeanRef.class.isInstance(anItem) || JAXBElement.class.isInstance(anItem)) {
getObjectContainer().remove(anItem);
- JAXBModelUtils.getGbeanRefs(getPlan()).remove(anItem);
+ JAXBModelUtils.getGbeanRefs(getRootElement()).remove(anItem);
}
else if (String.class.isInstance(anItem)) {
Object object = tree.getSelection()[0].getParentItem().getData();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.java Mon Sep 13 14:40:05 2010
@@ -24,9 +24,8 @@ import org.apache.geronimo.jee.deploymen
import org.apache.geronimo.jee.deployment.Gbean;
import org.apache.geronimo.jee.deployment.Pattern;
import org.apache.geronimo.jee.deployment.Reference;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.pages.DeploymentPage;
import org.apache.geronimo.st.v30.ui.wizards.GBeanWizard;
import org.eclipse.jface.viewers.ILabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/MessageDestSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/MessageDestSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/MessageDestSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/MessageDestSection.java Mon Sep 13 14:40:05 2010
@@ -22,7 +22,6 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.MessageDestination;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.wizards.MessageDestWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ModuleSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ModuleSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ModuleSection.java Mon Sep 13 14:40:05 2010
@@ -22,7 +22,6 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.application.Module;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.wizards.ModuleWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarCMPSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarCMPSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarCMPSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarCMPSection.java Mon Sep 13 14:40:05 2010
@@ -18,13 +18,12 @@ package org.apache.geronimo.st.v30.ui.se
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.jee.naming.ResourceLocator;
import org.apache.geronimo.jee.naming.ObjectFactory;
import org.apache.geronimo.jee.naming.Pattern;
+import org.apache.geronimo.jee.naming.ResourceLocator;
import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.internal.Messages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractSectionPart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarGeneralSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/OpenEjbJarGeneralSection.java Mon Sep 13 14:40:05 2010
@@ -18,8 +18,8 @@ package org.apache.geronimo.st.v30.ui.se
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.jee.openejb.ObjectFactory;
+import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.java Mon Sep 13 14:40:05 2010
@@ -23,10 +23,9 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.PersistenceContextRef;
import org.apache.geronimo.jee.naming.Property;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.PersContextRefWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -106,7 +105,7 @@ public class PersContextRefSection exten
public void removeItem(Object anItem) {
if (JAXBElement.class.isInstance(anItem)) {
getObjectContainer().remove(anItem);
- JAXBModelUtils.getGbeanRefs(getPlan()).remove(anItem);
+ JAXBModelUtils.getGbeanRefs(getRootElement()).remove(anItem);
}
else if (Property.class.isInstance(anItem)) {
Object object = tree.getSelection()[0].getParentItem().getData();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java Mon Sep 13 14:40:05 2010
@@ -22,10 +22,9 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.PersistenceUnitRef;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.PersUnitRefWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -98,7 +97,7 @@ public class PersUnitRefSection extends
public void removeItem(Object anItem) {
if (JAXBElement.class.isInstance(anItem)) {
getObjectContainer().remove(anItem);
- JAXBModelUtils.getGbeanRefs(getPlan()).remove(anItem);
+ JAXBModelUtils.getGbeanRefs(getRootElement()).remove(anItem);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceEnvRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceEnvRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceEnvRefSection.java Mon Sep 13 14:40:05 2010
@@ -21,9 +21,8 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.ResourceEnvRef;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.ResourceEnvRefWizard;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ResourceRefSection.java Mon Sep 13 14:40:05 2010
@@ -21,9 +21,8 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.ResourceRef;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.ResourceRefWizard;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ITableLabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityAdvancedSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityAdvancedSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityAdvancedSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityAdvancedSection.java Mon Sep 13 14:40:05 2010
@@ -30,11 +30,10 @@ import org.apache.geronimo.jee.security.
import org.apache.geronimo.jee.security.RoleMappings;
import org.apache.geronimo.jee.security.Security;
import org.apache.geronimo.jee.security.SubjectInfo;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v30.ui.wizards.SecurityRunAsSubjectWizard;
import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.wizards.SecurityRunAsSubjectWizard;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -291,7 +290,7 @@ public class SecurityAdvancedSection ext
@Override
public Object getInput() {
- return SecurityRoleMappingSection.getRoleMappings(getPlan(), false);
+ return SecurityRoleMappingSection.getRoleMappings(getRootElement(), false);
}
@Override
@@ -361,7 +360,7 @@ public class SecurityAdvancedSection ext
}
public Role getRole(String roleName) {
- List<Role> roles = SecurityRoleMappingSection.getRoles(getPlan(), false);
+ List<Role> roles = SecurityRoleMappingSection.getRoles(getRootElement(), false);
for (int i = 0; i < roles.size(); i++) {
Role role = roles.get(i);
if (role.getRoleName().equals(roleName)) {
@@ -372,7 +371,7 @@ public class SecurityAdvancedSection ext
}
public String[] getRolesWithoutRunAsSubject() {
- List<Role> roles = SecurityRoleMappingSection.getRoles(getPlan(), false);
+ List<Role> roles = SecurityRoleMappingSection.getRoles(getRootElement(), false);
List<Role> rolesWithoutRunAsSubject = new ArrayList<Role>();
for (int i = 0; i < roles.size(); i++) {
Role role = roles.get(i);
@@ -438,7 +437,7 @@ public class SecurityAdvancedSection ext
}
private Security getSecurity() {
- return JAXBModelUtils.getSecurity(getPlan());
+ return JAXBModelUtils.getSecurity(getRootElement());
}
private String getCredentialStoreRefName() {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java Mon Sep 13 14:40:05 2010
@@ -28,7 +28,6 @@ import org.apache.geronimo.jee.deploymen
import org.apache.geronimo.jee.deployment.XmlAttributeType;
import org.apache.geronimo.jee.loginconfig.LoginConfig;
import org.apache.geronimo.jee.loginconfig.LoginModule;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v30.ui.pages.SecurityPage;
import org.apache.geronimo.st.v30.ui.wizards.SecurityRealmWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java Mon Sep 13 14:40:05 2010
@@ -146,7 +146,7 @@ public class SecurityRoleMappingSection
@Override
public List getObjectContainer() {
- return getRoles(getPlan(), false);
+ return getRoles(getRootElement(), false);
}
public static List<Role> getRoles(JAXBElement plan, boolean create) {
@@ -189,7 +189,7 @@ public class SecurityRoleMappingSection
if (declaredRoleNames == null || declaredRoleNames.size() <= 0) {
return false;
}
- List<Role> definedRoles = getRoles(getPlan(), true);
+ List<Role> definedRoles = getRoles(getRootElement(), true);
List<Role> newRoles = new ArrayList<Role>();
for (int i = 0; i < declaredRoleNames.size(); i++) {
String roleName = declaredRoleNames.get(i);
@@ -213,7 +213,7 @@ public class SecurityRoleMappingSection
@Override
public Object getInput() {
addRolesFromDeploymentDescriptor();
- return getRoleMappings(getPlan(), false);
+ return getRoleMappings(getRootElement(), false);
}
@Override
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorLogLevelSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorLogLevelSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorLogLevelSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorLogLevelSection.java Mon Sep 13 14:40:05 2010
@@ -29,7 +29,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.wst.server.ui.editor.ServerEditorSection;
/**
* @version $Rev$ $Date$
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorPublishAdvancedSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorPublishAdvancedSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorPublishAdvancedSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorPublishAdvancedSection.java Mon Sep 13 14:40:05 2010
@@ -16,7 +16,6 @@
*/
package org.apache.geronimo.st.v30.ui.sections;
-import org.apache.geronimo.st.v30.core.GeronimoServerDelegate;
import org.apache.geronimo.st.v30.ui.commands.SetPublishTimeoutCommand;
import org.apache.geronimo.st.v30.ui.internal.Messages;
import org.eclipse.swt.SWT;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorSecuritySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorSecuritySection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorSecuritySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorSecuritySection.java Mon Sep 13 14:40:05 2010
@@ -16,7 +16,6 @@
*/
package org.apache.geronimo.st.v30.ui.sections;
-import org.apache.geronimo.st.v30.core.IGeronimoServer;
import org.apache.geronimo.st.v30.core.operations.GeronimoAccountManager;
import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.commands.SetPasswordCommand;
@@ -32,7 +31,6 @@ import org.eclipse.swt.events.ModifyEven
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorTestEnvSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorTestEnvSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorTestEnvSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorTestEnvSection.java Mon Sep 13 14:40:05 2010
@@ -19,7 +19,6 @@ package org.apache.geronimo.st.v30.ui.se
import java.util.List;
import org.apache.geronimo.st.v30.core.ClasspathContainersHelper;
-import org.apache.geronimo.st.v30.core.GeronimoServerBehaviourDelegate;
import org.apache.geronimo.st.v30.ui.commands.SetClasspathContainersCommand;
import org.apache.geronimo.st.v30.ui.commands.SetInPlaceSharedLibCommand;
import org.apache.geronimo.st.v30.ui.commands.SetNotRedeployJSPFilesCommand;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerPluginSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerPluginSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerPluginSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerPluginSection.java Mon Sep 13 14:40:05 2010
@@ -19,7 +19,6 @@ package org.apache.geronimo.st.v30.ui.se
import org.apache.geronimo.st.v30.core.operations.GeronimoServerPluginManager;
import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.internal.Trace;
-import org.apache.geronimo.st.v30.ui.sections.AbstractServerEditorSection;
import org.apache.geronimo.st.v30.ui.wizards.ServerCustomAssemblyWizard;
import org.apache.geronimo.st.v30.ui.wizards.ServerPluginManagerDialog;
import org.apache.geronimo.st.v30.ui.wizards.ServerPluginManagerWizard;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java Mon Sep 13 14:40:05 2010
@@ -23,9 +23,8 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.Port;
import org.apache.geronimo.jee.naming.PortCompletion;
import org.apache.geronimo.jee.naming.ServiceRef;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.wizards.ServiceRefWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/WebContainerSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/WebContainerSection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/WebContainerSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/WebContainerSection.java Mon Sep 13 14:40:05 2010
@@ -23,7 +23,6 @@ import org.apache.geronimo.jee.naming.Ob
import org.apache.geronimo.jee.naming.Pattern;
import org.apache.geronimo.jee.web.WebApp;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.sections.AbstractSectionPart;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintSectionPart.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintSectionPart.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintSectionPart.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintSectionPart.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,93 @@
+/*
+ * 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.v30.ui.sections.blueprint;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.ObjectFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.IFormColors;
+import org.eclipse.ui.forms.SectionPart;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public abstract class AbstractBlueprintSectionPart extends SectionPart {
+
+ protected FormToolkit toolkit;
+
+ protected JAXBElement blueprint;
+
+ protected ObjectFactory blueprintObjectFactory = null;
+
+
+ public AbstractBlueprintSectionPart(Section section) {
+ super(section);
+ }
+
+ public AbstractBlueprintSectionPart(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+ super(parent, toolkit, style);
+ this.toolkit = toolkit;
+ this.blueprint = 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 FormToolkit getToolkit() {
+ return toolkit;
+ }
+
+ public JAXBElement getRootElement() {
+ return blueprint;
+ }
+
+
+ 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;
+ }
+
+
+
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintTreeSectionPart.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintTreeSectionPart.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintTreeSectionPart.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/AbstractBlueprintTreeSectionPart.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,229 @@
+package org.apache.geronimo.st.v30.ui.sections.blueprint;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+import org.apache.geronimo.st.ui.internal.Trace;
+import org.apache.geronimo.st.v30.core.jaxb.BlueprintJAXBHelper;
+import org.apache.geronimo.st.v30.core.jaxb.BlueprintJAXBHelper.SubClazzWrapper;
+import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactoryImpl;
+import org.apache.geronimo.st.v30.ui.Activator;
+import org.apache.geronimo.st.v30.ui.BlueprintEditorUIHelper;
+import org.apache.geronimo.st.v30.ui.sections.AbstractTreeSection;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.forms.events.ExpansionEvent;
+import org.eclipse.ui.forms.events.IExpansionListener;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public abstract class AbstractBlueprintTreeSectionPart extends AbstractTreeSection implements
+ IBlueprintJAXBManipulator {
+
+ protected HashMap<Object, Field> treeFieldMap = new HashMap<Object,Field>();
+
+ public AbstractBlueprintTreeSectionPart(JAXBElement blueprint, Composite parent, FormToolkit toolkit, int style) {
+ super(blueprint, parent, toolkit, style);
+ }
+
+ @Override
+ public void createClient(){
+ super.createClient();
+
+ this.getSection().addExpansionListener(new IExpansionListener(){
+
+ @Override
+ public void expansionStateChanged(ExpansionEvent arg0) {
+ tree.deselectAll();
+
+ }
+
+ @Override
+ public void expansionStateChanging(ExpansionEvent arg0) {
+ //do nothing
+ }
+
+ });
+ }
+
+ @Override
+ public void setObjectValue(Object selectedObject, HashMap<Field, String> attrMap) {
+ try {
+ BlueprintJAXBHelper.setAttributeValue(selectedObject,attrMap);
+ } catch (SecurityException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+selectedObject, e);
+ } catch (IllegalArgumentException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+selectedObject, e);
+ } catch (NoSuchMethodException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+selectedObject, e);
+ } catch (IllegalAccessException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+selectedObject, e);
+ } catch (InvocationTargetException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+selectedObject, e);
+ }
+
+ }
+
+ @Override
+ public void setNewObjectValue(Object parentObject,SubClazzWrapper clazzWrapper, HashMap<Field, String> attrMap) {
+ Object newObject = JAXBObjectFactoryImpl.getInstance().createBlueprintElement(clazzWrapper.getClazz());
+ try {
+ BlueprintJAXBHelper.setAttributeValue(newObject,attrMap);
+ } catch (SecurityException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+newObject, e);
+ } catch (IllegalArgumentException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+newObject, e);
+ } catch (NoSuchMethodException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+newObject, e);
+ } catch (IllegalAccessException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+newObject, e);
+ } catch (InvocationTargetException e) {
+ Trace.trace(Trace.SEVERE, "can't set attribute value for object "+newObject, e);
+ }
+ try {
+ BlueprintJAXBHelper.attachToParent(parentObject,newObject,clazzWrapper.getField());
+ } catch (SecurityException e) {
+ Trace.trace(Trace.SEVERE, "can't add new object "+newObject, e);
+ } catch (IllegalArgumentException e) {
+ Trace.trace(Trace.SEVERE, "can't add new object "+newObject, e);
+ } catch (NoSuchFieldException e) {
+ Trace.trace(Trace.SEVERE, "can't add new object "+newObject, e);
+ } catch (NoSuchMethodException e) {
+ Trace.trace(Trace.SEVERE, "can't add new object "+newObject, e);
+ } catch (IllegalAccessException e) {
+ Trace.trace(Trace.SEVERE, "can't add new object "+newObject, e);
+ } catch (InvocationTargetException e) {
+ Trace.trace(Trace.SEVERE, "can't add new object "+newObject, e);
+ }
+
+ treeFieldMap.put(newObject, clazzWrapper.getField());
+ }
+
+ protected Tblueprint getBlueprint(){
+ return BlueprintEditorUIHelper.getBlueprint(getRootElement());
+ }
+
+ protected abstract Object getSectionRootElement();
+
+ public abstract List<Field> getExcludedFieldsOfClazz(Class clazz);
+
+ @Override
+ public ITreeContentProvider getContentProvider() {
+ return new ContentProvider() {
+ @Override
+ public Object[] getElements(Object inputElement) {
+ return getChildren(inputElement);
+ }
+
+ @Override
+ public Object[] getChildren(Object parentElement) {
+ if (List.class.isInstance(parentElement)) {
+ return ((List) parentElement).toArray();
+ }
+ if (JAXBElement.class.isInstance(parentElement)) {
+ parentElement = ((JAXBElement) parentElement).getValue();
+ }
+
+ if (BlueprintJAXBHelper.hasChildElements(parentElement.getClass(),getExcludedFieldsOfClazz(parentElement.getClass()))){
+ try {
+ List allSubElements = BlueprintJAXBHelper.getAllSubElements(parentElement);
+ return allSubElements.toArray(new Object[0]);
+ } catch (SecurityException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (IllegalArgumentException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (NoSuchMethodException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (IllegalAccessException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (InvocationTargetException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ }
+
+ }
+
+ return new String[] {};
+ }
+ };
+ }
+
+ @Override
+ public ILabelProvider getLabelProvider() {
+ return new LabelProvider() {
+ @Override
+ public String getText(Object element) {
+ if (JAXBElement.class.isInstance(element)) {
+ element = ((JAXBElement) element).getValue();
+ }
+
+ try {
+ HashMap<String,String> attrMap = BlueprintJAXBHelper.getAllAttributes(element);
+ if (attrMap.size()>0) {
+ StringBuilder sb = new StringBuilder();
+
+ //element name
+ Class clazz = element.getClass();
+ XmlRootElement root = (XmlRootElement) clazz.getAnnotation(javax.xml.bind.annotation.XmlRootElement.class);
+ sb.append(root.name()+": ");
+
+ Set<Entry<String, String>> entrySet = attrMap.entrySet();
+ Iterator<Entry<String,String>> iter = entrySet.iterator();
+ while (iter.hasNext()) {
+ Entry<String, String> entry = iter.next();
+ String field = entry.getKey();
+ Object value = entry.getValue();
+
+ sb.append(field+"="+value+" ");
+ }
+ return sb.toString();
+ }
+
+ } catch (SecurityException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (IllegalArgumentException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (NoSuchMethodException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (IllegalAccessException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ } catch (InvocationTargetException e) {
+ Trace.trace(Trace.SEVERE, "get child elements error! ", e);
+ }
+
+
+ return null;
+ }
+
+ @Override
+ public Image getImage(Object arg0) {
+ return Activator.imageDescriptorFromPlugin("org.eclipse.jst.j2ee",
+ "icons/full/obj16/module_web_obj.gif").createImage();
+ }
+ };
+ }
+
+ public Object getParentElement(){
+ if (isEditing()){
+ TreeItem item = tree.getSelection()[0].getParentItem();
+ if (item==null) return getSectionRootElement();
+ else return item.getData();
+ }else{
+ return getSelectedObject();
+ }
+ }
+
+ public void addItemFieldMap(Object data, Field field){
+ treeFieldMap.put(data, field);
+ }
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintDescriptionSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintDescriptionSection.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintDescriptionSection.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintDescriptionSection.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,97 @@
+/*
+ * 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.v30.ui.sections.blueprint;
+
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.Tdescription;
+import org.apache.geronimo.st.v30.ui.BlueprintEditorUIHelper;
+import org.apache.geronimo.st.v30.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.layout.GridLayout;
+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;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public class BlueprintDescriptionSection extends AbstractBlueprintSectionPart {
+
+ protected Text blueprintDescription;
+
+ public BlueprintDescriptionSection(Composite parent, FormToolkit toolkit, int style, JAXBElement bluerpint) {
+ super(parent, toolkit, style, bluerpint);
+
+ createClient();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.wst.server.ui.editor.ServerEditorSection#createSection(org.eclipse.swt.widgets.Composite)
+ */
+ public void createClient() {
+ Section section = getSection();
+
+ section.setText(getSectionDescriptionTitle());
+ section.setDescription(getSectionDescriptionDescription());
+ section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+
+ Composite composite = toolkit.createComposite(section);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 1;
+ 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);
+
+
+ blueprintDescription = toolkit.createText(composite, "", SWT.BORDER|SWT.WRAP|SWT.MULTI);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.heightHint = 75;
+ gd.widthHint = 100;
+ blueprintDescription.setLayoutData(gd);
+ blueprintDescription.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ Tdescription description = new Tdescription();
+ List<String> descriptionContent = description.getContent();
+ descriptionContent.clear();
+ descriptionContent.add(blueprintDescription.getText());
+ BlueprintEditorUIHelper.getBlueprint(getRootElement()).setDescription(description);
+ markDirty();
+ }
+ });
+ }
+
+ private String getSectionDescriptionDescription() {
+ return CommonMessages.blueprintDescriptionSectionTitle;
+ }
+
+ private String getSectionDescriptionTitle() {
+ return CommonMessages.blueprintDescriptionSectionDescription;
+ }
+
+
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,146 @@
+/*
+ * 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.v30.ui.sections.blueprint;
+
+import java.math.BigInteger;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.Tactivation;
+import org.apache.geronimo.osgi.blueprint.Tavailability;
+import org.apache.geronimo.st.v30.ui.BlueprintEditorUIHelper;
+import org.apache.geronimo.st.v30.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.layout.GridLayout;
+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;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public class BlueprintGeneralSection extends AbstractBlueprintSectionPart {
+
+ protected Text defaultActiviation;
+
+ protected Text defaultTimeout;
+
+ protected Text defaultAvailability;
+
+
+ public BlueprintGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement bluerpint) {
+ super(parent, toolkit, style, bluerpint);
+ createClient();
+ }
+
+ protected void createClient() {
+
+ Section section = getSection();
+
+ section.setText(getSectionGeneralTitle());
+ section.setDescription(getSectionGeneralDescription());
+ 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);
+
+ createLabel(composite, CommonMessages.defaultActivation);
+
+
+ defaultActiviation = toolkit.createText(composite, getDefaultActiviation(), SWT.BORDER);
+ defaultActiviation.setLayoutData(createTextFieldGridData());
+ defaultActiviation.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ BlueprintEditorUIHelper.getBlueprint(getRootElement()).setDefaultActivation(Tactivation.fromValue(defaultActiviation.getText()));
+ markDirty();
+ }
+ });
+
+ createLabel(composite, CommonMessages.defaultTimeout);
+
+ defaultTimeout = toolkit.createText(composite, getDefaultTimeout(), SWT.BORDER);
+ defaultTimeout.setLayoutData(createTextFieldGridData());
+ defaultTimeout.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ BlueprintEditorUIHelper.getBlueprint(getRootElement()).setDefaultTimeout(BigInteger.valueOf(Long.valueOf(defaultTimeout.getText())));
+ markDirty();
+ }
+ });
+
+ createLabel(composite, CommonMessages.defaultAvailability);
+
+ defaultAvailability = toolkit.createText(composite, getDefaultAvailability(), SWT.BORDER);
+ defaultAvailability.setLayoutData(createTextFieldGridData());
+ defaultAvailability.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ BlueprintEditorUIHelper.getBlueprint(getRootElement()).setDefaultAvailability(Tavailability.fromValue(defaultAvailability.getText()));
+ markDirty();
+ }
+ });
+
+ }
+
+
+
+ private String getDefaultAvailability() {
+ Tavailability defaultAvailability = BlueprintEditorUIHelper.getBlueprint(getRootElement()).getDefaultAvailability();
+ String value;
+ if (defaultAvailability==null) value = "";
+ else value = defaultAvailability.value();
+ return value;
+ }
+
+ private String getDefaultTimeout() {
+ BigInteger defaultTimeout = BlueprintEditorUIHelper.getBlueprint(getRootElement()).getDefaultTimeout();
+ String value;
+ if (defaultTimeout==null) value = "";
+ else value = String.valueOf(defaultTimeout.longValue());
+ return value;
+ }
+
+ private String getDefaultActiviation() {
+ Tactivation defaultActivation = BlueprintEditorUIHelper.getBlueprint(getRootElement()).getDefaultActivation();
+ String value;
+ if (defaultActivation==null) value = "";
+ else value = defaultActivation.value();
+ return value;
+ }
+
+ protected String getSectionGeneralTitle() {
+ return CommonMessages.blueprintAttributeSectionTitle;
+ }
+
+ protected String getSectionGeneralDescription() {
+ return CommonMessages.blueprintAttributeSectionDescription;
+ }
+
+
+
+
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,12 @@
+package org.apache.geronimo.st.v30.ui.sections.blueprint;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+
+import org.apache.geronimo.st.v30.core.jaxb.BlueprintJAXBHelper.SubClazzWrapper;
+
+public interface IBlueprintJAXBManipulator {
+ public void setNewObjectValue(Object parentObject,SubClazzWrapper clazz, HashMap<Field,String> attrMap);
+
+ public void setObjectValue(Object selectedObject, HashMap<Field,String> attrMap);
+}