MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (warnings)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-07-21 18:31:18 +02:00
parent 99fd06c6af
commit d2ca356083
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+10 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,7 +49,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/**
@@ -313,13 +312,13 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
CharSequence name2 = o2.name;
int cmp = compareNames(name1, name2, ignoreCase);
if (cmp == 0 && name1 != name2) {
LOG.error(ourPersistence + " returned duplicate file names("+name1+","+name2+")" +
" ignoreCase: "+ignoreCase+
" SystemInfo.isFileSystemCaseSensitive: "+ SystemInfo.isFileSystemCaseSensitive+
" SystemInfo.OS: "+ SystemInfo.OS_NAME+" "+SystemInfo.OS_VERSION+
" wasChildrenLoaded: "+wasChildrenLoaded+
" in the dir: "+VirtualDirectoryImpl.this+";" +
" children: "+Arrays.toString(childrenIds));
LOG.error(ourPersistence + " returned duplicate file names(" + name1 + "," + name2 + ")" +
" ignoreCase: " + ignoreCase +
" SystemInfo.isFileSystemCaseSensitive: " + SystemInfo.isFileSystemCaseSensitive +
" SystemInfo.OS: " + SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION +
" wasChildrenLoaded: " + wasChildrenLoaded +
" in the dir: " + this + ";" +
" children: " + Arrays.toString(childrenIds));
}
return cmp;
});
@@ -503,7 +502,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
@Override
@NotNull
public List<VirtualFile> getCachedChildren() {
return Arrays.<VirtualFile>asList(getArraySafely());
return Arrays.asList(getArraySafely());
}
@Override
@@ -557,4 +556,4 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
}
}
}
}
}
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java
+4 -5
View File
@@ -18,7 +18,6 @@ package com.intellij.openapi.vfs.newvfs.impl;
import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.io.FileTooBigException;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -254,7 +253,7 @@ public abstract class VirtualFileSystemEntry extends NewVirtualFile {
throw new IOException(VfsBundle.message("file.copy.target.must.be.directory"));
}
return EncodingRegistry.doActionAndRestoreEncoding(this, () -> ourPersistence.copyFile(requestor, VirtualFileSystemEntry.this, newParent, copyName));
return EncodingRegistry.doActionAndRestoreEncoding(this, () -> ourPersistence.copyFile(requestor, this, newParent, copyName));
}
@Override
@@ -264,8 +263,8 @@ public abstract class VirtualFileSystemEntry extends NewVirtualFile {
}
EncodingRegistry.doActionAndRestoreEncoding(this, () -> {
ourPersistence.moveFile(requestor, VirtualFileSystemEntry.this, newParent);
return VirtualFileSystemEntry.this;
ourPersistence.moveFile(requestor, this, newParent);
return this;
});
}
@@ -430,4 +429,4 @@ public abstract class VirtualFileSystemEntry extends NewVirtualFile {
}
return this;
}
}
}