From f03dface4aceb423412ae2b2d6d195094d0df359 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 23 Feb 2012 11:57:22 +0100
Subject: [PATCH] Cleanup

---
 .../ui/configuration/ProjectConfigurable.java    |  6 ++++--
 .../openapi/vfs/impl/VirtualFilePointerImpl.java | 16 +++++++++++-----
 .../vfs/newvfs/impl/VirtualDirectoryImpl.java    |  4 +++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
index 36bca133bd9a..12ec4001e269 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -39,6 +39,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.ui.DocumentAdapter;
@@ -190,8 +191,9 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
 
   public void apply() throws ConfigurationException {
     final CompilerProjectExtension compilerProjectExtension = CompilerProjectExtension.getInstance(myProject);
+    assert compilerProjectExtension != null : myProject;
 
-    if (myProjectName != null && myProjectName.getText().trim().length() == 0) {
+    if (myProjectName != null && StringUtil.isEmptyOrSpaces(myProjectName.getText())) {
       throw new ConfigurationException("Please, specify project name!");
     }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
index a23dfe9eb44a..f0127473655f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -27,12 +27,14 @@ import com.intellij.openapi.vfs.pointers.VirtualFilePointerListener;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
 public class VirtualFilePointerImpl extends UserDataHolderBase implements VirtualFilePointer, Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.VirtualFilePointerImpl");
+
   private Pair<VirtualFile, String> myFileAndUrl; // must not be both null
   private final VirtualFileManager myVirtualFileManager;
   private final VirtualFilePointerListener myListener;
@@ -44,7 +46,11 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
   private static final Key<Throwable> KILL_TRACE = Key.create("KILL_TRACE");
   private static final boolean TRACE_CREATION = /*true || */LOG.isDebugEnabled();
 
-  VirtualFilePointerImpl(VirtualFile file, @NotNull String url, @NotNull VirtualFileManager virtualFileManager, VirtualFilePointerListener listener, @NotNull Disposable parentDisposable) {
+  VirtualFilePointerImpl(VirtualFile file,
+                         @NotNull String url,
+                         @NotNull VirtualFileManager virtualFileManager,
+                         VirtualFilePointerListener listener,
+                         @NotNull Disposable parentDisposable) {
     myFileAndUrl = Pair.create(file, url);
     myVirtualFileManager = virtualFileManager;
     myListener = listener;
@@ -84,8 +90,6 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
   @Override
   @NotNull
   public String getUrl() {
-    //checkDisposed(); no check here since Disposer might want to compute hashcode during dispose()
-
     update();
     return getUrlNoUpdate();
   }
@@ -132,6 +136,7 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
 
     @Override
     public void printStackTrace(PrintStream s) {
+      //noinspection IOResourceOpenedButNotSafelyClosed
       printStackTrace(new PrintWriter(s));
     }
 
@@ -155,6 +160,7 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
     return result != null && result.first != null;
   }
 
+  @Nullable
   Pair<VirtualFile, String> update() {
     if (disposed) return null;
     long lastUpdated = myLastUpdated;
@@ -193,7 +199,7 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
   @Override
   public void dispose() {
     if (disposed) {
-      throw new MyException("Punching the dead horse.\nurl="+toString(), getUserData(CREATE_TRACE), getUserData(KILL_TRACE));
+      throw new MyException("Punching the dead horse.\nURL=" + toString(), getUserData(CREATE_TRACE), getUserData(KILL_TRACE));
     }
     if (--useCount == 0) {
       if (TRACE_CREATION) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
index d5d81f96374e..1dd4c42300a2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
@@ -171,10 +171,12 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
     final VirtualFileSystemEntry child;
     final NewVirtualFileSystem fs = getFileSystem();
     if (PersistentFS.isDirectory(id)) {
-      child = ALT_SYMLINK_HANDLING && PersistentFS.isSymLink(id) ? new SymlinkDirectory(name, this, fs, id) : new VirtualDirectoryImpl(name, this, fs, id);
+      child = ALT_SYMLINK_HANDLING && PersistentFS.isSymLink(id) ? new SymlinkDirectory(name, this, fs, id)
+                                                                 : new VirtualDirectoryImpl(name, this, fs, id);
     }
     else {
       child = new VirtualFileImpl(name, this, id);
+      //noinspection TestOnlyProblems
       assertAccessInTests(child);
     }