Attachment #233278 for bug #412592

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




/*******************************************************************************
 * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH 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:
 * mknauer - initial API and implementation
 *******************************************************************************/
package org.eclipse.emf.ecp.edit.internal.swt.actions;

import org.eclipse.osgi.util.NLS;

public class ActionMessages extends NLS {

	private static final String BUNDLE_NAME = "org.eclipse.emf.ecp.edit.internal.swt.actions.messages"; //$NON-NLS-1$

	public static String AddAttributeAction_AddEntry;
	public static String AddReferenceAction_Link;
	public static String DeleteReferenceAction_Confimation;
	public static String DeleteReferenceAction_DeleteModelQuestion;
	public static String DeleteReferenceAction_DeleteReference;
	public static String DeleteReferenceAction_No;
	public static String DeleteReferenceAction_Questionmark;
	public static String DeleteReferenceAction_Yes;
	public static String NewReferenceAction_CreateAndLinkNew;

	private ActionMessages() {
	}

	static {
		// initialize resource bundle
		NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
	}

}

Lines 38-45 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/AddAttributeAction.java (-2 / +2 lines)
38	EStructuralFeature feature) {	38	EStructuralFeature feature) {
39	super(modelElementContext, itemPropertyDescriptor, feature);	39	super(modelElementContext, itemPropertyDescriptor, feature);
40	// TODO remove PlatformUI	40	// TODO remove PlatformUI
41	setImageDescriptor(Activator.getImageDescriptor("icons/add.png"));	41	setImageDescriptor(Activator.getImageDescriptor("icons/add.png")); //$NON-NLS-1$
42	setToolTipText("Add Entry"); //$NON-NLS-1$	42	setToolTipText(ActionMessages.AddAttributeAction_AddEntry);
43	}	43	}
44		44
45	@Override	45	@Override

Lines 77-84 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/AddReferenceAction.java (-2 / +1 lines)
77	} else if (attribute.endsWith("s")) {//$NON-NLS-1$	77	} else if (attribute.endsWith("s")) {//$NON-NLS-1$
78	attribute = attribute.substring(0, attribute.length() - 1);	78	attribute = attribute.substring(0, attribute.length() - 1);
79	}	79	}
80	// TODO language dependent	80	setToolTipText(ActionMessages.AddReferenceAction_Link + attribute);
81	setToolTipText("Link " + attribute);//$NON-NLS-1$
82	}	81	}
83		82
84	/**	83	/**




		super(modelElementContext, itemPropertyDescriptor, feature);
		// TODO remove PlatformUI

		setImageDescriptor(Activator.getImageDescriptor("icons/delete.png")); //$NON-NLS-1$
		setToolTipText(ActionMessages.DeleteReferenceAction_DeleteReference);
		setToolTipText("Delete Reference"); //$NON-NLS-1$
	}

	@Override

		AdapterFactoryItemDelegator adapterFactoryItemDelegator = new AdapterFactoryItemDelegator(adapterFactory);
		// AdapterFactoryLabelProvider adapterFactoryLabelProvider = new AdapterFactoryLabelProvider(adapterFactory);
		String modelElementName = adapterFactoryItemDelegator.getText(toBeDeleted);
		question = ActionMessages.DeleteReferenceAction_DeleteModelQuestion + modelElementName + ActionMessages.DeleteReferenceAction_Questionmark;
		question = "Do you really want to delete the model element " + modelElementName + "?";//$NON-NLS-1$ //$NON-NLS-2$
		// } else {
		// question = "Do you really want to delete these " + toBeDeleted.size() + " model elements?";
		// }
		MessageDialog dialog = new MessageDialog(null, ActionMessages.DeleteReferenceAction_Confimation, null, question, MessageDialog.QUESTION,
			new String[] { ActionMessages.DeleteReferenceAction_Yes, ActionMessages.DeleteReferenceAction_No }, 0);

		boolean confirm = false;
		if (dialog.open() == Window.OK) {

Lines 75-81 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/NewReferenceAction.java (-1 / +1 lines)
75	} else if (attribute.endsWith("s")) {//$NON-NLS-1$	75	} else if (attribute.endsWith("s")) {//$NON-NLS-1$
76	attribute = attribute.substring(0, attribute.length() - 1);	76	attribute = attribute.substring(0, attribute.length() - 1);
77	}	77	}
78	setToolTipText("Create and link new " + attribute);//$NON-NLS-1$	78	setToolTipText(ActionMessages.NewReferenceAction_CreateAndLinkNew + attribute);
79	}	79	}
80		80
81	/**	81	/**





AddAttributeAction_AddEntry=Add Entry

AddReferenceAction_Link=Link 

DeleteReferenceAction_Confimation=Confirmation
DeleteReferenceAction_DeleteModelQuestion=Do you really want to delete the model element 
DeleteReferenceAction_DeleteReference=Delete Reference
DeleteReferenceAction_No=No
DeleteReferenceAction_Questionmark=?
DeleteReferenceAction_Yes=Yes

NewReferenceAction_CreateAndLinkNew=Create and link new 




	private void addControlDecoration(Composite composite) {
		controlDecoration = new ControlDecoration(text, SWT.LEFT | SWT.TOP, composite);
		controlDecoration.hide();
		controlDecoration.setDescriptionText(ControlMessages.AbstractTextControl_InvalidInput);
		controlDecoration.setDescriptionText("Invalid input");//$NON-NLS-1$
		controlDecoration.setShowHover(true);
		FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
			FieldDecorationRegistry.DEC_ERROR);

		text = new Text(composite, getTextWidgetStyle());
		text.setLayoutData(getTextWidgetLayoutData());
		if (getStructuralFeature().isUnsettable()) {
			text.setMessage(ControlMessages.AbstractTextControl_UNSET);
		}
		text.setData(CUSTOM_VARIANT, getTextVariantID());
		customizeText(text);


				controlDecoration.hide();
				updateValidationColor(null);
				if ("".equals(value)) { //$NON-NLS-1$
					value = null;
				}
				if (value == null && getStructuralFeature().isUnsettable()) {

			} catch (IllegalArgumentException e) {
				controlDecoration.show();
				updateValidationColor(getText().getShell().getDisplay().getSystemColor(SWT.COLOR_RED));
				controlDecoration.setDescriptionText(ControlMessages.AbstractTextControl_InvalidInputSpace + e.getLocalizedMessage());
				throw e;
			}
		}

Lines 62-68 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AttributeMultiControl.java (-2 / +2 lines)
62	*/	62	*/
63	@Override	63	@Override
64	protected String getUnsetLabelText() {	64	protected String getUnsetLabelText() {
65	return "Not set. Click to set!";	65	return ControlMessages.AttributeMultiControl_NotSetClickToSet;
66	}	66	}
67		67
68	/*	68	/*
Lines 71-77 Link Here
71	*/	71	*/
72	@Override	72	@Override
73	protected String getUnsetButtonTooltip() {	73	protected String getUnsetButtonTooltip() {
74	return "Unset";	74	return ControlMessages.AttributeMultiControl_Unset;
75	}	75	}
76		76
77	}	77	}




	@Override
	protected void fillControlComposite(Composite composite) {
		check = new Button(composite, SWT.CHECK);
		check.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_boolean"); //$NON-NLS-1$
	}

	/**

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.BooleanControl_NoBooleanSetClickToSetBoolean;
		return "No boolean set! Click to set boolean."; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.BooleanControl_UnsetBoolean;
	}

	/*




/*******************************************************************************
 * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH 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:
 * mknauer - initial API and implementation
 *******************************************************************************/
package org.eclipse.emf.ecp.edit.internal.swt.controls;

import org.eclipse.osgi.util.NLS;

public class ControlMessages extends NLS {

	private static final String BUNDLE_NAME = "org.eclipse.emf.ecp.edit.internal.swt.controls.messages"; //$NON-NLS-1$

	public static String AbstractTextControl_InvalidInput;
	public static String AbstractTextControl_InvalidInputSpace;
	public static String AbstractTextControl_UNSET;

	public static String AttributeMultiControl_NotSetClickToSet;
	public static String AttributeMultiControl_Unset;

	public static String BooleanControl_NoBooleanSetClickToSetBoolean;
	public static String BooleanControl_UnsetBoolean;

	public static String DateTimeControl_NoDateSetClickToSetDate;
	public static String DateTimeControl_UnsetDate;

	public static String EEnumControl_NoValueSetClickToSetValue;
	public static String EEnumControl_UnsetValue;

	public static String LinkControl_NoLinkSetClickToSetLink;
	public static String LinkControl_NotSet;
	public static String LinkControl_UnsetLink;

	public static String NumericalControl_FormatNumerical;
	public static String NumericalControl_FormatNumericalDecimal;
	public static String NumericalControl_InvalidNumber;
	public static String NumericalControl_InvalidNumberWillBeUnset;
	public static String NumericalControl_NoNumberClickToSetNumber;
	public static String NumericalControl_UnsetNumber;

	public static String ReferenceMultiControl_NotSetClickToSet;
	public static String ReferenceMultiControl_Unset;

	public static String StringControl_NoTextSetClickToSetText;
	public static String StringControl_UnsetText;

	public static String TableControl_AddInstanceOf;
	public static String TableControl_Delete;
	public static String TableControl_DeleteAreYouSure;
	public static String TableControl_NotSetClickToSet;
	public static String TableControl_RemoveSelected;
	public static String TableControl_Unset;

	public static String XmlDateControlText_InvalidNumber;
	public static String XmlDateControlText_NoDateSetClickToSetDate;
	public static String XmlDateControlText_NumberInvalidValueWillBeUnset;
	public static String XmlDateControlText_SelectDate;
	public static String XmlDateControlText_UnsetDate;

	private ControlMessages() {
	}

	static {
		// initialize resource bundle
		NLS.initializeMessages(BUNDLE_NAME, ControlMessages.class);
	}

}





		dateWidget = new DateTime(composite, SWT.DATE | SWT.BORDER);
		dateWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
		dateWidget.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_date"); //$NON-NLS-1$

		timeWidget = new DateTime(composite, SWT.TIME | SWT.SHORT | SWT.BORDER);
		timeWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
		timeWidget.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_time"); //$NON-NLS-1$
	}

	/**

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.DateTimeControl_NoDateSetClickToSetDate;
		return "No date set! Click to set date."; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.DateTimeControl_UnsetDate;
	}

	/*





		});
		combo.setInput(getStructuralFeature().getEType().getInstanceClass().getEnumConstants());
		combo.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_enum"); //$NON-NLS-1$
	}

	/**

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.EEnumControl_NoValueSetClickToSetValue;
		return "No value set! Click to set value."; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.EEnumControl_UnsetValue;
	}

	/*




		mainComposite.setLayout(stackLayout);

		unsetLabel = new Label(mainComposite, SWT.NONE);
		unsetLabel.setText(ControlMessages.LinkControl_NotSet);
		unsetLabel.setText("(Not Set)");//$NON-NLS-1$
		unsetLabel.setBackground(composite.getBackground());
		unsetLabel.setForeground(composite.getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
		unsetLabel.setAlignment(SWT.CENTER);

		imageHyperlink.setBackground(linkComposite.getBackground());

		hyperlink = new Link(linkComposite, SWT.NONE);
		hyperlink.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_reference"); //$NON-NLS-1$
		hyperlink.setBackground(linkComposite.getBackground());
		hyperlink.addSelectionListener(new SelectionAdapter() {


			@Override
			public Object convert(Object value) {
				updateChangeListener((EObject) value);
				return "<a>" + getLinkText(value) + "</a>"; //$NON-NLS-1$ //$NON-NLS-2$
			}
		});
		IObservableValue tooltipValue = SWTObservables.observeTooltipText(hyperlink);


	protected Object getLinkText(Object value) {
		String linkName = adapterFactoryItemDelegator.getText(value);
		return linkName == null ? "" : linkName; //$NON-NLS-1$
	}

	private void updateChangeListener(final EObject value) {

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.LinkControl_NoLinkSetClickToSetLink;
		return "No link set! Click to set link."; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.LinkControl_UnsetLink;
	}

	/*

Lines 350-356 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java (-1 / +1 lines)
350	*/	350	*/
351	private void createDeleteButton(Composite composite) {	351	private void createDeleteButton(Composite composite) {
352	Button delB = new Button(composite, SWT.PUSH);	352	Button delB = new Button(composite, SWT.PUSH);
353	delB.setImage(Activator.getImage("icons/delete.png"));	353	delB.setImage(Activator.getImage("icons/delete.png")); //$NON-NLS-1$
354	delB.addSelectionListener(new SelectionAdapter() {	354	delB.addSelectionListener(new SelectionAdapter() {
355		355
356	/*	356	/*




	 */
	@Override
	protected String getTextVariantID() {
		return "org_eclipse_emf_ecp_control_numerical"; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.NumericalControl_NoNumberClickToSetNumber;
		return "No number set! Click to set number."; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.NumericalControl_UnsetNumber;
	}

	@Override

	private String getFormatText() {

		if (NumericalHelper.isInteger(getInstanceClass())) {
			return ControlMessages.NumericalControl_FormatNumerical;
		} else if (NumericalHelper.isDouble(getInstanceClass())) {
			return ControlMessages.NumericalControl_FormatNumericalDecimal;
		}

		return ""; //$NON-NLS-1$
	}

	// TODO: Remarks EM:

					if (NumericalHelper.isInteger(getInstanceClass())) {
						boolean maxValue = false;
						Class<?> instanceClass = getInstanceClass();
						String formatedValue = ""; //$NON-NLS-1$
						try {
							if (Integer.class.isAssignableFrom(instanceClass)
								|| Integer.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
								if (Integer.MAX_VALUE == number.intValue()) {
									maxValue = true;
									formatedValue = format.format(Integer.MAX_VALUE);
								}
							} else if (Long.class.isAssignableFrom(instanceClass)
								|| Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
								if (Long.MAX_VALUE == number.longValue()) {
									maxValue = true;
									formatedValue = format.format(Long.MAX_VALUE);

						}
					}
				}
				String formatedNumber = ""; //$NON-NLS-1$
				if (number != null) {
					formatedNumber = format.format(number);
				}


		private Object revertToOldValue(final Object value) {

			if (getStructuralFeature().getDefaultValue() == null && (value == null || value.equals(""))) { //$NON-NLS-1$
				return null;
			}

			Object result = getModelValue().getValue();

			MessageDialog messageDialog = new MessageDialog(getText().getShell(), ControlMessages.NumericalControl_InvalidNumber, null,
				ControlMessages.NumericalControl_InvalidNumberWillBeUnset, MessageDialog.ERROR,
				new String[] { JFaceResources.getString(IDialogLabelKeys.OK_LABEL_KEY) }, 0);

			new ECPDialogExecutor(messageDialog) {

			}.execute();

			if (result == null) {
				getText().setText(""); //$NON-NLS-1$
			} else {
				getText().setText(format.format(result));
			}




	public static Number getDefaultValue(Class<?> instanceClass) {
		if (instanceClass.isPrimitive()) {
			try {
				if (Double.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
					|| Float.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
					|| Integer.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
					|| Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
					return 0;
				}
			} catch (IllegalArgumentException ex) {

	public static boolean isDouble(Class<?> instanceClass) {
		if (instanceClass.isPrimitive()) {
			try {
				return Double.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
					|| Float.class.getField("TYPE").get(null).equals(instanceClass); //$NON-NLS-1$
			} catch (IllegalArgumentException ex) {
				Activator.logException(ex);
			} catch (SecurityException ex) {

	public static boolean isInteger(Class<?> instanceClass) {
		if (instanceClass.isPrimitive()) {
			try {
				return Integer.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
					|| Long.class.getField("TYPE").get(null).equals(instanceClass); //$NON-NLS-1$
			} catch (IllegalArgumentException ex) {
				Activator.logException(ex);
			} catch (SecurityException ex) {

	public static Object numberToInstanceClass(Number number, Class<?> instanceClass) {
		if (instanceClass.isPrimitive()) {
			try {
				if (Double.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
					return number.doubleValue();
				} else if (Integer.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
					return number.intValue();
				} else if (Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
					return number.longValue();
				} else if (Float.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
					return number.floatValue();
				}
			} catch (IllegalArgumentException ex) {

Lines 64-70 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/ReferenceMultiControl.java (-2 / +2 lines)
64	*/	64	*/
65	@Override	65	@Override
66	protected String getUnsetLabelText() {	66	protected String getUnsetLabelText() {
67	return "Not set. Click to set!";	67	return ControlMessages.ReferenceMultiControl_NotSetClickToSet;
68	}	68	}
69		69
70	/*	70	/*
Lines 73-78 Link Here
73	*/	73	*/
74	@Override	74	@Override
75	protected String getUnsetButtonTooltip() {	75	protected String getUnsetButtonTooltip() {
76	return "Unset";	76	return ControlMessages.ReferenceMultiControl_Unset;
77	}	77	}
78	}	78	}

Lines 85-91 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/SingleControl.java (-1 / +1 lines)
85	return;	85	return;
86	}	86	}
87	validationLabel.setImage(null);	87	validationLabel.setImage(null);
88	validationLabel.setToolTipText("");	88	validationLabel.setToolTipText(""); //$NON-NLS-1$
89	updateValidationColor(null);	89	updateValidationColor(null);
90	}	90	}
91		91




	 */
	@Override
	protected String getTextVariantID() {
		return "org_eclipse_emf_ecp_control_string"; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.StringControl_NoTextSetClickToSetText;
		return "No text set! Click to set text."; //$NON-NLS-1$
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.StringControl_UnsetText;
	}

	@Override




		tableViewer = new TableViewer(composite, SWT.MULTI | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER);
		// GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).hint(SWT.DEFAULT, SWT.DEFAULT)
		// .applyTo(tableViewer.getTable());
		tableViewer.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_table"); //$NON-NLS-1$
		tableViewer.getTable().setHeaderVisible(true);
		tableViewer.getTable().setLinesVisible(true);


			final TableViewerColumn column = new TableViewerColumn(tableViewer, cellEditor.getStyle());

			if (ECPCellEditor.class.isInstance(cellEditor)) {
				column.getColumn().setData("width", ((ECPCellEditor) cellEditor).getColumnWidthWeight()); //$NON-NLS-1$
			} else {
				column.getColumn().setData("width", 100); //$NON-NLS-1$
			}

			// determine the attribute that should be observed

					if (ECPCellEditor.class.isInstance(cellEditor)) {
						ECPCellEditor ecpCellEditor = (ECPCellEditor) cellEditor;
						String text = ecpCellEditor.getFormatedString(value);
						cell.setText(text == null ? "" : text); //$NON-NLS-1$

					} else {

						cell.setText(value == null ? "" : value.toString()); //$NON-NLS-1$
						cell.getControl().setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_edit_cellEditor_string"); //$NON-NLS-1$
					}

					// if (featureErrorMap.containsKey(element)

		TableColumnLayout layout = new TableColumnLayout();
		composite.setLayout(layout);
		for (int i = 0; i < tableViewer.getTable().getColumns().length; i++) {
			Integer storedValue = (Integer) tableViewer.getTable().getColumns()[i].getData("width"); //$NON-NLS-1$
			layout.setColumnData(tableViewer.getTable().getColumns()[i], new ColumnWeightData(storedValue == null ? 50
				: storedValue));
		}

		removeButton = new Button(buttonComposite, SWT.None);
		Image image = Activator.getImage("icons/delete.png"); //$NON-NLS-1$
		removeButton.setImage(image);
		removeButton.setToolTipText(ControlMessages.TableControl_RemoveSelected + clazz.getInstanceClass().getSimpleName());
		removeButton.addSelectionListener(new SelectionAdapter() {
			/*
			 * (non-Javadoc)

					deletionList.add((EObject) iterator.next());
				}

				MessageDialog dialog = new MessageDialog(tableViewer.getTable().getShell(), ControlMessages.TableControl_Delete, null,
					ControlMessages.TableControl_DeleteAreYouSure, MessageDialog.CONFIRM, new String[] {
						JFaceResources.getString(IDialogLabelKeys.YES_LABEL_KEY),
						JFaceResources.getString(IDialogLabelKeys.NO_LABEL_KEY) }, 0);


		addButton = new Button(buttonComposite, SWT.None);
		Image image = Activator.getImage("icons/add.png"); //$NON-NLS-1$
		addButton.setImage(image);
		addButton.setToolTipText(ControlMessages.TableControl_AddInstanceOf + clazz.getInstanceClass().getSimpleName());
		addButton.addSelectionListener(new SelectionAdapter() {
			/*
			 * (non-Javadoc)

	 */
	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.TableControl_NotSetClickToSet;
	}

	/*

	 */
	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.TableControl_Unset;
	}

	/*





	@Override
	protected String getTextVariantID() {
		return "org_eclipse_emf_ecp_control_xmldate"; //$NON-NLS-1$
	}

	@Override
	protected String getUnsetLabelText() {
		return ControlMessages.XmlDateControlText_NoDateSetClickToSetDate;
		return "No date set! Click to set date."; //$NON-NLS-1$
	}

	@Override
	protected String getUnsetButtonTooltip() {
		return ControlMessages.XmlDateControlText_UnsetDate;
	}

	@Override

		super.fillControlComposite(composite);
		((GridLayout) composite.getLayout()).numColumns = 2;
		final Button button = new Button(composite, SWT.PUSH);
		button.setText(ControlMessages.XmlDateControlText_SelectDate);
		button.addSelectionListener(new SelectionAdapter() {

			@Override


		private Object revertToOldValue(final Object value) {

			if (getStructuralFeature().getDefaultValue() == null && (value == null || value.equals(""))) { //$NON-NLS-1$
				return null;
			}

			Object result = getModelValue().getValue();

			MessageDialog messageDialog = new MessageDialog(getText().getShell(), ControlMessages.XmlDateControlText_InvalidNumber, null,
				ControlMessages.XmlDateControlText_NumberInvalidValueWillBeUnset, MessageDialog.ERROR,
				new String[] { JFaceResources.getString(IDialogLabelKeys.OK_LABEL_KEY) }, 0);

			new ECPDialogExecutor(messageDialog) {

			}.execute();

			if (result == null) {
				getText().setText(""); //$NON-NLS-1$
			} else {
				XMLGregorianCalendar gregorianCalendar = (XMLGregorianCalendar) result;
				Date date = gregorianCalendar.toGregorianCalendar().getTime();




AbstractTextControl_InvalidInput=Invalid input
AbstractTextControl_InvalidInputSpace=Invalid input 
AbstractTextControl_UNSET=<unset>

AttributeMultiControl_NotSetClickToSet=Not set. Click to set\!
AttributeMultiControl_Unset=Unset

BooleanControl_NoBooleanSetClickToSetBoolean=No boolean set\! Click to set boolean.
BooleanControl_UnsetBoolean=Unset boolean

DateTimeControl_NoDateSetClickToSetDate=No date set\! Click to set date.
DateTimeControl_UnsetDate=Unset Date

EEnumControl_NoValueSetClickToSetValue=No value set\! Click to set value.
EEnumControl_UnsetValue=Unset value

LinkControl_NoLinkSetClickToSetLink=No link set\! Click to set link.
LinkControl_NotSet=(Not Set)
LinkControl_UnsetLink=Unset Link

NumericalControl_FormatNumerical=The format is '\#'.
NumericalControl_FormatNumericalDecimal=The format is '\#.\#'.
NumericalControl_InvalidNumber=Invalid Number
NumericalControl_InvalidNumberWillBeUnset=The Number you have entered is invalid. The value will be unset.
NumericalControl_NoNumberClickToSetNumber=No number set\! Click to set number.
NumericalControl_UnsetNumber=Unset number

ReferenceMultiControl_NotSetClickToSet=Not set. Click to set\!
ReferenceMultiControl_Unset=Unset

StringControl_NoTextSetClickToSetText=No text set\! Click to set text.
StringControl_UnsetText=Unset text

TableControl_AddInstanceOf=Add an instance of 
TableControl_Delete=Delete?
TableControl_DeleteAreYouSure=Are you sure you want to delete the selected Elements?
TableControl_NotSetClickToSet=Not set. Click to set\!
TableControl_RemoveSelected=Remove the selected 
TableControl_Unset=Unset

XmlDateControlText_InvalidNumber=Invalid Number
XmlDateControlText_NoDateSetClickToSetDate=No date set\! Click to set date.
XmlDateControlText_NumberInvalidValueWillBeUnset=The Number you have entered is invalid. The value will be unset.
XmlDateControlText_SelectDate=Select Date
XmlDateControlText_UnsetDate=Unset date

Return to bug 412592

Lines 112-119 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/LinkControl.java (-8 / +6 lines)
112	mainComposite.setLayout(stackLayout);	112	mainComposite.setLayout(stackLayout);
113		113
114	unsetLabel = new Label(mainComposite, SWT.NONE);	114	unsetLabel = new Label(mainComposite, SWT.NONE);
115	// TODO language	115	unsetLabel.setText(ControlMessages.LinkControl_NotSet);
116	unsetLabel.setText("(Not Set)");//$NON-NLS-1$
117	unsetLabel.setBackground(composite.getBackground());	116	unsetLabel.setBackground(composite.getBackground());
118	unsetLabel.setForeground(composite.getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));	117	unsetLabel.setForeground(composite.getShell().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
119	unsetLabel.setAlignment(SWT.CENTER);	118	unsetLabel.setAlignment(SWT.CENTER);
Lines 161-167 Link Here
161	imageHyperlink.setBackground(linkComposite.getBackground());	160	imageHyperlink.setBackground(linkComposite.getBackground());
162		161
163	hyperlink = new Link(linkComposite, SWT.NONE);	162	hyperlink = new Link(linkComposite, SWT.NONE);
164	hyperlink.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_reference");	163	hyperlink.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_reference"); //$NON-NLS-1$
165	hyperlink.setBackground(linkComposite.getBackground());	164	hyperlink.setBackground(linkComposite.getBackground());
166	hyperlink.addSelectionListener(new SelectionAdapter() {	165	hyperlink.addSelectionListener(new SelectionAdapter() {
167		166
Lines 219-225 Link Here
219	@Override	218	@Override
220	public Object convert(Object value) {	219	public Object convert(Object value) {
221	updateChangeListener((EObject) value);	220	updateChangeListener((EObject) value);
222	return "<a>" + getLinkText(value) + "</a>";	221	return "<a>" + getLinkText(value) + "</a>"; //$NON-NLS-1$ //$NON-NLS-2$
223	}	222	}
224	});	223	});
225	IObservableValue tooltipValue = SWTObservables.observeTooltipText(hyperlink);	224	IObservableValue tooltipValue = SWTObservables.observeTooltipText(hyperlink);
Lines 259-265 Link Here
259		258
260	protected Object getLinkText(Object value) {	259	protected Object getLinkText(Object value) {
261	String linkName = adapterFactoryItemDelegator.getText(value);	260	String linkName = adapterFactoryItemDelegator.getText(value);
262	return linkName == null ? "" : linkName;	261	return linkName == null ? "" : linkName; //$NON-NLS-1$
263	}	262	}
264		263
265	private void updateChangeListener(final EObject value) {	264	private void updateChangeListener(final EObject value) {
Lines 321-328 Link Here
321	*/	320	*/
322	@Override	321	@Override
323	protected String getUnsetLabelText() {	322	protected String getUnsetLabelText() {
324	// TODO language	323	return ControlMessages.LinkControl_NoLinkSetClickToSetLink;
325	return "No link set! Click to set link."; //$NON-NLS-1$
326	}	324	}
327		325
328	/*	326	/*
Lines 331-337 Link Here
331	*/	329	*/
332	@Override	330	@Override
333	protected String getUnsetButtonTooltip() {	331	protected String getUnsetButtonTooltip() {
334	return "Unset Link";	332	return ControlMessages.LinkControl_UnsetLink;
335	}	333	}
336		334
337	/*	335	/*

Added Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/ActionMessages.java (+38 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* mknauer - initial API and implementation
11	*******************************************************************************/
12	package org.eclipse.emf.ecp.edit.internal.swt.actions;
13
14	import org.eclipse.osgi.util.NLS;
15
16	public class ActionMessages extends NLS {
17
18	private static final String BUNDLE_NAME = "org.eclipse.emf.ecp.edit.internal.swt.actions.messages"; //$NON-NLS-1$
19
20	public static String AddAttributeAction_AddEntry;
21	public static String AddReferenceAction_Link;
22	public static String DeleteReferenceAction_Confimation;
23	public static String DeleteReferenceAction_DeleteModelQuestion;
24	public static String DeleteReferenceAction_DeleteReference;
25	public static String DeleteReferenceAction_No;
26	public static String DeleteReferenceAction_Questionmark;
27	public static String DeleteReferenceAction_Yes;
28	public static String NewReferenceAction_CreateAndLinkNew;
29
30	private ActionMessages() {
31	}
32
33	static {
34	// initialize resource bundle
35	NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
36	}
37
38	}

Added Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/actions/messages.properties (+13 lines)
1
2	AddAttributeAction_AddEntry=Add Entry
3
4	AddReferenceAction_Link=Link
5
6	DeleteReferenceAction_Confimation=Confirmation
7	DeleteReferenceAction_DeleteModelQuestion=Do you really want to delete the model element
8	DeleteReferenceAction_DeleteReference=Delete Reference
9	DeleteReferenceAction_No=No
10	DeleteReferenceAction_Questionmark=?
11	DeleteReferenceAction_Yes=Yes
12
13	NewReferenceAction_CreateAndLinkNew=Create and link new

Lines 75-82 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AbstractTextControl.java (-5 / +4 lines)
75	private void addControlDecoration(Composite composite) {	75	private void addControlDecoration(Composite composite) {
76	controlDecoration = new ControlDecoration(text, SWT.LEFT \| SWT.TOP, composite);	76	controlDecoration = new ControlDecoration(text, SWT.LEFT \| SWT.TOP, composite);
77	controlDecoration.hide();	77	controlDecoration.hide();
78	// TODO language	78	controlDecoration.setDescriptionText(ControlMessages.AbstractTextControl_InvalidInput);
79	controlDecoration.setDescriptionText("Invalid input");//$NON-NLS-1$
80	controlDecoration.setShowHover(true);	79	controlDecoration.setShowHover(true);
81	FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(	80	FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault().getFieldDecoration(
82	FieldDecorationRegistry.DEC_ERROR);	81	FieldDecorationRegistry.DEC_ERROR);
Lines 87-93 Link Here
87	text = new Text(composite, getTextWidgetStyle());	86	text = new Text(composite, getTextWidgetStyle());
88	text.setLayoutData(getTextWidgetLayoutData());	87	text.setLayoutData(getTextWidgetLayoutData());
89	if (getStructuralFeature().isUnsettable()) {	88	if (getStructuralFeature().isUnsettable()) {
90	text.setMessage("<unset>");	89	text.setMessage(ControlMessages.AbstractTextControl_UNSET);
91	}	90	}
92	text.setData(CUSTOM_VARIANT, getTextVariantID());	91	text.setData(CUSTOM_VARIANT, getTextVariantID());
93	customizeText(text);	92	customizeText(text);
Lines 241-247 Link Here
241		240
242	controlDecoration.hide();	241	controlDecoration.hide();
243	updateValidationColor(null);	242	updateValidationColor(null);
244	if ("".equals(value)) {	243	if ("".equals(value)) { //$NON-NLS-1$
245	value = null;	244	value = null;
246	}	245	}
247	if (value == null && getStructuralFeature().isUnsettable()) {	246	if (value == null && getStructuralFeature().isUnsettable()) {
Lines 255-261 Link Here
255	} catch (IllegalArgumentException e) {	254	} catch (IllegalArgumentException e) {
256	controlDecoration.show();	255	controlDecoration.show();
257	updateValidationColor(getText().getShell().getDisplay().getSystemColor(SWT.COLOR_RED));	256	updateValidationColor(getText().getShell().getDisplay().getSystemColor(SWT.COLOR_RED));
258	controlDecoration.setDescriptionText("Invalid input " + e.getLocalizedMessage());	257	controlDecoration.setDescriptionText(ControlMessages.AbstractTextControl_InvalidInputSpace + e.getLocalizedMessage());
259	throw e;	258	throw e;
260	}	259	}
261	}	260	}

Lines 75-85 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/DateTimeControl.java (-5 / +4 lines)
75		75
76	dateWidget = new DateTime(composite, SWT.DATE \| SWT.BORDER);	76	dateWidget = new DateTime(composite, SWT.DATE \| SWT.BORDER);
77	dateWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	77	dateWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
78	dateWidget.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_date");	78	dateWidget.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_date"); //$NON-NLS-1$
79		79
80	timeWidget = new DateTime(composite, SWT.TIME \| SWT.SHORT \| SWT.BORDER);	80	timeWidget = new DateTime(composite, SWT.TIME \| SWT.SHORT \| SWT.BORDER);
81	timeWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));	81	timeWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
82	timeWidget.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_time");	82	timeWidget.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_time"); //$NON-NLS-1$
83	}	83	}
84		84
85	/**	85	/**
Lines 105-112 Link Here
105	*/	105	*/
106	@Override	106	@Override
107	protected String getUnsetLabelText() {	107	protected String getUnsetLabelText() {
108	// TODO language	108	return ControlMessages.DateTimeControl_NoDateSetClickToSetDate;
109	return "No date set! Click to set date."; //$NON-NLS-1$
110	}	109	}
111		110
112	/*	111	/*
Lines 115-121 Link Here
115	*/	114	*/
116	@Override	115	@Override
117	protected String getUnsetButtonTooltip() {	116	protected String getUnsetButtonTooltip() {
118	return "Unset Date";	117	return ControlMessages.DateTimeControl_UnsetDate;
119	}	118	}
120		119
121	/*	120	/*

Lines 67-73 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/EEnumControl.java (-4 / +3 lines)
67		67
68	});	68	});
69	combo.setInput(getStructuralFeature().getEType().getInstanceClass().getEnumConstants());	69	combo.setInput(getStructuralFeature().getEType().getInstanceClass().getEnumConstants());
70	combo.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_enum");	70	combo.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_enum"); //$NON-NLS-1$
71	}	71	}
72		72
73	/**	73	/**
Lines 89-96 Link Here
89	*/	89	*/
90	@Override	90	@Override
91	protected String getUnsetLabelText() {	91	protected String getUnsetLabelText() {
92	// TODO language	92	return ControlMessages.EEnumControl_NoValueSetClickToSetValue;
93	return "No value set! Click to set value."; //$NON-NLS-1$
94	}	93	}
95		94
96	/*	95	/*
Lines 99-105 Link Here
99	*/	98	*/
100	@Override	99	@Override
101	protected String getUnsetButtonTooltip() {	100	protected String getUnsetButtonTooltip() {
102	return "Unset value";	101	return ControlMessages.EEnumControl_UnsetValue;
103	}	102	}
104		103
105	/*	104	/*

Lines 57-66 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalHelper.java (-12 / +12 lines)
57	public static Number getDefaultValue(Class<?> instanceClass) {	57	public static Number getDefaultValue(Class<?> instanceClass) {
58	if (instanceClass.isPrimitive()) {	58	if (instanceClass.isPrimitive()) {
59	try {	59	try {
60	if (Double.class.getField("TYPE").get(null).equals(instanceClass)	60	if (Double.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
61	\|\| Float.class.getField("TYPE").get(null).equals(instanceClass)	61	\|\| Float.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
62	\|\| Integer.class.getField("TYPE").get(null).equals(instanceClass)	62	\|\| Integer.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
63	\|\| Long.class.getField("TYPE").get(null).equals(instanceClass)) {	63	\|\| Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
64	return 0;	64	return 0;
65	}	65	}
66	} catch (IllegalArgumentException ex) {	66	} catch (IllegalArgumentException ex) {
Lines 91-98 Link Here
91	public static boolean isDouble(Class<?> instanceClass) {	91	public static boolean isDouble(Class<?> instanceClass) {
92	if (instanceClass.isPrimitive()) {	92	if (instanceClass.isPrimitive()) {
93	try {	93	try {
94	return Double.class.getField("TYPE").get(null).equals(instanceClass)	94	return Double.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
95	\|\| Float.class.getField("TYPE").get(null).equals(instanceClass);	95	\|\| Float.class.getField("TYPE").get(null).equals(instanceClass); //$NON-NLS-1$
96	} catch (IllegalArgumentException ex) {	96	} catch (IllegalArgumentException ex) {
97	Activator.logException(ex);	97	Activator.logException(ex);
98	} catch (SecurityException ex) {	98	} catch (SecurityException ex) {
Lines 116-123 Link Here
116	public static boolean isInteger(Class<?> instanceClass) {	116	public static boolean isInteger(Class<?> instanceClass) {
117	if (instanceClass.isPrimitive()) {	117	if (instanceClass.isPrimitive()) {
118	try {	118	try {
119	return Integer.class.getField("TYPE").get(null).equals(instanceClass)	119	return Integer.class.getField("TYPE").get(null).equals(instanceClass) //$NON-NLS-1$
120	\|\| Long.class.getField("TYPE").get(null).equals(instanceClass);	120	\|\| Long.class.getField("TYPE").get(null).equals(instanceClass); //$NON-NLS-1$
121	} catch (IllegalArgumentException ex) {	121	} catch (IllegalArgumentException ex) {
122	Activator.logException(ex);	122	Activator.logException(ex);
123	} catch (SecurityException ex) {	123	} catch (SecurityException ex) {
Lines 145-157 Link Here
145	public static Object numberToInstanceClass(Number number, Class<?> instanceClass) {	145	public static Object numberToInstanceClass(Number number, Class<?> instanceClass) {
146	if (instanceClass.isPrimitive()) {	146	if (instanceClass.isPrimitive()) {
147	try {	147	try {
148	if (Double.class.getField("TYPE").get(null).equals(instanceClass)) {	148	if (Double.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
149	return number.doubleValue();	149	return number.doubleValue();
150	} else if (Integer.class.getField("TYPE").get(null).equals(instanceClass)) {	150	} else if (Integer.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
151	return number.intValue();	151	return number.intValue();
152	} else if (Long.class.getField("TYPE").get(null).equals(instanceClass)) {	152	} else if (Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
153	return number.longValue();	153	return number.longValue();
154	} else if (Float.class.getField("TYPE").get(null).equals(instanceClass)) {	154	} else if (Float.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
155	return number.floatValue();	155	return number.floatValue();
156	}	156	}
157	} catch (IllegalArgumentException ex) {	157	} catch (IllegalArgumentException ex) {

Lines 208-214 Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java (-12 / +12 lines)
208	tableViewer = new TableViewer(composite, SWT.MULTI \| SWT.V_SCROLL \| SWT.FULL_SELECTION \| SWT.BORDER);	208	tableViewer = new TableViewer(composite, SWT.MULTI \| SWT.V_SCROLL \| SWT.FULL_SELECTION \| SWT.BORDER);
209	// GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).hint(SWT.DEFAULT, SWT.DEFAULT)	209	// GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).hint(SWT.DEFAULT, SWT.DEFAULT)
210	// .applyTo(tableViewer.getTable());	210	// .applyTo(tableViewer.getTable());
211	tableViewer.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_table");	211	tableViewer.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_table"); //$NON-NLS-1$
212	tableViewer.getTable().setHeaderVisible(true);	212	tableViewer.getTable().setHeaderVisible(true);
213	tableViewer.getTable().setLinesVisible(true);	213	tableViewer.getTable().setLinesVisible(true);
214		214
Lines 260-268 Link Here
260	final TableViewerColumn column = new TableViewerColumn(tableViewer, cellEditor.getStyle());	260	final TableViewerColumn column = new TableViewerColumn(tableViewer, cellEditor.getStyle());
261		261
262	if (ECPCellEditor.class.isInstance(cellEditor)) {	262	if (ECPCellEditor.class.isInstance(cellEditor)) {
263	column.getColumn().setData("width", ((ECPCellEditor) cellEditor).getColumnWidthWeight());	263	column.getColumn().setData("width", ((ECPCellEditor) cellEditor).getColumnWidthWeight()); //$NON-NLS-1$
264	} else {	264	} else {
265	column.getColumn().setData("width", 100);	265	column.getColumn().setData("width", 100); //$NON-NLS-1$
266	}	266	}
267		267
268	// determine the attribute that should be observed	268	// determine the attribute that should be observed
Lines 281-292 Link Here
281	if (ECPCellEditor.class.isInstance(cellEditor)) {	281	if (ECPCellEditor.class.isInstance(cellEditor)) {
282	ECPCellEditor ecpCellEditor = (ECPCellEditor) cellEditor;	282	ECPCellEditor ecpCellEditor = (ECPCellEditor) cellEditor;
283	String text = ecpCellEditor.getFormatedString(value);	283	String text = ecpCellEditor.getFormatedString(value);
284	cell.setText(text == null ? "" : text);	284	cell.setText(text == null ? "" : text); //$NON-NLS-1$
285		285
286	} else {	286	} else {
287		287
288	cell.setText(value == null ? "" : value.toString()); //$NON-NLS-1$	288	cell.setText(value == null ? "" : value.toString()); //$NON-NLS-1$
289	cell.getControl().setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_edit_cellEditor_string");	289	cell.getControl().setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_edit_cellEditor_string"); //$NON-NLS-1$
290	}	290	}
291		291
292	// if (featureErrorMap.containsKey(element)	292	// if (featureErrorMap.containsKey(element)
Lines 469-475 Link Here
469	TableColumnLayout layout = new TableColumnLayout();	469	TableColumnLayout layout = new TableColumnLayout();
470	composite.setLayout(layout);	470	composite.setLayout(layout);
471	for (int i = 0; i < tableViewer.getTable().getColumns().length; i++) {	471	for (int i = 0; i < tableViewer.getTable().getColumns().length; i++) {
472	Integer storedValue = (Integer) tableViewer.getTable().getColumns()[i].getData("width");	472	Integer storedValue = (Integer) tableViewer.getTable().getColumns()[i].getData("width"); //$NON-NLS-1$
473	layout.setColumnData(tableViewer.getTable().getColumns()[i], new ColumnWeightData(storedValue == null ? 50	473	layout.setColumnData(tableViewer.getTable().getColumns()[i], new ColumnWeightData(storedValue == null ? 50
474	: storedValue));	474	: storedValue));
475	}	475	}
Lines 501-507 Link Here
501	removeButton = new Button(buttonComposite, SWT.None);	501	removeButton = new Button(buttonComposite, SWT.None);
502	Image image = Activator.getImage("icons/delete.png"); //$NON-NLS-1$	502	Image image = Activator.getImage("icons/delete.png"); //$NON-NLS-1$
503	removeButton.setImage(image);	503	removeButton.setImage(image);
504	removeButton.setToolTipText("Remove the selected " + clazz.getInstanceClass().getSimpleName());	504	removeButton.setToolTipText(ControlMessages.TableControl_RemoveSelected + clazz.getInstanceClass().getSimpleName());
505	removeButton.addSelectionListener(new SelectionAdapter() {	505	removeButton.addSelectionListener(new SelectionAdapter() {
506	/*	506	/*
507	* (non-Javadoc)	507	* (non-Javadoc)
Lines 522-529 Link Here
522	deletionList.add((EObject) iterator.next());	522	deletionList.add((EObject) iterator.next());
523	}	523	}
524		524
525	MessageDialog dialog = new MessageDialog(tableViewer.getTable().getShell(), "Delete?", null,	525	MessageDialog dialog = new MessageDialog(tableViewer.getTable().getShell(), ControlMessages.TableControl_Delete, null,
526	"Are you sure you want to delete the selected Elements?", MessageDialog.CONFIRM, new String[] {	526	ControlMessages.TableControl_DeleteAreYouSure, MessageDialog.CONFIRM, new String[] {
527	JFaceResources.getString(IDialogLabelKeys.YES_LABEL_KEY),	527	JFaceResources.getString(IDialogLabelKeys.YES_LABEL_KEY),
528	JFaceResources.getString(IDialogLabelKeys.NO_LABEL_KEY) }, 0);	528	JFaceResources.getString(IDialogLabelKeys.NO_LABEL_KEY) }, 0);
529		529
Lines 565-571 Link Here
565	addButton = new Button(buttonComposite, SWT.None);	565	addButton = new Button(buttonComposite, SWT.None);
566	Image image = Activator.getImage("icons/add.png"); //$NON-NLS-1$	566	Image image = Activator.getImage("icons/add.png"); //$NON-NLS-1$
567	addButton.setImage(image);	567	addButton.setImage(image);
568	addButton.setToolTipText("Add an instance of " + clazz.getInstanceClass().getSimpleName());	568	addButton.setToolTipText(ControlMessages.TableControl_AddInstanceOf + clazz.getInstanceClass().getSimpleName());
569	addButton.addSelectionListener(new SelectionAdapter() {	569	addButton.addSelectionListener(new SelectionAdapter() {
570	/*	570	/*
571	* (non-Javadoc)	571	* (non-Javadoc)
Lines 721-727 Link Here
721	*/	721	*/
722	@Override	722	@Override
723	protected String getUnsetLabelText() {	723	protected String getUnsetLabelText() {
724	return "Not set. Click to set!";	724	return ControlMessages.TableControl_NotSetClickToSet;
725	}	725	}
726		726
727	/*	727	/*
Lines 730-736 Link Here
730	*/	730	*/
731	@Override	731	@Override
732	protected String getUnsetButtonTooltip() {	732	protected String getUnsetButtonTooltip() {
733	return "Unset";	733	return ControlMessages.TableControl_Unset;
734	}	734	}
735		735
736	/*	736	/*

Added Link Here

(-)a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/messages.properties (+45 lines)
1	AbstractTextControl_InvalidInput=Invalid input
2	AbstractTextControl_InvalidInputSpace=Invalid input
3	AbstractTextControl_UNSET=<unset>
4
5	AttributeMultiControl_NotSetClickToSet=Not set. Click to set\!
6	AttributeMultiControl_Unset=Unset
7
8	BooleanControl_NoBooleanSetClickToSetBoolean=No boolean set\! Click to set boolean.
9	BooleanControl_UnsetBoolean=Unset boolean
10
11	DateTimeControl_NoDateSetClickToSetDate=No date set\! Click to set date.
12	DateTimeControl_UnsetDate=Unset Date
13
14	EEnumControl_NoValueSetClickToSetValue=No value set\! Click to set value.
15	EEnumControl_UnsetValue=Unset value
16
17	LinkControl_NoLinkSetClickToSetLink=No link set\! Click to set link.
18	LinkControl_NotSet=(Not Set)
19	LinkControl_UnsetLink=Unset Link
20
21	NumericalControl_FormatNumerical=The format is '\#'.
22	NumericalControl_FormatNumericalDecimal=The format is '\#.\#'.
23	NumericalControl_InvalidNumber=Invalid Number
24	NumericalControl_InvalidNumberWillBeUnset=The Number you have entered is invalid. The value will be unset.
25	NumericalControl_NoNumberClickToSetNumber=No number set\! Click to set number.
26	NumericalControl_UnsetNumber=Unset number
27
28	ReferenceMultiControl_NotSetClickToSet=Not set. Click to set\!
29	ReferenceMultiControl_Unset=Unset
30
31	StringControl_NoTextSetClickToSetText=No text set\! Click to set text.
32	StringControl_UnsetText=Unset text
33
34	TableControl_AddInstanceOf=Add an instance of
35	TableControl_Delete=Delete?
36	TableControl_DeleteAreYouSure=Are you sure you want to delete the selected Elements?
37	TableControl_NotSetClickToSet=Not set. Click to set\!
38	TableControl_RemoveSelected=Remove the selected
39	TableControl_Unset=Unset
40
41	XmlDateControlText_InvalidNumber=Invalid Number
42	XmlDateControlText_NoDateSetClickToSetDate=No date set\! Click to set date.
43	XmlDateControlText_NumberInvalidValueWillBeUnset=The Number you have entered is invalid. The value will be unset.
44	XmlDateControlText_SelectDate=Select Date
45	XmlDateControlText_UnsetDate=Unset date