From ae92965aebfeacbbd7ab1d85170975e8db0344aa Mon Sep 17 00:00:00 2001 From: Eugene Petrenko Date: Thu, 21 Jul 2011 15:12:13 +0400 Subject: [PATCH] polish Publish RunType UI --- .../install/PackagesInstallerRunType.java | 2 +- .../nuget/server/publish/PublishRunType.java | 34 ++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java b/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java index 872ee48..cb3e894 100644 --- a/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java +++ b/nuget-server/src/jetbrains/buildServer/nuget/server/install/PackagesInstallerRunType.java @@ -83,7 +83,7 @@ public class PackagesInstallerRunType extends RunType { @NotNull @Override public String describeParameters(@NotNull Map parameters) { - return getDescription() + "\nSolution: " + parameters.get(SLN_PATH); + return "Solution: " + parameters.get(SLN_PATH); } @Override diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java b/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java index 20d72ec..42b15cc 100644 --- a/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java +++ b/nuget-server/src/jetbrains/buildServer/nuget/server/publish/PublishRunType.java @@ -29,9 +29,7 @@ import org.jetbrains.annotations.NotNull; import java.util.*; -import static jetbrains.buildServer.nuget.common.PackagesConstants.NUGET_API_KEY; -import static jetbrains.buildServer.nuget.common.PackagesConstants.NUGET_PATH; -import static jetbrains.buildServer.nuget.common.PackagesConstants.NUGET_PUBLISH_FILES; +import static jetbrains.buildServer.nuget.common.PackagesConstants.*; /** * Created by Eugene Petrenko (eugene.petrenko@gmail.com) @@ -75,7 +73,7 @@ public class PublishRunType extends RunType { } if (StringUtil.isEmptyOrSpaces(properties.get(NUGET_PUBLISH_FILES))) { - checks.add(new InvalidProperty(NUGET_API_KEY, "Specify at least one package to pusblish")); + checks.add(new InvalidProperty(NUGET_PUBLISH_FILES, "Specify at least one package to pusblish")); } return checks; @@ -105,4 +103,32 @@ public class PublishRunType extends RunType { return list; } + @NotNull + @Override + public String describeParameters(@NotNull Map parameters) { + StringBuilder sb = new StringBuilder(); + final String source = parameters.get(NUGET_PUBLISH_SOURCE); + if (!StringUtil.isEmptyOrSpaces(source)) { + sb.append("Publish to:").append(source).append("\n"); + } + + final String packages = parameters.get(NUGET_PUBLISH_FILES); + if (!StringUtil.isEmptyOrSpaces(packages)) { + sb.append("Packages: "); + boolean isFirst = true; + for (String split : packages.split("[\r\n]+")) { + if (!StringUtil.isEmptyOrSpaces(split)) { + if (!isFirst) {sb.append(", ");} else {isFirst = false; } + sb.append(StringUtil.truncateStringValueWithDotsAtCenter(split, 50)); + } + } + } + + final String doNotPublish = parameters.get(NUGET_PUBLISH_CREATE_ONLY); + if (!StringUtil.isEmptyOrSpaces(doNotPublish)) { + sb.append("\nDo not pusblish uploaded package"); + } + + return sb.toString(); + } } -- 2.23.3