Skip to content

Commit ff738a6

Browse files
committed
cleanup deprecated unused code
1 parent 32185f6 commit ff738a6

File tree

6 files changed

+0
-114
lines changed

6 files changed

+0
-114
lines changed

plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java

-24
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@ public CompilerResult performCompile(CompilerConfiguration configuration)
8282
throw new CompilerNotImplementedException("The performCompile method has not been implemented.");
8383
}
8484

85-
@Deprecated
86-
public List<CompilerError> compile(CompilerConfiguration configuration)
87-
throws CompilerException
88-
{
89-
throw new CompilerNotImplementedException("The compile method has not been implemented.");
90-
}
91-
9285
public CompilerOutputStyle getCompilerOutputStyle()
9386
{
9487
return compilerOutputStyle;
@@ -285,23 +278,6 @@ private static String getCanonicalPath( File origFile )
285278
}
286279
}
287280

288-
/**
289-
* @deprecated use (String[]) arguments.toArray( new String[ arguments.size() ] ); instead
290-
*/
291-
protected static String[] toStringArray( List<String> arguments )
292-
{
293-
String[] args = new String[arguments.size()];
294-
295-
int argLength = arguments.size();
296-
297-
for ( int i = 0; i < argLength; i++ )
298-
{
299-
args[i] = arguments.get( i );
300-
}
301-
302-
return args;
303-
}
304-
305281
protected void logCompiling( String[] sourceFiles, CompilerConfiguration config )
306282
{
307283
if ( ( getLogger() != null ) && getLogger().isInfoEnabled() )

plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/Compiler.java

-13
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,6 @@ boolean canUpdateTarget( CompilerConfiguration configuration )
6363
CompilerResult performCompile( CompilerConfiguration configuration )
6464
throws CompilerException;
6565

66-
/**
67-
* This method is provided for backwards compatibility only. Clients should
68-
* use {@link #performCompile(CompilerConfiguration)} instead.
69-
*
70-
* @param configuration the configuration description of the compilation
71-
* to perform
72-
* @return the result of the compilation returned by the language processor
73-
* @throws CompilerException
74-
*/
75-
@Deprecated
76-
List<CompilerError> compile( CompilerConfiguration configuration )
77-
throws CompilerException;
78-
7966
/**
8067
* Create the command line that would be executed using this configuration.
8168
* If this particular compiler has no concept of a command line then returns

plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java

-25
Original file line numberDiff line numberDiff line change
@@ -472,31 +472,6 @@ public void addCompilerCustomArgument( String customArgument, String value )
472472
customCompilerArguments.add( new AbstractMap.SimpleImmutableEntry<>( customArgument, value ) );
473473
}
474474

475-
/**
476-
* @deprecated will be removed in 2.X use #getCustomCompilerArgumentsAsMap
477-
* @return
478-
*/
479-
@Deprecated
480-
public LinkedHashMap<String, String> getCustomCompilerArguments()
481-
{
482-
LinkedHashMap<String, String> arguments = new LinkedHashMap<>( customCompilerArguments.size() );
483-
for ( Map.Entry<String, String> entry : customCompilerArguments )
484-
{
485-
arguments.put( entry.getKey(), entry.getValue() );
486-
}
487-
return arguments;
488-
}
489-
490-
/**
491-
* @deprecated will be removed in 2.X use #setCustomCompilerArgumentsAsMap
492-
* @param customCompilerArguments
493-
*/
494-
@Deprecated
495-
public void setCustomCompilerArguments( LinkedHashMap<String, String> customCompilerArguments )
496-
{
497-
setCustomCompilerArgumentsAsMap( customCompilerArguments );
498-
}
499-
500475
/**
501476
* Get all unique argument keys and their value. In case of duplicate keys, last one added wins.
502477
*

plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerError.java

-36
This file was deleted.

plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java

-12
Original file line numberDiff line numberDiff line change
@@ -645,18 +645,6 @@ protected static String[] getSourceFiles( CompilerConfiguration config )
645645
return result;
646646
}
647647

648-
/**
649-
* This method is just here to maintain the public api. This is now handled in the parse
650-
* compiler output function.
651-
*
652-
* @author Chris Stevenson
653-
* @deprecated
654-
*/
655-
public static CompilerMessage parseLine( String line )
656-
{
657-
return DefaultCSharpCompilerParser.parseLine( line );
658-
}
659-
660648
protected static Set<String> getSourceFilesForSourceRoot( CompilerConfiguration config, String sourceLocation )
661649
{
662650
DirectoryScanner scanner = new DirectoryScanner();

plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java

-4
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,6 @@ public void report( Diagnostic<? extends JavaFileObject> diagnostic )
377377
args.add( errorF.toString() );
378378
args.addAll( allSources );
379379

380-
String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() :
381-
config.getWorkingDirectory().toPath().relativize( new File( config.getOutputLocation() ).toPath() ).toString();
382-
getLogger().info( "Compiling with " + config.describe( "eclipse" ) +
383-
" to " + to );
384380
getLogger().debug( "ecj command line: " + args );
385381

386382
success = BatchCompiler.compile( args.toArray( new String[args.size()] ), devNull, devNull,

0 commit comments

Comments
 (0)