From d3c025446da4dc71612257fa9b472fd11649875f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 31 Jan 2013 15:40:50 +0400 Subject: [PATCH] Report file watcher giving up; don't try to shut it down --- .../src/com/intellij/openapi/vfs/impl/local/FileWatcher.java | 4 ++-- .../src/messages/ApplicationBundle.properties | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java index 1b5a91c359ff..33498fbf29c4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/FileWatcher.java @@ -400,6 +400,7 @@ public class FileWatcher { return myWatchedPaths; } + @SuppressWarnings("SpellCheckingInspection") private enum WatcherOp { GIVEUP, RESET, UNWATCHEABLE, REMAP, MESSAGE, CREATE, DELETE, STATS, CHANGE, DIRTY, RECDIRTY } @@ -444,9 +445,8 @@ public class FileWatcher { } if (watcherOp == WatcherOp.GIVEUP) { - LOG.info("Native file watcher gives up to operate on this platform"); + notifyOnFailure(ApplicationBundle.message("watcher.gave.up"), null); myIsShuttingDown = true; - shutdownProcess(); } else if (watcherOp == WatcherOp.RESET) { reset(); diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 7b1c93d43389..dd221ba7fc46 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -405,7 +405,7 @@ group.error.highlighting=Error highlighting editbox.autoreparse.delay.ms=Autoreparse delay (ms): editbox.error.stripe.mark.min.height.pixels=Error stripe mark min height (pixels): checkbox.suppress.with.suppresswarnings=Suppress with @SuppressWarnings (for Java 5.0 only) -checkbox.next.error.action.goes.to.errors.first='Next Error' action goes to high priority problems only +checkbox.next.error.action.goes.to.errors.first='Next Error' action goes to high priority problems only checkbox.show.import.popup=Show import &popup checkbox.indent.use.tab.character=Use tab character checkbox.indent.smart.tabs=Smart tabs @@ -560,6 +560,7 @@ watcher.exe.not.found=Native file watcher executable not found watcher.exe.not.exe=Native file watcher is not executable: {0} watcher.exe.outdated=Native file watcher executable is outdated watcher.failed.to.start=File watcher failed to start +watcher.gave.up=File watcher gave up to operate watcher.non.watchable.project=Project content is under network-mounted directory arrangement.title.settings.tab=Arrangement