Attachment #61176 for bug #141106

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;


	private CLabel publicIdLabel;
	private CLabel systemIdLabel;
	private FontMetrics fFontMetrics;

	public void doHandleEvent(Event event) {
		if (event.widget == publicIdText) {

	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
		super.createControls(parent, factory);
		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
		FormData data;

		// Create label first then attach other control to it
		publicIdLabel = getWidgetFactory().createCLabel(composite, PUBLIC_ID);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);
		publicIdLabel.setLayoutData(data);


		// Create label first then attach other control to it
		systemIdLabel = getWidgetFactory().createCLabel(composite, SYSTEM_ID);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);

	public boolean shouldUseExtraSpace() {
		return false;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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


import java.util.Iterator;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.eclipse.wst.dtd.core.internal.CMBasicNode;


	private CCombo typeCombo;
	private String[] typeComboValues = {CMNode.ANY, CMNode.EMPTY, CMNode.PCDATA, CMNode.CHILDREN, CMNode.MIXED};
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,

	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
		super.createControls(parent, factory);
		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
		FormData data;

		// Create label first then attach other control to it
		CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_TYPE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);
		cLabel.setLayoutData(data);

	public boolean shouldUseExtraSpace() {
		return false;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.eclipse.wst.dtd.core.internal.CMRepeatableNode;


	private CCombo occurrenceCombo;
	private String[] occurrenceComboValues = {ONCE, ONE_OR_MORE, OPTIONAL, ZERO_OR_MORE};
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,


		// Create label first then attach other control to it
		CLabel usageLabel = getWidgetFactory().createCLabel(composite, OCCURENCE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = usageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);

			setListenerEnabled(true);
		}
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.eclipse.wst.dtd.core.internal.Entity;

	private CCombo typeCombo;
	private String[] typeComboValues = {PARAMETER, GENERAL};
	private Button checkBox;
	private FontMetrics fFontMetrics;

	public static boolean isExternalEntity = false;



		// Create label first then attach other control to it
		CLabel cLabel = getWidgetFactory().createCLabel(composite, ENTITY_TYPE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);

		typeCombo.setItems(typeComboValues);

		checkBox = getWidgetFactory().createButton(composite, EXTERNAL_ENTITY, SWT.CHECK);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = checkBox.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.right = new FormAttachment(95, 0);

	public boolean shouldUseExtraSpace() {
		return false;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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


import java.util.Iterator;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.eclipse.wst.dtd.core.internal.CMBasicNode;


	private CCombo typeCombo;
	private String[] typeComboValues = {CMNode.PCDATA};
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,


		// Create label first then attach other control to it
		CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_MODEL);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);

	public boolean shouldUseExtraSpace() {
		return false;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;

	private String[] usageComboValues = {IMPLIED, REQUIRED, FIXED, DTDPropertiesMessages._UI_DEFAULT};
	private Text defaultValueText;
	private CLabel defaultValueLabel;
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,


		// Create label first then attach other control to it
		CLabel usageLabel = getWidgetFactory().createCLabel(composite, DTDPropertiesMessages._UI_LABEL_USAGE);
		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = usageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);


		// Create label first then attach other control to it
		defaultValueLabel = getWidgetFactory().createCLabel(composite, DTDPropertiesMessages._UI_LABEL_DEFAULT_VALUE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = defaultValueLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(usageLabel, +ITabbedPropertyConstants.VSPACE);

			}
		}
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.eclipse.wst.dtd.core.internal.CMGroupNode;


	private CCombo modelGroupCombo;
	private String[] modelGroupComboValues = {SEQUENCE, CHOICE};
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,


		// Create label first then attach other control to it
		CLabel cLabel = getWidgetFactory().createCLabel(composite, MODEL_GROUP);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);

			}
		}
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}

}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.core.resources.IFile;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.window.Window;

import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;

	private CCombo typeCombo;
	private String[] typeComboValues = {PARAMETER, GENERAL};
	private PageBook pageBook;
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,


		// Create label first then attach other control to it
		CLabel nameLabel = getWidgetFactory().createCLabel(entityCommonComposite, NAME); //$NON-NLS-1$

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);


		// Create label first then attach other control to it
		CLabel cLabel = getWidgetFactory().createCLabel(entityCommonComposite, ENTITY_TYPE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(nameLabel, +ITabbedPropertyConstants.VSPACE);


		// Create label first then attach other control to it
		CLabel entityValueLabel = getWidgetFactory().createCLabel(internalEntityComposite, VALUE); //$NON-NLS-1$

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = entityValueLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);


		// Create label first then attach other control to it
		CLabel publicIdLabel = getWidgetFactory().createCLabel(externalEntityComposite, PUBLIC_ID); //$NON-NLS-1$

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);

		// Create label first then attach other control to it
		// Create System ID Label
		CLabel systemIdLabel = getWidgetFactory().createCLabel(externalEntityComposite, SYSTEM_ID); //$NON-NLS-1$

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);

		}

	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.eclipse.wst.dtd.core.internal.Attribute;


	private CCombo typeCombo;
	private String[] typeComboValues = {Attribute.CDATA, Attribute.ID, Attribute.IDREF, Attribute.IDREFS, Attribute.ENTITY, Attribute.ENTITIES, Attribute.NMTOKEN, Attribute.NMTOKENS, Attribute.ENUMERATED_NAME, Attribute.ENUMERATED_NOTATION};
	private FontMetrics fFontMetrics;

	/**
	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,

	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
		super.createControls(parent, factory);
		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
		FormData data;

		// Create label first then attach other control to it
		CLabel cLabel = getWidgetFactory().createCLabel(composite, TYPE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);

	public boolean shouldUseExtraSpace() {
		return false;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;

	private CLabel valueLabel;
	private CLabel publicIdLabel;
	private CLabel systemIdLabel;
	private FontMetrics fFontMetrics;

	public void doHandleEvent(Event event) {
		if (event.widget == valueText) {

	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
		super.createControls(parent, factory);
		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
		FormData data;

		// Create label first then attach other control to it
		valueLabel = getWidgetFactory().createCLabel(composite, VALUE);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = valueLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);
		valueLabel.setLayoutData(data);


		// Create label first then attach other control to it
		publicIdLabel = getWidgetFactory().createCLabel(composite, PUBLIC_ID);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(valueLabel, +ITabbedPropertyConstants.VSPACE);


		// Create label first then attach other control to it
		systemIdLabel = getWidgetFactory().createCLabel(composite, SYSTEM_ID);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		labelWidth = Math.max(p.x, 98);
		data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);

	private boolean isExternalEntity() {
		return EntityTypeSection.isExternalEntity;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}




/*******************************************************************************
 * Copyright (c) 2006, 2007 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

 *******************************************************************************/
package org.eclipse.wst.dtd.ui.internal.properties.section;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;

public class NameSection extends AbstractSection {
	private final String NAME = DTDPropertiesMessages._UI_LABEL_NAME;
	private Text nameText;
	private FontMetrics fFontMetrics;

	public void doHandleEvent(Event event) {
		if (event.widget == nameText) {

		super.createControls(parent, factory);
		Composite composite = getWidgetFactory().createFlatFormComposite(parent);

		FormData data;
		// Create label first then attach other control to it
		CLabel nameLabel = getWidgetFactory().createCLabel(composite, NAME);

		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		Point p = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		int labelWidth = Math.max(p.x, 98);
		FormData data = new FormData(labelWidth, SWT.DEFAULT);
		data.left = new FormAttachment(0, 0);
		data.top = new FormAttachment(0, 0);
		nameLabel.setLayoutData(data);

	public boolean shouldUseExtraSpace() {
		return false;
	}

	/**
	 * Initilize font metrics
	 * 
	 * @param control
	 */
	private void initializeFontMetrics(Control control) {
		GC gc = new GC(control);
		gc.setFont(control.getFont());
		fFontMetrics = gc.getFontMetrics();
		gc.dispose();
	}

	/**
	 * Determine appropriate label width
	 * 
	 * @param labelText
	 * @return
	 */
	private int getLabelWidth(String labelText) {
		int labelWidth = 98;

		int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
		labelWidth = Math.max(pixels, labelWidth);
		return labelWidth;
	}
}

Return to bug 141106

Lines 1-5 Link Here

(-)src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NotationSection.java (-37 / +11 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.	2	* Copyright (c) 2006, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-25 Link Here
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.wst.dtd.ui.internal.properties.section;	12	package org.eclipse.wst.dtd.ui.internal.properties.section;
13		13
14	import org.eclipse.jface.dialogs.Dialog;
15	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.custom.CLabel;	15	import org.eclipse.swt.custom.CLabel;
17	import org.eclipse.swt.graphics.FontMetrics;	16	import org.eclipse.swt.graphics.Point;
18	import org.eclipse.swt.graphics.GC;
19	import org.eclipse.swt.layout.FormAttachment;	17	import org.eclipse.swt.layout.FormAttachment;
20	import org.eclipse.swt.layout.FormData;	18	import org.eclipse.swt.layout.FormData;
21	import org.eclipse.swt.widgets.Composite;	19	import org.eclipse.swt.widgets.Composite;
22	import org.eclipse.swt.widgets.Control;
23	import org.eclipse.swt.widgets.Event;	20	import org.eclipse.swt.widgets.Event;
24	import org.eclipse.swt.widgets.Text;	21	import org.eclipse.swt.widgets.Text;
25	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;	22	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
Lines 36-42 Link Here
36		33
37	private CLabel publicIdLabel;	34	private CLabel publicIdLabel;
38	private CLabel systemIdLabel;	35	private CLabel systemIdLabel;
39	private FontMetrics fFontMetrics;
40		36
41	public void doHandleEvent(Event event) {	37	public void doHandleEvent(Event event) {
42	if (event.widget == publicIdText) {	38	if (event.widget == publicIdText) {
Lines 64-76 Link Here
64	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {	60	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
65	super.createControls(parent, factory);	61	super.createControls(parent, factory);
66	Composite composite = getWidgetFactory().createFlatFormComposite(parent);	62	Composite composite = getWidgetFactory().createFlatFormComposite(parent);
67	FormData data;
68		63
69	// Create label first then attach other control to it	64	// Create label first then attach other control to it
70	publicIdLabel = getWidgetFactory().createCLabel(composite, PUBLIC_ID);	65	publicIdLabel = getWidgetFactory().createCLabel(composite, PUBLIC_ID);
71	initializeFontMetrics(publicIdLabel);	66
72	int labelWidth = getLabelWidth(publicIdLabel.getText());	67	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
73	data = new FormData(labelWidth, SWT.DEFAULT);	68	Point p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		69	int labelWidth = Math.max(p.x, 98);
		70	FormData data = new FormData(labelWidth, SWT.DEFAULT);
74	data.left = new FormAttachment(0, 0);	71	data.left = new FormAttachment(0, 0);
75	data.top = new FormAttachment(0, 0);	72	data.top = new FormAttachment(0, 0);
76	publicIdLabel.setLayoutData(data);	73	publicIdLabel.setLayoutData(data);
Lines 86-92 Link Here
86		83
87	// Create label first then attach other control to it	84	// Create label first then attach other control to it
88	systemIdLabel = getWidgetFactory().createCLabel(composite, SYSTEM_ID);	85	systemIdLabel = getWidgetFactory().createCLabel(composite, SYSTEM_ID);
89	labelWidth = getLabelWidth(systemIdLabel.getText());	86
		87	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		88	p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		89	labelWidth = Math.max(p.x, 98);
90	data = new FormData(labelWidth, SWT.DEFAULT);	90	data = new FormData(labelWidth, SWT.DEFAULT);
91	data.left = new FormAttachment(0, 0);	91	data.left = new FormAttachment(0, 0);
92	data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);	92	data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);
Lines 128-157 Link Here
128	public boolean shouldUseExtraSpace() {	128	public boolean shouldUseExtraSpace() {
129	return false;	129	return false;
130	}	130	}
131
132	/**
133	* Initilize font metrics
134	*
135	* @param control
136	*/
137	private void initializeFontMetrics(Control control) {
138	GC gc = new GC(control);
139	gc.setFont(control.getFont());
140	fFontMetrics = gc.getFontMetrics();
141	gc.dispose();
142	}
143
144	/**
145	* Determine appropriate label width
146	*
147	* @param labelText
148	* @return
149	*/
150	private int getLabelWidth(String labelText) {
151	int labelWidth = 98;
152
153	int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
154	labelWidth = Math.max(pixels, labelWidth);
155	return labelWidth;
156	}
157	}	131	}

Lines 1-5 Link Here

(-)src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeSection.java (-36 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.	2	* Copyright (c) 2006, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-29 Link Here
13		13
14	import java.util.Iterator;	14	import java.util.Iterator;
15		15
16	import org.eclipse.jface.dialogs.Dialog;
17	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.custom.CCombo;	17	import org.eclipse.swt.custom.CCombo;
19	import org.eclipse.swt.custom.CLabel;	18	import org.eclipse.swt.custom.CLabel;
20	import org.eclipse.swt.events.SelectionEvent;	19	import org.eclipse.swt.events.SelectionEvent;
21	import org.eclipse.swt.graphics.FontMetrics;	20	import org.eclipse.swt.graphics.Point;
22	import org.eclipse.swt.graphics.GC;
23	import org.eclipse.swt.layout.FormAttachment;	21	import org.eclipse.swt.layout.FormAttachment;
24	import org.eclipse.swt.layout.FormData;	22	import org.eclipse.swt.layout.FormData;
25	import org.eclipse.swt.widgets.Composite;	23	import org.eclipse.swt.widgets.Composite;
26	import org.eclipse.swt.widgets.Control;
27	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;	24	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
28	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;	25	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
29	import org.eclipse.wst.dtd.core.internal.CMBasicNode;	26	import org.eclipse.wst.dtd.core.internal.CMBasicNode;
Lines 39-45 Link Here
39		36
40	private CCombo typeCombo;	37	private CCombo typeCombo;
41	private String[] typeComboValues = {CMNode.ANY, CMNode.EMPTY, CMNode.PCDATA, CMNode.CHILDREN, CMNode.MIXED};	38	private String[] typeComboValues = {CMNode.ANY, CMNode.EMPTY, CMNode.PCDATA, CMNode.CHILDREN, CMNode.MIXED};
42	private FontMetrics fFontMetrics;
43		39
44	/**	40	/**
45	* @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,	41	* @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
Lines 48-60 Link Here
48	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {	44	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
49	super.createControls(parent, factory);	45	super.createControls(parent, factory);
50	Composite composite = getWidgetFactory().createFlatFormComposite(parent);	46	Composite composite = getWidgetFactory().createFlatFormComposite(parent);
51	FormData data;
52		47
53	// Create label first then attach other control to it	48	// Create label first then attach other control to it
54	CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_TYPE);	49	CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_TYPE);
55	initializeFontMetrics(cLabel);	50
56	int labelWidth = getLabelWidth(cLabel.getText());	51	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
57	data = new FormData(labelWidth, SWT.DEFAULT);	52	Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		53	int labelWidth = Math.max(p.x, 98);
		54	FormData data = new FormData(labelWidth, SWT.DEFAULT);
58	data.left = new FormAttachment(0, 0);	55	data.left = new FormAttachment(0, 0);
59	data.top = new FormAttachment(0, 0);	56	data.top = new FormAttachment(0, 0);
60	cLabel.setLayoutData(data);	57	cLabel.setLayoutData(data);
Lines 123-152 Link Here
123	public boolean shouldUseExtraSpace() {	120	public boolean shouldUseExtraSpace() {
124	return false;	121	return false;
125	}	122	}
126
127	/**
128	* Initilize font metrics
129	*
130	* @param control
131	*/
132	private void initializeFontMetrics(Control control) {
133	GC gc = new GC(control);
134	gc.setFont(control.getFont());
135	fFontMetrics = gc.getFontMetrics();
136	gc.dispose();
137	}
138
139	/**
140	* Determine appropriate label width
141	*
142	* @param labelText
143	* @return
144	*/
145	private int getLabelWidth(String labelText) {
146	int labelWidth = 98;
147
148	int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
149	labelWidth = Math.max(pixels, labelWidth);
150	return labelWidth;
151	}
152	}	123	}

Lines 1-5 Link Here

(-)src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceSection.java (-34 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.	2	* Copyright (c) 2006, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-27 Link Here
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.wst.dtd.ui.internal.properties.section;	12	package org.eclipse.wst.dtd.ui.internal.properties.section;
13		13
14	import org.eclipse.jface.dialogs.Dialog;
15	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.custom.CCombo;	15	import org.eclipse.swt.custom.CCombo;
17	import org.eclipse.swt.custom.CLabel;	16	import org.eclipse.swt.custom.CLabel;
18	import org.eclipse.swt.events.SelectionEvent;	17	import org.eclipse.swt.events.SelectionEvent;
19	import org.eclipse.swt.graphics.FontMetrics;	18	import org.eclipse.swt.graphics.Point;
20	import org.eclipse.swt.graphics.GC;
21	import org.eclipse.swt.layout.FormAttachment;	19	import org.eclipse.swt.layout.FormAttachment;
22	import org.eclipse.swt.layout.FormData;	20	import org.eclipse.swt.layout.FormData;
23	import org.eclipse.swt.widgets.Composite;	21	import org.eclipse.swt.widgets.Composite;
24	import org.eclipse.swt.widgets.Control;
25	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;	22	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
26	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;	23	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
27	import org.eclipse.wst.dtd.core.internal.CMRepeatableNode;	24	import org.eclipse.wst.dtd.core.internal.CMRepeatableNode;
Lines 36-42 Link Here
36		33
37	private CCombo occurrenceCombo;	34	private CCombo occurrenceCombo;
38	private String[] occurrenceComboValues = {ONCE, ONE_OR_MORE, OPTIONAL, ZERO_OR_MORE};	35	private String[] occurrenceComboValues = {ONCE, ONE_OR_MORE, OPTIONAL, ZERO_OR_MORE};
39	private FontMetrics fFontMetrics;
40		36
41	/**	37	/**
42	* @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,	38	* @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
Lines 48-55 Link Here
48		44
49	// Create label first then attach other control to it	45	// Create label first then attach other control to it
50	CLabel usageLabel = getWidgetFactory().createCLabel(composite, OCCURENCE);	46	CLabel usageLabel = getWidgetFactory().createCLabel(composite, OCCURENCE);
51	initializeFontMetrics(usageLabel);	47
52	int labelWidth = getLabelWidth(usageLabel.getText());	48	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		49	Point p = usageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		50	int labelWidth = Math.max(p.x, 98);
53	FormData data = new FormData(labelWidth, SWT.DEFAULT);	51	FormData data = new FormData(labelWidth, SWT.DEFAULT);
54	data.left = new FormAttachment(0, 0);	52	data.left = new FormAttachment(0, 0);
55	data.top = new FormAttachment(0, 0);	53	data.top = new FormAttachment(0, 0);
Lines 104-133 Link Here
104	setListenerEnabled(true);	102	setListenerEnabled(true);
105	}	103	}
106	}	104	}
107
108	/**
109	* Initilize font metrics
110	*
111	* @param control
112	*/
113	private void initializeFontMetrics(Control control) {
114	GC gc = new GC(control);
115	gc.setFont(control.getFont());
116	fFontMetrics = gc.getFontMetrics();
117	gc.dispose();
118	}
119
120	/**
121	* Determine appropriate label width
122	*
123	* @param labelText
124	* @return
125	*/
126	private int getLabelWidth(String labelText) {
127	int labelWidth = 98;
128
129	int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
130	labelWidth = Math.max(pixels, labelWidth);
131	return labelWidth;
132	}
133	}	105	}

Lines 1-5 Link Here

(-)src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityTypeSection.java (-35 / +10 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.	2	* Copyright (c) 2006, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-28 Link Here
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.wst.dtd.ui.internal.properties.section;	12	package org.eclipse.wst.dtd.ui.internal.properties.section;
13		13
14	import org.eclipse.jface.dialogs.Dialog;
15	import org.eclipse.swt.SWT;	14	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.custom.CCombo;	15	import org.eclipse.swt.custom.CCombo;
17	import org.eclipse.swt.custom.CLabel;	16	import org.eclipse.swt.custom.CLabel;
18	import org.eclipse.swt.events.SelectionEvent;	17	import org.eclipse.swt.events.SelectionEvent;
19	import org.eclipse.swt.graphics.FontMetrics;	18	import org.eclipse.swt.graphics.Point;
20	import org.eclipse.swt.graphics.GC;
21	import org.eclipse.swt.layout.FormAttachment;	19	import org.eclipse.swt.layout.FormAttachment;
22	import org.eclipse.swt.layout.FormData;	20	import org.eclipse.swt.layout.FormData;
23	import org.eclipse.swt.widgets.Button;	21	import org.eclipse.swt.widgets.Button;
24	import org.eclipse.swt.widgets.Composite;	22	import org.eclipse.swt.widgets.Composite;
25	import org.eclipse.swt.widgets.Control;
26	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;	23	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
27	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;	24	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
28	import org.eclipse.wst.dtd.core.internal.Entity;	25	import org.eclipse.wst.dtd.core.internal.Entity;
Lines 37-43 Link Here
37	private CCombo typeCombo;	34	private CCombo typeCombo;
38	private String[] typeComboValues = {PARAMETER, GENERAL};	35	private String[] typeComboValues = {PARAMETER, GENERAL};
39	private Button checkBox;	36	private Button checkBox;
40	private FontMetrics fFontMetrics;
41		37
42	public static boolean isExternalEntity = false;	38	public static boolean isExternalEntity = false;
43		39
Lines 51-58 Link Here
51		47
52	// Create label first then attach other control to it	48	// Create label first then attach other control to it
53	CLabel cLabel = getWidgetFactory().createCLabel(composite, ENTITY_TYPE);	49	CLabel cLabel = getWidgetFactory().createCLabel(composite, ENTITY_TYPE);
54	initializeFontMetrics(cLabel);	50
55	int labelWidth = getLabelWidth(cLabel.getText());	51	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		52	Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		53	int labelWidth = Math.max(p.x, 98);
56	FormData data = new FormData(labelWidth, SWT.DEFAULT);	54	FormData data = new FormData(labelWidth, SWT.DEFAULT);
57	data.left = new FormAttachment(0, 0);	55	data.left = new FormAttachment(0, 0);
58	data.top = new FormAttachment(0, 0);	56	data.top = new FormAttachment(0, 0);
Lines 68-74 Link Here
68	typeCombo.setItems(typeComboValues);	66	typeCombo.setItems(typeComboValues);
69		67
70	checkBox = getWidgetFactory().createButton(composite, EXTERNAL_ENTITY, SWT.CHECK);	68	checkBox = getWidgetFactory().createButton(composite, EXTERNAL_ENTITY, SWT.CHECK);
71	labelWidth = getLabelWidth(checkBox.getText());	69
		70	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		71	p = checkBox.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		72	labelWidth = Math.max(p.x, 98);
72	data = new FormData(labelWidth, SWT.DEFAULT);	73	data = new FormData(labelWidth, SWT.DEFAULT);
73	data.left = new FormAttachment(0, 0);	74	data.left = new FormAttachment(0, 0);
74	data.right = new FormAttachment(95, 0);	75	data.right = new FormAttachment(95, 0);
Lines 137-166 Link Here
137	public boolean shouldUseExtraSpace() {	138	public boolean shouldUseExtraSpace() {
138	return false;	139	return false;
139	}	140	}
140
141	/**
142	* Initilize font metrics
143	*
144	* @param control
145	*/
146	private void initializeFontMetrics(Control control) {
147	GC gc = new GC(control);
148	gc.setFont(control.getFont());
149	fFontMetrics = gc.getFontMetrics();
150	gc.dispose();
151	}
152
153	/**
154	* Determine appropriate label width
155	*
156	* @param labelText
157	* @return
158	*/
159	private int getLabelWidth(String labelText) {
160	int labelWidth = 98;
161
162	int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
163	labelWidth = Math.max(pixels, labelWidth);
164	return labelWidth;
165	}
166	}	141	}

Lines 1-5 Link Here

(-)src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameSection.java (-34 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.	2	* Copyright (c) 2006, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-29 Link Here
13		13
14	import java.util.Iterator;	14	import java.util.Iterator;
15		15
16	import org.eclipse.jface.dialogs.Dialog;
17	import org.eclipse.swt.SWT;	16	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.custom.CCombo;	17	import org.eclipse.swt.custom.CCombo;
19	import org.eclipse.swt.custom.CLabel;	18	import org.eclipse.swt.custom.CLabel;
20	import org.eclipse.swt.events.SelectionEvent;	19	import org.eclipse.swt.events.SelectionEvent;
21	import org.eclipse.swt.graphics.FontMetrics;	20	import org.eclipse.swt.graphics.Point;
22	import org.eclipse.swt.graphics.GC;
23	import org.eclipse.swt.layout.FormAttachment;	21	import org.eclipse.swt.layout.FormAttachment;
24	import org.eclipse.swt.layout.FormData;	22	import org.eclipse.swt.layout.FormData;
25	import org.eclipse.swt.widgets.Composite;	23	import org.eclipse.swt.widgets.Composite;
26	import org.eclipse.swt.widgets.Control;
27	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;	24	import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
28	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;	25	import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
29	import org.eclipse.wst.dtd.core.internal.CMBasicNode;	26	import org.eclipse.wst.dtd.core.internal.CMBasicNode;
Lines 38-44 Link Here
38		35
39	private CCombo typeCombo;	36	private CCombo typeCombo;
40	private String[] typeComboValues = {CMNode.PCDATA};	37	private String[] typeComboValues = {CMNode.PCDATA};
41	private FontMetrics fFontMetrics;
42		38
43	/**	39	/**
44	* @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,	40	* @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
Lines 50-57 Link Here
50		46
51	// Create label first then attach other control to it	47	// Create label first then attach other control to it
52	CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_MODEL);	48	CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_MODEL);
53	initializeFontMetrics(cLabel);	49
54	int labelWidth = getLabelWidth(cLabel.getText());	50	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
		51	Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
		52	int labelWidth = Math.max(p.x, 98);
55	FormData data = new FormData(labelWidth, SWT.DEFAULT);	53	FormData data = new FormData(labelWidth, SWT.DEFAULT);
56	data.left = new FormAttachment(0, 0);	54	data.left = new FormAttachment(0, 0);
57	data.top = new FormAttachment(0, 0);	55	data.top = new FormAttachment(0, 0);
Lines 109-138 Link Here
109	public boolean shouldUseExtraSpace() {	107	public boolean shouldUseExtraSpace() {
110	return false;	108	return false;
111	}	109	}
112
113	/**
114	* Initilize font metrics
115	*
116	* @param control
117	*/
118	private void initializeFontMetrics(Control control) {
119	GC gc = new GC(control);
120	gc.setFont(control.getFont());
121	fFontMetrics = gc.getFontMetrics();
122	gc.dispose();
123	}
124
125	/**
126	* Determine appropriate label width
127	*
128	* @param labelText
129	* @return
130	*/
131	private int getLabelWidth(String labelText) {
132	int labelWidth = 98;
133
134	int pixels = Dialog.convertWidthInCharsToPixels(fFontMetrics, labelText.length() + 5);
135	labelWidth = Math.max(pixels, labelWidth);
136	return labelWidth;
137	}
138	}	110	}