From 776d11b31ac24d381dbd2e70fc5cc449314e996d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 11 Aug 2017 20:04:44 +0200
Subject: [PATCH] [platform] saner default for app version; cleanup (warnings)

---
 .../application/impl/ApplicationInfoImpl.java | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index fdcdbbf311db..6c2eec5be676 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 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.
@@ -254,10 +254,14 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
 
   @Override
   public String getApiVersion() {
+    BuildNumber build = getBuild();
     if (myApiVersion != null) {
-      return BuildNumber.fromString(myApiVersion, getBuild().getProductCode()).asString();
+      BuildNumber api = BuildNumber.fromString(myApiVersion, build.getProductCode());
+      if (api != null) {
+        return api.asString();
+      }
     }
-    return getBuild().asString();
+    return build.asString();
   }
 
   @Override
@@ -282,29 +286,17 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
 
   @Override
   public String getFullVersion() {
-    String result = doGetFullVersion();
+    String result;
+    if (myFullVersionFormat != null) {
+      result = MessageFormat.format(myFullVersionFormat, myMajorVersion, myMinorVersion, myMicroVersion, myPatchVersion);
+    }
+    else {
+      result = StringUtil.notNullize(myMajorVersion, "0") + '.' + StringUtil.notNullize(myMinorVersion, "0");
+    }
     if (isEAP()) result += " EAP";
     return result;
   }
 
-  private String doGetFullVersion() {
-    if (myFullVersionFormat == null) {
-      if (!StringUtil.isEmptyOrSpaces(myMajorVersion)) {
-        if (!StringUtil.isEmptyOrSpaces(myMinorVersion)) {
-          return myMajorVersion + "." + myMinorVersion;
-        }
-        else {
-          return myMajorVersion + ".0";
-        }
-      }
-      else {
-        return getVersionName();
-      }
-    } else {
-      return MessageFormat.format(myFullVersionFormat, myMajorVersion, myMinorVersion, myMicroVersion, myPatchVersion);
-    }
-  }
-
   @Override
   public String getStrictVersion() {
     return myMajorVersion + "." + myMinorVersion + "." + StringUtil.notNullize(myMicroVersion, "0") + "." + StringUtil.notNullize(myPatchVersion, "0");
@@ -312,10 +304,8 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
 
   @Override
   public String getVersionName() {
-    final String fullName = ApplicationNamesInfo.getInstance().getFullProductName();
-    if (myEAP && !StringUtil.isEmptyOrSpaces(myCodeName)) {
-      return fullName + " (" + myCodeName + ")";
-    }
+    String fullName = ApplicationNamesInfo.getInstance().getFullProductName();
+    if (myEAP && !StringUtil.isEmptyOrSpaces(myCodeName)) fullName += " (" + myCodeName + ")";
     return fullName;
   }