diff options
| author | Stephan Herrmann | 2016-03-19 15:21:11 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2016-03-19 15:21:11 +0000 |
| commit | 6054d02b972eb36ed97f16b3e527865e65da2f42 (patch) | |
| tree | 3d5f9f43bb744b40976bd393da3448b36d3fda1e /org.eclipse.jdt.core/batch/org/eclipse/jdt/internal | |
| parent | 7651846f879214113abe3a571fcb0bca30383aea (diff) | |
| download | org.eclipse.objectteams-6054d02b972eb36ed97f16b3e527865e65da2f42.tar.gz org.eclipse.objectteams-6054d02b972eb36ed97f16b3e527865e65da2f42.tar.xz org.eclipse.objectteams-6054d02b972eb36ed97f16b3e527865e65da2f42.zip | |
Releng: update jdt.core to I20160317-0200 for 4.6 M6
Diffstat (limited to 'org.eclipse.jdt.core/batch/org/eclipse/jdt/internal')
| -rw-r--r-- | org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java index 5b6749306..69540cfb6 100644 --- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java +++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -177,7 +177,7 @@ public NameEnvironmentAnswer findSecondaryInClass(char[] typeName, String qualif public boolean hasAnnotationFileFor(String qualifiedTypeName) { int pos = qualifiedTypeName.lastIndexOf('/'); if (pos != -1 && (pos + 1 < qualifiedTypeName.length())) { - String fileName = qualifiedTypeName.substring(pos + 1) + '.' + ExternalAnnotationProvider.ANNOTION_FILE_EXTENSION; + String fileName = qualifiedTypeName.substring(pos + 1) + ExternalAnnotationProvider.ANNOTATION_FILE_SUFFIX; return doesFileExist(fileName, qualifiedTypeName.substring(0, pos)); } return false; diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java index 8d56c0a91..77ad9037c 100644 --- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java +++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -127,7 +127,7 @@ public NameEnvironmentAnswer findClass(char[] typeName, String qualifiedPackageN } @Override public boolean hasAnnotationFileFor(String qualifiedTypeName) { - return this.zipFile.getEntry(qualifiedTypeName+'.'+ExternalAnnotationProvider.ANNOTION_FILE_EXTENSION) != null; + return this.zipFile.getEntry(qualifiedTypeName+ExternalAnnotationProvider.ANNOTATION_FILE_SUFFIX) != null; } public char[][][] findTypeNames(String qualifiedPackageName) { if (!isPackage(qualifiedPackageName)) |