cleanup

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/InstallResult.java b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/InstallResult.java
deleted file mode 100644 (file)
index 56624b7..0000000
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/InstallResult.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*\r
- * Copyright 2000-2011 JetBrains s.r.o.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package jetbrains.buildServer.nuget.server.toolRegistry.impl;\r
-\r
-import org.jetbrains.annotations.NotNull;\r
-\r
-import java.io.File;\r
-\r
-/**\r
-* Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
-* Date: 15.08.11 21:32\r
-*/\r
-public class InstallResult {\r
-  private final File myExtractedPackage;\r
-  private final File myAgentPlugin;\r
-\r
-  public InstallResult(@NotNull final File extractedPackage,\r
-                       @NotNull final File agentPlugin) {\r
-    myExtractedPackage = extractedPackage;\r
-    myAgentPlugin = agentPlugin;\r
-  }\r
-\r
-  @NotNull\r
-  public File getExtractedPackage() {\r
-    return myExtractedPackage;\r
-  }\r
-\r
-  @NotNull\r
-  public File getAgentPlugin() {\r
-    return myAgentPlugin;\r
-  }\r
-}\r

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java
index 82172d33b83cdbc20b962446202c795b46e5d32d..28e695ca6687c9773682f549b7c6c2a2cbd297b4 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java
@@ -51,7 +51,7 @@ public class NuGetToolsInstaller {
     myNaming = naming;\r
   }\r
 \r
-  public InstallResult installNuGet(@NotNull final String packageId, @NotNull final InstallLogger logger) {\r
+  public void installNuGet(@NotNull final String packageId, @NotNull final InstallLogger logger) {\r
     logger.started(packageId);\r
 \r
     FeedPackage tool = null;\r
@@ -59,20 +59,17 @@ public class NuGetToolsInstaller {
       tool = myState.findTool(packageId);\r
       if (tool == null) {\r
         logger.packageNotFound(packageId);\r
-        return null;\r
+        return;\r
       }\r
 \r
       final File pkg = downloadPackage(logger, tool);\r
       final File dest = extractPackage(logger, tool, pkg);\r
       File agentTool = packAgentPlugin(logger, tool, dest);\r
-      agentTool = registerAgentPlugins(logger, tool, agentTool);\r
-\r
-      return new InstallResult(dest, agentTool);\r
+      registerAgentPlugins(logger, tool, agentTool);\r
     } catch (ProcessedException e) {\r
-      return null;\r
+      //NOP;\r
     } catch (Exception e) {\r
       LOG.warn("Failed to install NuGet.Commandline package. " + e.getMessage(), e);\r
-      return null;\r
     } finally {\r
       logger.finished(packageId, tool);\r
     }\r