Attachment #149346 for bug #247268

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 247268
Collapse All | Expand All

Lines 264-270 Link Here

(-)a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/plugins/CsmRefactoringPlugin.java (-1 / +2 lines)
264	name = ((CsmGotoStatement)referencedObject).getLabel();	264	name = ((CsmGotoStatement)referencedObject).getLabel();
265	}	265	}
266	}	266	}
267		267
		268	name = CsmRefactoringUtils.getRefactoredName(referencedObject, name.toString());
268	final CsmReferenceRepository xRef = CsmReferenceRepository.getDefault();	269	final CsmReferenceRepository xRef = CsmReferenceRepository.getDefault();
269	relevantFiles.addAll(xRef.findRelevantFiles(relevantPrjs, name));	270	relevantFiles.addAll(xRef.findRelevantFiles(relevantPrjs, name));
270	} else {	271	} else {




    } 

    private static final Lookup.Result<CsmRefactoringNameProvider> renameProviders = Lookup.getDefault().lookupResult(CsmRefactoringNameProvider.class);

    public static String getRefactoredName(CsmObject element, String text) {
        for (CsmRefactoringNameProvider provider : renameProviders.allInstances()) {
            String newName = provider.getRefactoredName(element, text);
            if (newName != null) {
                text = newName;
            }
        }
        return text;
    }
    
    public static String getReplaceText(CsmReference ref, String newName, AbstractRefactoring refactoring) {
        for (CsmRefactoringNameProvider provider : renameProviders.allInstances()) {

            if (text.startsWith("~")) { // NOI18N
                text = text.substring(1);
            }
            text = getRefactoredName(element, text);
                String newName = provider.getRefactoredName(element, text);
                if (newName != null) {
                    text = newName;
                }
            }
        }
        return text;
    }

    public static ModificationResult.Difference rename(int startOffset, int endOffset, CloneableEditorSupport ces,
            String oldName, String newName, String descr) {
        assert oldName != null;

Return to bug 247268

Lines 226-231 Link Here

(-)a/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/support/CsmRefactoringUtils.java (-7 / +12 lines)
226	}	226	}
227		227
228	private static final Lookup.Result<CsmRefactoringNameProvider> renameProviders = Lookup.getDefault().lookupResult(CsmRefactoringNameProvider.class);	228	private static final Lookup.Result<CsmRefactoringNameProvider> renameProviders = Lookup.getDefault().lookupResult(CsmRefactoringNameProvider.class);
		229
		230	public static String getRefactoredName(CsmObject element, String text) {
		231	for (CsmRefactoringNameProvider provider : renameProviders.allInstances()) {
		232	String newName = provider.getRefactoredName(element, text);
		233	if (newName != null) {
		234	text = newName;
		235	}
		236	}
		237	return text;
		238	}
229		239
230	public static String getReplaceText(CsmReference ref, String newName, AbstractRefactoring refactoring) {	240	public static String getReplaceText(CsmReference ref, String newName, AbstractRefactoring refactoring) {
231	for (CsmRefactoringNameProvider provider : renameProviders.allInstances()) {	241	for (CsmRefactoringNameProvider provider : renameProviders.allInstances()) {
Lines 269-284 Link Here
269	if (text.startsWith("~")) { // NOI18N	279	if (text.startsWith("~")) { // NOI18N
270	text = text.substring(1);	280	text = text.substring(1);
271	}	281	}
272	for (CsmRefactoringNameProvider provider : renameProviders.allInstances()) {	282	text = getRefactoredName(element, text);
273	String newName = provider.getRefactoredName(element, text);
274	if (newName != null) {
275	text = newName;
276	}
277	}
278	}	283	}
279	return text;	284	return text;
280	}	285	}
281		286
282	public static ModificationResult.Difference rename(int startOffset, int endOffset, CloneableEditorSupport ces,	287	public static ModificationResult.Difference rename(int startOffset, int endOffset, CloneableEditorSupport ces,
283	String oldName, String newName, String descr) {	288	String oldName, String newName, String descr) {
284	assert oldName != null;	289	assert oldName != null;