From 719ec475eee7caa63c826cfc91389f51b3d674ce Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 9 Feb 2012 19:46:43 +0100
Subject: [PATCH] workaround compile server make failures for now

---
 jps/model/src/org/jetbrains/jps/JavaSdk.groovy      | 13 ++++++++++---
 jps/model/src/org/jetbrains/jps/JavaSdkImpl.groovy  |  2 +-
 .../src/org/jetbrains/jps/android/AndroidSdk.groovy |  7 +++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/jps/model/src/org/jetbrains/jps/JavaSdk.groovy b/jps/model/src/org/jetbrains/jps/JavaSdk.groovy
index 17aa8457d59c..132d69a2c49d 100644
--- a/jps/model/src/org/jetbrains/jps/JavaSdk.groovy
+++ b/jps/model/src/org/jetbrains/jps/JavaSdk.groovy
@@ -3,9 +3,16 @@ package org.jetbrains.jps
 /**
  * @author Eugene.Kudelevsky
  */
-public interface JavaSdk {
+public abstract class JavaSdk extends Sdk {
+  def JavaSdk(Project project, String name, String jdkPath, Closure initializer) {
+    super(project, name, initializer)
+  }
 
-  String getJavacExecutable();
+  JavaSdk(project, name, initializer) {
+    super(project, name, initializer)
+  }
 
-  String getJavaExecutable();
+  abstract String getJavacExecutable();
+
+  abstract String getJavaExecutable();
 }
\ No newline at end of file
diff --git a/jps/model/src/org/jetbrains/jps/JavaSdkImpl.groovy b/jps/model/src/org/jetbrains/jps/JavaSdkImpl.groovy
index 9caa1092f55d..d1a20ceb9f21 100644
--- a/jps/model/src/org/jetbrains/jps/JavaSdkImpl.groovy
+++ b/jps/model/src/org/jetbrains/jps/JavaSdkImpl.groovy
@@ -3,7 +3,7 @@ package org.jetbrains.jps
 /**
  * @author nik
  */
-class JavaSdkImpl extends Sdk implements JavaSdk {
+class JavaSdkImpl extends JavaSdk {
   String jdkPath
 
   def JavaSdkImpl(Project project, String name, String jdkPath, Closure initializer) {
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSdk.groovy b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSdk.groovy
index b4ce00b91c41..e105eb6b275e 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSdk.groovy
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSdk.groovy
@@ -1,20 +1,19 @@
 package org.jetbrains.jps.android
 
 import org.jetbrains.jps.JavaSdk
-import org.jetbrains.jps.Project
-import org.jetbrains.jps.Sdk
 import org.jetbrains.jps.JavaSdkImpl
+import org.jetbrains.jps.Project
 
 /**
  * @author Eugene.Kudelevsky
  */
-class AndroidSdk extends Sdk implements JavaSdk {
+class AndroidSdk extends JavaSdk {
   final String sdkPath;
   final String buildTargetHashString;
   final String javaSdkName;
 
   AndroidSdk(Project project, String name, String sdkPath, String javaSdkName, String buildTargetHashString) {
-    super(project, name, {})
+    super(project, name, '', {})
     this.sdkPath = sdkPath
     this.buildTargetHashString = buildTargetHashString
     this.javaSdkName = javaSdkName;