diff options
| author | emerks | 2011-10-25 17:42:24 +0000 |
|---|---|---|
| committer | emerks | 2011-10-25 17:42:24 +0000 |
| commit | ca7aaebd03f26c903a9188391df135247d6d161e (patch) | |
| tree | 40f4abd706e6b6068d02835390b364fd43f64e02 /plugins | |
| parent | 2e625ef9b53c6c5758df97ce5b61a184156eb08f (diff) | |
| download | org.eclipse.emf-ca7aaebd03f26c903a9188391df135247d6d161e.tar.gz org.eclipse.emf-ca7aaebd03f26c903a9188391df135247d6d161e.tar.xz org.eclipse.emf-ca7aaebd03f26c903a9188391df135247d6d161e.zip | |
[361978] Use proper code for validateEStructuralFeature_ValidDefaultValueLiteral .
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EObjectValidator.java | 4 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EObjectValidator.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EObjectValidator.java index cc24693d6..886afa56d 100644 --- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EObjectValidator.java +++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EObjectValidator.java @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: EObjectValidator.java,v 1.3 2011/01/12 16:24:24 emerks Exp $ + * $Id: EObjectValidator.java,v 1.4 2011/10/25 17:42:24 emerks Exp $ */ package org.eclipse.emf.ecore.util; @@ -1608,7 +1608,7 @@ public class EObjectValidator implements EValidator { getValueLabel(eDataType, value, context), value == null ? "<null>" : value.getClass().getName(), - eDataType.getInstanceClass().getName() + eDataType.getInstanceClassName() }, new Object [] { value, eDataType }, context)); diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java index 049988976..f911c090c 100644 --- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java +++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreValidator.java @@ -13,7 +13,7 @@ * * </copyright> * - * $Id: EcoreValidator.java,v 1.4 2011/05/13 15:08:05 emerks Exp $ + * $Id: EcoreValidator.java,v 1.5 2011/10/25 17:42:24 emerks Exp $ */ package org.eclipse.emf.ecore.util; @@ -1454,6 +1454,7 @@ public class EcoreValidator extends EObjectValidator } }.parseInstanceTypeName(instanceTypeName); String formattedName = null; + @SuppressWarnings("null") boolean result = instanceTypeName != null ? typeBuilderDiagnostic.getSeverity() == Diagnostic.OK && @@ -2582,7 +2583,7 @@ public class EcoreValidator extends EObjectValidator createDiagnostic (Diagnostic.ERROR, DIAGNOSTIC_SOURCE, - VALID_LOWER_BOUND, + VALID_DEFAULT_VALUE_LITERAL, "_UI_EStructuralFeatureValidDefaultValueLiteral_diagnostic", new Object[] { defaultValueLiteral }, new Object[] { eStructuralFeature }, |