diff options
| author | vlorenzo | 2012-11-15 12:54:14 +0000 |
|---|---|---|
| committer | vlorenzo | 2012-11-15 12:54:14 +0000 |
| commit | 2dec1d520a15fdcdc5bf20060ce123132e076ca3 (patch) | |
| tree | 26f6a79aefae07e304656cad75404ccd1d61a846 | |
| parent | cbd3abd450ee7ba0071c0d3318b1c942d9251e43 (diff) | |
| download | org.eclipse.papyrus-2dec1d520a15fdcdc5bf20060ce123132e076ca3.tar.gz org.eclipse.papyrus-2dec1d520a15fdcdc5bf20060ce123132e076ca3.tar.xz org.eclipse.papyrus-2dec1d520a15fdcdc5bf20060ce123132e076ca3.zip | |
389599: [Table] Papyrus should support the copy paste from Excel (or others editors) to the table
https://bugs.eclipse.org/bugs/show_bug.cgi?id=389599
2 files changed, 9 insertions, 2 deletions
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java index 7bc132fe312..e969c8c717d 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java @@ -65,13 +65,17 @@ public class NameResolutionHelper { Namespace enclosingNamespace = scope.getNamespace();
String prefix = "";
while(enclosingNamespace != null) {
- prefix += enclosingNamespace.getName() + NamedElementUtil.QUALIFIED_NAME_SEPARATOR;
+// prefix += enclosingNamespace.getName() + NamedElementUtil.QUALIFIED_NAME_SEPARATOR;
+ prefix="";
computeNames(prefix, enclosingNamespace, false);
enclosingNamespace = enclosingNamespace.getNamespace();
}
// Compute names related to the root context model
Namespace model = scope.getModel();
+ if(model==null){
+ model = scope;
+ }
if(filter != null) {
if(filter.isSuperTypeOf(model.eClass())) {
List<NamedElement> l = this.allNames.get(model.getName());
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java index b2cfc37ac15..b348d6513bd 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java @@ -88,7 +88,10 @@ public class NameResolutionUtils { // If no named elements have been found, tries to evaluate the name using the root context model has a root of the qualified name
if(resolvedNamedElements.isEmpty()) {
- final Namespace model = scope.getModel();
+ Namespace model = scope.getModel();
+ if(model==null){
+ model = scope;
+ }
if(model.getName().equals(nameFragments.get(0))) {
if(nameFragments.size() == 1) {
if(filter != null) {
|