Skip to content

Commit 2e83c7f

Browse files
dhendriksdhendriks
authored
Merge pull request #15 from dhendriks/5-Clean_up_source_code
#5 clean up source code
2 parents 00a9685 + 1c62945 commit 2e83c7f

19 files changed

+6332
-3849
lines changed

‎.checkstyle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<local-check-config name="JavaBDD Checkstyle" location="checkstyle.xml" type="project" description="JavaBDD Checkstyle.">
5+
<additional-data name="protect-config-file" value="false"/>
6+
</local-check-config>
7+
<fileset name="all" enabled="true" check-config-name="JavaBDD Checkstyle" local="true">
8+
<file-match-pattern match-pattern="." include-pattern="true"/>
9+
</fileset>
10+
</fileset-config>

‎.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
28+
<buildCommand>
29+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2833
</buildSpec>
2934
<natures>
3035
<nature>org.eclipse.jdt.core.javanature</nature>
3136
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3237
<nature>org.eclipse.pde.PluginNature</nature>
38+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
3339
</natures>
3440
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs

Lines changed: 525 additions & 2 deletions
Large diffs are not rendered by default.

‎.settings/org.eclipse.jdt.launching.prefs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning
3+
org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning

‎.settings/org.eclipse.jdt.ui.prefs

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
eclipse.preferences.version=1
2+
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
3+
formatter_profile=_JavaBDD formatter profile
4+
formatter_settings_version=21
5+
org.eclipse.jdt.ui.text.custom_code_templates=
6+
sp_cleanup.add_default_serial_version_id=true
7+
sp_cleanup.add_generated_serial_version_id=false
8+
sp_cleanup.add_missing_annotations=false
9+
sp_cleanup.add_missing_deprecated_annotations=true
10+
sp_cleanup.add_missing_methods=false
11+
sp_cleanup.add_missing_nls_tags=false
12+
sp_cleanup.add_missing_override_annotations=true
13+
sp_cleanup.add_missing_override_annotations_interface_methods=true
14+
sp_cleanup.add_serial_version_id=false
15+
sp_cleanup.always_use_blocks=true
16+
sp_cleanup.always_use_parentheses_in_expressions=false
17+
sp_cleanup.always_use_this_for_non_static_field_access=false
18+
sp_cleanup.always_use_this_for_non_static_method_access=false
19+
sp_cleanup.convert_to_enhanced_for_loop=false
20+
sp_cleanup.correct_indentation=false
21+
sp_cleanup.format_source_code=false
22+
sp_cleanup.format_source_code_changes_only=false
23+
sp_cleanup.make_local_variable_final=false
24+
sp_cleanup.make_parameters_final=false
25+
sp_cleanup.make_private_fields_final=true
26+
sp_cleanup.make_type_abstract_if_missing_method=false
27+
sp_cleanup.make_variable_declarations_final=false
28+
sp_cleanup.never_use_blocks=false
29+
sp_cleanup.never_use_parentheses_in_expressions=true
30+
sp_cleanup.on_save_use_additional_actions=true
31+
sp_cleanup.organize_imports=false
32+
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
33+
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
34+
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
35+
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
36+
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
37+
sp_cleanup.remove_private_constructors=true
38+
sp_cleanup.remove_trailing_whitespaces=true
39+
sp_cleanup.remove_trailing_whitespaces_all=true
40+
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
41+
sp_cleanup.remove_unnecessary_casts=false
42+
sp_cleanup.remove_unnecessary_nls_tags=false
43+
sp_cleanup.remove_unused_imports=false
44+
sp_cleanup.remove_unused_local_variables=false
45+
sp_cleanup.remove_unused_private_fields=true
46+
sp_cleanup.remove_unused_private_members=false
47+
sp_cleanup.remove_unused_private_methods=true
48+
sp_cleanup.remove_unused_private_types=true
49+
sp_cleanup.sort_members=false
50+
sp_cleanup.sort_members_all=false
51+
sp_cleanup.use_blocks=false
52+
sp_cleanup.use_blocks_only_for_return_and_throw=false
53+
sp_cleanup.use_parentheses_in_expressions=false
54+
sp_cleanup.use_this_for_non_static_field_access=false
55+
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
56+
sp_cleanup.use_this_for_non_static_method_access=false
57+
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

‎checkstyle.xml

Lines changed: 299 additions & 0 deletions
Large diffs are not rendered by default.

‎pom.xml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23

34
<modelVersion>4.0.0</modelVersion>
45

@@ -35,6 +36,22 @@
3536

3637
<build>
3738
<plugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-compiler-plugin</artifactId>
42+
<version>3.8.1</version>
43+
<configuration>
44+
<encoding>UTF-8</encoding>
45+
<failOnWarning>true</failOnWarning>
46+
<parameters>true</parameters>
47+
<release>11</release>
48+
<showDeprecation>true</showDeprecation>
49+
<showWarnings>true</showWarnings>
50+
<source>11</source>
51+
<target>11</target>
52+
</configuration>
53+
</plugin>
54+
3855
<plugin>
3956
<artifactId>maven-deploy-plugin</artifactId>
4057
<version>2.8.2</version>
@@ -104,6 +121,33 @@
104121
<artifactId>maven-javadoc-plugin</artifactId>
105122
<version>3.1.1</version>
106123
</plugin>
124+
125+
<plugin>
126+
<groupId>org.apache.maven.plugins</groupId>
127+
<artifactId>maven-checkstyle-plugin</artifactId>
128+
<version>3.1.2</version>
129+
<dependencies>
130+
<dependency>
131+
<groupId>com.puppycrawl.tools</groupId>
132+
<artifactId>checkstyle</artifactId>
133+
<version>8.41</version>
134+
</dependency>
135+
</dependencies>
136+
<executions>
137+
<execution>
138+
<id>checkstyle-validate</id>
139+
<configuration>
140+
<configLocation>checkstyle.xml</configLocation>
141+
<consoleOutput>false</consoleOutput>
142+
<failOnViolation>true</failOnViolation>
143+
<violationSeverity>info</violationSeverity>
144+
</configuration>
145+
<goals>
146+
<goal>check</goal>
147+
</goals>
148+
</execution>
149+
</executions>
150+
</plugin>
107151
</plugins>
108152
</build>
109153

0 commit comments

Comments
 (0)