Skip to content

Commit 4b62012

Browse files
vschvsch
committed
clean up unused variables and fields, clean up code
1 parent 5c60cce commit 4b62012

558 files changed

Lines changed: 3120 additions & 4164 deletions

File tree

Some content is hidden

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

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter;
131131
import com.vladsch.flexmark.util.data.DataHolder;
132132

133133
public class PegdownOptions {
134-
private static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(
134+
final private static DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(
135135
Extensions.ALL
136136
);
137137

@@ -157,7 +157,7 @@ import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter;
157157
import com.vladsch.flexmark.util.data.DataHolder;
158158

159159
public class PegdownOptions {
160-
private static final DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(true,
160+
final private static DataHolder OPTIONS = PegdownOptionsAdapter.flexmarkOptions(true,
161161
Extensions.ALL
162162
);
163163

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterSpecTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void parse(CharSequence input) {
107107
if (!trackedOffsets.isEmpty()) {
108108
TestUtils.appendBanner(out, TestUtils.bannerText("Tracked Offsets"), false);
109109
int i1 = 0;
110-
for (TrackedOffset trackedOffset1 : trackedOffsets){
110+
for (TrackedOffset trackedOffset1 : trackedOffsets) {
111111
out.append("[").append(i1).append("]: ").append(trackedOffset1.toString()).append("\n");
112112
i1++;
113113
}

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/FormatterTranslationSpecTestBase.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.vladsch.flexmark.core.test.util;
22

33
import com.vladsch.flexmark.formatter.Formatter;
4-
import com.vladsch.flexmark.html.HtmlRenderer;
54
import com.vladsch.flexmark.parser.Parser;
65
import com.vladsch.flexmark.parser.ParserEmulationProfile;
76
import com.vladsch.flexmark.test.util.ComboSpecTestCase;
@@ -24,16 +23,15 @@
2423
public abstract class FormatterTranslationSpecTestBase extends ComboSpecTestCase {
2524
final static boolean SKIP_IGNORED_TESTS = true;
2625
final public static DataKey<Boolean> SHOW_LINE_RANGES = new DataKey<>("SHOW_LINE_RANGES", false);
27-
public static final DataKey<Character> EDIT_OP_CHAR = new DataKey<>("EDIT_OP_CHAR", SequenceUtils.NUL);
28-
public static final DataKey<Integer> EDIT_OP = new DataKey<>("EDIT_OP", 0);
29-
// public static final DataKey<Boolean> EDIT_INDENT = new DataKey<>("EDIT_INDENT", false);
26+
final public static DataKey<Character> EDIT_OP_CHAR = new DataKey<>("EDIT_OP_CHAR", SequenceUtils.NUL);
27+
final public static DataKey<Integer> EDIT_OP = new DataKey<>("EDIT_OP", 0);
3028

3129
final private static DataHolder OPTIONS = new MutableDataSet()
3230
.set(Parser.BLANK_LINES_IN_AST, true)
3331
.set(Parser.HEADING_NO_ATX_SPACE, true)
3432
.toImmutable();
3533

36-
private static final DataHolder FIXED_INDENT_OPTIONS = new MutableDataSet().setFrom(ParserEmulationProfile.FIXED_INDENT)
34+
final private static DataHolder FIXED_INDENT_OPTIONS = new MutableDataSet().setFrom(ParserEmulationProfile.FIXED_INDENT)
3735
.toMutable();
3836

3937
final private static Map<String, DataHolder> optionsMap = new HashMap<>();
@@ -141,7 +139,6 @@ public abstract class FormatterTranslationSpecTestBase extends ComboSpecTestCase
141139
optionsMap.put("first-prefix", new MutableDataSet().set(TestUtils.CUSTOM_OPTION, (option, params) -> TestUtils.customStringOption(option, params, FormatterTranslationSpecTestBase::firstIndentOption)));
142140
optionsMap.put("prefix", new MutableDataSet().set(TestUtils.CUSTOM_OPTION, (option, params) -> TestUtils.customStringOption(option, params, FormatterTranslationSpecTestBase::indentOption)));
143141
}
144-
145142
static DataHolder firstIndentOption(@Nullable String params) {
146143
String value = params != null ? params : "";
147144
return new MutableDataSet().set(Formatter.DOCUMENT_FIRST_PREFIX, value);

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/RendererSpecTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public abstract class RendererSpecTest extends ComboSpecTestCase {
1919
.set(HtmlRenderer.INDENT_SIZE, 2)
2020
.toImmutable();
2121

22-
private static final Map<String, DataHolder> optionsMap = new HashMap<>();
22+
final private static Map<String, DataHolder> optionsMap = new HashMap<>();
2323
static {
2424
optionsMap.put("src-pos", new MutableDataSet().set(HtmlRenderer.SOURCE_POSITION_ATTRIBUTE, "md-pos"));
2525
}

‎flexmark-core-test/src/main/java/com/vladsch/flexmark/core/test/util/TranslationFormatterSpecTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
import java.util.Map;
2626

2727
public abstract class TranslationFormatterSpecTest extends FormatterTranslationSpecTestBase {
28-
private static final boolean SHOW_INTERMEDIATE = false;
29-
private static final boolean SHOW_INTERMEDIATE_AST = false;
28+
final private static boolean SHOW_INTERMEDIATE = false;
29+
final private static boolean SHOW_INTERMEDIATE_AST = false;
3030

31-
public static final DataKey<Boolean> DETAILS = new DataKey<>("DETAILS", SHOW_INTERMEDIATE);
32-
public static final DataKey<Boolean> AST_DETAILS = new DataKey<>("AST_DETAILS", SHOW_INTERMEDIATE_AST);
31+
final public static DataKey<Boolean> DETAILS = new DataKey<>("DETAILS", SHOW_INTERMEDIATE);
32+
final public static DataKey<Boolean> AST_DETAILS = new DataKey<>("AST_DETAILS", SHOW_INTERMEDIATE_AST);
3333

34-
private static DataHolder OPTIONS = new MutableDataSet()
34+
final private static DataHolder OPTIONS = new MutableDataSet()
3535
.set(Parser.HTML_FOR_TRANSLATOR, true)
3636
.set(Parser.PARSE_INNER_HTML_COMMENTS, true)
3737
.set(Formatter.MAX_TRAILING_BLANK_LINES, 0)
3838
.toImmutable();
3939

40-
private static final Map<String, DataHolder> optionsMap = new HashMap<>();
40+
final private static Map<String, DataHolder> optionsMap = new HashMap<>();
4141
static {
4242
optionsMap.put("details", new MutableDataSet().set(DETAILS, true));
4343
optionsMap.put("ast-details", new MutableDataSet().set(AST_DETAILS, true));

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterNoBlankLinesSpecTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import java.util.List;
1313

1414
public class ComboCoreFormatterNoBlankLinesSpecTest extends ComboCoreFormatterSpecTestBase {
15-
private static final String SPEC_RESOURCE = "/core_formatter_no_blanklines_spec.md";
16-
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
17-
private static final DataHolder OPTIONS = new MutableDataSet()
15+
final private static String SPEC_RESOURCE = "/core_formatter_no_blanklines_spec.md";
16+
final public static @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
17+
final private static DataHolder OPTIONS = new MutableDataSet()
1818
.set(Parser.BLANK_LINES_IN_AST, false)
1919
.toImmutable();
2020

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterSpecTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.util.List;
99

1010
public class ComboCoreFormatterSpecTest extends ComboCoreFormatterSpecTestBase {
11-
private static final String SPEC_RESOURCE = "/core_formatter_spec.md";
12-
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
11+
final private static String SPEC_RESOURCE = "/core_formatter_spec.md";
12+
final public static @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
1313

1414
public ComboCoreFormatterSpecTest(@NotNull SpecExample example) {
1515
super(example, null);

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreFormatterSpecTestBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.Map;
1212

1313
public abstract class ComboCoreFormatterSpecTestBase extends FormatterSpecTest {
14-
private static final Map<String, DataHolder> optionsMap = new HashMap<>();
14+
final private static Map<String, DataHolder> optionsMap = new HashMap<>();
1515
// static {
1616
// optionsMap.put("atx-space-as-is", new MutableDataSet().set(Formatter.SPACE_AFTER_ATX_MARKER, DiscretionaryText.AS_IS));
1717
// }

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreTranslationFormatterSpecTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import java.util.Map;
1717

1818
public class ComboCoreTranslationFormatterSpecTest extends TranslationFormatterSpecTest {
19-
private static final String SPEC_RESOURCE = "/core_translation_formatter_spec.md";
20-
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
19+
final private static String SPEC_RESOURCE = "/core_translation_formatter_spec.md";
20+
final public static @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
2121

22-
private static final Map<String, DataHolder> optionsMap = placementAndSortOptions(
22+
final private static Map<String, DataHolder> optionsMap = placementAndSortOptions(
2323
Parser.REFERENCES_KEEP,
2424
Formatter.REFERENCE_PLACEMENT,
2525
Formatter.REFERENCE_SORT

‎flexmark-core-test/src/test/java/com/vladsch/flexmark/core/test/util/formatter/ComboCoreWrappingSpecTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import java.util.List;
1212

1313
public class ComboCoreWrappingSpecTest extends ComboCoreFormatterSpecTestBase {
14-
private static final String SPEC_RESOURCE = "/core_wrapping_spec.md";
15-
public static final @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
14+
final private static String SPEC_RESOURCE = "/core_wrapping_spec.md";
15+
final public static @NotNull ResourceLocation RESOURCE_LOCATION = ResourceLocation.of(SPEC_RESOURCE);
1616

1717
final private static DataHolder OPTIONS = new MutableDataSet()
1818
.set(SharedDataKeys.RUNNING_TESTS, false) // Set to true to get stdout printout of intermediate wrapping information

0 commit comments

Comments
 (0)