Skip to content

Commit 6be27e9

Browse files
schumacher-mschumacher-m
committed
Switch ConsoleColor class to interface
1 parent b5f3aed commit 6be27e9

File tree

2 files changed

+62
-63
lines changed

2 files changed

+62
-63
lines changed

‎src/main/java/org/apache/ibatis/migration/CommandLine.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.apache.ibatis.migration.options.SelectedOptions;
2727
import org.apache.ibatis.migration.ConsoleColors;
2828

29-
public class CommandLine {
29+
public class CommandLine implements ConsoleColors {
3030
private final PrintStream console = System.out;
3131
private final String[] args;
3232

@@ -46,7 +46,7 @@ public void execute() {
4646
String errorMessage = e.getMessage();
4747

4848
if (selectedOptions.hasColor()) {
49-
console.printf(ConsoleColors.RED + "\nERROR: %s%n", errorMessage + ConsoleColors.RESET);
49+
console.printf(RED + "\nERROR: %s%n", errorMessage + RESET);
5050
} else {
5151
console.printf("\nERROR: %s%n", errorMessage);
5252
}
@@ -82,8 +82,8 @@ private void runCommand(SelectedOptions selectedOptions) {
8282
console.printf("------------------------------------------------------------------------%n");
8383

8484
if (selectedOptions.hasColor()) {
85-
console.printf("-- MyBatis Migrations %s%s%s%n", (exceptionCaught) ? ConsoleColors.RED : ConsoleColors.GREEN,
86-
(exceptionCaught) ? "FAILURE" : "SUCCESS", ConsoleColors.RESET);
85+
console.printf("-- MyBatis Migrations %s%s%s%n", (exceptionCaught) ? RED : GREEN,
86+
(exceptionCaught) ? "FAILURE" : "SUCCESS", RESET);
8787
} else {
8888
console.printf("-- MyBatis Migrations %s%n", (exceptionCaught) ? "FAILURE" : "SUCCESS");
8989
}

‎src/main/java/org/apache/ibatis/migration/ConsoleColors.java

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -17,77 +17,76 @@
1717

1818
// Credit: https://stackoverflow.com/a/45444716
1919

20-
public class ConsoleColors {
21-
// Reset
22-
public static final String RESET = "\033[0m"; // Text Reset
20+
interface ConsoleColors {
21+
String RESET = "\033[0m"; // Text Reset
2322

2423
// Regular Colors
25-
public static final String BLACK = "\033[0;30m"; // BLACK
26-
public static final String RED = "\033[0;31m"; // RED
27-
public static final String GREEN = "\033[0;32m"; // GREEN
28-
public static final String YELLOW = "\033[0;33m"; // YELLOW
29-
public static final String BLUE = "\033[0;34m"; // BLUE
30-
public static final String PURPLE = "\033[0;35m"; // PURPLE
31-
public static final String CYAN = "\033[0;36m"; // CYAN
32-
public static final String WHITE = "\033[0;37m"; // WHITE
24+
String BLACK = "\033[0;30m"; // BLACK
25+
String RED = "\033[0;31m"; // RED
26+
String GREEN = "\033[0;32m"; // GREEN
27+
String YELLOW = "\033[0;33m"; // YELLOW
28+
String BLUE = "\033[0;34m"; // BLUE
29+
String PURPLE = "\033[0;35m"; // PURPLE
30+
String CYAN = "\033[0;36m"; // CYAN
31+
String WHITE = "\033[0;37m"; // WHITE
3332

3433
// Bold
35-
public static final String BLACK_BOLD = "\033[1;30m"; // BLACK
36-
public static final String RED_BOLD = "\033[1;31m"; // RED
37-
public static final String GREEN_BOLD = "\033[1;32m"; // GREEN
38-
public static final String YELLOW_BOLD = "\033[1;33m"; // YELLOW
39-
public static final String BLUE_BOLD = "\033[1;34m"; // BLUE
40-
public static final String PURPLE_BOLD = "\033[1;35m"; // PURPLE
41-
public static final String CYAN_BOLD = "\033[1;36m"; // CYAN
42-
public static final String WHITE_BOLD = "\033[1;37m"; // WHITE
34+
String BLACK_BOLD = "\033[1;30m"; // BLACK
35+
String RED_BOLD = "\033[1;31m"; // RED
36+
String GREEN_BOLD = "\033[1;32m"; // GREEN
37+
String YELLOW_BOLD = "\033[1;33m"; // YELLOW
38+
String BLUE_BOLD = "\033[1;34m"; // BLUE
39+
String PURPLE_BOLD = "\033[1;35m"; // PURPLE
40+
String CYAN_BOLD = "\033[1;36m"; // CYAN
41+
String WHITE_BOLD = "\033[1;37m"; // WHITE
4342

4443
// Underline
45-
public static final String BLACK_UNDERLINED = "\033[4;30m"; // BLACK
46-
public static final String RED_UNDERLINED = "\033[4;31m"; // RED
47-
public static final String GREEN_UNDERLINED = "\033[4;32m"; // GREEN
48-
public static final String YELLOW_UNDERLINED = "\033[4;33m"; // YELLOW
49-
public static final String BLUE_UNDERLINED = "\033[4;34m"; // BLUE
50-
public static final String PURPLE_UNDERLINED = "\033[4;35m"; // PURPLE
51-
public static final String CYAN_UNDERLINED = "\033[4;36m"; // CYAN
52-
public static final String WHITE_UNDERLINED = "\033[4;37m"; // WHITE
44+
String BLACK_UNDERLINED = "\033[4;30m"; // BLACK
45+
String RED_UNDERLINED = "\033[4;31m"; // RED
46+
String GREEN_UNDERLINED = "\033[4;32m"; // GREEN
47+
String YELLOW_UNDERLINED = "\033[4;33m"; // YELLOW
48+
String BLUE_UNDERLINED = "\033[4;34m"; // BLUE
49+
String PURPLE_UNDERLINED = "\033[4;35m"; // PURPLE
50+
String CYAN_UNDERLINED = "\033[4;36m"; // CYAN
51+
String WHITE_UNDERLINED = "\033[4;37m"; // WHITE
5352

5453
// Background
55-
public static final String BLACK_BACKGROUND = "\033[40m"; // BLACK
56-
public static final String RED_BACKGROUND = "\033[41m"; // RED
57-
public static final String GREEN_BACKGROUND = "\033[42m"; // GREEN
58-
public static final String YELLOW_BACKGROUND = "\033[43m"; // YELLOW
59-
public static final String BLUE_BACKGROUND = "\033[44m"; // BLUE
60-
public static final String PURPLE_BACKGROUND = "\033[45m"; // PURPLE
61-
public static final String CYAN_BACKGROUND = "\033[46m"; // CYAN
62-
public static final String WHITE_BACKGROUND = "\033[47m"; // WHITE
54+
String BLACK_BACKGROUND = "\033[40m"; // BLACK
55+
String RED_BACKGROUND = "\033[41m"; // RED
56+
String GREEN_BACKGROUND = "\033[42m"; // GREEN
57+
String YELLOW_BACKGROUND = "\033[43m"; // YELLOW
58+
String BLUE_BACKGROUND = "\033[44m"; // BLUE
59+
String PURPLE_BACKGROUND = "\033[45m"; // PURPLE
60+
String CYAN_BACKGROUND = "\033[46m"; // CYAN
61+
String WHITE_BACKGROUND = "\033[47m"; // WHITE
6362

6463
// High Intensity
65-
public static final String BLACK_BRIGHT = "\033[0;90m"; // BLACK
66-
public static final String RED_BRIGHT = "\033[0;91m"; // RED
67-
public static final String GREEN_BRIGHT = "\033[0;92m"; // GREEN
68-
public static final String YELLOW_BRIGHT = "\033[0;93m"; // YELLOW
69-
public static final String BLUE_BRIGHT = "\033[0;94m"; // BLUE
70-
public static final String PURPLE_BRIGHT = "\033[0;95m"; // PURPLE
71-
public static final String CYAN_BRIGHT = "\033[0;96m"; // CYAN
72-
public static final String WHITE_BRIGHT = "\033[0;97m"; // WHITE
64+
String BLACK_BRIGHT = "\033[0;90m"; // BLACK
65+
String RED_BRIGHT = "\033[0;91m"; // RED
66+
String GREEN_BRIGHT = "\033[0;92m"; // GREEN
67+
String YELLOW_BRIGHT = "\033[0;93m"; // YELLOW
68+
String BLUE_BRIGHT = "\033[0;94m"; // BLUE
69+
String PURPLE_BRIGHT = "\033[0;95m"; // PURPLE
70+
String CYAN_BRIGHT = "\033[0;96m"; // CYAN
71+
String WHITE_BRIGHT = "\033[0;97m"; // WHITE
7372

7473
// Bold High Intensity
75-
public static final String BLACK_BOLD_BRIGHT = "\033[1;90m"; // BLACK
76-
public static final String RED_BOLD_BRIGHT = "\033[1;91m"; // RED
77-
public static final String GREEN_BOLD_BRIGHT = "\033[1;92m"; // GREEN
78-
public static final String YELLOW_BOLD_BRIGHT = "\033[1;93m";// YELLOW
79-
public static final String BLUE_BOLD_BRIGHT = "\033[1;94m"; // BLUE
80-
public static final String PURPLE_BOLD_BRIGHT = "\033[1;95m";// PURPLE
81-
public static final String CYAN_BOLD_BRIGHT = "\033[1;96m"; // CYAN
82-
public static final String WHITE_BOLD_BRIGHT = "\033[1;97m"; // WHITE
74+
String BLACK_BOLD_BRIGHT = "\033[1;90m"; // BLACK
75+
String RED_BOLD_BRIGHT = "\033[1;91m"; // RED
76+
String GREEN_BOLD_BRIGHT = "\033[1;92m"; // GREEN
77+
String YELLOW_BOLD_BRIGHT = "\033[1;93m";// YELLOW
78+
String BLUE_BOLD_BRIGHT = "\033[1;94m"; // BLUE
79+
String PURPLE_BOLD_BRIGHT = "\033[1;95m";// PURPLE
80+
String CYAN_BOLD_BRIGHT = "\033[1;96m"; // CYAN
81+
String WHITE_BOLD_BRIGHT = "\033[1;97m"; // WHITE
8382

8483
// High Intensity backgrounds
85-
public static final String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";// BLACK
86-
public static final String RED_BACKGROUND_BRIGHT = "\033[0;101m";// RED
87-
public static final String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";// GREEN
88-
public static final String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";// YELLOW
89-
public static final String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";// BLUE
90-
public static final String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m"; // PURPLE
91-
public static final String CYAN_BACKGROUND_BRIGHT = "\033[0;106m"; // CYAN
92-
public static final String WHITE_BACKGROUND_BRIGHT = "\033[0;107m"; // WHITE
84+
String BLACK_BACKGROUND_BRIGHT = "\033[0;100m";// BLACK
85+
String RED_BACKGROUND_BRIGHT = "\033[0;101m";// RED
86+
String GREEN_BACKGROUND_BRIGHT = "\033[0;102m";// GREEN
87+
String YELLOW_BACKGROUND_BRIGHT = "\033[0;103m";// YELLOW
88+
String BLUE_BACKGROUND_BRIGHT = "\033[0;104m";// BLUE
89+
String PURPLE_BACKGROUND_BRIGHT = "\033[0;105m"; // PURPLE
90+
String CYAN_BACKGROUND_BRIGHT = "\033[0;106m"; // CYAN
91+
String WHITE_BACKGROUND_BRIGHT = "\033[0;107m"; // WHITE
9392
}

0 commit comments

Comments
 (0)