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

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-08-28 20:12:54 +04:00
parent dee081ff7f
commit 7d6de4f7b1
11 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+4 -4
View File
@@ -109,25 +109,25 @@ public class JavaSdkImpl extends JavaSdk {
}
@Override
public void saveAdditionalData(SdkAdditionalData additionalData, Element additional) {
public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) {
}
@Override
@SuppressWarnings({"HardCodedStringLiteral"})
public String getBinPath(Sdk sdk) {
public String getBinPath(@NotNull Sdk sdk) {
return getConvertedHomePath(sdk) + "bin";
}
@Override
@NonNls
public String getToolsPath(Sdk sdk) {
public String getToolsPath(@NotNull Sdk sdk) {
final String versionString = sdk.getVersionString();
final boolean isJdk1_x = versionString != null && (versionString.contains("1.0") || versionString.contains("1.1"));
return getConvertedHomePath(sdk) + "lib" + File.separator + (isJdk1_x? "classes.zip" : "tools.jar");
}
@Override
public String getVMExecutablePath(Sdk sdk) {
public String getVMExecutablePath(@NotNull Sdk sdk) {
/*
if ("64".equals(System.getProperty("sun.arch.data.model"))) {
return getBinPath(sdk) + File.separator + System.getProperty("os.arch") + File.separator + VM_EXE_NAME;
java/openapi/src/com/intellij/openapi/projectRoots/JavaSdk.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
public abstract class JavaSdk extends SdkType implements JavaSdkType, ApplicationComponent {
public JavaSdk(@NonNls String name) {
public JavaSdk(@NotNull @NonNls String name) {
super(name);
}
platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java
+4 -4
View File
@@ -68,7 +68,7 @@ public abstract class SdkType implements SdkTypeId {
@Override
@Nullable
public String getVersionString(Sdk sdk) {
public String getVersionString(@NotNull Sdk sdk) {
return getVersionString(sdk.getHomePath());
}
@@ -99,15 +99,15 @@ public abstract class SdkType implements SdkTypeId {
@Override
@Nullable
public SdkAdditionalData loadAdditionalData(Sdk currentSdk, Element additional) {
public SdkAdditionalData loadAdditionalData(@NotNull Sdk currentSdk, Element additional) {
return loadAdditionalData(additional);
}
public SdkType(@NonNls String name) {
public SdkType(@NotNull @NonNls String name) {
myName = name;
}
@NotNull
@Override
public String getName() {
return myName;
platform/lang-api/src/com/intellij/openapi/projectRoots/SimpleJavaSdkType.java
+5 -4
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.projectRoots.impl.SdkVersionUtil;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -55,24 +56,24 @@ public class SimpleJavaSdkType extends SdkType implements JavaSdkType {
}
@Override
public void saveAdditionalData(SdkAdditionalData additionalData, Element additional) {
public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) {
}
@Override
public String getBinPath(Sdk sdk) {
public String getBinPath(@NotNull Sdk sdk) {
return getConvertedHomePath(sdk) + "bin";
}
@Override
@NonNls
public String getToolsPath(Sdk sdk) {
public String getToolsPath(@NotNull Sdk sdk) {
final String versionString = sdk.getVersionString();
final boolean isJdk1_x = versionString != null && (versionString.contains("1.0") || versionString.contains("1.1"));
return getConvertedHomePath(sdk) + "lib" + File.separator + (isJdk1_x? "classes.zip" : "tools.jar");
}
@Override
public String getVMExecutablePath(Sdk sdk) {
public String getVMExecutablePath(@NotNull Sdk sdk) {
return getBinPath(sdk) + File.separator + VM_EXE_NAME;
}
platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java
+5 -3
View File
@@ -19,6 +19,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.projectRoots.*;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.util.HashMap;
@@ -35,11 +36,12 @@ public class UnknownSdkType extends SdkType{
/**
* @param typeName the name of the SDK type that this SDK serves as a plug for
*/
private UnknownSdkType(String typeName) {
private UnknownSdkType(@NotNull String typeName) {
super(typeName);
}
public static UnknownSdkType getInstance(String typeName) {
@NotNull
public static UnknownSdkType getInstance(@NotNull String typeName) {
UnknownSdkType instance = ourTypeNameToInstanceMap.get(typeName);
if (instance == null) {
instance = new UnknownSdkType(typeName);
@@ -86,7 +88,7 @@ public class UnknownSdkType extends SdkType{
}
@Override
public void saveAdditionalData(SdkAdditionalData additionalData, Element additional) {
public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) {
}
@Override
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkTableImpl.java
+3 -3
View File
@@ -209,15 +209,15 @@ public class ProjectJdkTableImpl extends ProjectJdkTable implements PersistentSt
@Override
public SdkTypeId getDefaultSdkType() {
return UnknownSdkType.getInstance(null);
return UnknownSdkType.getInstance("");
}
@Override
public SdkTypeId getSdkTypeByName(String sdkTypeName) {
public SdkTypeId getSdkTypeByName(@NotNull String sdkTypeName) {
return findSdkTypeByName(sdkTypeName);
}
public static SdkTypeId findSdkTypeByName(String sdkTypeName) {
public static SdkTypeId findSdkTypeByName(@NotNull String sdkTypeName) {
final SdkType[] allSdkTypes = SdkType.getAllTypes();
for (final SdkType type : allSdkTypes) {
if (type.getName().equals(sdkTypeName)) {
platform/projectModel-api/src/com/intellij/openapi/projectRoots/ProjectJdkTable.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.util.messages.Topic;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.EventListener;
@@ -88,7 +89,7 @@ public abstract class ProjectJdkTable {
public abstract SdkTypeId getDefaultSdkType();
public abstract SdkTypeId getSdkTypeByName(String name);
public abstract SdkTypeId getSdkTypeByName(@NotNull String name);
public abstract Sdk createSdk(final String name, final SdkTypeId sdkType);
platform/projectModel-api/src/com/intellij/openapi/projectRoots/SdkTypeId.java
+5 -3
View File
@@ -16,19 +16,21 @@
package com.intellij.openapi.projectRoots;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author yole
*/
public interface SdkTypeId {
@NotNull
String getName();
@Nullable
String getVersionString(Sdk sdk);
String getVersionString(@NotNull Sdk sdk);
void saveAdditionalData(SdkAdditionalData additionalData, Element additional);
void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional);
@Nullable
SdkAdditionalData loadAdditionalData(Sdk currentSdk, Element additional);
SdkAdditionalData loadAdditionalData(@NotNull Sdk currentSdk, Element additional);
}
platform/projectModel-impl/src/com/intellij/core/CoreProjectJdkTable.java
+2 -1
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.projectRoots.ProjectJdkTable;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkTypeId;
import com.intellij.openapi.util.Comparing;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
@@ -99,7 +100,7 @@ public class CoreProjectJdkTable extends ProjectJdkTable {
}
@Override
public SdkTypeId getSdkTypeByName(String name) {
public SdkTypeId getSdkTypeByName(@NotNull String name) {
return CoreSdkType.INSTANCE;
}
platform/projectModel-impl/src/com/intellij/core/CoreSdkType.java
+5 -3
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkAdditionalData;
import com.intellij.openapi.projectRoots.SdkTypeId;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
/**
* @author yole
@@ -29,22 +30,23 @@ public class CoreSdkType implements SdkTypeId {
public static CoreSdkType INSTANCE = new CoreSdkType();
@NotNull
@Override
public String getName() {
return "";
}
@Override
public String getVersionString(Sdk sdk) {
public String getVersionString(@NotNull Sdk sdk) {
return "";
}
@Override
public void saveAdditionalData(SdkAdditionalData additionalData, Element additional) {
public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) {
}
@Override
public SdkAdditionalData loadAdditionalData(Sdk currentSdk, Element additional) {
public SdkAdditionalData loadAdditionalData(@NotNull Sdk currentSdk, Element additional) {
return null;
}
}
plugins/devkit/src/projectRoots/IdeaJdk.java
+6 -6
View File
@@ -121,7 +121,7 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
}
@Nullable
public final String getVersionString(final Sdk sdk) {
public final String getVersionString(@NotNull final Sdk sdk) {
final Sdk internalJavaSdk = getInternalJavaSdk(sdk);
return internalJavaSdk != null ? internalJavaSdk.getVersionString() : null;
}
@@ -401,13 +401,13 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
}
@Nullable
public String getBinPath(Sdk sdk) {
public String getBinPath(@NotNull Sdk sdk) {
final Sdk internalJavaSdk = getInternalJavaSdk(sdk);
return internalJavaSdk == null ? null : JavaSdk.getInstance().getBinPath(internalJavaSdk);
}
@Nullable
public String getToolsPath(Sdk sdk) {
public String getToolsPath(@NotNull Sdk sdk) {
final Sdk jdk = getInternalJavaSdk(sdk);
if (jdk != null && jdk.getVersionString() != null){
return JavaSdk.getInstance().getToolsPath(jdk);
@@ -416,12 +416,12 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
}
@Nullable
public String getVMExecutablePath(Sdk sdk) {
public String getVMExecutablePath(@NotNull Sdk sdk) {
final Sdk internalJavaSdk = getInternalJavaSdk(sdk);
return internalJavaSdk == null ? null : JavaSdk.getInstance().getVMExecutablePath(internalJavaSdk);
}
public void saveAdditionalData(SdkAdditionalData additionalData, Element additional) {
public void saveAdditionalData(@NotNull SdkAdditionalData additionalData, @NotNull Element additional) {
if (additionalData instanceof Sandbox) {
try {
((Sandbox)additionalData).writeExternal(additional);
@@ -432,7 +432,7 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
}
}
public SdkAdditionalData loadAdditionalData(Sdk sdk, Element additional) {
public SdkAdditionalData loadAdditionalData(@NotNull Sdk sdk, Element additional) {
Sandbox sandbox = new Sandbox(sdk);
try {
sandbox.readExternal(additional);