diff options
| author | Sam Bratton | 2014-04-02 21:16:34 +0000 |
|---|---|---|
| committer | Thomas Watson | 2014-04-16 21:02:31 +0000 |
| commit | 1c0ea788bcf56ac1abcf77346cdd0f853e38ce6e (patch) | |
| tree | b87a00f0524e57a2612f9ebfc61f04339c7c2d1c /bundles/org.eclipse.equinox.metatype | |
| parent | 6ba4e5af7021c0d7efc110cca527376ca55326e7 (diff) | |
| download | rt.equinox.bundles-1c0ea788bcf56ac1abcf77346cdd0f853e38ce6e.tar.gz rt.equinox.bundles-1c0ea788bcf56ac1abcf77346cdd0f853e38ce6e.tar.xz rt.equinox.bundles-1c0ea788bcf56ac1abcf77346cdd0f853e38ce6e.zip | |
Bug 423344 - [metatype] R6 metatype xml schema will use Character inI20140428-0800I20140427-2030I20140422-0800
addition to Char as an attribute definition type.
Change-Id: Icda6f5e8cd5143693c62fe60a569b01bd5d2394d
Signed-off-by: sbratton@us.ibm.com <sbratton@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.metatype')
| -rw-r--r-- | bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java index 176e23691..9f8b7c1ea 100644 --- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java +++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/DataParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2013 IBM Corporation and others. + * Copyright (c) 2005, 2014 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 @@ -65,6 +65,7 @@ public class DataParser { private static final String BYTE = "Byte"; //$NON-NLS-1$ private static final String LONG = "Long"; //$NON-NLS-1$ private static final String CHAR = "Char"; //$NON-NLS-1$ + private static final String CHARACTER = "Character"; //$NON-NLS-1$ private static final String BOOLEAN = "Boolean"; //$NON-NLS-1$ private static final String SHORT = "Short"; //$NON-NLS-1$ private static final String PASSWORD = "Password"; //$NON-NLS-1$ @@ -480,7 +481,7 @@ public class DataParser { _dataType = AttributeDefinition.INTEGER; } else if (ad_type_val.equalsIgnoreCase(BYTE)) { _dataType = AttributeDefinition.BYTE; - } else if (ad_type_val.equalsIgnoreCase(CHAR)) { + } else if (ad_type_val.equalsIgnoreCase(CHAR) || ad_type_val.equalsIgnoreCase(CHARACTER)) { _dataType = AttributeDefinition.CHARACTER; } else if (ad_type_val.equalsIgnoreCase(BOOLEAN)) { _dataType = AttributeDefinition.BOOLEAN; |