MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SqlHighlightingTest fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-07-25 22:22:41 +04:00
parent a803fbed45
commit a3ef7a3ad9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java
+7 -4
View File
@@ -33,6 +33,7 @@ import com.intellij.openapi.vfs.impl.BulkVirtualFileListenerAdapter;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.messages.MessageBusConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
@@ -116,7 +117,7 @@ public class PushedFilePropertiesUpdater {
final boolean isDir = fileOrDir.isDirectory();
for (FilePropertyPusher<Object> pusher : pushers) {
if (!isDir && (pusher.pushDirectoriesOnly() || !pusher.acceptsFile(fileOrDir))) continue;
findAndUpdateValue(project, fileOrDir, pusher, pusher.getDefaultValue());
findAndUpdateValue(project, fileOrDir, pusher, null);
}
return true;
}
@@ -154,14 +155,16 @@ public class PushedFilePropertiesUpdater {
public static <T> T findAndUpdateValue(final Project project,
final VirtualFile fileOrDir,
final FilePropertyPusher<T> pusher,
final T parentValue) {
@Nullable final T parentValue) {
final T immediateValue = pusher.getImmediateValue(project, fileOrDir);
final T value = immediateValue != null ? immediateValue : parentValue;
updateValue(fileOrDir, value, pusher);
if (value != null) {
updateValue(fileOrDir, value, pusher);
}
return value;
}
private static <T> void updateValue(final VirtualFile fileOrDir, final T value, final FilePropertyPusher<T> pusher) {
private static <T> void updateValue(final VirtualFile fileOrDir, final @NotNull T value, final FilePropertyPusher<T> pusher) {
final T oldValue = fileOrDir.getUserData(pusher.getFileDataKey());
if (value != oldValue) {
fileOrDir.putUserData(pusher.getFileDataKey(), value);