74
74
public class AutoBuildLanguageSettingsProvider extends AbstractExecutableExtensionBase
75
75
implements ILanguageSettingsBroadcastingProvider {
76
76
77
- private static final String CDT_MANAGEDBUILDER_UI_PLUGIN_ID = "org.eclipse.cdt.managedbuilder.ui" ; //$NON-NLS-1$
78
77
private static final String SCANNER_DISCOVERY_CONSOLE = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryConsole" ; //$NON-NLS-1$
79
78
private static final String SCANNER_DISCOVERY_GLOBAL_CONSOLE = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryGlobalConsole" ; //$NON-NLS-1$
80
79
private static final String DEFAULT_CONSOLE_ICON = "icons/obj16/inspect_sys.gif" ; //$NON-NLS-1$
@@ -122,7 +121,7 @@ protected IStatus run(IProgressMonitor monitor) {
122
121
}
123
122
}
124
123
} catch (CoreException e ) {
125
- return new Status (IStatus .ERROR , Activator .PLUGIN_ID , "Error checking markers." , //$NON-NLS-1$
124
+ return new Status (IStatus .ERROR , Activator .getId () , "Error checking markers." , //$NON-NLS-1$
126
125
e );
127
126
}
128
127
@@ -145,7 +144,7 @@ protected IStatus run(IProgressMonitor monitor) {
145
144
marker .setAttribute (IMarker .LOCATION , msgProperties );
146
145
}
147
146
} catch (CoreException e ) {
148
- return new Status (IStatus .ERROR , Activator .PLUGIN_ID , "Error adding markers." , //$NON-NLS-1$
147
+ return new Status (IStatus .ERROR , Activator .getId () , "Error adding markers." , //$NON-NLS-1$
149
148
e );
150
149
}
151
150
@@ -311,7 +310,7 @@ private List<ICLanguageSettingEntry> runForLanguage(String currentLanguageId, St
311
310
// that looks in extension points registry and won't find the id, this console
312
311
// is not shown
313
312
console = CCorePlugin .getDefault ()
314
- .getConsole (Activator .PLUGIN_ID + DOT + currentLanguageId + ".console.hidden" ); //$NON-NLS-1$
313
+ .getConsole (Activator .getId () + DOT + currentLanguageId + ".console.hidden" ); //$NON-NLS-1$
315
314
}
316
315
console .start (currentProject );
317
316
@@ -349,7 +348,7 @@ private List<ICLanguageSettingEntry> runForLanguage(String currentLanguageId, St
349
348
350
349
} catch (Exception e ) {
351
350
Activator .log (new CoreException (
352
- new Status (IStatus .ERROR , Activator .PLUGIN_ID , "Error running Builtin Specs Detector" , e ))); //$NON-NLS-1$
351
+ new Status (IStatus .ERROR , Activator .getId () , "Error running Builtin Specs Detector" , e ))); //$NON-NLS-1$
353
352
} finally {
354
353
monitor .done ();
355
354
}
@@ -373,14 +372,14 @@ private IConsole startProviderConsole(IProject currentProject, String currentLan
373
372
}
374
373
ILanguage ld = LanguageManager .getInstance ().getLanguage (currentLanguageId );
375
374
if (ld != null ) {
376
- String consoleId = Activator .PLUGIN_ID + '.' + getId () + '.' + currentLanguageId ;
375
+ String consoleId = Activator .getId () + '.' + getId () + '.' + currentLanguageId ;
377
376
String consoleName = getName () + ", " + ld .getName (); //$NON-NLS-1$
378
- URL defaultIcon = Platform .getBundle (CDT_MANAGEDBUILDER_UI_PLUGIN_ID ).getEntry (DEFAULT_CONSOLE_ICON );
377
+ URL defaultIcon = Platform .getBundle (Activator . getId () ).getEntry (DEFAULT_CONSOLE_ICON );
379
378
if (defaultIcon == null ) {
380
379
@ SuppressWarnings ("nls" )
381
380
String msg = "Unable to find icon " + DEFAULT_CONSOLE_ICON + " in plugin "
382
- + CDT_MANAGEDBUILDER_UI_PLUGIN_ID ;
383
- Activator .log (new Status (IStatus .ERROR , Activator .PLUGIN_ID , msg ));
381
+ + Activator . getId () ;
382
+ Activator .log (new Status (IStatus .ERROR , Activator .getId () , msg ));
384
383
}
385
384
386
385
console = CCorePlugin .getDefault ().getConsole (extConsoleId , consoleId , consoleName , defaultIcon );
@@ -390,7 +389,7 @@ private IConsole startProviderConsole(IProject currentProject, String currentLan
390
389
if (console == null ) {
391
390
// that looks in extension points registry and won't find the id, this console
392
391
// is not shown
393
- console = CCorePlugin .getDefault ().getConsole (Activator .PLUGIN_ID + ".console.hidden" ); //$NON-NLS-1$
392
+ console = CCorePlugin .getDefault ().getConsole (Activator .getId () + ".console.hidden" ); //$NON-NLS-1$
394
393
}
395
394
396
395
return console ;
0 commit comments