Changeset 54 in default

Timestamp:

12/02/10 10:33:53 (13 years ago)

Author:

zeiss

Message:

 

Location:

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools

Files:

• ui/quickfix/modifications/RemovePassthroughRuleModification.java (modified) (1 diff)
• utils/URIFragmentResolver.java (modified) (1 diff)
• utils/Utils.java (modified) (1 diff)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/quickfix/modifications/RemovePassthroughRuleModification.java

@@ -48 +48 @@
                                 resourceDescriptions, editor);
 
+                System.out.println(references);
+                
                 List<DeclarationReferencesPair> nodePairs = new ArrayList<DeclarationReferencesPair>();
                 nodePairs.add(new DeclarationReferencesPair((CompositeNode) declarationNode.getParserNode(), references));

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/utils/URIFragmentResolver.java

@@ -18 +18 @@
         public CompositeNode exec(XtextResource state) throws Exception {
                 EObject o = state.getEObject(uriFragment);
+                
+                if (o == null)
+                        return null;
+                
                 NodeAdapter node = NodeUtil.getNodeAdapter(o);
 

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/utils/Utils.java

@@ -106 +106 @@
 //TODO: dieser check ignoriert links zu anderen dateien wg. exception
                                 if ((matchingReferenceDescription instanceof org.eclipse.xtext.resource.impl.DefaultReferenceDescription) || (matchingReferenceDescription instanceof ReferenceDescriptionImpl)){
-                                        CompositeNode node = editor.getDocument().readOnly(
-                                                        new URIFragmentResolver(matchingReferenceDescription
-                                                                        .getSourceEObjectUri().fragment()));
-                                        references.add(node);
+                                        URIFragmentResolver uriFragmentResolver = new URIFragmentResolver(matchingReferenceDescription
+                                                        .getSourceEObjectUri().fragment());
+                                        CompositeNode node = editor.getDocument().readOnly(uriFragmentResolver);
+                                        if (node != null)
+                                                references.add(node);
                                 }
                         }