From fa31d5570c699f263b5a47c0c7ee2c916c120c32 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 6 Feb 2025 20:44:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B5=D0=B7=D0=BE=D0=BF=D0=B0=D1=81?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8.=20=D0=BD=D0=B5=20=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B7=D0=B4=D0=B5=20=D0=B1=D1=8B=D0=BB=20=D1=81=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BD=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=20=D1=87?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                | 14 +++++++++++++-
 src/Common/Visual/DataSetControlForm.java          |  1 +
 src/Common/Visual/Windows/Dialog/Dialog.java       |  4 ++++
 src/_VisualDVM/Passes/All/PauseDVMPackage.java     |  2 +-
 src/_VisualDVM/Passes/All/ResumeDVMPackage.java    |  2 +-
 .../UI/DVMConfigurationDialog.java                 |  1 +
 .../DVMConfiguration/UI/DVMConfigurationsForm.java |  1 -
 .../DVM/DVMSettings/UI/DVMSettingsDialog.java      |  5 +++++
 .../DVM/DVMSettings/UI/DVMSettingsFields.java      |  8 ++++----
 .../DVM/DVMSettings/UI/DVMSettingsForm.java        |  1 -
 .../UI/SapforConfigurationDialog.java              |  2 +-
 .../UI/SapforConfigurationsForm.java               | 13 +++++++++++++
 .../SapforSettings/UI/SapforSettingsDialog.java    |  7 +++++++
 .../SapforSettings/UI/SapforSettingsForm.java      | 14 ++++++++++++++
 14 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9e46d6f9..4350ab1d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,19 @@
   <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/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Windows/Dialog/Dialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PauseDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResumeDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Visual/DataSetControlForm.java b/src/Common/Visual/DataSetControlForm.java
index 3e028fd5..3db3bcfe 100644
--- a/src/Common/Visual/DataSetControlForm.java
+++ b/src/Common/Visual/DataSetControlForm.java
@@ -559,6 +559,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
         } else {
             title += "просмотр";
             dialog.SetReadonly();
+            dialog.BlockButtons();
         }
         return dialog.ShowDialog(title, object);
     }
diff --git a/src/Common/Visual/Windows/Dialog/Dialog.java b/src/Common/Visual/Windows/Dialog/Dialog.java
index d7db7ae9..b172e1e1 100644
--- a/src/Common/Visual/Windows/Dialog/Dialog.java
+++ b/src/Common/Visual/Windows/Dialog/Dialog.java
@@ -108,6 +108,10 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
         }
         getContentPane().add(buttonsPane, BorderLayout.SOUTH);
     }
+    public void BlockButtons(){
+        btnOK.setVisible(false);
+        btnCancel.setVisible(false);
+    }
     public boolean isOnTop() {
         return true;
     }
diff --git a/src/_VisualDVM/Passes/All/PauseDVMPackage.java b/src/_VisualDVM/Passes/All/PauseDVMPackage.java
index 2fc8e594..abe52df0 100644
--- a/src/_VisualDVM/Passes/All/PauseDVMPackage.java
+++ b/src/_VisualDVM/Passes/All/PauseDVMPackage.java
@@ -30,7 +30,7 @@ public class PauseDVMPackage extends ConnectionPass<DVMPackage> {
         }
         machine =target.getMachine();
         user = target.getUser();
-        return true;
+        return Global.mainModule.getAccount().CheckAuthorship(target.sender_address,Log);
     }
     @Override
     protected void ServerAction() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/ResumeDVMPackage.java b/src/_VisualDVM/Passes/All/ResumeDVMPackage.java
index 4253509c..2ef031f3 100644
--- a/src/_VisualDVM/Passes/All/ResumeDVMPackage.java
+++ b/src/_VisualDVM/Passes/All/ResumeDVMPackage.java
@@ -27,7 +27,7 @@ public class ResumeDVMPackage extends ConnectionPass<DVMPackage> {
         }
         machine = target.getMachine();
         user = target.getUser();
-        return true;
+        return Global.mainModule.getAccount().CheckAuthorship(target.sender_address,Log);
     }
     @Override
     protected void ServerAction() throws Exception {
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
index 41d2a546..5dc54644 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationDialog.java
@@ -33,5 +33,6 @@ public class DVMConfigurationDialog extends DBObjectDialog<DVMConfiguration, DVM
         fields.tfName.setEnabled(false);
         fields.sCompilationMaxtime.setEnabled(false);
         fields.sRunMaxtime.setEnabled(false);
+        fields.sKernels.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
index d806f942..304d66e1 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
@@ -101,7 +101,6 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
         if (Global.mainModule.getAccount().CheckRegistered(null)) {
             switch (Global.mainModule.getAccount().role) {
                 case Admin:
-                case Developer:
                     return true;
                 default:
                     return (Global.mainModule.getAccount().email.equals(object.sender_address));
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
index 0f4abf78..c7e719c6 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
@@ -56,5 +56,10 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
         fields.sMaxDimProc.setEnabled(false);
         fields.cbCube.setEnabled(false);
         fields.sMaxProc.setEnabled(false);
+        fields.bAddFlags.setEnabled(false);
+        fields.bAddEnvironments.setEnabled(false);
+        fields.bDeleteEnvironment.setEnabled(false);
+        fields.bDeleteFlags.setEnabled(false);
+        fields.cbDvmStat.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
index 140a61ce..e54f6103 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
@@ -21,10 +21,10 @@ public class DVMSettingsFields implements DialogFields {
     public JTextField tfEnvironments;
     public JCheckBox cbDvmStat;
     private JPanel content;
-    private JButton bAddFlags;
-    private JButton bAddEnvironments;
-    private JButton bDeleteFlags;
-    private JButton bDeleteEnvironment;
+    public JButton bAddFlags;
+    public JButton bAddEnvironments;
+    public JButton bDeleteFlags;
+    public JButton bDeleteEnvironment;
     public DVMSettingsFields() {
         sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
         sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
index 50cc5e71..8429ff41 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
@@ -94,7 +94,6 @@ public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
         if (Global.mainModule.getAccount().CheckRegistered(null)) {
             switch (Global.mainModule.getAccount().role) {
                 case Admin:
-                case Developer:
                     return true;
                 default:
                     return (Global.mainModule.getAccount().email.equals(object.sender_address));
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java
index 9d892ba0..edb126de 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationDialog.java
@@ -29,6 +29,6 @@ public class SapforConfigurationDialog extends DBObjectDialog<SapforConfiguratio
     @Override
     public void SetReadonly() {
         fields.tfName.setEnabled(false);
-        fields.sTransformationMaxtime.setEnabled(false);
+        fields.sKernels.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index 52afc6c5..0536972d 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -12,6 +12,7 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
 import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
 
@@ -128,4 +129,16 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
             Global.testingServer.db.sapforPackages.getUI().ClearSelection();
         }
     }
+    @Override
+    protected boolean isObjectEditable(SapforConfiguration object) {
+        if (Global.mainModule.getAccount().CheckRegistered(null)) {
+            switch (Global.mainModule.getAccount().role) {
+                case Admin:
+                    return true;
+                default:
+                    return (Global.mainModule.getAccount().email.equals(object.sender_address));
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java
index 6c597508..3b864fce 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsDialog.java
@@ -2,6 +2,8 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
 import Common.Utils.Utils_;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
+
+import javax.swing.*;
 public class SapforSettingsDialog extends DBObjectDialog<SapforSettings, SapforSettingsFields> {
     public SapforSettingsDialog() {
         super(SapforSettingsFields.class);
@@ -39,5 +41,10 @@ public class SapforSettingsDialog extends DBObjectDialog<SapforSettings, SapforS
     @Override
     public void SetReadonly() {
         fields.tfName.setEnabled(false);
+        fields.cbFREE_FORM.setEnabled(false);
+        fields.cbKEEP_SPF_DIRECTIVES.setEnabled(false);
+        fields.cbSTATIC_SHADOW_ANALYSIS.setEnabled(false);
+        fields.cbKEEP_DVM_DIRECTIVES.setEnabled(false);
+        fields.sMAX_SHADOW_WIDTH.setEnabled(false);
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
index 858f4555..2a5ffec2 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java
@@ -5,7 +5,9 @@ import Common.Visual.DataSetControlForm;
 import Common.Visual.Menus.DataMenuBar;
 import Common.Visual.Tables.ColumnInfo;
 import Common.Visual.Windows.Dialog.DBObjectDialog;
+import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 
 import javax.swing.*;
@@ -52,4 +54,16 @@ public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
     protected DBObjectDialog getDialog() {
         return new SapforSettingsDialog();
     }
+    @Override
+    protected boolean isObjectEditable(SapforSettings object) {
+        if (Global.mainModule.getAccount().CheckRegistered(null)) {
+            switch (Global.mainModule.getAccount().role) {
+                case Admin:
+                    return true;
+                default:
+                    return (Global.mainModule.getAccount().email.equals(object.sender_address));
+            }
+        }
+        return false;
+    }
 }