Skip to content

Miscellaneous linting & cleanups #64

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.

Sign up for GitHub

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

Closed
wants to merge 21 commits into from
Closed

Miscellaneous linting & cleanups #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0e504ee
Remove unused imports
rhowe Jun 5, 2019
a4ae171
Remove unused InclusionScanException
rhowe Jun 5, 2019
2cd8ab5
Remove unused throws clauses
rhowe Jun 5, 2019
580f7c8
Use Collections.addAll() instead of a for loop
rhowe Jun 5, 2019
86eba96
Replace for loops with foreach loops
rhowe Jun 5, 2019
05e9b21
Prefer String.contains() over String.indexOf()
rhowe Jun 5, 2019
1640387
Remove unnecessary unboxing
rhowe Jun 5, 2019
ad9ab2f
Use try-with-resources in JarUtil
rhowe Jun 5, 2019
d7020d7
Merge identical catch blocks
rhowe Jun 5, 2019
f596043
Use <> where we can
rhowe Jun 5, 2019
639ab48
Mark fields used for thread synchronisation as final
rhowe Jun 5, 2019
522873d
Used fixed array sizes when calling toArray()
rhowe Jun 5, 2019
b15b3db
Remove unnecessary local variable
rhowe Jun 5, 2019
e80f2ed
Use StandardCharsets
rhowe Jun 5, 2019
3f12fe0
Use assertFalse() when we want to test falseness
rhowe Jun 5, 2019
6929507
Simplify CompilerOutputStyle.equals()
rhowe Jun 5, 2019
2d81c33
Remove redundant check of errorsAsWarnings in EclipseJavaCompiler
rhowe Jun 5, 2019
d48d35d
Remove unnecessary null check in AspectJCompiler
rhowe Jun 5, 2019
013502d
Remove unnecessary array creation
rhowe Jun 5, 2019
f16095f
Remove unnecessary casts
rhowe Jun 5, 2019
621414c
Remove redundant initialisers
rhowe Jun 5, 2019
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
Prev Previous commit
Next Next commit
Remove unnecessary casts
  • Loading branch information
@rhowe
rhowe committed Jun 5, 2019
commit f16095f5863b7b31b346879cc6c216ae9fbfca1c
6 changes: 3 additions & 3 deletions ...xus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private String[] buildCompilerArguments( CompilerConfiguration config, String[]

if ( !StringUtils.isEmpty( resourcefile ) )
{
String resourceTarget = (String) compilerArguments.get( "-resourcetarget" );
String resourceTarget = compilerArguments.get( "-resourcetarget" );
args.add( "/res:" + new File( resourcefile ).getAbsolutePath() + "," + resourceTarget );
}

Expand Down Expand Up @@ -434,7 +434,7 @@ private File findResourceDir( CompilerConfiguration config )

Map<String, String> compilerArguments = getCompilerArguments( config );

String tempResourcesDirAsString = (String) compilerArguments.get( "-resourceDir" );
String tempResourcesDirAsString = compilerArguments.get( "-resourceDir" );
File filteredResourceDir = null;
if ( tempResourcesDirAsString != null )
{
Expand Down Expand Up @@ -628,7 +628,7 @@ protected static String[] getSourceFiles( CompilerConfiguration config )
}
else
{
result = (String[]) sources.toArray( new String[0] );
result = sources.toArray( new String[0] );
}

return result;
Expand Down
8 changes: 4 additions & 4 deletions ...compiler-csharp/src/test/java/org/codehaus/plexus/compiler/csharp/CSharpCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ public void testParserCscWin()
assertEquals( 24, messagesWinCsc.size() );

assertTrue( "Check that the line number is not -1",
( (CompilerMessage) messagesWinCsc.get( 0 ) ).getStartLine() != -1 );
messagesWinCsc.get( 0 ).getStartLine() != -1 );
assertTrue( "Check that the column number is not -1",
( (CompilerMessage) messagesWinCsc.get( 0 ) ).getStartColumn() != -1 );
messagesWinCsc.get( 0 ).getStartColumn() != -1 );

}

Expand Down Expand Up @@ -211,9 +211,9 @@ public void testParserMonoWin()
assertEquals( 5, messagesMonoWin.size() );

assertTrue( "Check that the line number is not -1",
( (CompilerMessage) messagesMonoWin.get( 0 ) ).getStartLine() != -1 );
messagesMonoWin.get( 0 ).getStartLine() != -1 );
assertTrue( "Check that the column number is not -1",
( (CompilerMessage) messagesMonoWin.get( 0 ) ).getStartColumn() != -1 );
messagesMonoWin.get( 0 ).getStartColumn() != -1 );

}

Expand Down
2 changes: 1 addition & 1 deletion ...mpiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/ErrorMessageParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public void testLocalizedWarningNotTreatedAsError()
JavacCompiler.parseModernStream( 0, new BufferedReader( new StringReader( errors ) ) );

assertEquals( 1, messages.size() );
assertFalse( ( (CompilerMessage) messages.get( 0 ) ).isError() );
assertFalse( messages.get( 0 ).isError() );
}

public void testUnixFileNames()
Expand Down
2 changes: 1 addition & 1 deletion ...plexus-compiler-jikes/src/main/java/org/codehaus/plexus/compiler/jikes/JikesCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public String[] createCommandLine( CompilerConfiguration config )

}

return (String[]) args.toArray( new String[0] );
return args.toArray( new String[0] );
}

// -----------------------------------------------------------------------
Expand Down