summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Rybin2012-09-10 11:20:42 (EDT)
committer Mike Rennie2012-09-10 11:20:42 (EDT)
commit8dc6d86528ac3b9b11358fe7469fbf10778e2699 (patch)
treef05370479c41cae6373609de7245ab6a6743d3af
parent38010e6c04168eea820c0227b5e8ebbae0bc9141 (diff)
downloadwebtools.jsdt.debug-8dc6d86528ac3b9b11358fe7469fbf10778e2699.zip
webtools.jsdt.debug-8dc6d86528ac3b9b11358fe7469fbf10778e2699.tar.gz
webtools.jsdt.debug-8dc6d86528ac3b9b11358fe7469fbf10778e2699.tar.bz2
Bug 389133 - Allow enablement and properties ruler actions for
third-party breakpoints in JavaScript Editor
-rw-r--r--bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/BreakpointPropertiesRulerAction.java17
-rw-r--r--bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointEnablementRulerAction.java10
2 files changed, 14 insertions, 13 deletions
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/BreakpointPropertiesRulerAction.java b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/BreakpointPropertiesRulerAction.java
index c75bd67..7072a29 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/BreakpointPropertiesRulerAction.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/BreakpointPropertiesRulerAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Peter Rybin - Bug 389133 - Allow enablement and properties ruler actions for third-party breakpoints in JavaScript Editor
*******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.ui.breakpoints;
@@ -25,7 +26,7 @@ import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptBreakpoint;
*/
public class BreakpointPropertiesRulerAction extends RulerBreakpointAction implements IUpdate {
- private IJavaScriptBreakpoint breakpoint = null;
+ private IBreakpoint breakpoint = null;
/**
* Constructor
@@ -42,10 +43,14 @@ public class BreakpointPropertiesRulerAction extends RulerBreakpointAction imple
*/
public void run() {
if(this.breakpoint != null) {
+ String pageId = null;
+ if (this.breakpoint instanceof IJavaScriptBreakpoint) {
+ pageId = JavaScriptBreakpointPropertyPage.PAGE_ID;
+ }
PreferencesUtil.createPropertyDialogOn(
getEditor().getSite().getShell(),
this.breakpoint,
- JavaScriptBreakpointPropertyPage.PAGE_ID,
+ pageId,
null,
null,
0).open();
@@ -56,11 +61,7 @@ public class BreakpointPropertiesRulerAction extends RulerBreakpointAction imple
* @see org.eclipse.ui.texteditor.IUpdate#update()
*/
public void update() {
- this.breakpoint = null;
- IBreakpoint bp = getBreakpoint();
- if (bp != null && (bp instanceof IJavaScriptBreakpoint)) {
- this.breakpoint = (IJavaScriptBreakpoint) bp;
- }
+ this.breakpoint = getBreakpoint();
setEnabled(this.breakpoint != null);
}
diff --git a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointEnablementRulerAction.java b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointEnablementRulerAction.java
index 2b311dd..e21d6a3 100644
--- a/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointEnablementRulerAction.java
+++ b/bundles/org.eclipse.wst.jsdt.debug.ui/src/org/eclipse/wst/jsdt/debug/internal/ui/breakpoints/ToggleBreakpointEnablementRulerAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Peter Rybin - Bug 389133 - Allow enablement and properties ruler actions for third-party breakpoints in JavaScript Editor
*******************************************************************************/
package org.eclipse.wst.jsdt.debug.internal.ui.breakpoints;
@@ -16,7 +17,6 @@ import org.eclipse.debug.ui.actions.RulerBreakpointAction;
import org.eclipse.jface.text.source.IVerticalRulerInfo;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptBreakpoint;
import org.eclipse.wst.jsdt.debug.internal.ui.JavaScriptDebugUIPlugin;
/**
@@ -27,7 +27,7 @@ import org.eclipse.wst.jsdt.debug.internal.ui.JavaScriptDebugUIPlugin;
*/
public class ToggleBreakpointEnablementRulerAction extends RulerBreakpointAction implements IUpdate {
- private IJavaScriptBreakpoint breakpoint = null;
+ private IBreakpoint breakpoint = null;
/**
* Constructor
@@ -71,8 +71,8 @@ public class ToggleBreakpointEnablementRulerAction extends RulerBreakpointAction
public void update() {
this.breakpoint = null;
IBreakpoint bp = getBreakpoint();
- if (bp != null && (bp instanceof IJavaScriptBreakpoint)) {
- this.breakpoint = (IJavaScriptBreakpoint) bp;
+ if (bp != null) {
+ this.breakpoint = bp;
try {
if(this.breakpoint.isEnabled()) {
setText(Messages.disable_breakpoint);