Skip to content

Commit f789c1c

Browse files
authored
chore!: Wrap each enum on a separate line when there are many of them (#20160)
1 parent 92c0853 commit f789c1c

7 files changed

Lines changed: 100 additions & 25 deletions

File tree

‎eclipse/VaadinJavaConventions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
249249
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
250250
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
251-
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
251+
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
252252
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
253253
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
254254
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>

‎flow-data/src/test/java/com/vaadin/flow/tests/data/bean/Country.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22

33
public enum Country {
44

5-
FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA(
6-
"Russia"), NETHERLANDS("Netherlands"), SOUTH_AFRICA("South Africa");
5+
FINLAND("Finland"),
6+
SWEDEN("Sweden"),
7+
USA("USA"),
8+
RUSSIA("Russia"),
9+
NETHERLANDS("Netherlands"),
10+
SOUTH_AFRICA("South Africa");
711

812
private final String name;
913

‎flow-html-components/src/main/java/com/vaadin/flow/component/html/IFrame.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,21 @@ private static Optional<ImportanceType> fromAttributeValue(
8383
* Sandbox types.
8484
*/
8585
public enum SandboxType {
86-
RESTRICT_ALL(""), ALLOW_FORMS("allow-forms"), ALLOW_MODALS(
87-
"allow-modals"), ALLOW_ORIENTATION_LOCK(
88-
"allow-orientation-lock"), ALLOW_POINTER_LOCK(
89-
"allow-pointer-lock"), ALLOW_POPUPS(
90-
"allow-popups"), ALLOW_POPUPS_TO_ESCAPE_SANDBOX(
91-
"allow-popups-to-escape-sandbox"), ALLOW_PRESENTATION(
92-
"allow-presentation"), ALLOW_SAME_ORIGIN(
93-
"allow-same-origin"), ALLOW_SCRIPTS(
94-
"allow-scripts"), ALLOW_STORAGE_ACCESS_BY_USER_ACTIVATION(
95-
"allow-storage-access-by-user-activation"), ALLOW_TOP_NAVIGATION(
96-
"allow-top-navigation"), ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION(
97-
"allow-top-navigation-by-user-activation");
86+
RESTRICT_ALL(""),
87+
ALLOW_FORMS("allow-forms"),
88+
ALLOW_MODALS("allow-modals"),
89+
ALLOW_ORIENTATION_LOCK("allow-orientation-lock"),
90+
ALLOW_POINTER_LOCK("allow-pointer-lock"),
91+
ALLOW_POPUPS("allow-popups"),
92+
ALLOW_POPUPS_TO_ESCAPE_SANDBOX("allow-popups-to-escape-sandbox"),
93+
ALLOW_PRESENTATION("allow-presentation"),
94+
ALLOW_SAME_ORIGIN("allow-same-origin"),
95+
ALLOW_SCRIPTS("allow-scripts"),
96+
ALLOW_STORAGE_ACCESS_BY_USER_ACTIVATION(
97+
"allow-storage-access-by-user-activation"),
98+
ALLOW_TOP_NAVIGATION("allow-top-navigation"),
99+
ALLOW_TOP_NAVIGATION_BY_USER_ACTIVATION(
100+
"allow-top-navigation-by-user-activation");
98101

99102
private final String value;
100103

‎flow-server/src/main/java/com/vaadin/flow/dom/Style.java‎

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,29 @@ default Style setColor(String value) {
267267
}
268268

269269
public enum Display {
270-
INLINE, BLOCK, CONTENTS, FLEX, GRID, INLINE_BLOCK, INLINE_FLEX, INLINE_GRID, INLINE_TABLE, LIST_ITEM, RUN_IN, TABLE, TABLE_CAPTION, TABLE_COLUMN_GROUP, TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW_GROUP, TABLE_CELL, TABLE_COLUMN, TABLE_ROW, NONE, INITIAL, INHERIT
270+
INLINE,
271+
BLOCK,
272+
CONTENTS,
273+
FLEX,
274+
GRID,
275+
INLINE_BLOCK,
276+
INLINE_FLEX,
277+
INLINE_GRID,
278+
INLINE_TABLE,
279+
LIST_ITEM,
280+
RUN_IN,
281+
TABLE,
282+
TABLE_CAPTION,
283+
TABLE_COLUMN_GROUP,
284+
TABLE_HEADER_GROUP,
285+
TABLE_FOOTER_GROUP,
286+
TABLE_ROW_GROUP,
287+
TABLE_CELL,
288+
TABLE_COLUMN,
289+
TABLE_ROW,
290+
NONE,
291+
INITIAL,
292+
INHERIT
271293
}
272294

273295
/**
@@ -837,7 +859,19 @@ default Style setLineHeight(String value) {
837859
* Css values for the <code>align-items</code> property.
838860
*/
839861
public enum AlignItems {
840-
NORMAL, STRETCH, CENTER, UNSAFE, SAFE, START, END, FLEX_START, FLEX_END, SELF_START, SELF_END, BASELINE, INITIAL;
862+
NORMAL,
863+
STRETCH,
864+
CENTER,
865+
UNSAFE,
866+
SAFE,
867+
START,
868+
END,
869+
FLEX_START,
870+
FLEX_END,
871+
SELF_START,
872+
SELF_END,
873+
BASELINE,
874+
INITIAL;
841875
}
842876

843877
/**
@@ -856,7 +890,20 @@ default Style setAlignItems(AlignItems value) {
856890
* Css values for the <code>align-self</code> property.
857891
*/
858892
public enum AlignSelf {
859-
AUTO, NORMAL, STRETCH, UNSAFE, SAFE, CENTER, START, END, FLEX_START, FLEX_END, SELF_START, SELF_END, BASELINE, INITIAL;
893+
AUTO,
894+
NORMAL,
895+
STRETCH,
896+
UNSAFE,
897+
SAFE,
898+
CENTER,
899+
START,
900+
END,
901+
FLEX_START,
902+
FLEX_END,
903+
SELF_START,
904+
SELF_END,
905+
BASELINE,
906+
INITIAL;
860907
}
861908

862909
/**
@@ -918,7 +965,21 @@ default Style setFlexShrink(String value) {
918965
* Css values for the <code>justify-content</code> property.
919966
*/
920967
public enum JustifyContent {
921-
CENTER, START, END, FLEX_START, FLEX_END, LEFT, RIGHT, NORMAL, SPACE_BETWEEN, SPACE_AROUND, SPACE_EVENLY, STRETCH, SAFE, UNSAFE, INITIAL
968+
CENTER,
969+
START,
970+
END,
971+
FLEX_START,
972+
FLEX_END,
973+
LEFT,
974+
RIGHT,
975+
NORMAL,
976+
SPACE_BETWEEN,
977+
SPACE_AROUND,
978+
SPACE_EVENLY,
979+
STRETCH,
980+
SAFE,
981+
UNSAFE,
982+
INITIAL
922983
}
923984

924985
/**

‎flow-server/src/main/java/com/vaadin/flow/internal/StringUtil.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ public final class StringUtil {
3636
* Comment parser state enumeration.
3737
*/
3838
private enum State {
39-
NORMAL, IN_LINE_COMMENT, IN_BLOCK_COMMENT, IN_STRING, IN_STRING_APOSTROPHE
39+
NORMAL,
40+
IN_LINE_COMMENT,
41+
IN_BLOCK_COMMENT,
42+
IN_STRING,
43+
IN_STRING_APOSTROPHE
4044
}
4145

4246
/**

‎flow-server/src/main/java/com/vaadin/flow/server/Mode.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
* One of production, development using livereload or development using bundle
2222
*/
2323
public enum Mode {
24-
PRODUCTION_CUSTOM("production", true), PRODUCTION_PRECOMPILED_BUNDLE(
25-
"production", true), DEVELOPMENT_FRONTEND_LIVERELOAD("development",
26-
false), DEVELOPMENT_BUNDLE("development", false);
24+
PRODUCTION_CUSTOM("production", true),
25+
PRODUCTION_PRECOMPILED_BUNDLE("production", true),
26+
DEVELOPMENT_FRONTEND_LIVERELOAD("development", false),
27+
DEVELOPMENT_BUNDLE("development", false);
2728

2829
private final String name;
2930
private final boolean production;

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ public class FrontendTools {
137137
1, 0, 6); // Bun 1.0.6 is the first version with "overrides" support
138138

139139
private enum BuildTool {
140-
NPM("npm", "npm-cli.js"), NPX("npx", "npx-cli.js"), PNPM("pnpm",
141-
null), BUN("bun", null);
140+
NPM("npm", "npm-cli.js"),
141+
NPX("npx", "npx-cli.js"),
142+
PNPM("pnpm", null),
143+
BUN("bun", null);
142144

143145
private final String name;
144146
private final String script;

0 commit comments

Comments
 (0)