This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 131560
Collapse All | Expand All

(-)a/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContextUtilities.java (-5 / +9 lines)
Lines 357-368 public class CsmContextUtilities { Link Here
357 
        return isInContext(fullContext, elem);
 357 
        return isInContext(fullContext, elem);
358 
    }
 358 
    }
359
359
360 
    private static List/*<CsmDeclaration>*/ mergeDeclarations(List/*<CsmDeclaration>*/ decls, List/*<CsmDeclaration>*/ newList) {
 360 
    private static List/*<CsmDeclaration>*/ mergeDeclarations(List/*<CsmDeclaration>*/ prevScopeDecls, List/*<CsmDeclaration>*/ newScopeDecls) {
361 
        // XXX: now just add all
 361 
        // new scope elements have priority
362 
        if (newList != null && newList.size() > 0) {
 362 
        List res = new ArrayList();
363 
            decls.addAll(newList);
 363 
        if (newScopeDecls != null && newScopeDecls.size() > 0) {
364 
            res.addAll(newScopeDecls);
364 
        }
 365 
        }
365 
        return decls;
 366 
        if (prevScopeDecls != null && prevScopeDecls.size() > 0) {
367 
            res.addAll(prevScopeDecls);
368 
        }
369 
        return res;
366 
    }
 370 
    }
367 

          371
          

        

        

          368
          
//    public static void updateContextObject(CsmObject obj, CsmContext context) {

          372
          
//    public static void updateContextObject(CsmObject obj, CsmContext context) {

        






  

  Return to bug 131560