Add a couple of @NotNull annotations to ApplicationInfo

GitOrigin-RevId: 85bc58f3b880f20e3879649cd9ac48b8978b4840
This commit is contained in:
Dmitry Jemerov
2020-01-02 14:41:23 +01:00
committed by intellij-monorepo-bot
parent cc2fc4a4bd
commit 7b42fc13fd
2 changed files with 7 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.application; package com.intellij.openapi.application;
import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.ServiceManager;
@@ -6,6 +6,7 @@ import com.intellij.openapi.util.BuildNumber;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ObjectUtils; import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.awt.*; import java.awt.*;
@@ -72,8 +73,10 @@ public abstract class ApplicationInfo {
public abstract boolean hasContextHelp(); public abstract boolean hasContextHelp();
@NotNull
public abstract String getFullVersion(); public abstract String getFullVersion();
@NotNull
public abstract String getStrictVersion(); public abstract String getStrictVersion();
public static ApplicationInfo getInstance() { public static ApplicationInfo getInstance() {

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.application.impl; package com.intellij.openapi.application.impl;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@@ -261,6 +261,7 @@ public final class ApplicationInfoImpl extends ApplicationInfoEx {
return myPatchVersion; return myPatchVersion;
} }
@NotNull
@Override @Override
public String getFullVersion() { public String getFullVersion() {
String result; String result;
@@ -276,6 +277,7 @@ public final class ApplicationInfoImpl extends ApplicationInfoEx {
return result; return result;
} }
@NotNull
@Override @Override
public String getStrictVersion() { public String getStrictVersion() {
return myMajorVersion + "." + myMinorVersion + "." + StringUtil.notNullize(myMicroVersion, "0") + "." + StringUtil.notNullize(myPatchVersion, "0"); return myMajorVersion + "." + myMinorVersion + "." + StringUtil.notNullize(myMicroVersion, "0") + "." + StringUtil.notNullize(myPatchVersion, "0");