From 87f7d8633e68b1478d9bcd356c81a2bc10e3d2fd Mon Sep 17 00:00:00 2001
From: Mikhail Mutcianko <mutcianko.m@gmail.com>
Date: Mon, 23 May 2016 16:46:32 +0300
Subject: [PATCH] update idea sdk to branch 162

---
 project/dependencies.scala                                      | 2 +-
 .../introduceParameter/ScalaIntroduceParameterDialog.scala      | 2 +-
 .../plugins/scala/debugger/ScalaDebuggerTestCase.scala          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/dependencies.scala b/project/dependencies.scala
index d11207f556a..d8c1a84eb6e 100644
--- a/project/dependencies.scala
+++ b/project/dependencies.scala
@@ -4,7 +4,7 @@ import sbt._
 object Versions {
   val scalaVersion = "2.11.6"
   val sbtVersion = "0.13.9"
-  val ideaVersion = "145.970.4"
+  val ideaVersion = "162.74.16"
   val sbtStructureVersion = "5.1.2"
   val luceneVersion = "4.8.1"
   val aetherVersion = "1.0.0.v20140518"
diff --git a/src/org/jetbrains/plugins/scala/lang/refactoring/introduceParameter/ScalaIntroduceParameterDialog.scala b/src/org/jetbrains/plugins/scala/lang/refactoring/introduceParameter/ScalaIntroduceParameterDialog.scala
index b40b9b7a025..2933bddf8f3 100644
--- a/src/org/jetbrains/plugins/scala/lang/refactoring/introduceParameter/ScalaIntroduceParameterDialog.scala
+++ b/src/org/jetbrains/plugins/scala/lang/refactoring/introduceParameter/ScalaIntroduceParameterDialog.scala
@@ -30,7 +30,7 @@ class ScalaIntroduceParameterDialog(project: Project,
         extends ScalaChangeSignatureDialog(project, method) {
 
   private var paramNameField: EditorTextField = _
-  private var typeCombobox: ComboBox = _
+  private var typeCombobox: ComboBox[String] = _
   private var typeMap: util.LinkedHashMap[String, ScType] = _
   private var replaceOccurrencesChb: JCheckBox = _
   private var defaultValuesUsagePanel: DefaultValuesUsagePanel = _
diff --git a/test/org/jetbrains/plugins/scala/debugger/ScalaDebuggerTestCase.scala b/test/org/jetbrains/plugins/scala/debugger/ScalaDebuggerTestCase.scala
index 47f1f26ea93..9ebd0103b11 100644
--- a/test/org/jetbrains/plugins/scala/debugger/ScalaDebuggerTestCase.scala
+++ b/test/org/jetbrains/plugins/scala/debugger/ScalaDebuggerTestCase.scala
@@ -171,7 +171,7 @@ abstract class ScalaDebuggerTestCase extends ScalaDebuggerTestBase {
     val semaphore = new Semaphore()
     semaphore.down()
     getDebugProcess.getManagerThread.invokeAndWait(new DebuggerContextCommandImpl(ctx) {
-      def threadAction() {
+      override def threadAction() {
         result = callback
         semaphore.up()
       }