View | Details | Raw Unified | Return to bug 274114
Collapse All | Expand All

(-)src/org/eclipse/jdt/internal/compiler/tool/Options.java (-68 / +80 lines)
Lines 55-60 Link Here
55 
		Options.ZERO_ARGUMENT_OPTIONS.add("-1.6");//$NON-NLS-1$
 55 
		Options.ZERO_ARGUMENT_OPTIONS.add("-1.6");//$NON-NLS-1$
56 
		Options.ZERO_ARGUMENT_OPTIONS.add("-6");//$NON-NLS-1$
 56 
		Options.ZERO_ARGUMENT_OPTIONS.add("-6");//$NON-NLS-1$
57 
		Options.ZERO_ARGUMENT_OPTIONS.add("-6.0");//$NON-NLS-1$
 57 
		Options.ZERO_ARGUMENT_OPTIONS.add("-6.0");//$NON-NLS-1$
58 
		Options.ZERO_ARGUMENT_OPTIONS.add("-1.7");//$NON-NLS-1$
59 
		Options.ZERO_ARGUMENT_OPTIONS.add("-7");//$NON-NLS-1$
60 
		Options.ZERO_ARGUMENT_OPTIONS.add("-7.0");//$NON-NLS-1$
58 
		Options.ZERO_ARGUMENT_OPTIONS.add("-proc:only");//$NON-NLS-1$
 61 
		Options.ZERO_ARGUMENT_OPTIONS.add("-proc:only");//$NON-NLS-1$
59 
		Options.ZERO_ARGUMENT_OPTIONS.add("-proc:none");//$NON-NLS-1$
 62 
		Options.ZERO_ARGUMENT_OPTIONS.add("-proc:none");//$NON-NLS-1$
60 
		Options.ZERO_ARGUMENT_OPTIONS.add("-XprintProcessorInfo");//$NON-NLS-1$
 63 
		Options.ZERO_ARGUMENT_OPTIONS.add("-XprintProcessorInfo");//$NON-NLS-1$
Lines 139-224 Link Here
139 
			while (tokenizer.hasMoreTokens()) {
 142 
			while (tokenizer.hasMoreTokens()) {
140 
				String token = tokenizer.nextToken();
 143 
				String token = tokenizer.nextToken();
141 
				tokenCounter++;
 144 
				tokenCounter++;
142 
				if ("constructorName".equals(token)//$NON-NLS-1$
 145 
				if (token.equals("allDeadCode")//$NON-NLS-1$
143 
						|| token.equals("pkgDefaultMethod")//$NON-NLS-1$
144 
						|| token.equals("packageDefaultMethod")//$NON-NLS-1$
145 
						|| token.equals("maskedCatchBlock")//$NON-NLS-1$
146 
						|| token.equals("maskedCatchBlocks")//$NON-NLS-1$
147 
						|| token.equals("deprecation")//$NON-NLS-1$
148 
						|| token.equals("allDeprecation")//$NON-NLS-1$
 146 
						|| token.equals("allDeprecation")//$NON-NLS-1$
149 
						|| token.equals("unusedLocal")//$NON-NLS-1$
 147 
						|| token.equals("allJavadoc")//$NON-NLS-1$
150 
						|| token.equals("unusedLocals")//$NON-NLS-1$
 148 
						|| token.equals("assertIdentifier")//$NON-NLS-1$
151 
						|| token.equals("unusedArgument")//$NON-NLS-1$
 149 
						|| token.equals("boxing")//$NON-NLS-1$
152 
						|| token.equals("unusedArguments")//$NON-NLS-1$
 150 
						|| token.equals("charConcat")//$NON-NLS-1$
153 
						|| token.equals("unusedImport")//$NON-NLS-1$
 151 
						|| token.equals("compareIdentical")//$NON-NLS-1$
154 
						|| token.equals("unusedImports")//$NON-NLS-1$
155 
						|| token.equals("unusedPrivate")//$NON-NLS-1$
156 
						|| token.equals("unusedLabel")//$NON-NLS-1$
157 
						|| token.equals("localHiding")//$NON-NLS-1$
158 
						|| token.equals("fieldHiding")//$NON-NLS-1$
159 
						|| token.equals("specialParamHiding")//$NON-NLS-1$
160 
						|| token.equals("conditionAssign")//$NON-NLS-1$
 152 
						|| token.equals("conditionAssign")//$NON-NLS-1$
161 
						|| token.equals("syntheticAccess")//$NON-NLS-1$
 153 
						|| token.equals("constructorName")//$NON-NLS-1$
162 
						|| token.equals("synthetic-access")//$NON-NLS-1$
 154 
						|| token.equals("deadCode")//$NON-NLS-1$
163 
						|| token.equals("nls")//$NON-NLS-1$
 155 
						|| token.equals("dep-ann")//$NON-NLS-1$
164 
						|| token.equals("staticReceiver")//$NON-NLS-1$
 156 
						|| token.equals("deprecation")//$NON-NLS-1$
157 
						|| token.equals("discouraged")//$NON-NLS-1$
158 
						|| token.equals("emptyBlock")//$NON-NLS-1$
159 
						|| token.equals("enumIdentifier")//$NON-NLS-1$
160 
						|| token.equals("enumSwitch")//$NON-NLS-1$
161 
						|| token.equals("fallthrough")//$NON-NLS-1$
162 
						|| token.equals("fieldHiding")//$NON-NLS-1$
163 
						|| token.equals("finalBound")//$NON-NLS-1$
164 
						|| token.equals("finally")//$NON-NLS-1$
165 
						|| token.equals("forbidden")//$NON-NLS-1$
166 
						|| token.equals("hashCode")//$NON-NLS-1$
167 
						|| token.equals("hiding")//$NON-NLS-1$
168 
						|| token.equals("incomplete-switch")//$NON-NLS-1$
165 
						|| token.equals("indirectStatic")//$NON-NLS-1$
 169 
						|| token.equals("indirectStatic")//$NON-NLS-1$
166 
						|| token.equals("noEffectAssign")//$NON-NLS-1$
167 
						|| token.equals("intfNonInherited")//$NON-NLS-1$
168 
						|| token.equals("interfaceNonInherited")//$NON-NLS-1$
 170 
						|| token.equals("interfaceNonInherited")//$NON-NLS-1$
169 
						|| token.equals("charConcat")//$NON-NLS-1$
 171 
						|| token.equals("intfAnnotation")//$NON-NLS-1$
172 
						|| token.equals("intfNonInherited")//$NON-NLS-1$
173 
						|| token.equals("intfRedundant")//$NON-NLS-1$
174 
						|| token.equals("javadoc")//$NON-NLS-1$
175 
						|| token.equals("localHiding")//$NON-NLS-1$
176 
						|| token.equals("maskedCatchBlock")//$NON-NLS-1$
177 
						|| token.equals("maskedCatchBlocks")//$NON-NLS-1$
178 
						|| token.equals("nls")//$NON-NLS-1$
179 
						|| token.equals("noEffectAssign")//$NON-NLS-1$
170 
						|| token.equals("noImplicitStringConversion")//$NON-NLS-1$
 180 
						|| token.equals("noImplicitStringConversion")//$NON-NLS-1$
181 
						|| token.equals("null")//$NON-NLS-1$
182 
						|| token.equals("nullDereference")//$NON-NLS-1$
183 
						|| token.equals("over-ann")//$NON-NLS-1$
184 
						|| token.equals("packageDefaultMethod")//$NON-NLS-1$
185 
						|| token.equals("paramAssign")//$NON-NLS-1$
186 
						|| token.equals("pkgDefaultMethod")//$NON-NLS-1$
187 
						|| token.equals("raw")//$NON-NLS-1$
171 
						|| token.equals("semicolon")//$NON-NLS-1$
 188 
						|| token.equals("semicolon")//$NON-NLS-1$
172 
						|| token.equals("serial")//$NON-NLS-1$
 189 
						|| token.equals("serial")//$NON-NLS-1$
173 
						|| token.equals("emptyBlock")//$NON-NLS-1$
 190 
						|| token.equals("specialParamHiding")//$NON-NLS-1$
174 
						|| token.equals("uselessTypeCheck")//$NON-NLS-1$
 191 
						|| token.equals("static-access")//$NON-NLS-1$
175 
						|| token.equals("unchecked")//$NON-NLS-1$
 192 
						|| token.equals("staticReceiver")//$NON-NLS-1$
176 
						|| token.equals("unsafe")//$NON-NLS-1$
 193 
						|| token.equals("super")//$NON-NLS-1$
177 
						|| token.equals("raw")//$NON-NLS-1$
178 
						|| token.equals("finalBound")//$NON-NLS-1$
179 
						|| token.equals("suppress")//$NON-NLS-1$
 194 
						|| token.equals("suppress")//$NON-NLS-1$
180 
						|| token.equals("warningToken")//$NON-NLS-1$
 195 
						|| token.equals("syncOverride")//$NON-NLS-1$
196 
						|| token.equals("synthetic-access")//$NON-NLS-1$
197 
						|| token.equals("syntheticAccess")//$NON-NLS-1$
198 
						|| token.equals("typeHiding")//$NON-NLS-1$
199 
						|| token.equals("unchecked")//$NON-NLS-1$
181 
						|| token.equals("unnecessaryElse")//$NON-NLS-1$
 200 
						|| token.equals("unnecessaryElse")//$NON-NLS-1$
182 
						|| token.equals("javadoc")//$NON-NLS-1$
183 
						|| token.equals("allJavadoc")//$NON-NLS-1$
184 
						|| token.equals("assertIdentifier")//$NON-NLS-1$
185 
						|| token.equals("enumIdentifier")//$NON-NLS-1$
186 
						|| token.equals("finally")//$NON-NLS-1$
187 
						|| token.equals("unusedThrown")//$NON-NLS-1$
188 
						|| token.equals("unqualifiedField")//$NON-NLS-1$
189 
						|| token.equals("unqualified-field-access")//$NON-NLS-1$
 201 
						|| token.equals("unqualified-field-access")//$NON-NLS-1$
190 
						|| token.equals("typeHiding")//$NON-NLS-1$
 202 
						|| token.equals("unqualifiedField")//$NON-NLS-1$
191 
						|| token.equals("varargsCast")//$NON-NLS-1$
 203 
						|| token.equals("unsafe")//$NON-NLS-1$
192 
						|| token.equals("null")//$NON-NLS-1$
193 
						|| token.equals("boxing")//$NON-NLS-1$
194 
						|| token.equals("over-ann")//$NON-NLS-1$
195 
						|| token.equals("dep-ann")//$NON-NLS-1$
196 
						|| token.equals("intfAnnotation")//$NON-NLS-1$
197 
						|| token.equals("enumSwitch")//$NON-NLS-1$
198 
						|| token.equals("incomplete-switch")//$NON-NLS-1$
199 
						|| token.equals("hiding")//$NON-NLS-1$
200 
						|| token.equals("static-access")//$NON-NLS-1$
201 
						|| token.equals("unused")//$NON-NLS-1$
 204 
						|| token.equals("unused")//$NON-NLS-1$
202 
						|| token.equals("paramAssign")//$NON-NLS-1$
 205 
						|| token.equals("unusedArgument")//$NON-NLS-1$
203 
						|| token.equals("discouraged")//$NON-NLS-1$
 206 
						|| token.equals("unusedArguments")//$NON-NLS-1$
204 
						|| token.equals("forbidden")//$NON-NLS-1$
 207 
						|| token.equals("unusedImport")//$NON-NLS-1$
205 
						|| token.equals("fallthrough")) {//$NON-NLS-1$
 208 
						|| token.equals("unusedImports")//$NON-NLS-1$
209 
						|| token.equals("unusedLabel")//$NON-NLS-1$
210 
						|| token.equals("unusedLocal")//$NON-NLS-1$
211 
						|| token.equals("unusedLocals")//$NON-NLS-1$
212 
						|| token.equals("unusedPrivate")//$NON-NLS-1$
213 
						|| token.equals("unusedThrown")//$NON-NLS-1$
214 
						|| token.equals("unusedTypeArgs")//$NON-NLS-1$
215 
						|| token.equals("uselessTypeCheck")//$NON-NLS-1$
216 
						|| token.equals("varargsCast")//$NON-NLS-1$
217 
						|| token.equals("warningToken")) {//$NON-NLS-1$
218 
					continue;
219 
				} else if (token.equals("tasks")) {//$NON-NLS-1$
220 
					String taskTags = "";//$NON-NLS-1$
221 
					int start = token.indexOf('(');
222 
					int end = token.indexOf(')');
223 
					if (start >= 0 && end >= 0 && start < end){
224 
						taskTags = token.substring(start+1, end).trim();
225 
						taskTags = taskTags.replace('|',',');
226 
					}
227 
					if (taskTags.length() == 0){
228 
						return -1;
229 
					}
206 
					continue;
 230 
					continue;
207 
    			} else if (token.equals("tasks")) {//$NON-NLS-1$
 231 
				} else {
208 
    				String taskTags = "";//$NON-NLS-1$
 232 
					return -1;
209 
    				int start = token.indexOf('(');
 233 
				}
210 
    				int end = token.indexOf(')');
211 
    				if (start >= 0 && end >= 0 && start < end){
212 
    					taskTags = token.substring(start+1, end).trim();
213 
    					taskTags = taskTags.replace('|',',');
214 
    				}
215 
    				if (taskTags.length() == 0){
216 
    					return -1;
217 
    				}
218 
    				continue;
219 
    			} else {
220 
    				return -1;
221 
    			}
222 
			}
 234 
			}
223 
			if (tokenCounter == 0) {
 235 
			if (tokenCounter == 0) {
224 
				return -1;
 236 
				return -1;
(-)src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java (+3 lines)
Lines 86-91 Link Here
86 
		"-1.4",
 86 
		"-1.4",
87 
		"-1.5",
 87 
		"-1.5",
88 
		"-1.6",
 88 
		"-1.6",
89 
		"-1.7",
90 
		"-7",
91 
		"-7.0",
89 
		"-6",
 92 
		"-6",
90 
		"-6.0",
 93 
		"-6.0",
91 
		"-5",
 94 
		"-5",

Return to bug 274114