Skip to content

Commit d61541a

Browse files
Merge branch 'develop'
# Conflicts: # .github/workflows/release.yml # CHANGELOG.md # README.md # src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/Sorting.java # src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/PrettyPrintOptions.java # src/test/java/io/github/computerdaddyguy/jfiletreeprettyprinter/SortingTest.java
2 parents bf4dda8 + 2c7993a commit d61541a

File tree

98 files changed

+1182
-154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1182
-154
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo "Git tag: $RELEASE_VERSION"
3636
echo "Pom version: $POM_VERSION"
3737
38-
if [ "${RELEASE_VERSION}-SNAPSHOT" != "$POM_VERSION" ]; then
38+
if [ "$RELEASE_VERSION" != "$POM_VERSION" ]; then
3939
echo "Error: Git tag ($RELEASE_VERSION) does not match pom.xml version ($POM_VERSION)"
4040
exit 1
4141
fi

CHANGELOG.md

Lines changed: 14 additions & 3 deletions

README.md

Lines changed: 43 additions & 13 deletions

ROADMAP.md

Lines changed: 10 additions & 6 deletions

release_process.md

Lines changed: 1 addition & 0 deletions

src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/ChildrenLimitDynamic.java renamed to src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/ChildLimitDynamic.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package io.github.computerdaddyguy.jfiletreeprettyprinter.example;
22

3+
import io.github.computerdaddyguy.jfiletreeprettyprinter.ChildLimitBuilder;
34
import io.github.computerdaddyguy.jfiletreeprettyprinter.FileTreePrettyPrinter;
45
import io.github.computerdaddyguy.jfiletreeprettyprinter.PathPredicates;
5-
import java.nio.file.Path;
6-
import java.util.function.ToIntFunction;
76

8-
public class ChildrenLimitDynamic {
7+
public class ChildLimitDynamic {
98

109
public static void main(String[] args) {
11-
ToIntFunction<Path> pathLimitFunction = path -> PathPredicates.hasName(path, "node_modules") ? 0 : -1; // Negative value means "no limit"
10+
var childLimit = ChildLimitBuilder.builder()
11+
.defaultLimit(ChildLimitBuilder.UNLIMITED)
12+
.limit(PathPredicates.hasName("node_modules"), 0)
13+
.build();
1214
var prettyPrinter = FileTreePrettyPrinter.builder()
13-
.customizeOptions(options -> options.withChildrenLimitFunction(pathLimitFunction))
15+
.customizeOptions(options -> options.withChildLimit(childLimit))
1416
.build();
15-
var tree = prettyPrinter.prettyPrint("src/example/resources/children_limit_dynamic");
17+
var tree = prettyPrinter.prettyPrint("src/example/resources/child_limit_dynamic");
1618
System.out.println(tree);
1719
}
1820

src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/ChildrenLimitStatic.java renamed to src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/ChildLimitStatic.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import io.github.computerdaddyguy.jfiletreeprettyprinter.FileTreePrettyPrinter;
44

5-
public class ChildrenLimitStatic {
5+
public class ChildLimitStatic {
66

77
public static void main(String[] args) {
88
var prettyPrinter = FileTreePrettyPrinter.builder()
9-
.customizeOptions(options -> options.withChildrenLimit(3))
9+
.customizeOptions(options -> options.withChildLimit(3))
1010
.build();
11-
var tree = prettyPrinter.prettyPrint("src/example/resources/children_limit_static");
11+
var tree = prettyPrinter.prettyPrint("src/example/resources/child_limit_static");
1212
System.out.println(tree);
1313
}
1414

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package io.github.computerdaddyguy.jfiletreeprettyprinter.example;
2+
3+
import io.github.computerdaddyguy.jfiletreeprettyprinter.FileTreePrettyPrinter;
4+
import io.github.computerdaddyguy.jfiletreeprettyprinter.PathPredicates;
5+
6+
public class Filtering {
7+
8+
public static void main(String[] args) {
9+
var filter = PathPredicates.hasExtension("java");
10+
var prettyPrinter = FileTreePrettyPrinter.createDefault();
11+
var tree = prettyPrinter.prettyPrint("src/example/resources/filtering", filter);
12+
System.out.println(tree);
13+
}
14+
15+
}

src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/Sorting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class Sorting {
77

88
public static void main(String[] args) {
99
var prettyPrinter = FileTreePrettyPrinter.builder()
10-
.customizeOptions(options -> options.withFileSort(PrettyPrintOptions.Sorts.BY_FILE_SIZE))
10+
.customizeOptions(options -> options.sort(PrettyPrintOptions.Sorts.DIRECTORY_FIRST))
1111
.build();
1212
var tree = prettyPrinter.prettyPrint("src/example/resources/sorting");
1313
System.out.println(tree);
File renamed without changes.

0 commit comments

Comments
 (0)