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

@Nls annotations

Browse Source 
GitOrigin-RevId: 3c6640649c93eb38d822ad5346eaff91b6026b73
This commit is contained in:
Tagir Valeev
2020-07-08 11:00:33 +00:00
committed by intellij-monorepo-bot
parent b65f0cd9cd
commit 0730360037
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginError.java
+7 -6
View File
@@ -2,21 +2,22 @@
package com.intellij.ide.plugins;
import com.intellij.openapi.extensions.PluginId;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
final class PluginError {
final IdeaPluginDescriptorImpl plugin;
private final String message;
private final String incompatibleReason;
private boolean myNotifyUser;
private final @Nls String message;
private final @Nls String incompatibleReason;
private final boolean myNotifyUser;
private PluginId myDisabledDependency;
public PluginError(@Nullable IdeaPluginDescriptorImpl plugin, @NotNull String message, @Nullable String incompatibleReason) {
PluginError(@Nullable IdeaPluginDescriptorImpl plugin, @NotNull @Nls String message, @Nullable @Nls String incompatibleReason) {
this(plugin, message, incompatibleReason, true);
}
public PluginError(@Nullable IdeaPluginDescriptorImpl plugin,
PluginError(@Nullable IdeaPluginDescriptorImpl plugin,
@NotNull String message,
@Nullable String incompatibleReason,
boolean notifyUser) {
@@ -30,7 +31,7 @@ final class PluginError {
myDisabledDependency = disabledDependency;
}
@NotNull String toUserError() {
@NotNull @Nls String toUserError() {
if (plugin == null) {
return message;
}
platform/core-impl/src/com/intellij/ide/plugins/PluginLoadingResult.java
+3 -4
View File
@@ -6,9 +6,7 @@ import com.intellij.openapi.util.BuildNumber;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.PlatformUtils;
import com.intellij.util.text.VersionComparatorUtil;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.*;
import java.nio.file.Path;
import java.util.*;
@@ -100,7 +98,8 @@ final class PluginLoadingResult {
}
}
void reportIncompatiblePlugin(@NotNull IdeaPluginDescriptorImpl plugin, @NotNull String reason, @Nullable String since, @Nullable String until) {
void reportIncompatiblePlugin(@NotNull IdeaPluginDescriptorImpl plugin, @NotNull @Nls String reason,
@Nullable @NonNls String since, @Nullable @NonNls String until) {
// do not report if some compatible plugin were already added
// no race condition here — plugins from classpath are loaded before and not in parallel to loading from plugin dir
if (idMap.containsKey(plugin.getPluginId())) {
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+3 -5
View File
@@ -28,10 +28,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.execution.ParametersListUtil;
import com.intellij.util.graph.*;
import com.intellij.util.lang.UrlClassLoader;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.annotations.*;
import java.io.*;
import java.lang.invoke.MethodHandle;
@@ -1092,7 +1089,8 @@ public final class PluginManagerCore {
return getIncompatibleMessage(buildNumber, descriptor.getSinceBuild(), descriptor.getUntilBuild()) != null;
}
static @Nullable String getIncompatibleMessage(@NotNull BuildNumber buildNumber, @Nullable String sinceBuild, @Nullable String untilBuild) {
static @Nullable @Nls String getIncompatibleMessage(@NotNull BuildNumber buildNumber, @Nullable @NonNls String sinceBuild,
@Nullable @NonNls String untilBuild) {
try {
String message = null;
BuildNumber sinceBuildNumber = sinceBuild == null ? null : BuildNumber.fromString(sinceBuild, null, null);