[135441] Fix Object Selection Dialog sizing and check in new icons.

19 files changed, 74 insertions, 24 deletions

diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
index 00518bfc5..c6304a18b 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
index 75ab74262..8f682d626 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
index 3c1f27e89..95768751a 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
index c84dacbc4..b71b3a5e7 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
index 09974ee57..77ae6f422 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
index c6827780a..33cd760e9 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
index 19fadc4c9..40ed2e972 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
index 510fa63b4..16d9d718d 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ * IBM Corporation - initial API and implementation
+ * yyyymmdd bug      Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
  *******************************************************************************/
 package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
 
@@ -15,6 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
 
 
@@ -48,4 +52,10 @@ public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataCont
 	    //  subclass should override this method
 	  return "";
    }
+   
+   public Point getWidgetSize()
+   {
+      // subclasses should override with an appropriate default dialog size for this widget	  
+ 	  return null;  
+   }
   }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
index 9c6490518..4a4fff059 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
@@ -1,18 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ * IBM Corporation - initial API and implementation
+ * yyyymmdd bug      Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
  *******************************************************************************/
 package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
 
 /**
@@ -73,4 +77,11 @@ public interface IObjectSelectionWidget extends WidgetDataContributor
    * @return returns the string to displayed in the UI for the selected object
    */
   public  String getObjectSelectionDisplayableString();
-}
\ No newline at end of file
+  
+  /**
+   * 
+   * @return returns the default initial size for the widget to be called from getInitialSize from any parent dialog
+   */
+  public Point getWidgetSize();
+  
+}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
index e502aec31..2727182df 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
@@ -10,6 +10,7 @@
  * yyyymmdd bug      Email and other contact information
  * -------- -------- -----------------------------------------------------------
  * 20060224   129387 pmoogk@ca.ibm.com - Peter Moogk
+ * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
  *******************************************************************************/
 package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
 
@@ -46,6 +47,7 @@ public class ObjectSelectionWidget extends AbstractObjectSelectionWidget impleme
   private IProject project;
   private String componentName;
   private IObjectSelectionWidget child;
+  private Point widgetSize_;
   
   public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
   {
@@ -56,6 +58,10 @@ public class ObjectSelectionWidget extends AbstractObjectSelectionWidget impleme
     return this;
   }
   
+  public Control getControl(){
+	  return composite;
+  }
+  
   /**
    * @param typeRuntimeServer The typeRuntimeServer to set.
    */
@@ -107,8 +113,8 @@ public class ObjectSelectionWidget extends AbstractObjectSelectionWidget impleme
                   composite.setLayoutData(gd);
                   child = (IObjectSelectionWidget)object;
                   child.addControls(composite, statusListener);
-                  child.setInitialSelection(initialSelection);
-                  
+                  child.setInitialSelection(initialSelection);                  
+
                   Point origSize = shell.getSize();
                   Point compSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
                   int   newX     = origSize.x;
@@ -129,15 +135,9 @@ public class ObjectSelectionWidget extends AbstractObjectSelectionWidget impleme
                   {
                     newY = compSize.y + 205;
                   }
+   
+                  widgetSize_ = new Point(newX, newY);                  
                   
-                  composite.setSize(newX - 20, newY - 205 );
-                  parent.setSize(newX - 10, newY - 195 );
-                  shell.setSize(newX, newY);
-                  
-                  //jvh - the following call hangs the web service wizard 
-                  //shell.setRedraw(true); 
-                  shell.redraw();
-                  shell.update();
                   return;
                 }
               }
@@ -261,4 +261,12 @@ public class ObjectSelectionWidget extends AbstractObjectSelectionWidget impleme
   public String getObjectSelectionDisplayableString() {
 	return child.getObjectSelectionDisplayableString();    
   }
+  
+  public Point getWidgetSize()
+  {
+	  Point childWidgetSize = child.getWidgetSize();
+	  if (childWidgetSize == null)
+		  	  return widgetSize_;
+	  return childWidgetSize;
+  }
 }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
index 867e83d59..7eb631231 100644
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ * IBM Corporation - initial API and implementation
+ * yyyymmdd bug      Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
  *******************************************************************************/
 package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
 
@@ -44,6 +47,7 @@ import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
@@ -235,7 +239,7 @@ public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implement
     else
       tree.setEnabled(true);
     tree.setWebServiceURI(wsURI);
-    tree.refreshTreeViewer();    
+    tree.refreshTreeViewer();  
   }
   
   public void run()
@@ -562,4 +566,8 @@ public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implement
   public String getObjectSelectionDisplayableString() {	
 	    return wsdlURI_;
 	  }
-}
\ No newline at end of file
+  
+  public Point getWidgetSize() {	
+	  return new Point( 550, 500 );  
+  }
+}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale0_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale0_bground.jpg
index 00518bfc5..c6304a18b 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale0_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale0_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale1_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale1_bground.jpg
index 75ab74262..8f682d626 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale1_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale1_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale2_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale2_bground.jpg
index 3c1f27e89..95768751a 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale2_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale2_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale3_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale3_bground.jpg
index c84dacbc4..b71b3a5e7 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale3_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale3_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale4_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale4_bground.jpg
index 09974ee57..77ae6f422 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale4_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale4_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale5_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale5_bground.jpg
index c6827780a..33cd760e9 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale5_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale5_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale6_bground.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale6_bground.jpg
index 19fadc4c9..40ed2e972 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/scale6_bground.jpg
+++ b/bundles/org.eclipse.jst.ws.creation.ui/icons/scale6_bground.jpg
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
index 1a63d9039..bd1c03fc6 100644
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
+++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * yyyymmdd bug      Email and other contact information
+ * -------- -------- -----------------------------------------------------------
+ * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
+ *******************************************************************************/
 package org.eclipse.jst.ws.internal.creation.ui.widgets;
 
 import org.eclipse.core.resources.IProject;
@@ -66,7 +79,7 @@ public class ServiceImplSelectionDialog extends AbstractSelectionDialog {
 	  }
 	  
 	  protected Point getInitialSize()
-	  {
-	    return new Point( 550, 500 );  
+	  {	
+		  return ((ObjectSelectionWidget)getWidget()).getWidgetSize();	    
 	  }
 }