stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8149160: use StringJoiner in sjavac option handling

Browse Source 
Concatenation of strings now uses StringJoiner.

Reviewed-by: alundblad, jjg
This commit is contained in:
Liam Miller-Cushon 2016-02-10 14:22:50 +01:00 committed by Andreas Lundblad
parent 94a0d8f5f8
commit 1986f47320
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Options.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.HashSet; import java.util.HashSet;
import java.util.StringJoiner;
import com.sun.tools.sjavac.Transformer; import com.sun.tools.sjavac.Transformer;
import com.sun.tools.sjavac.Util; import com.sun.tools.sjavac.Util;
@ -225,10 +226,7 @@ public class Options {
} }
String getResult() { String getResult() {
String result = ""; return String.join(" ", args);
for (String s : args)
result += s + " ";
return result.trim();
} }
public void addAll(Collection<String> toAdd) { public void addAll(Collection<String> toAdd) {
@ -337,10 +335,11 @@ public class Options {
// Helper method to join a list of source locations separated by // Helper method to join a list of source locations separated by
// File.pathSeparator // File.pathSeparator
private static String concatenateSourceLocations(List<SourceLocation> locs) { private static String concatenateSourceLocations(List<SourceLocation> locs) {
String s = ""; StringJoiner joiner = new StringJoiner(java.io.File.pathSeparator);
for (SourceLocation loc : locs) for (SourceLocation loc : locs) {
s += (s.isEmpty() ? "" : java.io.File.pathSeparator) + loc.getPath(); joiner.add(loc.getPath().toString());
return s; }
return joiner.toString();
} }
// OptionHelper that records the traversed options in this Options instance. // OptionHelper that records the traversed options in this Options instance.

4
langtools/test/tools/sjavac/JavacOptionPrep.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -65,7 +65,7 @@ public class JavacOptionPrep {
// - Sources provided without preceding option (SRC2) // - Sources provided without preceding option (SRC2)
// - An unrecognized option which is to be passed on to javac // - An unrecognized option which is to be passed on to javac
String sjavacArgs = "-cp " + TestPath.CP1 + SEP + TestPath.CP2 + String sjavacArgs = "-cp " + TestPath.CP1 + SEP + TestPath.CP2 +
" -d dest " + " -d dest" +
" -h header" + " -h header" +
" -sourcepath " + TestPath.SOURCEPATH1 + " -sourcepath " + TestPath.SOURCEPATH1 +
" -src " + TestPath.SRC1 + " -src " + TestPath.SRC1 +