From f20eec07b015ef8ab596301f1dca4789d566b64f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 2 Nov 2023 20:43:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=94=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=20=D1=81=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?=
 =?UTF-8?q?=D0=B9,=20=D0=B2=20=D1=82=D0=BE=D0=BC=20=D1=87=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BB=D0=B5=20=D0=B8=20=D0=BE=D0=B1=D1=8B=D1=87=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85.=20=D0=9C=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BC=D0=B0=D1=82=D1=80=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D0=B5=D1=81=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=82=D0=BE=D1=80=D0=B0=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 ++-
 .../SapforTasksPackageTree.java               |  2 +-
 .../UI/Main/ComparisonForm.java               |  4 +-
 .../UI/Main/SapforVersionsComparisonForm.java | 34 +++++++-------
 .../UI/Main/VersionsComparisonForm.java       | 45 ++++++++++---------
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 57030572..121db274 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,9 @@
   <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/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
index f00b5918..266a364e 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
@@ -27,7 +27,7 @@ public class SapforTasksPackageTree extends DataTree {
     }
     @Override
     public void SelectionAction(TreePath e) {
-        System.out.println("Select " + current);
+       // System.out.println("Select " + current);
         DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
         // Current.set(Current.ProjectNode, node);
         Object o = node.getUserObject();
diff --git a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
index 6a65e98b..895fe36f 100644
--- a/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/ComparisonForm.java
@@ -65,10 +65,12 @@ public abstract class ComparisonForm<T> {
         removeObject();
         showNoObject();
         ClearText();
+        /*
         if (isMaster())
             slave.ClearText();
         else if (isSlave())
             master.ClearText();
+         */
     }
     public void ApplyObject() {
         RemoveObject();
@@ -184,7 +186,7 @@ public abstract class ComparisonForm<T> {
     }
     protected void ClearText() {
         events_on = false;
-        Body.setText("");
+        Body.setText("объект не назначен");
     }
     //предполагаем что оба объекта есть и мы можем получить с них текст.
     protected void Compare() throws Exception {
diff --git a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
index c158164a..5140935b 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java
@@ -28,28 +28,25 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
         tools.add(cbFile, 3);
         //--
         cbFile.addActionListener(e -> {
-            ProjectFile File1 = null;
-            ProjectFile File2 = null;
-            ClearText();
             file = (cbFile.getSelectedItem() instanceof ProjectFile) ?
                     ((ProjectFile) cbFile.getSelectedItem()) : null;
-            if (file != null) {
-                if (isMaster()) {
-                    getSlave().selectSameFile(file);
-                } else {
-                    File1 = getMaster().file;
-                    File2 = file;
-                    //---
-                    if ((File1 != null) && (File2 != null)) {
+            //-->>
+            if (isMaster()) {
+                if (isReady() && !getSlave().selectSameFile(file))
+                    DoShowPass(true);
+            } else {
+                if (isReady()) {
+                    if (getMaster().isReady()) {
                         boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
-                        String name1 = ExtensionsOn ? File1.file.getName() : Utils.getFileNameWithoutExtension(File1.file);
-                        String name2 = ExtensionsOn ? File2.file.getName() : Utils.getFileNameWithoutExtension(File2.file);
-                        System.out.println("name1=" + Utils.Brackets(name1) + "name2=" + Utils.Brackets(name2));
+                        String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils.getFileNameWithoutExtension(getMaster().file.file);
+                        String name2 = ExtensionsOn ? file.file.getName() : Utils.getFileNameWithoutExtension(file.file);
                         if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                             if (name1.equalsIgnoreCase(name2))
                                 master.DoComparePass(true);
                         } else
                             master.DoShowPass(true);
+                    } else {
+                        master.DoShowPass(true);
                     }
                 }
             }
@@ -61,7 +58,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
     }
     @Override
     protected String getText() {
-        return Utils.ReadAllText(file.file);
+        return isReady() ? Utils.ReadAllText(file.file) : "объект не назначен";
     }
     @Override
     public boolean isReady() {
@@ -81,7 +78,7 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
         cbFile.removeAllItems();
         file = null;
     }
-    public void selectSameFile(ProjectFile file_in) {
+    public boolean selectSameFile(ProjectFile file_in) {
         file = null;
         cbFile.setSelectedIndex(-1);
         for (int i = 0; i < cbFile.getItemCount(); ++i) {
@@ -90,15 +87,16 @@ public class SapforVersionsComparisonForm extends ComparisonForm<SapforVersion_j
                 //если учитываем расширения, ищем полное совпадение
                 if (projectFile.file.getName().equals(file_in.file.getName())) {
                     cbFile.setSelectedIndex(i);
-                    return;
+                    return true;
                 }
             } else {
                 if (Utils.getNameWithoutExtension(projectFile.file.getName()).equals(
                         Utils.getNameWithoutExtension(file_in.file.getName()))) {
                     cbFile.setSelectedIndex(i);
-                    return;
+                    return true;
                 }
             }
         }
+        return (cbFile.getSelectedItem() != null) && (cbFile.getSelectedItem() instanceof ProjectFile);
     }
 }
diff --git a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
index 277ae45a..091fa124 100644
--- a/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java
@@ -4,6 +4,7 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Settings.SettingName;
 import ProjectData.Files.DBProjectFile;
+import ProjectData.Files.ProjectFile;
 import ProjectData.Project.db_project_info;
 
 import javax.swing.*;
@@ -21,29 +22,28 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
         super(db_project_info.class, slave_in);
         cbFile = new JComboBox<>();
         tools.add(cbFile, 3);
+        file = (cbFile.getSelectedItem() instanceof DBProjectFile) ?
+                ((DBProjectFile) cbFile.getSelectedItem()) : null;
         cbFile.addActionListener(e -> {
-            DBProjectFile File1 = null;
-            DBProjectFile File2 = null;
-            ClearText();
             file = (cbFile.getSelectedItem() instanceof DBProjectFile) ?
                     ((DBProjectFile) cbFile.getSelectedItem()) : null;
-            if (file != null) {
-                if (isMaster()) {
-                    getSlave().selectSameFile(file);
-                } else {
-                    File1 = getMaster().file;
-                    File2 = file;
-                    //---
-                    if ((File1 != null) && (File2 != null)) {
+            //-->>
+            if (isMaster()) {
+                if (isReady() && !getSlave().selectSameFile(file))
+                    DoShowPass(true);
+            } else {
+                if (isReady()) {
+                    if (getMaster().isReady()) {
                         boolean ExtensionsOn = Global.db.settings.get(SettingName.ExtensionsOn).toBoolean();
-                        String name1 = ExtensionsOn ? File1.file.getName() : Utils.getFileNameWithoutExtension(File1.file);
-                        String name2 = ExtensionsOn ? File2.file.getName() : Utils.getFileNameWithoutExtension(File2.file);
-                        System.out.println("name1=" + Utils.Brackets(name1) + "name2=" + Utils.Brackets(name2));
+                        String name1 = ExtensionsOn ? getMaster().file.file.getName() : Utils.getFileNameWithoutExtension(getMaster().file.file);
+                        String name2 = ExtensionsOn ? file.file.getName() : Utils.getFileNameWithoutExtension(file.file);
                         if (Global.db.settings.get(SettingName.ComparsionDiffMergeOn).toBoolean()) {
                             if (name1.equalsIgnoreCase(name2))
                                 master.DoComparePass(true);
                         } else
                             master.DoShowPass(true);
+                    } else {
+                        master.DoShowPass(true);
                     }
                 }
             }
@@ -55,7 +55,7 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
     }
     @Override
     protected String getText() {
-        return Utils.ReadAllText(file.file);
+        return isReady() ? Utils.ReadAllText(file.file) : "объект не назначен";
     }
     @Override
     protected void removeObject() {
@@ -77,25 +77,26 @@ public class VersionsComparisonForm extends ComparisonForm<db_project_info> {
         for (DBProjectFile file : files)
             cbFile.addItem(file);
     }
-    public void selectSameFile(DBProjectFile file_in) {
+    public boolean selectSameFile(ProjectFile file_in) {
         file = null;
         cbFile.setSelectedIndex(-1);
         for (int i = 0; i < cbFile.getItemCount(); ++i) {
-            DBProjectFile dbProjectFile = cbFile.getItemAt(i);
+            ProjectFile projectFile = cbFile.getItemAt(i);
             if (Global.db.settings.get(SettingName.ExtensionsOn).toBoolean()) {
                 //если учитываем расширения, ищем полное совпадение
-                if (dbProjectFile.name.equals(file_in.name)) {
+                if (projectFile.file.getName().equals(file_in.file.getName())) {
                     cbFile.setSelectedIndex(i);
-                    return;
+                    return true;
                 }
             } else {
-                if (Utils.getNameWithoutExtension(dbProjectFile.name).equals(Utils.getNameWithoutExtension(file_in.name))) {
+                if (Utils.getNameWithoutExtension(projectFile.file.getName()).equals(
+                        Utils.getNameWithoutExtension(file_in.file.getName()))) {
                     cbFile.setSelectedIndex(i);
-                    return;
+                    return true;
                 }
             }
-            //если drk.x
         }
+        return (cbFile.getSelectedItem() != null) && (cbFile.getSelectedItem() instanceof ProjectFile);
     }
     public void CheckVersion(db_project_info version_in) {
         if ((object != null) && version_in.Home.equals(object.Home)) {