View | Details | Raw Unified | Return to bug 133562 | Differences between
and this patch

Collapse All | Expand All

(-)model/org/eclipse/jdt/internal/core/InternalNamingConventions.java (-19 / +27 lines)
Lines 14-20 Link Here
14
14
15
import org.eclipse.jdt.core.Flags;
15
import org.eclipse.jdt.core.Flags;
16
import org.eclipse.jdt.core.IJavaProject;
16
import org.eclipse.jdt.core.IJavaProject;
17
import org.eclipse.jdt.core.JavaConventions;
18
import org.eclipse.jdt.core.compiler.CharOperation;
17
import org.eclipse.jdt.core.compiler.CharOperation;
19
import org.eclipse.jdt.core.compiler.InvalidInputException;
18
import org.eclipse.jdt.core.compiler.InvalidInputException;
20
import org.eclipse.jdt.internal.codeassist.impl.AssistOptions;
19
import org.eclipse.jdt.internal.codeassist.impl.AssistOptions;
Lines 199-223 Link Here
199
									prefixName,
198
									prefixName,
200
									suffixes[l],
199
									suffixes[l],
201
									excludedNames);
200
									excludedNames);
202
							if(JavaConventions.validateFieldName(new String(suffixName)).isOK()) {
201
							try{
203
								acceptName(suffixName, prefixes[k], suffixes[l],  k == 0, l == 0, internalPrefix.length - j, requestor);
202
								nameScanner.setSource(suffixName);
204
								acceptDefaultName = false;
203
								switch (nameScanner.getNextToken()) {
205
							} else {
204
									case TerminalTokens.TokenNameIdentifier :
206
								suffixName = CharOperation.concat(
205
										acceptName(suffixName, prefixes[k], suffixes[l],  k == 0, l == 0, internalPrefix.length - j, requestor);
207
									prefixName,
206
										acceptDefaultName = false;
208
									String.valueOf(1).toCharArray(),
207
										break;
209
									suffixes[l]
208
									default:
210
								);
209
										suffixName = CharOperation.concat(
211
								suffixName =
210
											prefixName,
212
									excludeNames(
211
											String.valueOf(1).toCharArray(),
213
										suffixName,
212
											suffixes[l]
214
										prefixName,
213
										);
215
										suffixes[l],
214
										suffixName =
216
										excludedNames);
215
											excludeNames(
217
								if(JavaConventions.validateFieldName(new String(suffixName)).isOK()) {
216
												suffixName,
218
									acceptName(suffixName, prefixes[k], suffixes[l], k == 0, l == 0, internalPrefix.length - j, requestor);
217
												prefixName,
219
									acceptDefaultName = false;
218
												suffixes[l],
219
												excludedNames);
220
										nameScanner.setSource(suffixName);
221
										switch (nameScanner.getNextToken()) {
222
											case TerminalTokens.TokenNameIdentifier :
223
												acceptName(suffixName, prefixes[k], suffixes[l], k == 0, l == 0, internalPrefix.length - j, requestor);
224
												acceptDefaultName = false;
225
										}
220
								}
226
								}
227
							} catch(InvalidInputException e){
228
								// ignore
221
							}
229
							}
222
						}
230
						}
223
					}
231
					}

Return to bug 133562