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

BuildNumber: deprecate 'fallback' method and use 'currentVersion' instead; 'fallback' name is obscure and it's better to use fallback version (999.SNAPSHOT) only if we cannot read more actual build number from build.txt, otherwise some plugins may be disabled as incompatible

Browse Source
This commit is contained in:
nik
2016-04-25 12:14:36 +03:00
parent 3beec9ace3
commit 306d16f2b4
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class PluginManagerCore {
if (ourBuildNumber == null) {
ourBuildNumber = BUILD_NUMBER == null ? null : BuildNumber.fromString(BUILD_NUMBER);
if (ourBuildNumber == null) {
ourBuildNumber = BuildNumber.fromString("SNAPSHOT");
ourBuildNumber = BuildNumber.currentVersion();
}
}
return ourBuildNumber;
platform/util/src/com/intellij/openapi/util/BuildNumber.java
+10 -2
View File
@@ -96,7 +96,7 @@ public class BuildNumber implements Comparable<BuildNumber> {
if (BUILD_NUMBER.equals(version) || SNAPSHOT.equals(version)) {
final String productCode = name != null ? name : "";
return new BuildNumber(productCode, Holder.CURRENT_VERSION.myComponents);
return new BuildNumber(productCode, currentVersion().myComponents);
}
String code = version;
@@ -171,9 +171,17 @@ public class BuildNumber implements Comparable<BuildNumber> {
}
catch (IOException ignored) { }
return fallback();
return fromString(FALLBACK_VERSION);
}
/**
* This method is for internal platform use only. In regular code use {@link com.intellij.openapi.application.ApplicationInfo#getBuild()} instead.
*/
public static BuildNumber currentVersion() {
return Holder.CURRENT_VERSION;
}
@Deprecated
public static BuildNumber fallback() {
return fromString(FALLBACK_VERSION);
}
platform/util/testSrc/com/intellij/openapi/util/BuildNumberTest.java
+6 -6
View File
@@ -129,12 +129,12 @@ public class BuildNumberTest {
}
@Test
public void fallbackVersion() throws Exception {
assertParsed(BuildNumber.fallback(), 999, BuildNumber.SNAPSHOT_VALUE, "999.SNAPSHOT");
assertTrue(BuildNumber.fallback().isSnapshot());
public void currentVersion() throws Exception {
BuildNumber current = BuildNumber.currentVersion();
assertTrue(current.isSnapshot());
assertTrue(BuildNumber.fallback().compareTo(BuildNumber.fromString("7512")) > 0);
assertTrue(BuildNumber.fallback().compareTo(BuildNumber.fromString("145")) > 0);
assertTrue(BuildNumber.fallback().compareTo(BuildNumber.fromString("145.12")) > 0);
assertTrue(current.compareTo(BuildNumber.fromString("7512")) > 0);
assertTrue(current.compareTo(BuildNumber.fromString("145")) > 0);
assertTrue(current.compareTo(BuildNumber.fromString("145.12")) > 0);
}
}