Target Explorer: Change default layout for the button part of a BaseEditBrowseTextControl. Adjust transport type combo box length.

1 files changed, 91 insertions, 70 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypeControl.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypeControl.java
index bfc2c1753..1be26e87f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypeControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/controls/TransportSectionTypeControl.java
@@ -1,70 +1,91 @@
-/*******************************************************************************

- * Copyright (c) 2011, 2012 Wind River Systems, Inc. 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:

- * Wind River Systems - initial API and implementation

- *******************************************************************************/

-package org.eclipse.tcf.te.tcf.ui.editor.controls;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.tcf.te.tcf.ui.controls.TransportTypeControl;

-import org.eclipse.tcf.te.tcf.ui.editor.sections.TransportSection;

-import org.eclipse.tcf.te.ui.jface.interfaces.IValidatingContainer;

-

-/**

- * Transport section transport type control implementation.

- */

-public class TransportSectionTypeControl extends TransportTypeControl {

-	// Reference to the parent transport section

-	private final TransportSection transportSection;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param transportSection The parent transport section. Must not be <code>null</code>.

-	 */

-	public TransportSectionTypeControl(TransportSection transportSection) {

-		super(null);

-

-		Assert.isNotNull(transportSection);

-		this.transportSection = transportSection;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#widgetSelected(org.eclipse.swt.events.SelectionEvent)

-	 */

-	@Override

-	public void widgetSelected(SelectionEvent e) {

-		TransportSectionTypePanelControl transportTypePanelControl = (TransportSectionTypePanelControl)transportSection.getAdapter(TransportSectionTypePanelControl.class);

-

-		if (transportTypePanelControl != null) {

-			transportTypePanelControl.showConfigurationPanel(getSelectedTransportType());

-

-			IValidatingContainer validatingContainer = getValidatingContainer();

-			if (validatingContainer != null) validatingContainer.validate();

-		}

-	}

-

-    /* (non-Javadoc)

-     * @see org.eclipse.tcf.te.ui.controls.BaseDialogPageControl#getValidatingContainer()

-     */

-    @Override

-    public IValidatingContainer getValidatingContainer() {

-		Object container = transportSection.getManagedForm().getContainer();

-		return container instanceof IValidatingContainer ? (IValidatingContainer)container : null;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#modifyText(org.eclipse.swt.events.ModifyEvent)

-	 */

-	@Override

-	public void modifyText(ModifyEvent e) {

-		super.modifyText(e);

-		transportSection.dataChanged(e);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. 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:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.tcf.ui.editor.controls;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.tcf.te.tcf.ui.controls.TransportTypeControl;
+import org.eclipse.tcf.te.tcf.ui.editor.sections.TransportSection;
+import org.eclipse.tcf.te.ui.jface.interfaces.IValidatingContainer;
+import org.eclipse.tcf.te.ui.swt.SWTControlUtil;
+
+/**
+ * Transport section transport type control implementation.
+ */
+public class TransportSectionTypeControl extends TransportTypeControl {
+	// Reference to the parent transport section
+	private final TransportSection transportSection;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param transportSection The parent transport section. Must not be <code>null</code>.
+	 */
+	public TransportSectionTypeControl(TransportSection transportSection) {
+		super(null);
+
+		Assert.isNotNull(transportSection);
+		this.transportSection = transportSection;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+	 */
+	@Override
+	public void widgetSelected(SelectionEvent e) {
+		TransportSectionTypePanelControl transportTypePanelControl = (TransportSectionTypePanelControl)transportSection.getAdapter(TransportSectionTypePanelControl.class);
+
+		if (transportTypePanelControl != null) {
+			transportTypePanelControl.showConfigurationPanel(getSelectedTransportType());
+
+			IValidatingContainer validatingContainer = getValidatingContainer();
+			if (validatingContainer != null) validatingContainer.validate();
+		}
+	}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.tcf.te.ui.controls.BaseDialogPageControl#getValidatingContainer()
+     */
+    @Override
+    public IValidatingContainer getValidatingContainer() {
+		Object container = transportSection.getManagedForm().getContainer();
+		return container instanceof IValidatingContainer ? (IValidatingContainer)container : null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#modifyText(org.eclipse.swt.events.ModifyEvent)
+	 */
+	@Override
+	public void modifyText(ModifyEvent e) {
+		super.modifyText(e);
+		transportSection.dataChanged(e);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#doAdjustEditFieldControlLayoutData(org.eclipse.swt.layout.GridData)
+	 */
+	@Override
+	protected void doAdjustEditFieldControlLayoutData(GridData layoutData) {
+	    super.doAdjustEditFieldControlLayoutData(layoutData);
+
+	    int maxWidth = -1;
+	    for (String type : getTransportTypes()) {
+	    	maxWidth = Math.max(type.length(), maxWidth);
+	    }
+
+	    if (maxWidth != -1) {
+	    	layoutData.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
+	    	layoutData.grabExcessHorizontalSpace = false;
+	    	layoutData.widthHint = SWTControlUtil.convertWidthInCharsToPixels(getEditFieldControl(), maxWidth + 4);
+	    }
+	}
+}