Commit Graph

5 Commits

Author SHA1 Message Date
Joakim Erdfelt a11f6a0304 Merging build-resources from `jetty-9.4.x` to `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-14 09:40:46 -05:00
Greg Wilkins b7a7a53a18
Jetty 10.0.x reformat (#3812)
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"

# Conflicts:
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml

* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
Joakim Erdfelt 6e44a7cfd1 More changes from PR feedback
Both Formatters / CodeStyles
+ Maximum Line Length for wrapping is now 128
  (Sorry, cannot turn it off, but we can set it high)

Eclipse Formatter
+ javadoc formatting turned off
+ line comment formatting turned off
+ block comment formatting is turned off
+ preserving whitespace between code and comments
+ don't join already wrapped lines of code or comments
+ keeping empty array initializers on one line
+ brace position for array inializers are on next line

IntelliJ Formatter
+ turn off various javadoc / block / line formatting
+ consecutive blank lines capped at 1
+ align multiline array initializers
+ turned off brace force on if statements
+ array initializer braces on new line

Checkstyle Rules
+ disabled NeedBraces
+ NoWhitespaceAfter now allows lineBreaks without a violation

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-21 11:08:15 -05:00
Joakim Erdfelt 3cb588b28b Updating IDE formatters / codestyles from PR feedback.
+ Lambda braces are always on new line
+ Space after (cast) is removed
+ Do not force braces on single line if statements, only on multi-line.
2019-05-20 14:23:44 -05:00
Joakim Erdfelt 371f828378 Update to jetty-checkstyle.xml + Intellij Style Def
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 14:22:04 -05:00