M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
02090095
2025-02-12 23:24:54 +03:00
parent 57baa6c9c1
commit 90b6f3648e
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -8,11 +8,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

8
src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
View File

@@ -4,6 +4,7 @@ import Common.Utils.Utils_;
import _VisualDVM.Constants; import _VisualDVM.Constants;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass; import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.Common.TasksPackageState;
@@ -55,6 +56,7 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
for (DVMCompilationTask compilationTask : target.package_json.compilationTasks) for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
for (DVMRunTask runTask : compilationTask.runTasks) { for (DVMRunTask runTask : compilationTask.runTasks) {
ShowProgress(runTasks.size(), i, true); ShowProgress(runTasks.size(), i, true);
++i;
rt_count++; rt_count++;
if (compilationTask.state != TaskState.Done) { if (compilationTask.state != TaskState.Done) {
runTask.state = TaskState.Canceled; runTask.state = TaskState.Canceled;
@@ -115,5 +117,11 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
Utils_.fileToBytes(target.getJsonFile()) Utils_.fileToBytes(target.getJsonFile())
) )
); );
Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
}
@Override
protected void showFinish() throws Exception {
super.showFinish();
Global.testingServer.db.dvmPackages.getUI().SetCurrentByPK(target.id);
} }
} }

4
src/_VisualDVM/Utils.java
View File

@@ -565,7 +565,9 @@ public class Utils {
if (errors > 0) { if (errors > 0) {
state = TaskState.DoneWithErrors; state = TaskState.DoneWithErrors;
} else { } else {
complete = total; if (complete==0){
complete = total = 1;
}
state = TaskState.Done; state = TaskState.Done;
} }
return new Pair<>(state, (int) ((((double) complete) / total) * 100)); return new Pair<>(state, (int) ((((double) complete) / total) * 100));