23 * questions. |
23 * questions. |
24 */ |
24 */ |
25 |
25 |
26 package com.sun.tools.javac.util; |
26 package com.sun.tools.javac.util; |
27 |
27 |
28 import com.sun.tools.javac.main.Main; |
|
29 import java.io.*; |
28 import java.io.*; |
30 import java.util.Arrays; |
29 import java.util.Arrays; |
31 import java.util.EnumSet; |
30 import java.util.EnumSet; |
32 import java.util.HashSet; |
31 import java.util.HashSet; |
33 import java.util.Map; |
|
34 import java.util.Queue; |
32 import java.util.Queue; |
35 import java.util.Set; |
33 import java.util.Set; |
36 import javax.tools.DiagnosticListener; |
34 import javax.tools.DiagnosticListener; |
37 import javax.tools.JavaFileObject; |
35 import javax.tools.JavaFileObject; |
38 |
36 |
39 import com.sun.tools.javac.api.DiagnosticFormatter; |
37 import com.sun.tools.javac.api.DiagnosticFormatter; |
40 import com.sun.tools.javac.main.OptionName; |
38 import com.sun.tools.javac.main.Main; |
|
39 import com.sun.tools.javac.main.Option; |
41 import com.sun.tools.javac.parser.EndPosTable; |
40 import com.sun.tools.javac.parser.EndPosTable; |
42 import com.sun.tools.javac.tree.JCTree; |
|
43 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
41 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
44 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType; |
42 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType; |
45 |
43 |
46 import static com.sun.tools.javac.main.OptionName.*; |
44 import static com.sun.tools.javac.main.Option.*; |
47 |
45 |
48 /** A class for error logs. Reports errors and warnings, and |
46 /** A class for error logs. Reports errors and warnings, and |
49 * keeps track of error numbers and positions. |
47 * keeps track of error numbers and positions. |
50 * |
48 * |
51 * <p><b>This is NOT part of any supported API. |
49 * <p><b>This is NOT part of any supported API. |
177 String ek = options.get("expectKeys"); |
175 String ek = options.get("expectKeys"); |
178 if (ek != null) |
176 if (ek != null) |
179 expectDiagKeys = new HashSet<String>(Arrays.asList(ek.split(", *"))); |
177 expectDiagKeys = new HashSet<String>(Arrays.asList(ek.split(", *"))); |
180 } |
178 } |
181 |
179 |
182 private int getIntOption(Options options, OptionName optionName, int defaultValue) { |
180 private int getIntOption(Options options, Option option, int defaultValue) { |
183 String s = options.get(optionName); |
181 String s = options.get(option); |
184 try { |
182 try { |
185 if (s != null) { |
183 if (s != null) { |
186 int n = Integer.parseInt(s); |
184 int n = Integer.parseInt(s); |
187 return (n <= 0 ? Integer.MAX_VALUE : n); |
185 return (n <= 0 ? Integer.MAX_VALUE : n); |
188 } |
186 } |