MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SdkTypeId extracted

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-05-17 13:02:29 +02:00
parent 3e185cef92
commit b02e6faad3
25 changed files with 105 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
+1 -1
View File
@@ -517,7 +517,7 @@ public class CompileServerManager implements ApplicationComponent{
}
final SdkAdditionalData data = sdk.getSdkAdditionalData();
final String additionalDataXml;
final SdkType sdkType = sdk.getSdkType();
final SdkType sdkType = (SdkType)sdk.getSdkType();
if (data == null) {
additionalDataXml = null;
}
java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ex.ProjectEx;
import com.intellij.openapi.projectRoots.JavaSdkType;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkType;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.roots.libraries.LibraryTable;
@@ -137,7 +137,7 @@ public class BuildPropertiesImpl extends BuildProperties {
if (jdk.getHomeDirectory() == null) {
continue;
}
final SdkType sdkType = jdk.getSdkType();
final SdkTypeId sdkType = jdk.getSdkType();
if (!(sdkType instanceof JavaSdkType) || ((JavaSdkType)sdkType).getBinPath(jdk) == null) {
continue;
}
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -83,7 +83,7 @@ public class JavacCompiler extends ExternalCompiler {
continue;
}
checkedJdks.add(jdk);
final SdkType sdkType = jdk.getSdkType();
final SdkTypeId sdkType = jdk.getSdkType();
if (!(sdkType instanceof JavaSdkType)) {
continue;
}
java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+1 -1
View File
@@ -543,7 +543,7 @@ public class BuildManager implements ApplicationComponent{
}
final SdkAdditionalData data = sdk.getSdkAdditionalData();
final String additionalDataXml;
final SdkType sdkType = sdk.getSdkType();
final SdkType sdkType = (SdkType) sdk.getSdkType();
if (data == null) {
additionalDataXml = null;
}
java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -22,7 +22,7 @@ package com.intellij.openapi.projectRoots.impl;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkAdditionalData;
import com.intellij.openapi.projectRoots.SdkModificator;
import com.intellij.openapi.projectRoots.SdkType;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.roots.RootProvider;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.io.FileUtil;
@@ -56,7 +56,7 @@ public final class MockJdkWrapper implements Sdk {
}
@NotNull
public SdkType getSdkType() {
public SdkTypeId getSdkType() {
return myDelegate.getSdkType();
}