Skip to content

Commit 6e12570

Browse files
slachiewiczslachiewicz
committed
[MSHARED-1199] Reformat
1 parent f11560a commit 6e12570

39 files changed

+2315
-2971
lines changed

‎pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version='1.0' encoding='UTF-8'?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
Licensed to the Apache Software Foundation (ASF) under one
44
or more contributor license agreements. See the NOTICE file
@@ -33,11 +33,17 @@
3333
<name>Apache Maven Filtering</name>
3434
<description>A component to assist in filtering of resource files with properties from a Maven project.</description>
3535

36+
<contributors>
37+
<contributor>
38+
<name>Graham Leggett</name>
39+
</contributor>
40+
</contributors>
41+
3642
<scm>
3743
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-filtering.git</connection>
3844
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-filtering.git</developerConnection>
39-
<url>https://github.com/apache/maven-filtering/tree/${project.scm.tag}</url>
4045
<tag>maven-filtering-3.2.0</tag>
46+
<url>https://github.com/apache/maven-filtering/tree/${project.scm.tag}</url>
4147
</scm>
4248
<issueManagement>
4349
<system>JIRA</system>
@@ -62,12 +68,6 @@
6268
<project.build.outputTimestamp>2022-06-11T13:41:41Z</project.build.outputTimestamp>
6369
</properties>
6470

65-
<contributors>
66-
<contributor>
67-
<name>Graham Leggett</name>
68-
</contributor>
69-
</contributors>
70-
7171
<dependencies>
7272
<dependency>
7373
<groupId>javax.inject</groupId>
@@ -146,8 +146,8 @@
146146
<groupId>org.sonatype.plexus</groupId>
147147
<artifactId>plexus-build-api</artifactId>
148148
<version>${plexusBuildApiVersion}</version>
149-
<scope>test</scope>
150149
<classifier>tests</classifier>
150+
<scope>test</scope>
151151
</dependency>
152152
<dependency>
153153
<groupId>org.eclipse.sisu</groupId>

‎src/main/java/org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.java‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.apache.maven.shared.filtering;
2-
31
/*
42
* Licensed to the Apache Software Foundation (ASF) under one
53
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@
97
* "License"); you may not use this file except in compliance
108
* with the License. You may obtain a copy of the License at
119
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1311
*
1412
* Unless required by applicable law or agreed to in writing,
1513
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@
1816
* specific language governing permissions and limitations
1917
* under the License.
2018
*/
19+
package org.apache.maven.shared.filtering;
2120

2221
import java.io.FilterReader;
2322
import java.io.Reader;
@@ -28,9 +27,7 @@
2827
/**
2928
* @author Karl Heinz Marbaise <a href="mailto:[email protected]">[email protected]</a>
3029
*/
31-
public abstract class AbstractFilterReaderLineEnding
32-
extends FilterReader
33-
{
30+
public abstract class AbstractFilterReaderLineEnding extends FilterReader {
3431

3532
private String escapeString;
3633

@@ -53,27 +50,23 @@ public abstract class AbstractFilterReaderLineEnding
5350
protected int markLength = 255;
5451
// CHECKSTYLE_ON: MagicNumber
5552

56-
protected AbstractFilterReaderLineEnding( Reader in )
57-
{
58-
super( in );
53+
protected AbstractFilterReaderLineEnding(Reader in) {
54+
super(in);
5955
}
6056

6157
/**
6258
* @return the escapce string.
6359
*/
64-
public String getEscapeString()
65-
{
60+
public String getEscapeString() {
6661
return escapeString;
6762
}
6863

6964
/**
7065
* @param escapeString Set the value of the escape string.
7166
*/
72-
public void setEscapeString( String escapeString )
73-
{
67+
public void setEscapeString(String escapeString) {
7468
// TODO NPE if escapeString is null ?
75-
if ( escapeString != null && escapeString.length() >= 1 )
76-
{
69+
if (escapeString != null && escapeString.length() >= 1) {
7770
this.escapeString = escapeString;
7871
this.useEscape = true;
7972
calculateMarkLength();
@@ -83,34 +76,28 @@ public void setEscapeString( String escapeString )
8376
/**
8477
* @return state of preserve escape string.
8578
*/
86-
public boolean isPreserveEscapeString()
87-
{
79+
public boolean isPreserveEscapeString() {
8880
return preserveEscapeString;
8981
}
9082

9183
/**
9284
* @param preserveEscapeString preserve escape string {@code true} or {@code false}.
9385
*/
94-
public void setPreserveEscapeString( boolean preserveEscapeString )
95-
{
86+
public void setPreserveEscapeString(boolean preserveEscapeString) {
9687
this.preserveEscapeString = preserveEscapeString;
9788
}
9889

99-
protected void calculateMarkLength()
100-
{
90+
protected void calculateMarkLength() {
10191
// CHECKSTYLE_OFF: MagicNumber
10292
markLength = 255;
10393
// CHECKSTYLE_ON: MagicNumber
10494

105-
if ( escapeString != null )
106-
{
95+
if (escapeString != null) {
10796
markLength += escapeString.length();
10897
}
109-
for ( DelimiterSpecification spec : delimiters )
110-
{
98+
for (DelimiterSpecification spec : delimiters) {
11199
markLength += spec.getBegin().length();
112100
markLength += spec.getEnd().length();
113-
114101
}
115102
}
116103
}

0 commit comments

Comments
 (0)