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

Bug fix: incorrect value of fraction was set to progress indicator.

Browse Source
This commit is contained in:
Sergey Evdokimov
2012-03-06 19:44:55 +04:00
parent 07a457aa11
commit 6cd17e7809
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
+8 -8
View File
@@ -301,7 +301,7 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler {
List<MyProcessingItem> 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) {