From 9fc0bfdd285e6cc514b7faf93e01d4921f8ada86 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Thu, 7 Apr 2016 15:40:01 +0200
Subject: [PATCH] Platform: build numbers: get rid or
 BuildNumber.getBuildNumber uses

---
 .../src/org/jetbrains/ide/AboutHttpService.java      |  4 ++--
 .../IdeAboutInfoUtil.java}                           | 12 +++++++-----
 .../wm/impl/welcomeScreen/FlatWelcomeFrame.java      |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename platform/platform-impl/src/com/intellij/{openapi/application/ApplicationInfoUtil.java => ide/IdeAboutInfoUtil.java} (80%)

diff --git a/platform/built-in-server/src/org/jetbrains/ide/AboutHttpService.java b/platform/built-in-server/src/org/jetbrains/ide/AboutHttpService.java
index 1b58b5cb8308..97c307070065 100644
--- a/platform/built-in-server/src/org/jetbrains/ide/AboutHttpService.java
+++ b/platform/built-in-server/src/org/jetbrains/ide/AboutHttpService.java
@@ -16,7 +16,7 @@
 package org.jetbrains.ide;
 
 import com.google.gson.stream.JsonWriter;
-import com.intellij.openapi.application.ApplicationInfoUtil;
+import com.intellij.ide.IdeAboutInfoUtil;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.application.ex.ApplicationInfoEx;
 import com.intellij.openapi.fileTypes.FileType;
@@ -82,7 +82,7 @@ public class AboutHttpService extends RestService {
     JsonWriter writer = createJsonWriter(out);
     writer.beginObject();
 
-    ApplicationInfoUtil.writeJson(writer);
+    IdeAboutInfoUtil.writeAboutJson(writer);
 
     if (urlDecoder != null && getBooleanParameter("registeredFileTypes", urlDecoder)) {
       writer.name("registeredFileTypes").beginArray();
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ApplicationInfoUtil.java b/platform/platform-impl/src/com/intellij/ide/IdeAboutInfoUtil.java
similarity index 80%
rename from platform/platform-impl/src/com/intellij/openapi/application/ApplicationInfoUtil.java
rename to platform/platform-impl/src/com/intellij/ide/IdeAboutInfoUtil.java
index e72f28c57cf0..99119419dbdf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ApplicationInfoUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeAboutInfoUtil.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.application;
+package com.intellij.ide;
 
 import com.google.gson.stream.JsonWriter;
+import com.intellij.openapi.application.ApplicationInfo;
+import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.application.ex.ApplicationInfoEx;
 import com.intellij.openapi.util.BuildNumber;
 import com.intellij.openapi.util.text.StringUtil;
@@ -23,8 +25,8 @@ import com.intellij.util.PlatformUtils;
 
 import java.io.IOException;
 
-public class ApplicationInfoUtil {
-  public static void writeJson(JsonWriter writer) throws IOException {
+public class IdeAboutInfoUtil {
+  public static void writeAboutJson(JsonWriter writer) throws IOException {
     String appName = ApplicationInfoEx.getInstanceEx().getFullApplicationName();
     BuildNumber build = ApplicationInfo.getInstance().getBuild();
 
@@ -37,8 +39,8 @@ public class ApplicationInfoUtil {
     writer.name("name").value(appName);
     writer.name("productName").value(ApplicationNamesInfo.getInstance().getProductName());
     writer.name("baselineVersion").value(build.getBaselineVersion());
-    if (build.getBuildNumber() != BuildNumber.SNAPSHOT_VALUE) {
-      writer.name("buildNumber").value(build.getBuildNumber());
+    if (!build.isSnapshot()) {
+      writer.name("buildNumber").value(build.asStringWithoutProductCode());
     }
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
index 51399e05c065..a1286aa84919 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
@@ -432,8 +432,8 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, AccessibleCont
       else {
         appVersion += app.getFullVersion();
 
-        if (app.isEAP() && app.getBuild().getBuildNumber() != BuildNumber.SNAPSHOT_VALUE) {
-          appVersion += " (" + app.getBuild().asString() + ")";
+        if (app.isEAP() && !app.getBuild().isSnapshot()) {
+          appVersion += " (" + app.getBuild().asStringWithoutProductCode() + ")";
         }
       }