Merge branch 'master' of github.com:consulo/consulo-java

Author: VISTALL

java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java

@@ -42,6 +42,7 @@
 import consulo.execution.debug.XDebugSession;
 import consulo.execution.debug.XSourcePosition;
 import consulo.execution.debug.evaluation.ValueLookupManager;
+import consulo.execution.debug.localize.XDebuggerLocalize;
 import consulo.execution.debug.ui.XDebuggerUIConstants;
 import consulo.execution.unscramble.ThreadState;
 import consulo.internal.com.sun.jdi.ObjectCollectedException;
@@ -53,7 +54,6 @@
 import consulo.language.psi.scope.GlobalSearchScope;
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
-import consulo.platform.base.localize.ActionLocalize;
 import consulo.process.ExecutionException;
 import consulo.process.ProcessHandler;
 import consulo.process.ProcessOutputTypes;
@@ -391,7 +391,7 @@ public void runToCursor(@Nonnull XSourcePosition position, boolean ignoreBreakpo
             resumeAction(runToCursorCommand, Event.STEP);
         }
         catch (EvaluateException e) {
-            Messages.showErrorDialog(e.getMessage(), ActionLocalize.actionRuntocursorText().map(Presentation.NO_MNEMONIC).get());
+            Messages.showErrorDialog(e.getMessage(), XDebuggerLocalize.actionRunToCursorText().map(Presentation.NO_MNEMONIC).get());
         }
     }
 

java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java

@@ -64,6 +64,7 @@
 import consulo.execution.ExecutionUtil;
 import consulo.execution.debug.XDebugSession;
 import consulo.execution.debug.XSourcePosition;
+import consulo.execution.debug.localize.XDebuggerLocalize;
 import consulo.execution.debug.ui.XDebuggerUIConstants;
 import consulo.internal.com.sun.jdi.*;
 import consulo.internal.com.sun.jdi.connect.*;
@@ -77,7 +78,6 @@
 import consulo.localize.LocalizeValue;
 import consulo.logging.Logger;
 import consulo.platform.Platform;
-import consulo.platform.base.localize.ActionLocalize;
 import consulo.process.ExecutionException;
 import consulo.process.ProcessHandler;
 import consulo.process.ProcessOutputTypes;
@@ -1670,7 +1670,7 @@ public void contextAction(@Nonnull SuspendContextImpl suspendContext) {
                                 myRunToCursorBreakpoint.getSourcePosition().getFile().getName(),
                                 myRunToCursorBreakpoint.getLineIndex() + 1
                             ).get(),
-                            ActionLocalize.actionRuntocursorText().map(Presentation.NO_MNEMONIC).get()
+                            XDebuggerLocalize.actionRunToCursorText().map(Presentation.NO_MNEMONIC).get()
                         );
                         DebuggerSession session = debugProcess.getSession();
                         session.getContextManager().setState(