Merge branch 'devonfw:main' into feature/63-create-ide-wrapper-script

Author: aBega2000

.gitignore

@@ -5,6 +5,12 @@
 *.log
 *.bak
 .*
+!.gitignore
+!.ide.software.version
+!.devon.software.version
+!.ide
+!.anyedit.properties
+!.ide.properties
 target/
 eclipse-target/
 generated/

cli/src/main/java/com/devonfw/tools/ide/cli/Ideasy.java

@@ -104,7 +104,7 @@ private AbstractIdeContext initContext(CliArguments arguments) {
         if (property instanceof FlagProperty) {
           ((FlagProperty) property).setValue(Boolean.TRUE);
         } else {
-          this.context.error("Missing value for option {}", key);
+          System.err.println("Missing value for option " + key);
         }
       } else {
         property.setValueAsString(value, this.context);

cli/src/main/java/com/devonfw/tools/ide/commandlet/Commandlet.java

@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.devonfw.tools.ide.completion.CompletionCandidateCollector;
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.property.KeywordProperty;
 import com.devonfw.tools.ide.property.Property;

cli/src/main/java/com/devonfw/tools/ide/commandlet/CommandletManagerImpl.java

@@ -11,12 +11,14 @@
 import com.devonfw.tools.ide.property.Property;
 import com.devonfw.tools.ide.tool.aws.Aws;
 import com.devonfw.tools.ide.tool.az.Azure;
+import com.devonfw.tools.ide.tool.cobigen.Cobigen;
 import com.devonfw.tools.ide.tool.eclipse.Eclipse;
 import com.devonfw.tools.ide.tool.gcviewer.GcViewer;
 import com.devonfw.tools.ide.tool.gh.Gh;
 import com.devonfw.tools.ide.tool.gradle.Gradle;
 import com.devonfw.tools.ide.tool.helm.Helm;
 import com.devonfw.tools.ide.tool.java.Java;
+import com.devonfw.tools.ide.tool.jmc.Jmc;
 import com.devonfw.tools.ide.tool.kotlinc.Kotlinc;
 import com.devonfw.tools.ide.tool.kotlinc.KotlincNative;
 import com.devonfw.tools.ide.tool.mvn.Mvn;
@@ -25,7 +27,6 @@
 import com.devonfw.tools.ide.tool.quarkus.Quarkus;
 import com.devonfw.tools.ide.tool.terraform.Terraform;
 import com.devonfw.tools.ide.tool.vscode.Vscode;
-import com.devonfw.tools.ide.tool.cobigen.Cobigen;
 
 /**
  * Implementation of {@link CommandletManager}.
@@ -60,6 +61,9 @@ public CommandletManagerImpl(IdeContext context) {
     add(new VersionSetCommandlet(context));
     add(new VersionGetCommandlet(context));
     add(new VersionListCommandlet(context));
+    add(new EditionGetCommandlet(context));
+    add(new EditionSetCommandlet(context));
+    add(new EditionListCommandlet(context));
     add(new VersionCommandlet(context));
     add(new Gh(context));
     add(new Helm(context));
@@ -78,6 +82,7 @@ public CommandletManagerImpl(IdeContext context) {
     add(new Azure(context));
     add(new Aws(context));
     add(new Cobigen(context));
+    add(new Jmc(context));
   }
 
   private void add(Commandlet commandlet) {

cli/src/main/java/com/devonfw/tools/ide/commandlet/CompleteCommandlet.java

@@ -1,6 +1,5 @@
 package com.devonfw.tools.ide.commandlet;
 
-import java.util.Collections;
 import java.util.List;
 
 import com.devonfw.tools.ide.cli.CliArguments;

cli/src/main/java/com/devonfw/tools/ide/commandlet/EditionGetCommandlet.java

@@ -0,0 +1,50 @@
+package com.devonfw.tools.ide.commandlet;
+
+import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.property.ToolProperty;
+import com.devonfw.tools.ide.tool.ToolCommandlet;
+import com.devonfw.tools.ide.version.VersionIdentifier;
+
+/**
+ * An internal {@link Commandlet} to get the installed edition for a tool.
+ *
+ * @see ToolCommandlet#getInstalledEdition()
+ */
+public class EditionGetCommandlet extends Commandlet {
+
+  /** The tool to get the edition of. */
+  public final ToolProperty tool;
+
+  /**
+   * The constructor.
+   *
+   * @param context the {@link IdeContext}.
+   */
+  public EditionGetCommandlet(IdeContext context) {
+
+    super(context);
+    addKeyword(getName());
+    this.tool = add(new ToolProperty("", true, "tool"));
+  }
+
+  @Override
+  public String getName() {
+
+    return "get-edition";
+  }
+
+  @Override
+  public void run() {
+
+    ToolCommandlet commandlet = this.tool.getValue();
+    VersionIdentifier installedVersion = commandlet.getInstalledVersion();
+    if (installedVersion == null) {
+      this.context.info("The configured edition for tool {} is {}", commandlet.getName(), commandlet.getEdition());
+      this.context.info("To install that edition call the following command:");
+      this.context.info("ide install {}", commandlet.getName());
+      return;
+    }
+    String installedEdition = commandlet.getInstalledEdition();
+    this.context.info(installedEdition);
+  }
+}

cli/src/main/java/com/devonfw/tools/ide/commandlet/EditionListCommandlet.java

@@ -0,0 +1,42 @@
+package com.devonfw.tools.ide.commandlet;
+
+import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.property.ToolProperty;
+import com.devonfw.tools.ide.tool.ToolCommandlet;
+
+/**
+ * An internal {@link Commandlet} to list editions for a tool.
+ *
+ * @see ToolCommandlet#listEditions()
+ */
+public class EditionListCommandlet extends Commandlet {
+
+  /** The tool to list the editions of. */
+  public final ToolProperty tool;
+
+  /**
+   * The constructor.
+   *
+   * @param context the {@link IdeContext}.
+   */
+  public EditionListCommandlet(IdeContext context) {
+
+    super(context);
+    addKeyword(getName());
+    this.tool = add(new ToolProperty("", true, "tool"));
+  }
+
+  @Override
+  public String getName() {
+
+    return "list-editions";
+  }
+
+  @Override
+  public void run() {
+
+    ToolCommandlet commandlet = this.tool.getValue();
+    commandlet.listEditions();
+  }
+
+}

cli/src/main/java/com/devonfw/tools/ide/commandlet/EditionSetCommandlet.java

@@ -0,0 +1,47 @@
+package com.devonfw.tools.ide.commandlet;
+
+import com.devonfw.tools.ide.context.IdeContext;
+import com.devonfw.tools.ide.property.EditionProperty;
+import com.devonfw.tools.ide.property.ToolProperty;
+import com.devonfw.tools.ide.tool.ToolCommandlet;
+
+/**
+ * An internal {@link Commandlet} to set a tool edition.
+ */
+public class EditionSetCommandlet extends Commandlet {
+
+  /** The tool to set the edition of. */
+  public final ToolProperty tool;
+
+  /** The edition to set. */
+  public final EditionProperty edition;
+
+  /**
+   * The constructor.
+   *
+   * @param context the {@link IdeContext}.
+   */
+  public EditionSetCommandlet(IdeContext context) {
+
+    super(context);
+    addKeyword(getName());
+    this.tool = add(new ToolProperty("", true, "tool"));
+    this.edition = add(new EditionProperty("", true, "edition"));
+  }
+
+  @Override
+  public String getName() {
+
+    return "set-edition";
+  }
+
+  @Override
+  public void run() {
+
+    ToolCommandlet commandlet = this.tool.getValue();
+    String edition = this.edition.getValue();
+
+    commandlet.setEdition(edition);
+  }
+
+}

cli/src/main/java/com/devonfw/tools/ide/commandlet/ShellCommandlet.java

@@ -17,12 +17,10 @@
 
 import com.devonfw.tools.ide.cli.CliArgument;
 import com.devonfw.tools.ide.cli.CliArguments;
-import com.devonfw.tools.ide.cli.CliException;
 import com.devonfw.tools.ide.completion.IdeCompleter;
 import com.devonfw.tools.ide.context.AbstractIdeContext;
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.property.BooleanProperty;
-import com.devonfw.tools.ide.property.FlagProperty;
 import com.devonfw.tools.ide.property.KeywordProperty;
 import com.devonfw.tools.ide.property.Property;
 
@@ -166,8 +164,7 @@ private boolean apply(CliArgument argument, Commandlet commandlet) {
             }
             currentProperty = valueIterator.next();
             this.context.trace("Next value candidate is {}", currentProperty);
-            if (currentProperty instanceof KeywordProperty) {
-              KeywordProperty keyword = (KeywordProperty) currentProperty;
+            if (currentProperty instanceof KeywordProperty keyword) {
               if (keyword.matches(arg)) {
                 keyword.setValue(Boolean.TRUE);
                 this.context.trace("Keyword matched");

cli/src/main/java/com/devonfw/tools/ide/commandlet/VersionGetCommandlet.java

@@ -8,9 +8,9 @@
 import com.devonfw.tools.ide.version.VersionIdentifier;
 
 /**
- * An internal {@link Commandlet} to set a tool version.
+ * An internal {@link Commandlet} to get the installed version for a tool.
  *
- * @see ToolCommandlet#setVersion(VersionIdentifier, boolean)
+ * @see ToolCommandlet#getInstalledVersion()
  */
 public class VersionGetCommandlet extends Commandlet {