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/10/06 20:45:20 UTC
svn commit: r306834 -
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/
Author: sppatel
Date: Thu Oct 6 11:45:16 2005
New Revision: 306834
URL: http://svn.apache.org/viewcvs?rev=306834&view=rev
Log:
added getImageDescriptor()
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java?rev=306834&r1=306833&r2=306834&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java Thu Oct 6 11:45:16 2005
@@ -54,16 +54,12 @@
private EObject plan;
+ private Image image;
+
protected Table table;
protected TableViewer tableViewer;
- private ImageDescriptor defaultDescriptor = GeronimoUIPlugin
- .imageDescriptorFromPlugin("org.apache.geronimo.ui",
- "icons/obj16/geronimo.gif");
-
- private Image defaultImage = defaultDescriptor.createImage();
-
public DynamicTableSection(Section section) {
super(section);
}
@@ -81,7 +77,7 @@
super(parent, toolkit, style);
this.plan = plan;
}
-
+
public void create() {
if (isValid()) {
createClient();
@@ -253,7 +249,7 @@
}
}
});
-
+
add.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
}
@@ -275,7 +271,15 @@
}
public Image getImage() {
- return defaultImage;
+ if (image == null) {
+ image = getImageDescriptor().createImage();
+ }
+ return image;
+ }
+
+ public ImageDescriptor getImageDescriptor() {
+ return GeronimoUIPlugin.imageDescriptorFromPlugin(
+ "org.apache.geronimo.ui", "icons/obj16/geronimo.gif");
}
public TableViewer getTableViewer() {
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java?rev=306834&r1=306833&r2=306834&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java Thu Oct 6 11:45:16 2005
@@ -15,6 +15,7 @@
*/
package org.apache.geronimo.ui.sections;
+import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.wizards.EjbLocalRefWizard;
import org.apache.geronimo.xml.ns.naming.NamingFactory;
@@ -24,6 +25,7 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -101,6 +103,14 @@
*/
public Wizard getWizard() {
return new EjbLocalRefWizard(this);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return GeronimoUIPlugin.imageDescriptorFromPlugin(
+ "org.eclipse.jst.j2ee", "icons/full/obj16/ejb_local-ref_obj.gif");
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java?rev=306834&r1=306833&r2=306834&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java Thu Oct 6 11:45:16 2005
@@ -15,6 +15,7 @@
*/
package org.apache.geronimo.ui.sections;
+import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.wizards.EjbRefWizard;
import org.apache.geronimo.xml.ns.naming.NamingFactory;
@@ -24,6 +25,7 @@
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -114,6 +116,16 @@
*/
public Wizard getWizard() {
return new EjbRefWizard(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return GeronimoUIPlugin.imageDescriptorFromPlugin(
+ "org.eclipse.jst.j2ee", "icons/full/obj16/ejbRef_obj.gif");
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java?rev=306834&r1=306833&r2=306834&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java Thu Oct 6 11:45:16 2005
@@ -15,6 +15,7 @@
*/
package org.apache.geronimo.ui.sections;
+import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.wizards.ResourceEnvRefWizard;
import org.apache.geronimo.xml.ns.naming.NamingFactory;
@@ -24,6 +25,7 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -102,6 +104,14 @@
*/
public Wizard getWizard() {
return new ResourceEnvRefWizard(this);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return GeronimoUIPlugin.imageDescriptorFromPlugin(
+ "org.eclipse.jst.j2ee", "icons/full/obj16/res_env_ref_obj.gif");
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java?rev=306834&r1=306833&r2=306834&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java Thu Oct 6 11:45:16 2005
@@ -15,6 +15,7 @@
*/
package org.apache.geronimo.ui.sections;
+import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.wizards.ResourceRefWizard;
import org.apache.geronimo.xml.ns.naming.NamingFactory;
@@ -24,6 +25,7 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -106,6 +108,14 @@
*/
public Wizard getWizard() {
return new ResourceRefWizard(this);
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return GeronimoUIPlugin.imageDescriptorFromPlugin(
+ "org.eclipse.jst.j2ee", "icons/full/obj16/resourceRef_obj.gif");
}
}
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java?rev=306834&r1=306833&r2=306834&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java Thu Oct 6 11:45:16 2005
@@ -15,6 +15,7 @@
*/
package org.apache.geronimo.ui.sections;
+import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
import org.apache.geronimo.ui.internal.Messages;
import org.apache.geronimo.ui.wizards.SecurityRoleWizard;
import org.apache.geronimo.xml.ns.security.DescriptionType;
@@ -29,6 +30,7 @@
import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
@@ -198,6 +200,14 @@
item.setData((EObject) list.get(j));
}
}
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
+ */
+ public ImageDescriptor getImageDescriptor() {
+ return GeronimoUIPlugin.imageDescriptorFromPlugin(
+ "org.eclipse.jst.j2ee", "icons/full/obj16/security_role.gif");
}
class TableSelectionListener implements SelectionListener {