From 334a8de3bf58a35e36168138e16cd0a08dce9f1f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 14 Oct 2024 11:48:44 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                                         | 4 +---
 src/Common/Passes/Pass.java                                 | 6 +-----
 src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java         | 1 +
 src/Visual_DVM_2021/Passes/All/CopyProject.java             | 2 +-
 .../UI => _VisualDVM/Visual/Windows}/CopyProjectFields.form | 2 +-
 .../UI => _VisualDVM/Visual/Windows}/CopyProjectFields.java | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)
 rename src/{Visual_DVM_2021/Passes/UI => _VisualDVM/Visual/Windows}/CopyProjectFields.form (98%)
 rename src/{Visual_DVM_2021/Passes/UI => _VisualDVM/Visual/Windows}/CopyProjectFields.java (97%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7756d69c..79a65e60 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <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/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/ZipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ZipFolderPass.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java
index 7dc40aa7..cd7d5dc4 100644
--- a/src/Common/Passes/Pass.java
+++ b/src/Common/Passes/Pass.java
@@ -203,6 +203,7 @@ public class Pass<T> {
                 next.createStack_r(ToDo, ToPrint);
         }
     }
+    //todo обращение к пропертиес как то пофиксить
     public boolean Do(Object... args) {
         Stack<Pass> ToDo = new Stack<>();
         Vector<String> ToPrint = new Vector<>();
@@ -263,7 +264,6 @@ public class Pass<T> {
             if (UI_.isActive()) FocusBeforeStart();
             if (canStart(args)) {
                 PerformPreparation();
-                //todo тут должна быть вилка на анимацию?
                 if (UI_.isActive() && needsAnimation()) {
                     animation_sem = new Semaphore(1);
                     animation_sem.acquire();
@@ -320,11 +320,7 @@ public class Pass<T> {
                         CheckException(ex);
                     }
                 }
-                //---
-                //    UI.Info(this.getClass().getSimpleName()+" +");
                 PerformFinish();
-                //    UI.Info(this.getClass().getSimpleName()+" ++");
-                //---
                 if ((state != PassState.Crushed) && validate()) {
                     state = PassState.Done;
                     PerformDone();
diff --git a/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java b/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
index a0df12ee..5d3904ab 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java
@@ -10,4 +10,5 @@ public class AbortDVMPackage extends AbortTestingPackage {
     public int getAbortType() {
         return 0;
     }
+
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/Visual_DVM_2021/Passes/All/CopyProject.java
index 00227233..fa83a519 100644
--- a/src/Visual_DVM_2021/Passes/All/CopyProject.java
+++ b/src/Visual_DVM_2021/Passes/All/CopyProject.java
@@ -6,7 +6,7 @@ import Common.Visual.Windows.Dialog.Dialog;
 import _VisualDVM.Utils;
 import Visual_DVM_2021.Passes.CurrentProjectPass;
 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 java.io.File;
diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.form b/src/_VisualDVM/Visual/Windows/CopyProjectFields.form
similarity index 98%
rename from src/Visual_DVM_2021/Passes/UI/CopyProjectFields.form
rename to src/_VisualDVM/Visual/Windows/CopyProjectFields.form
index 9e328afd..2141752c 100644
--- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.form
+++ b/src/_VisualDVM/Visual/Windows/CopyProjectFields.form
@@ -1,5 +1,5 @@
 <?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">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java b/src/_VisualDVM/Visual/Windows/CopyProjectFields.java
similarity index 97%
rename from src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
rename to src/_VisualDVM/Visual/Windows/CopyProjectFields.java
index 80e0a9bb..e4cd541a 100644
--- a/src/Visual_DVM_2021/Passes/UI/CopyProjectFields.java
+++ b/src/_VisualDVM/Visual/Windows/CopyProjectFields.java
@@ -1,4 +1,4 @@
-package Visual_DVM_2021.Passes.UI;
+package _VisualDVM.Visual.Windows;
 import _VisualDVM.Current;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;