Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

checkstyle #81

Merged
merged 71 commits into from
Feb 26, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
eaa091e
Begin work on checkstyle
Gaming32 Feb 24, 2022
701ad38
Update checkstyle.yml
Gaming32 Feb 24, 2022
1ad8483
[skip ci] Remove unused config
Gaming32 Feb 24, 2022
756badb
Improve checkstyle.xml
Gaming32 Feb 24, 2022
810a179
Some improvements
Gaming32 Feb 24, 2022
e7424e4
Update pom.xml
Gaming32 Feb 24, 2022
7b438af
Create extensions.json
Gaming32 Feb 24, 2022
d7e3a95
Fix VisualStyles.java
Gaming32 Feb 24, 2022
e6d6aee
Fix Timer.java
Gaming32 Feb 24, 2022
3929fa8
Fix Delays.java
Gaming32 Feb 24, 2022
f5aed64
Merge branch 'checkstyle' of https://github.com/Gaming32/ArrayV into …
Gaming32 Feb 24, 2022
4004f11
A few quick updates
Gaming32 Feb 24, 2022
2284a38
Fix Visual.java
Gaming32 Feb 24, 2022
b466615
Fix PerlinNoise.java
Gaming32 Feb 25, 2022
a9338e4
Fix PixelMesh.java
Gaming32 Feb 25, 2022
8217213
Fix HoopStack.java
Gaming32 Feb 25, 2022
f534887
Fix CustomImage.java
Gaming32 Feb 25, 2022
794111a
Fix WaveDots.java
Gaming32 Feb 25, 2022
cf3162e
Fix SpiralDots.java
Gaming32 Feb 25, 2022
c1735b3
Fix ScatterPlot.java
Gaming32 Feb 25, 2022
4a7633d
Fix DisparityDots.java
Gaming32 Feb 25, 2022
bdddaaf
Add trailing whitespace module
Gaming32 Feb 25, 2022
ffe7e3c
Fix Spiral.java
Gaming32 Feb 25, 2022
0c84b90
Fix DisparityCircle.java
Gaming32 Feb 25, 2022
4d15cc9
Fix DisparityChords.java
Gaming32 Feb 25, 2022
dd96a60
Fix ColorCircle.java
Gaming32 Feb 25, 2022
2b0fe35
Fix SineWave.java
Gaming32 Feb 25, 2022
d61629c
Fix Rainbow.java
Gaming32 Feb 25, 2022
bfe0e07
Fix DisparityBarGraph.java
Gaming32 Feb 25, 2022
be291f4
Fix BarGraph.java
Gaming32 Feb 25, 2022
43b5369
Fix Writes.java
Gaming32 Feb 25, 2022
099900c
Fix Statistics.java
Gaming32 Feb 25, 2022
7e55df6
Fix Sounds.java
Gaming32 Feb 25, 2022
5cc9525
Fix SortingNetworkGenerator.java
Gaming32 Feb 25, 2022
c7a069e
Fix GraphReader.java
Gaming32 Feb 25, 2022
5bca5eb
Fix GraphNode.java
Gaming32 Feb 25, 2022
117ddd6
Fix GraphConnection.java
Gaming32 Feb 25, 2022
c0d4f7e
Fix AWTUtils.java
Gaming32 Feb 25, 2022
0523894
Fix Shuffles.java
Gaming32 Feb 25, 2022
59b2c88
Fix ShuffleGraph.java
Gaming32 Feb 25, 2022
135c077
Fix Rotations.java
Gaming32 Feb 25, 2022
958d7b7
Fix Renderer.java
Gaming32 Feb 25, 2022
a4936a1
Fix Reads.java
Gaming32 Feb 25, 2022
83a2bf0
Fix MultipleScript.java
Gaming32 Feb 25, 2022
456dee5
Fix m.java
Gaming32 Feb 25, 2022
80e1e02
Fix IndexedRotations.java
Gaming32 Feb 25, 2022
71201d7
Fix Highlights.java
Gaming32 Feb 25, 2022
e406013
Fix Distributions.java
Gaming32 Feb 25, 2022
c378260
Fix ArrayVList.java
Gaming32 Feb 25, 2022
50557e5
Fix ArrayFileWriter.java
Gaming32 Feb 25, 2022
18153cb
Fix threads
Gaming32 Feb 25, 2022
302b4c7
[skip ci] Add workflow results to README
Gaming32 Feb 25, 2022
886bcb0
Update pom.xml
Gaming32 Feb 25, 2022
b866dbf
Fix ViewPrompt.java
Gaming32 Feb 25, 2022
33e5eeb
Fix SortPrompt.java
Gaming32 Feb 25, 2022
677660d
Fix ShufflePrompt.java
Gaming32 Feb 25, 2022
e3319c8
Fix JErrorPane.java
Gaming32 Feb 25, 2022
b1aa9cc
Fix JEnhancedOptionPane.java
Gaming32 Feb 25, 2022
3da5ee5
Fix ShufflePanel.java
Gaming32 Feb 25, 2022
31367cf
Fix SortAnalyzer.java
Gaming32 Feb 25, 2022
46c72fd
Fix ArrayVisualizer.java
Gaming32 Feb 25, 2022
525689b
Fix broken @checkstyle:off marks
Gaming32 Feb 25, 2022
2848b86
Fix ArrayManager.java
Gaming32 Feb 25, 2022
39ec46b
Fix UtilFrame.java
Gaming32 Feb 25, 2022
4b6d33e
Fix SoundFrame.java
Gaming32 Feb 25, 2022
cdf1405
Fix ImageFrame.java
Gaming32 Feb 25, 2022
2bc4777
Fix ArrayFrame.java
Gaming32 Feb 25, 2022
c70deee
Fix AppFrame.java
Gaming32 Feb 25, 2022
dca8e77
Fix ShuffleDialog.java
Gaming32 Feb 25, 2022
b1c8f77
Fix ViewPrompt.java
Gaming32 Feb 25, 2022
5927587
Add FileTabCharacter
Gaming32 Feb 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Begin work on checkstyle
  • Loading branch information
Gaming32 committed Feb 24, 2022
commit eaa091e13c0e3297e51a781e9474fa9bf3c2faa8
15 changes: 15 additions & 0 deletions .github/workflows/checkstyle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: checkstyle
on: [pull_request, push, workflow_dispatch]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 8
uses: actions/[email protected]
with:
java-version: 8
distribution: zulu
- name: Run checkstyle with Maven
run: mvn -Dcheckstyle.violationSeverity=warning checkstyle:check
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
"java.configuration.updateBuildConfiguration": "interactive",
"java.format.settings.url": ".vscode/java-formatter.xml",
"java.checkstyle.configuration": "${workspaceFolder}\\checkstyle.xml",
"java.checkstyle.version": "9.3",
"java.checkstyle.properties": {
"severity": "error"
}
}
55 changes: 55 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="severity" value="warning"/>
<property name="cacheFile" value="target/cachefile"/>
<property name="fileExtensions" value="java"/>

<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value=".*[\\/]src[\\/]main[\\/]java[\\/]io[\\/]github[\\/]arrayv[\\/]sorts.*$"/>
</module>

<module name="NewlineAtEndOfFile"/>

<module name="TreeWalker">
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="@checkstyle\:off ([\w\|]+)"/>
<property name="onCommentFormat" value="@checkstyle\:on ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>
<module name="SuppressionCommentFilter">
<!-- This second one allows for general exclusions -->
<property name="offCommentFormat" value="@checkstyle\:off"/>
<property name="onCommentFormat" value="@checkstyle\:on"/>
</module>

<!-- Enforces that constants are in SHOUTING_SNAKE_CASE -->
<module name="ConstantName"/>

<!-- Handles the mistake described here: https://checkstyle.sourceforge.io/config_coding.html#CovariantEquals_Description -->
<module name="CovariantEquals"/>

<module name="FinalClass"/>

<module name="GenericWhitespace"/>

<module name="HideUtilityClassConstructor"/>

<module name="Indentation">
<property name="basicOffset" value="4"/>
</module>

<module name="InvalidJavadocPosition"/>

<module name="JavadocMissingLeadingAsterisk"/>

<module name="JavadocMissingWhitespaceAfterAsterisk"/>

<module name="LeftCurly">
<property name="option" value="eol"/>
<property name="ignoreEnums" value="false"/>
</module>
</module>
</module>
19 changes: 18 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,25 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.2</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/arrayv/threads/RunSort.java
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public void run() {
if (warning == 0) goAhead = true;
else goAhead = false;
}
}
}
} else {
goAhead = true;
}
Expand Down
98 changes: 52 additions & 46 deletions src/main/java/io/github/arrayv/visuals/Visual.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,62 +65,68 @@ public static void setRectColor(Graphics2D rect, boolean color, boolean analysis
//The longer the array length, the more bars marked. Makes the visual easier to see when bars are thinner.
public static void colorMarkedBars(int logOfLen, int index, Highlights Highlights, Graphics2D mainRender, boolean colorEnabled, boolean rainbowEnabled, boolean analysis) {
switch(logOfLen) {
case 15: if (Highlights.containsPosition(index - 15)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 14)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 13)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 12)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 11)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 14: if (Highlights.containsPosition(index - 10)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 9)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 8)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 13: if (Highlights.containsPosition(index - 7)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 6)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 5)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 12: if (Highlights.containsPosition(index - 4)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 3)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 11: if (Highlights.containsPosition(index - 2)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 10: if (Highlights.containsPosition(index - 1)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
default: if (Highlights.containsPosition(index)) markBar(mainRender, colorEnabled, rainbowEnabled, analysis);
// @checkstyle:off LeftCurlyCheck
case 15: if (Highlights.containsPosition(index - 15)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 14)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 13)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 12)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 11)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 14: if (Highlights.containsPosition(index - 10)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 9)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 8)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 13: if (Highlights.containsPosition(index - 7)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 6)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 5)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 12: if (Highlights.containsPosition(index - 4)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
if (Highlights.containsPosition(index - 3)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 11: if (Highlights.containsPosition(index - 2)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
case 10: if (Highlights.containsPosition(index - 1)) { markBar(mainRender, colorEnabled, rainbowEnabled, analysis); break; }
default: if (Highlights.containsPosition(index)) markBar(mainRender, colorEnabled, rainbowEnabled, analysis);
// @checkstyle:on LeftCurlyCheck
}
}

public static void drawFancyFinish(int logOfLen, int index, int position, Graphics2D mainRender, boolean colorEnabled, boolean rainbowEnabled) {
switch(logOfLen) {
case 15: if (index == position - 14) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 14: if (index == position - 13) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 13: if (index == position - 12) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 12: if (index == position - 11) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 11: if (index == position - 10) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 10: if (index == position - 9) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 9: if (index == position - 8) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 8: if (index == position - 7) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 7: if (index == position - 6) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 6: if (index == position - 5) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 5: if (index == position - 4) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 4: if (index == position - 3) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 3: if (index == position - 2) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 2: if (index == position - 1) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
default: if (index == position) markBarFancy(mainRender, colorEnabled, rainbowEnabled);
// @checkstyle:off LeftCurlyCheck
case 15: if (index == position - 14) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 14: if (index == position - 13) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 13: if (index == position - 12) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 12: if (index == position - 11) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 11: if (index == position - 10) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 10: if (index == position - 9) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 9: if (index == position - 8) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 8: if (index == position - 7) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 7: if (index == position - 6) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 6: if (index == position - 5) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 5: if (index == position - 4) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 4: if (index == position - 3) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 3: if (index == position - 2) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
case 2: if (index == position - 1) { markBarFancy(mainRender, colorEnabled, rainbowEnabled); break; }
default: if (index == position) markBarFancy(mainRender, colorEnabled, rainbowEnabled);
// @checkstyle:on LeftCurlyCheck
}
}

public static void drawFancyFinishLine(int logOfLen, int index, int position, Graphics2D mainRender, double width, boolean colorEnabled) {
switch(logOfLen) {
case 15: if (index == position - 14) { lineMark(mainRender, width, colorEnabled, false); break; }
case 14: if (index == position - 13) { lineMark(mainRender, width, colorEnabled, false); break; }
case 13: if (index == position - 12) { lineMark(mainRender, width, colorEnabled, false); break; }
case 12: if (index == position - 11) { lineMark(mainRender, width, colorEnabled, false); break; }
case 11: if (index == position - 10) { lineMark(mainRender, width, colorEnabled, false); break; }
case 10: if (index == position - 9) { lineMark(mainRender, width, colorEnabled, false); break; }
case 9: if (index == position - 8) { lineMark(mainRender, width, colorEnabled, false); break; }
case 8: if (index == position - 7) { lineMark(mainRender, width, colorEnabled, false); break; }
case 7: if (index == position - 6) { lineMark(mainRender, width, colorEnabled, false); break; }
case 6: if (index == position - 5) { lineMark(mainRender, width, colorEnabled, false); break; }
case 5: if (index == position - 4) { lineMark(mainRender, width, colorEnabled, false); break; }
case 4: if (index == position - 3) { lineMark(mainRender, width, colorEnabled, false); break; }
case 3: if (index == position - 2) { lineMark(mainRender, width, colorEnabled, false); break; }
case 2: if (index == position - 1) { lineMark(mainRender, width, colorEnabled, false); break; }
default: if (index == position) lineMark(mainRender, width, colorEnabled, false);
// @checkstyle:off LeftCurlyCheck
case 15: if (index == position - 14) { lineMark(mainRender, width, colorEnabled, false); break; }
case 14: if (index == position - 13) { lineMark(mainRender, width, colorEnabled, false); break; }
case 13: if (index == position - 12) { lineMark(mainRender, width, colorEnabled, false); break; }
case 12: if (index == position - 11) { lineMark(mainRender, width, colorEnabled, false); break; }
case 11: if (index == position - 10) { lineMark(mainRender, width, colorEnabled, false); break; }
case 10: if (index == position - 9) { lineMark(mainRender, width, colorEnabled, false); break; }
case 9: if (index == position - 8) { lineMark(mainRender, width, colorEnabled, false); break; }
case 8: if (index == position - 7) { lineMark(mainRender, width, colorEnabled, false); break; }
case 7: if (index == position - 6) { lineMark(mainRender, width, colorEnabled, false); break; }
case 6: if (index == position - 5) { lineMark(mainRender, width, colorEnabled, false); break; }
case 5: if (index == position - 4) { lineMark(mainRender, width, colorEnabled, false); break; }
case 4: if (index == position - 3) { lineMark(mainRender, width, colorEnabled, false); break; }
case 3: if (index == position - 2) { lineMark(mainRender, width, colorEnabled, false); break; }
case 2: if (index == position - 1) { lineMark(mainRender, width, colorEnabled, false); break; }
default: if (index == position) lineMark(mainRender, width, colorEnabled, false);
// @checkstyle:on LeftCurlyCheck
}
}

Expand Down
Loading