diff options
| author | Thanh Ha | 2014-12-21 04:31:29 +0000 |
|---|---|---|
| committer | vrubezhny | 2015-01-17 02:33:30 +0000 |
| commit | 1983ba12f277ae5c1738239eb4157372dd654630 (patch) | |
| tree | e56f9bb11a7d5b3c2b4b5a537edba2dec9b42113 | |
| parent | e40b8acc2718e83bf89b3c62fb89d053fa332bf9 (diff) | |
| download | webtools.jsdt-1983ba12f277ae5c1738239eb4157372dd654630.tar.gz webtools.jsdt-1983ba12f277ae5c1738239eb4157372dd654630.tar.xz webtools.jsdt-1983ba12f277ae5c1738239eb4157372dd654630.zip | |
Bug 455878 - If-statements must use braces in debug.core
Change-Id: Ia0715a2247d96603db5fec5dffc4ae9b4fd9b696
Signed-off-by: Thanh Ha <thanh.ha@alumni.carleton.ca>
2 files changed, 18 insertions, 9 deletions
diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java index c47ce0933..8222d9587 100644 --- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java +++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptThread.java @@ -596,8 +596,9 @@ public class JavaScriptThread extends JavaScriptDebugElement implements IJavaScr */ synchronized void markSuspended() { if (DEBUG){ - if (!thread.isSuspended()) + if (!thread.isSuspended()) { System.err.println("Warning: model thread marked suspended when underlything thread is not suspended"); //$NON-NLS-1$ + } } this.state = SUSPENDED; } @@ -608,8 +609,9 @@ public class JavaScriptThread extends JavaScriptDebugElement implements IJavaScr */ synchronized void markResumed() { if (DEBUG){ - if (thread.isSuspended()) + if (thread.isSuspended()) { System.err.println("Warning: model thread marked resumed when underlything thread is suspended"); //$NON-NLS-1$ + } } this.state = RUNNING; clearFrames(); @@ -692,8 +694,9 @@ public class JavaScriptThread extends JavaScriptDebugElement implements IJavaScr */ public synchronized void stepInto() throws DebugException { if (!canStepInto()) { - if (DEBUG) + if (DEBUG) { System.err.println("Warning: StepInto called on model thread when it canStepInto is false"); //$NON-NLS-1$ + } return; } StepHandler handler = new StepHandler(); @@ -707,8 +710,9 @@ public class JavaScriptThread extends JavaScriptDebugElement implements IJavaScr */ public synchronized void stepOver() throws DebugException { if (!canStepOver()) { - if (DEBUG) + if (DEBUG) { System.err.println("Warning: stepOver called on model thread when it canStepOver is false"); //$NON-NLS-1$ + } return; } StepHandler handler = new StepHandler(); @@ -722,8 +726,9 @@ public class JavaScriptThread extends JavaScriptDebugElement implements IJavaScr */ public synchronized void stepReturn() throws DebugException { if (!canStepReturn()) { - if (DEBUG) + if (DEBUG) { System.err.println("Warning: stepReturn called on model thread when it canStepReturn is false"); //$NON-NLS-1$ + } return; } StepHandler handler = new StepHandler(); diff --git a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptValue.java b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptValue.java index 739fe032a..c2a63b4f4 100644 --- a/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptValue.java +++ b/bundles/org.eclipse.wst.jsdt.debug.core/src/org/eclipse/wst/jsdt/debug/internal/core/model/JavaScriptValue.java @@ -92,15 +92,17 @@ public class JavaScriptValue extends JavaScriptDebugElement implements IJavaScri ArrayReference array = (ArrayReference) this.value; List values = array.getValues(); Iterator iterator = values.iterator(); - if (! iterator.hasNext()) + if (! iterator.hasNext()) { return "[]"; //$NON-NLS-1$ + } StringBuffer buffer = new StringBuffer(); buffer.append('['); for (;;) { Value jsValue = (Value) iterator.next(); buffer.append(getValueString(jsValue)); - if (! iterator.hasNext()) + if (! iterator.hasNext()) { return buffer.append(']').toString(); + } buffer.append(", "); //$NON-NLS-1$ } } @@ -228,12 +230,14 @@ public class JavaScriptValue extends JavaScriptDebugElement implements IJavaScri String name1 = ((IVariable) arg1).getName(); if (Character.isDigit(name0.charAt(0))) { - if (Character.isDigit(name1.charAt(0))) + if (Character.isDigit(name1.charAt(0))) { return Integer.valueOf(name0).compareTo(Integer.valueOf(name1)); + } return -1; } - if (Character.isDigit(name1.charAt(0))) + if (Character.isDigit(name1.charAt(0))) { return 1; + } return name0.compareToIgnoreCase(name1); } catch (DebugException e) { |