geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r366886 - /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/
Date Sat, 07 Jan 2006 19:16:07 GMT
Author: sppatel
Date: Sat Jan  7 11:16:01 2006
New Revision: 366886

URL: http://svn.apache.org/viewcvs?rev=366886&view=rev
Log:
refactor

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
    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/GBeanRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.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
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java?rev=366886&r1=366885&r2=366886&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
Sat Jan  7 11:16:01 2006
@@ -18,9 +18,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.jface.wizard.Wizard;
@@ -39,7 +37,7 @@
     public BeansSection(EObject plan, Composite parent, FormToolkit toolkit,
             int style) {
         super(plan, parent, toolkit, style);
-        createNew();
+        create();
     }
 
     /* (non-Javadoc)

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java?rev=366886&r1=366885&r2=366886&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
Sat Jan  7 11:16:01 2006
@@ -52,7 +52,7 @@
             Composite parent, FormToolkit toolkit, int style) {
         super(plan, parent, toolkit, style);
         this.dependenciesERef = dependenciesERef;
-        createNew();
+        create();
     }
 
     /*

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=366886&r1=366885&r2=366886&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
Sat Jan  7 11:16:01 2006
@@ -92,9 +92,9 @@
 		super(parent, toolkit, style, plan);
 	}
 
-	public void createNew() {
-		if (isValidNew()) {
-			createClientNew();
+	public void create() {
+		if (isValid()) {
+			createClient();
 		} else {
 			Trace.trace(Trace.SEVERE, "Could not create client, "
 					+ getClass().getName() + ".isValid() == false");
@@ -102,12 +102,12 @@
 
 	}
 
-	private boolean isValidNew() {
+	private boolean isValid() {
 		return getTableEntryObjectType() != null
 				&& getTableColumnNames() != null && !getFactories().isEmpty();
 	}
 
-	public void createClientNew() {
+	public void createClient() {
 
 		getSection().setText(getTitle());
 		getSection().setDescription(getDescription());
@@ -145,34 +145,6 @@
 
 	abstract public EClass getTableEntryObjectType();
 
-	/**
-	 * @deprecated
-	 * 
-	 */
-	public void createClient() {
-
-		getSection().setText(getTitle());
-		getSection().setDescription(getDescription());
-		getSection().setLayoutData(getSectionLayoutData());
-
-		Composite composite = createTableComposite(getSection());
-		getSection().setClient(composite);
-		createTable(composite);
-		fillTableItems();
-
-		tableViewer = new TableViewer(table);
-
-		if (getTableColumnNames().length > 0) {
-			tableViewer.setColumnProperties(getTableColumnNames());
-		}
-
-		Composite buttonComp = createButtonComposite(composite);
-		createAddButton(toolkit, buttonComp);
-		createRemoveButton(toolkit, buttonComp);
-		createEditButton(toolkit, buttonComp);
-
-	}
-
 	protected Composite createTableComposite(Composite parent) {
 		Composite composite = toolkit.createComposite(parent);
 		composite.setLayout(getSectionCompositeLayout());
@@ -198,21 +170,6 @@
 		return layout;
 	}
 
-	/**
-	 * @deprecated
-	 */
-	protected final void fillTableItems() {
-		EList list = (EList) plan.eGet(getEReference());
-
-		for (int j = 0; j < list.size(); j++) {
-			TableItem item = new TableItem(table, SWT.NONE);
-			String[] tableTextData = getTableText((EObject) list.get(j));
-			item.setImage(getImage());
-			item.setText(tableTextData);
-			item.setData((EObject) list.get(j));
-		}
-	}
-
 	protected void createTable(Composite composite) {
 		table = new Table(composite, SWT.BORDER | SWT.FULL_SELECTION
 				| SWT.V_SCROLL | SWT.SINGLE);
@@ -321,51 +278,6 @@
 
 		editButton
 				.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-	}
-
-	/**
-	 * @deprecated
-	 * @param eObject
-	 * @return
-	 */
-	public final String[] getTableText(EObject eObject) {
-		/*List tableText = new ArrayList();
-		for (int i = 0; i < getTableColumnEAttributes().length; i++) {
-			if (getTableColumnEAttributes()[i].getEContainingClass().equals(
-					eObject.eClass())) {
-				String value = (String) eObject
-						.eGet(getTableColumnEAttributes()[i]);
-				if (value != null) {
-					tableText.add(value);
-				} else {
-					tableText.add("");
-				}
-			}
-		}
-		return (String[]) tableText.toArray(new String[tableText.size()]);*/
-		return null;
-	}
-
-	/**
-	 * @deprecated
-	 * @return
-	 */
-	public Image getImage() {
-		if (image == null) {
-			ImageDescriptor descriptor = getImageDescriptor();
-			if (descriptor == null)
-				descriptor = defaultImgDesc;
-			image = descriptor.createImage();
-		}
-		return image;
-	}
-
-	/**
-	 * @deprecated
-	 * @return
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return defaultImgDesc;
 	}
 
 	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=366886&r1=366885&r2=366886&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
Sat Jan  7 11:16:01 2006
@@ -44,7 +44,7 @@
             FormToolkit toolkit, int style,  EReference ejbLocalRefERef) {
         super(plan, parent, toolkit, style);
         this.ejbLocalRefERef = ejbLocalRefERef;
-        createNew();
+        create();
     }
 
     /*

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=366886&r1=366885&r2=366886&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
Sat Jan  7 11:16:01 2006
@@ -51,7 +51,7 @@
             int style, EReference ejbRefERef) {
         super(plan, parent, toolkit, style);
         this.ejbRefERef = ejbRefERef;
-        createNew();
+        create();
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java?rev=366886&r1=366885&r2=366886&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
Sat Jan  7 11:16:01 2006
@@ -42,7 +42,7 @@
 			int style, EReference gbeanERef) {
 		super(plan, parent, toolkit, style);
 		this.gbeanERef = gbeanERef;
-		createNew();
+		create();
 	}
 
 	/*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java?rev=366886&r1=366885&r2=366886&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
Sat Jan  7 11:16:01 2006
@@ -48,7 +48,7 @@
             FormToolkit toolkit, int style) {
         super(plan, parent, toolkit, style);
         this.gBeanERef = gBeanERef;
-        createNew();
+        create();
     }
 
     /*

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=366886&r1=366885&r2=366886&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
Sat Jan  7 11:16:01 2006
@@ -44,7 +44,7 @@
             FormToolkit toolkit, int style,  EReference resourceEnvRefERef) {
         super(plan, parent, toolkit, style);
         this.resourceEnvRefERef = resourceEnvRefERef;
-        createNew();
+        create();
     }
 
     /*

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=366886&r1=366885&r2=366886&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
Sat Jan  7 11:16:01 2006
@@ -55,7 +55,7 @@
         super(plan, parent, toolkit, style);
         this.resourceRefERef = resourceRefERef;
         this.factory = factory;
-        createNew();
+        create();
     }  
 
     /*

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=366886&r1=366885&r2=366886&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
Sat Jan  7 11:16:01 2006
@@ -62,7 +62,7 @@
             int style, EReference securityERef) {
         super(plan, parent, toolkit, style);
         this.securityERef = securityERef;
-        createNew();
+        create();
     }
 
     /**
@@ -135,9 +135,9 @@
      * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#createClient()
      */
-    public void createClientNew() {
+    public void createClient() {
 
-        super.createClientNew();
+        super.createClient();
 
         Composite detail = toolkit.createComposite(table.getParent());
         GridLayout gl = new GridLayout();

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java?rev=366886&r1=366885&r2=366886&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java
Sat Jan  7 11:16:01 2006
@@ -42,7 +42,7 @@
 			FormToolkit toolkit, int style,  EReference serviceRefERef) {
 		super(plan, parent, toolkit, style);
 		this.serviceRefERef = serviceRefERef;
-		createNew();
+		create();
 	}
 
 	/* (non-Javadoc)



Mime
View raw message