diff options
| -rw-r--r-- | org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java | 4 | ||||
| -rw-r--r-- | org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java index 841b06ae6..e03eec7e3 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugOptions.java @@ -56,8 +56,8 @@ public class DebugOptions implements DebugOptionsListener { public void optionsChanged(org.eclipse.osgi.service.debug.DebugOptions options) { fgDebugTrace = options.newDebugTrace(DebugPlugin.getUniqueIdentifier()); DEBUG = options.getBooleanOption(DEBUG_FLAG, false); - DEBUG_COMMANDS = DEBUG & options.getBooleanOption(DEBUG_FLAG_COMMANDS, false); - DEBUG_EVENTS = DEBUG & options.getBooleanOption(DEBUG_FLAG_EVENTS, false); + DEBUG_COMMANDS = DEBUG && options.getBooleanOption(DEBUG_FLAG_COMMANDS, false); + DEBUG_EVENTS = DEBUG && options.getBooleanOption(DEBUG_FLAG_EVENTS, false); } /** diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java index 477ce0dce..fb9c0c749 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java @@ -453,7 +453,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe @Override public boolean visit(IResourceProxy proxy) { if (proxy.getType() == IResource.FILE) { - if (ILaunchConfiguration.LAUNCH_CONFIGURATION_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension()) | ILaunchConfiguration.LAUNCH_CONFIGURATION_PROTOTYPE_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension())) { + if (ILaunchConfiguration.LAUNCH_CONFIGURATION_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension()) || ILaunchConfiguration.LAUNCH_CONFIGURATION_PROTOTYPE_FILE_EXTENSION.equalsIgnoreCase(proxy.requestFullPath().getFileExtension())) { fList.add(proxy.requestResource()); } return false; @@ -1662,7 +1662,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe // compatibility. initializePreferredDelegates(); for (PreferredDelegate pd : fPreferredDelegates) { - if(pd.getModes().equals(modes) & pd.getTypeId().equals(typeid)) { + if (pd.getModes().equals(modes) && pd.getTypeId().equals(typeid)) { return pd.getDelegate(); } } @@ -2393,7 +2393,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe try { for (ILaunch launch : launches) { for (ILaunchConfiguration config : configs) { - if(config.equals(launch.getLaunchConfiguration()) & launch.canTerminate()) { + if (config.equals(launch.getLaunchConfiguration()) && launch.canTerminate()) { launch.terminate(); } } |