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

no message

Browse Source
This commit is contained in:
02090095
2024-10-14 11:48:44 +03:00
parent 69173eb2b8
commit 334a8de3bf
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -7,10 +7,8 @@
</component> </component>
<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$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.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" />

6
src/Common/Passes/Pass.java
View File

@@ -203,6 +203,7 @@ public class Pass<T> {
next.createStack_r(ToDo, ToPrint); next.createStack_r(ToDo, ToPrint);
} }
} }
//todo обращение к пропертиес как то пофиксить
public boolean Do(Object... args) { public boolean Do(Object... args) {
Stack<Pass> ToDo = new Stack<>(); Stack<Pass> ToDo = new Stack<>();
Vector<String> ToPrint = new Vector<>(); Vector<String> ToPrint = new Vector<>();
@@ -263,7 +264,6 @@ public class Pass<T> {
if (UI_.isActive()) FocusBeforeStart(); if (UI_.isActive()) FocusBeforeStart();
if (canStart(args)) { if (canStart(args)) {
PerformPreparation(); PerformPreparation();
//todo тут должна быть вилка на анимацию?
if (UI_.isActive() && needsAnimation()) { if (UI_.isActive() && needsAnimation()) {
animation_sem = new Semaphore(1); animation_sem = new Semaphore(1);
animation_sem.acquire(); animation_sem.acquire();
@@ -320,11 +320,7 @@ public class Pass<T> {
CheckException(ex); CheckException(ex);
} }
} }
//---
// UI.Info(this.getClass().getSimpleName()+" +");
PerformFinish(); PerformFinish();
// UI.Info(this.getClass().getSimpleName()+" ++");
//---
if ((state != PassState.Crushed) && validate()) { if ((state != PassState.Crushed) && validate()) {
state = PassState.Done; state = PassState.Done;
PerformDone(); PerformDone();

1
src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
View File

@@ -10,4 +10,5 @@ public class AbortDVMPackage extends AbortTestingPackage {
public int getAbortType() { public int getAbortType() {
return 0; return 0;
} }
} }

2
src/Visual_DVM_2021/Passes/All/CopyProject.java
View File

@@ -6,7 +6,7 @@ import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import Visual_DVM_2021.Passes.CurrentProjectPass; import Visual_DVM_2021.Passes.CurrentProjectPass;
import Visual_DVM_2021.Passes.PassCode; import Visual_DVM_2021.Passes.PassCode;
import Visual_DVM_2021.Passes.UI.CopyProjectFields; import _VisualDVM.Visual.Windows.CopyProjectFields;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import java.io.File; import java.io.File;

2
src/Visual_DVM_2021/Passes/UI/CopyProjectFields.form → src/_VisualDVM/Visual/Windows/CopyProjectFields.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="Visual_DVM_2021.Passes.UI.CopyProjectFields"> <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.Visual.Windows.CopyProjectFields">
<grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <constraints>

2
src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java → src/_VisualDVM/Visual/Windows/CopyProjectFields.java
View File

@@ -1,4 +1,4 @@
package Visual_DVM_2021.Passes.UI; package _VisualDVM.Visual.Windows;
import _VisualDVM.Current; import _VisualDVM.Current;
import Common.Visual.TextField.StyledTextField; import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;