diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java index 52deacf0614c..ba16024b58d9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeManagerEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -32,8 +32,6 @@ public abstract class FileTypeManagerEx extends FileTypeManager{ public abstract void registerFileType(FileType fileType); public abstract void unregisterFileType(FileType fileType); -// public abstract String getIgnoredFilesList(); -// public abstract void setIgnoredFilesList(String list); public abstract boolean isIgnoredFilesListEqualToCurrent(String list); @NotNull public abstract String getExtension(String fileName); diff --git a/platform/util/src/com/intellij/util/containers/StripedLockIntObjectConcurrentHashMap.java b/platform/util/src/com/intellij/util/containers/StripedLockIntObjectConcurrentHashMap.java index ca3d89c6237c..4e38e39a2dcd 100644 --- a/platform/util/src/com/intellij/util/containers/StripedLockIntObjectConcurrentHashMap.java +++ b/platform/util/src/com/intellij/util/containers/StripedLockIntObjectConcurrentHashMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -488,7 +488,7 @@ public class StripedLockIntObjectConcurrentHashMap implements ConcurrentIntOb lock(); try { IntHashEntry e = getFirst(key); - while (e != null && !(key == e.key)) { + while (e != null && key != e.key) { e = e.next; } @@ -613,7 +613,7 @@ public class StripedLockIntObjectConcurrentHashMap implements ConcurrentIntOb int index = key & tab.length - 1; IntHashEntry first = tab[index]; IntHashEntry e = first; - while (e != null && !(key == e.key)) { + while (e != null && key != e.key) { e = e.next; }