mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Possible NPE in "getUniqueIdentifier" if the plugin's bundle hasn't been loaded. Replaced by a constant string for the plugin id.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2007-07-25 11:45:42 +00:00
parent 8563df14dc
commit 79c143bd48
4 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java
View file

@ -122,13 +122,7 @@ public class CDebugCorePlugin extends Plugin {
* @return the unique identifier of this plugin * @return the unique identifier of this plugin
*/ */
public static String getUniqueIdentifier() { public static String getUniqueIdentifier() {
if ( getDefault() == null ) { return PLUGIN_ID;
// If the default instance is not yet initialized,
// return a static identifier. This identifier must
// match the plugin id defined in plugin.xml
return PLUGIN_ID;
}
return getDefault().getBundle().getSymbolicName();
} }
/** /**

8
debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java
View file

@ -492,13 +492,7 @@ public class MIPlugin extends Plugin {
* Convenience method which returns the unique identifier of this plugin. * Convenience method which returns the unique identifier of this plugin.
*/ */
public static String getUniqueIdentifier() { public static String getUniqueIdentifier() {
if (getDefault() == null) { return PLUGIN_ID;
// If the default instance is not yet initialized,
// return a static identifier. This identifier must
// match the plugin id defined in plugin.xml
return PLUGIN_ID;
}
return getDefault().getBundle().getSymbolicName();
} }
public void debugLog(String message) { public void debugLog(String message) {

8
debug/org.eclipse.cdt.debug.mi.ui/src/org/eclipse/cdt/debug/mi/internal/ui/MIUIPlugin.java
View file

@ -56,12 +56,6 @@ public class MIUIPlugin extends AbstractUIPlugin {
* @return the unique identifier of this plugin * @return the unique identifier of this plugin
*/ */
public static String getUniqueIdentifier() { public static String getUniqueIdentifier() {
if ( getDefault() == null ) { return PLUGIN_ID;
// If the default instance is not yet initialized,
// return a static identifier. This identifier must
// match the plugin id defined in plugin.xml
return PLUGIN_ID;
}
return getDefault().getBundle().getSymbolicName();
} }
} }

8
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
View file

@ -106,13 +106,7 @@ public class CDebugUIPlugin extends AbstractUIPlugin {
* Convenience method which returns the unique identifier of this plugin. * Convenience method which returns the unique identifier of this plugin.
*/ */
public static String getUniqueIdentifier() { public static String getUniqueIdentifier() {
if ( getDefault() == null ) { return PLUGIN_ID;
// If the default instance is not yet initialized,
// return a static identifier. This identifier must
// match the plugin id defined in plugin.xml
return PLUGIN_ID;
}
return getDefault().getBundle().getSymbolicName();
} }
/** /**