From 6cd17e78090dca86ab6136adad9c4c000038f5eb Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Tue, 6 Mar 2012 18:42:49 +0400 Subject: [PATCH] Bug fix: incorrect value of fraction was set to progress indicator. --- .../maven/compiler/MavenResourceCompiler.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java index 3e363cb961f8..a6bb8baa5e49 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java @@ -301,7 +301,7 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler { List result, ProgressIndicator indicator) { indicator.checkCanceled(); - final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(module.getProject()).getFileIndex(); + for (VirtualFile eachSourceFile : currentDir.getChildren()) { if (eachSourceFile.isDirectory()) { collectProcessingItems(module, @@ -325,6 +325,7 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler { continue; } + ProjectFileIndex fileIndex = ProjectRootManager.getInstance(module.getProject()).getFileIndex(); if (fileIndex.isIgnored(eachSourceFile)) continue; if (!MavenUtil.isIncluded(relPath, includes, excludes)) continue; @@ -384,14 +385,13 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler { deleteOutdatedFile(context.getUserData(FILES_TO_DELETE_KEY), filesToRefresh); - int count = 0; - for (final ProcessingItem each : items) { - if (!(each instanceof MyProcessingItem)) continue; + for (int i = 0; i < items.length; i++) { + if (!(items[i] instanceof MyProcessingItem)) continue; - context.getProgressIndicator().setFraction(((double)count) / items.length); + context.getProgressIndicator().setFraction(((double)i) / items.length); context.getProgressIndicator().checkCanceled(); - MyProcessingItem eachItem = (MyProcessingItem)each; + MyProcessingItem eachItem = (MyProcessingItem)items[i]; VirtualFile sourceVirtualFile = eachItem.getFile(); File sourceFile = new File(sourceVirtualFile.getPath()); File outputFile = new File(eachItem.getOutputPath()); @@ -411,7 +411,7 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler { String charset = sourceVirtualFile.getCharset().name(); String text = new String(FileUtil.loadFileBytes(sourceFile), charset); String escapedCharacters = sourceVirtualFile.getName().endsWith(".properties") ? "\\" : null; - + PrintWriter printWriter = new PrintWriter(outputFile, charset); try { MavenPropertyResolver.doFilterText(eachItem.getModule(), @@ -430,7 +430,7 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler { } eachItem.getValidityState().setOutputFileTimestamp(outputFile.lastModified()); - result.add(each); + result.add(eachItem); filesToRefresh.add(outputFile); } catch (IOException e) {