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

replace @Nullable findInstance with @NotNull utility with logging (EA-55734)

Browse Source
This commit is contained in:
Gregory.Shrago
2014-05-19 21:06:42 +04:00
parent 061c4b094d
commit 8168063f50
6 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java
+2 -7
View File
@@ -17,14 +17,9 @@ package com.intellij.execution.applet;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configuration.ConfigurationFactoryEx;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.execution.configurations.ModuleBasedConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.*;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -72,6 +67,6 @@ public class AppletConfigurationType implements ConfigurationType {
}
public static AppletConfigurationType getInstance() {
return ContainerUtil.findInstance(Extensions.getExtensions(CONFIGURATION_TYPE_EP), AppletConfigurationType.class);
return ConfigurationTypeUtil.findConfigurationType(AppletConfigurationType.class);
}
}
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java
+3 -8
View File
@@ -17,18 +17,13 @@ package com.intellij.execution.application;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configuration.ConfigurationFactoryEx;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.execution.configurations.ModuleBasedConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.*;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiJavaFile;
import com.intellij.psi.util.PsiMethodUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -98,9 +93,9 @@ public class ApplicationConfigurationType implements ConfigurationType {
return "Application";
}
@Nullable
@NotNull
public static ApplicationConfigurationType getInstance() {
return ContainerUtil.findInstance(Extensions.getExtensions(CONFIGURATION_TYPE_EP), ApplicationConfigurationType.class);
return ConfigurationTypeUtil.findConfigurationType(ApplicationConfigurationType.class);
}
}
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurationType.java
+3 -5
View File
@@ -23,13 +23,11 @@ package com.intellij.execution.remote;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.execution.configurations.ConfigurationTypeUtil;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -72,9 +70,9 @@ public class RemoteConfigurationType implements ConfigurationType {
return "Remote";
}
@Nullable
@NotNull
public static RemoteConfigurationType getInstance() {
return ContainerUtil.findInstance(Extensions.getExtensions(CONFIGURATION_TYPE_EP), RemoteConfigurationType.class);
return ConfigurationTypeUtil.findConfigurationType(RemoteConfigurationType.class);
}
}