[jbosstools-commits] JBoss Tools SVN: r39531 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-15 09:29:18 -0400 (Thu, 15 Mar 2012)
New Revision: 39531

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
Log:
Addition of  LocalBehaviorUI caused a white block to appear in the new server wizard. Fixed. 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java	2012-03-15 13:28:37 UTC (rev 39530)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentTypeUIUtil.java	2012-03-15 13:29:18 UTC (rev 39531)
@@ -99,6 +99,9 @@
 		public Object getAttribute(String key) {
 			return tm.getObject(key);
 		}
+		public int getCallbackType() {
+			return WIZARD;
+		}
 	}
 
 	
@@ -141,6 +144,10 @@
 		public Object getAttribute(String key) {
 			return null;
 		}
+		public int getCallbackType() {
+			return EDITOR;
+		}
 	}
+	
 
 }

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java	2012-03-15 13:28:37 UTC (rev 39530)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/IDeploymentTypeUI.java	2012-03-15 13:29:18 UTC (rev 39531)
@@ -21,12 +21,15 @@
 public interface IDeploymentTypeUI {
 	
 	public interface IServerModeUICallback {
+		public static final int WIZARD = 1;
+		public static final int EDITOR = 2;
 		public IServerWorkingCopy getServer();
 		public IRuntime getRuntime();
 		public void execute(IUndoableOperation operation);
 		public void executeLongRunning(Job j);
 		public void setErrorMessage(String msg);
 		public Object getAttribute(String key);
+		public int getCallbackType();
 	}
 	
 	/**

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java	2012-03-15 13:28:37 UTC (rev 39530)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/LocalBehaviorUI.java	2012-03-15 13:29:18 UTC (rev 39531)
@@ -16,6 +16,8 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
 import org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory;
@@ -24,14 +26,19 @@
 
 public class LocalBehaviorUI implements IDeploymentTypeUI {
 	private IServerModeUICallback callback;
-	public void fillComposite(Composite parent, IServerModeUICallback callback) {
+	public void fillComposite(Composite parent, final IServerModeUICallback callback) {
 		//Do Nothing, just verify
 		this.callback = callback;
-		verify();
+		if( callback.getCallbackType() == callback.EDITOR)
+			verify();
 		callback.getServer().addPropertyChangeListener(new PropertyChangeListener(){
 			public void propertyChange(PropertyChangeEvent evt) {
-				verify();
+				if( callback.getCallbackType() == callback.EDITOR)
+					verify();
 			}});
+		parent.setLayout(new FillLayout());
+		Composite child = new Composite(parent, SWT.None);
+
 	}
 	
 	private void verify() {