From 0e336eee0118f9274ca1a2c171ed90d8faa710c6 Mon Sep 17 00:00:00 2001 From: "CORP\\albega" Date: Tue, 13 Aug 2024 17:49:45 +0200 Subject: [PATCH] #439: Small changes after review --- .../tools/ide/tool/LocalToolCommandlet.java | 9 ++++----- .../com/devonfw/tools/ide/tool/tomcat/Tomcat.java | 15 +-------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/LocalToolCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/tool/LocalToolCommandlet.java index 91159f16b..95e669a2d 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/LocalToolCommandlet.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/LocalToolCommandlet.java @@ -61,7 +61,7 @@ public Path getToolBinPath() { @Override protected boolean doInstall(boolean silent) { - + return doInstall(null, silent); } @@ -392,14 +392,13 @@ private void installDependencies(DependencyInfo dependencyInfo, EnvironmentConte private void installDependencyInRepo(String dependencyName, ToolCommandlet dependencyTool, VersionIdentifier dependencyVersionToInstall, EnvironmentContext ec) { - this.context.info("The version {} of the dependency {} is being installed", dependencyVersionToInstall, dependencyName); - if (dependencyTool instanceof LocalToolCommandlet) { + this.context.info("The version {} of the dependency {} is being installed", dependencyVersionToInstall, dependencyName); ((LocalToolCommandlet) dependencyTool).installTool(ec, dependencyVersionToInstall); + this.context.info("The version {} of the dependency {} was successfully installed", dependencyVersionToInstall, dependencyName); } else { - // TODO + this.context.trace("The dependency is not an instance of LocalToolCommandlet, hence not able to be installed"); } - this.context.info("The version {} of the dependency {} was successfully installed", dependencyVersionToInstall, dependencyName); } diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/Tomcat.java b/cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/Tomcat.java index 6ac4e3a0a..604c5cf23 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/Tomcat.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/tomcat/Tomcat.java @@ -32,20 +32,7 @@ public Tomcat(IdeContext context) { super(context, "tomcat", Set.of(Tag.JAVA)); add(this.arguments); } - -//@Override -// public void postInstall() { -// -// super.postInstall(); -// -// EnvironmentVariables variables = this.context.getVariables(); -// EnvironmentVariables typeVariables = variables.getByType(EnvironmentVariablesType.CONF); -// -// typeVariables.set("CATALINA_HOME", getToolPath().toString(), true); -// typeVariables.save(); -// } - - + @Override public void runTool(ProcessMode processMode, VersionIdentifier toolVersion, String... args) {