cleanup
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 28 Oct 2015 13:53:37 +0000 (14:53 +0100)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Wed, 28 Oct 2015 15:22:42 +0000 (16:22 +0100)
platform/script-debugger/backend/src/org/jetbrains/debugger/BreakpointManagerBase.kt
platform/script-debugger/backend/src/org/jetbrains/debugger/HasUrl.java [deleted file]
platform/script-debugger/backend/src/org/jetbrains/debugger/Script.kt [moved from platform/script-debugger/backend/src/org/jetbrains/debugger/Script.java with 100% similarity]
platform/script-debugger/backend/src/org/jetbrains/debugger/ScriptBase.kt [moved from platform/script-debugger/backend/src/org/jetbrains/debugger/ScriptBase.java with 100% similarity]
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/LineBreakpointManager.kt

index 6174d7f0d0dd263ae05ee491862df5bb2fbd759c..2bd3e11330772ff1feee185277f4251f104afb57 100644 (file)
@@ -57,7 +57,7 @@ abstract class BreakpointManagerBase<T : BreakpointBase<*>> : BreakpointManager
 
     breakpoints.add(breakpoint)
     if (enabled) {
-      doSetBreakpoint(target, breakpoint).rejected { dispatcher.multicaster.errorOccurred(breakpoint, it.getMessage() ?: it.toString()) }
+      doSetBreakpoint(target, breakpoint).rejected { dispatcher.multicaster.errorOccurred(breakpoint, it.message ?: it.toString()) }
     }
     return breakpoint
   }
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/HasUrl.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/HasUrl.java
deleted file mode 100644 (file)
index 56f51c5..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.debugger;
-
-import com.intellij.util.Url;
-import org.jetbrains.annotations.NotNull;
-
-
-public interface HasUrl {
-  @NotNull
-  Url getUrl();
-}
index ff8175839ba56d80e6be4b6438ff62fc96a98a09..815275f37a0377ca4b2678072ea67749c728bfd8 100644 (file)
@@ -73,7 +73,7 @@ abstract class LineBreakpointManager(private val debugProcess: DebugProcessImpl<
         vmBreakpoints = list
         while (iterator.hasNext()) {
           val vmBreakpoint = iterator.next()
-          if ((vmToIdeBreakpoints.get(vmBreakpoint)?.size ?: -1) > 1) {
+          if ((vmToIdeBreakpoints[vmBreakpoint]?.size ?: -1) > 1) {
             // we must not disable vm breakpoint - it is used for another ide breakpoints
             iterator.remove()
           }
@@ -134,7 +134,7 @@ abstract class LineBreakpointManager(private val debugProcess: DebugProcessImpl<
     if (breakpointResolvedListenerAdded.compareAndSet(false, true)) {
       breakpointManager.addBreakpointListener(object : BreakpointListener {
         override fun resolved(breakpoint: Breakpoint) {
-          synchronized (lock) { vmToIdeBreakpoints.get(breakpoint) }?.let {
+          synchronized (lock) { vmToIdeBreakpoints[breakpoint] }?.let {
             for (ideBreakpoint in it) {
               debugProcess.session.updateBreakpointPresentation(ideBreakpoint, AllIcons.Debugger.Db_verified_breakpoint, null)
             }
@@ -151,7 +151,7 @@ abstract class LineBreakpointManager(private val debugProcess: DebugProcessImpl<
             return
           }
 
-          synchronized (lock) { vmToIdeBreakpoints.get(breakpoint) }?.let {
+          synchronized (lock) { vmToIdeBreakpoints[breakpoint] }?.let {
             for (ideBreakpoint in it) {
               debugProcess.session.updateBreakpointPresentation(ideBreakpoint, AllIcons.Debugger.Db_invalid_breakpoint, errorMessage)
             }