mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-24 09:25:31 +02:00
[cleanup] compiler warnings
This commit is contained in:
parent
d65885e486
commit
461e061e8f
3 changed files with 8 additions and 11 deletions
|
@ -943,7 +943,7 @@ public class FileClassifier extends Thread
|
|||
/**
|
||||
* Classify virtual children.
|
||||
*
|
||||
* @param fullPath
|
||||
* @param parentPath
|
||||
* the full path of the parent file. The path could represent an
|
||||
* archive or a virtual folder.
|
||||
*/
|
||||
|
|
|
@ -36,9 +36,7 @@ public class UniversalFileSystemFilter implements java.io.FilenameFilter, IUnive
|
|||
protected int includeFilesOrFolders;
|
||||
|
||||
/**
|
||||
* Insert the method's description here.
|
||||
* Creation date: (2/22/01 1:15:54 PM)
|
||||
* @param filter java.lang.String
|
||||
* @param fString the filter string
|
||||
*/
|
||||
public UniversalFileSystemFilter(String fString, boolean files, boolean folders, boolean caseSensitive) {
|
||||
this.filter = fString;
|
||||
|
@ -55,10 +53,10 @@ public class UniversalFileSystemFilter implements java.io.FilenameFilter, IUnive
|
|||
* @return <code>true</code> if and only if the name should be
|
||||
* included in the file list; <code>false</code> otherwise.
|
||||
*/
|
||||
public boolean accept(java.io.File dir, String nameFilter) {
|
||||
public boolean accept(java.io.File dir, String name) {
|
||||
|
||||
boolean match = true;
|
||||
java.io.File file = new java.io.File(dir, nameFilter);
|
||||
java.io.File file = new java.io.File(dir, name);
|
||||
if (!allowDirs && file.isDirectory())
|
||||
return false;
|
||||
|
||||
|
@ -80,14 +78,14 @@ public class UniversalFileSystemFilter implements java.io.FilenameFilter, IUnive
|
|||
if ((matcher == null) && (folderNameMatcher == null))
|
||||
return true;
|
||||
if (includeFilesOrFolders != INCLUDE_ALL)
|
||||
match = matcher.matches(nameFilter);
|
||||
match = matcher.matches(name);
|
||||
else {
|
||||
if (file.isFile()) {
|
||||
if (matcher!=null)
|
||||
match = matcher.matches(nameFilter);
|
||||
match = matcher.matches(name);
|
||||
} else {
|
||||
if (folderNameMatcher!=null)
|
||||
match = folderNameMatcher.matches(nameFilter);
|
||||
match = folderNameMatcher.matches(name);
|
||||
}
|
||||
}
|
||||
return match;
|
||||
|
@ -112,7 +110,7 @@ public class UniversalFileSystemFilter implements java.io.FilenameFilter, IUnive
|
|||
* when there is separate filters for both folder names and filter names.
|
||||
* @param includeFilesOrFolders A constant from {IFileConstants}
|
||||
* @param folderNameFilter The pattern to filter the folder names by. Can be null to include all folders
|
||||
* @param nameFilter The pattern to filter the file names by. Can be null to include all files
|
||||
* @param fileNameFilter The pattern to filter the file names by. Can be null to include all files
|
||||
*/
|
||||
protected void setListValues(int includeFilesOrFolders, String folderNameFilter, String fileNameFilter)
|
||||
{
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
|
||||
<accessrules>
|
||||
<accessrule kind="accessible" pattern="org/eclipse/dstore/**"/>
|
||||
<accessrule kind="discouraged" pattern="**/internal/**"/>
|
||||
</accessrules>
|
||||
</classpathentry>
|
||||
|
|
Loading…
Add table
Reference in a new issue