rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 00:07:12 -07:00
Code Activity

Interrupt creation operation when a blank package or project name is provided

Browse source
This commit is contained in:
Geert Bevin 2024-12-26 18:47:14 -05:00
parent b27cc78fb7
commit 32052deaa3
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/rife/bld/operations/CreateOperation.java
View file

@ -50,7 +50,7 @@ public class CreateOperation {
throw new OperationOptionException("ERROR: Expecting the package, project and base names as the arguments."); throw new OperationOptionException("ERROR: Expecting the package, project and base names as the arguments.");
} }
if (type == null || type.isEmpty()) { if (type == null || type.isBlank()) {
System.out.println("Please enter a number for the project type:"); System.out.println("Please enter a number for the project type:");
System.out.printf(" 1: %s (Java baseline project)%n", BASE); System.out.printf(" 1: %s (Java baseline project)%n", BASE);
System.out.printf(" 2: %s (Java application project)%n", APP); System.out.printf(" 2: %s (Java application project)%n", APP);
@ -81,14 +81,17 @@ public class CreateOperation {
throw new OperationOptionException("ERROR: Unsupported project type."); throw new OperationOptionException("ERROR: Unsupported project type.");
} }
if (package_name == null || package_name.isEmpty()) { if (package_name == null || package_name.isBlank()) {
System.out.println("Please enter a package name (for instance: com.example):"); System.out.println("Please enter a package name (for instance: com.example):");
package_name = System.console().readLine(); package_name = System.console().readLine();
if (package_name == null || package_name.isEmpty()) {
throw new OperationOptionException("ERROR: package name is required.");
}
} else { } else {
System.out.println("Using package name: " + package_name); System.out.println("Using package name: " + package_name);
} }
if (project_name == null || project_name.isEmpty()) { if (project_name == null || project_name.isBlank()) {
String name_example; String name_example;
if (LIB.equals(type)) { if (LIB.equals(type)) {
name_example = "my-lib"; name_example = "my-lib";
@ -99,15 +102,18 @@ public class CreateOperation {
} }
System.out.println("Please enter a project name (for instance: " + name_example + ")"); System.out.println("Please enter a project name (for instance: " + name_example + ")");
project_name = System.console().readLine(); project_name = System.console().readLine();
if (project_name == null || project_name.isEmpty()) {
throw new OperationOptionException("ERROR: project name is required.");
}
} else { } else {
System.out.println("Using project name: " + project_name); System.out.println("Using project name: " + project_name);
} }
if (base_name == null || base_name.isEmpty()) { if (base_name == null || base_name.isBlank()) {
var default_base_name = AbstractCreateOperation.generateBaseName(project_name); var default_base_name = AbstractCreateOperation.generateBaseName(project_name);
System.out.println("Please enter the base name for generated project classes (default: " + default_base_name + "):"); System.out.println("Please enter the base name for generated project classes (default: " + default_base_name + "):");
base_name = System.console().readLine(); base_name = System.console().readLine();
if (base_name == null || base_name.trim().isEmpty()) { if (base_name == null || base_name.isBlank()) {
base_name = default_base_name; base_name = default_base_name;
System.out.println("Using base name: " + base_name); System.out.println("Using base name: " + base_name);
} }