From 21a41987b49ba6bebbbd2eb09e270c829b5b2fa0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 16 Mar 2025 15:28:04 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  15 ++-
 properties                                    |   6 +-
 .../ComponentsServer/ComponentsServer.java    |  23 ++++
 src/_VisualDVM/Constants.java                 |   2 +-
 .../Compiler/UI/CompilerDialog.java           |   6 +-
 .../Compiler/UI/CompilerFields.form           | 102 +++++++++---------
 .../GlobalData/Machine/UI/MachineDialog.java  |   6 +-
 .../GlobalData/Machine/UI/MachineFields.form  |  32 +++---
 .../GlobalData/User/UI/UserDialog.java        |   6 +-
 .../GlobalData/User/UI/UserFields.form        |  56 +++++-----
 .../GlobalData/User/UI/UserFields.java        |  22 ++++
 src/_VisualDVM/Passes/All/InitialiseUser.java |   8 ++
 .../Passes/All/PublishRemoteWorkspace.java    |   2 +-
 .../Repository/Server/ServerCode.java         |  12 ++-
 14 files changed, 193 insertions(+), 105 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3558e82c..b3aae925 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,20 @@
   </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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CompareDVMRunTaskToEthalon.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UserFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/InitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 14498de6..d5154b30 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -32,8 +32,8 @@
   "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
-  "lastMachineId": 29,
-  "lastUserId": 37,
+  "lastMachineId": 1,
+  "lastUserId": 40,
   "lastCompilerId": -1,
   "RegisterOn": false,
   "SpacesOn": false,
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index 1a3df75e..9b6217e1 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -7,6 +7,7 @@ import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
 import _VisualDVM.ComponentsServer.Component.ComponentType;
 import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
 import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
+import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
@@ -294,11 +295,24 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     void EditUserAccount() throws Exception {
         UserAccount new_object = (UserAccount) request.object;
         credentials_db.UpdateWithCheck(new_object);
+        afterEditAction(new_object);
     }
     void DeleteUserAccount() throws Exception {
         Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
         afterDeleteAction(credentials_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
     }
+    void PublishSubscriberWorkspace() throws Exception {
+        DBObject dbObject = (DBObject) request.object;
+        response.object = (Serializable) credentials_db.InsertS(dbObject).getPK();
+    }
+    void EditSubcriberWorkpace() throws Exception {
+        SubscriberWorkspace new_object = (SubscriberWorkspace) request.object;
+        credentials_db.UpdateWithCheck(new_object);
+    }
+    void DeleteSubscriberWorkspace() throws Exception {
+        Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
+        afterDeleteAction(credentials_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
+    }
     //--
     @Override
     protected void UnsafeSession() throws Exception {
@@ -338,6 +352,15 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
             case EditUserAccount:
                 EditUserAccount();
                 break;
+            case PublishSubscriberWorkspace:
+                PublishSubscriberWorkspace();
+                break;
+            case EditSubcriberWorkpace:
+                EditSubcriberWorkpace();
+                break;
+            case DeleteSubscriberWorkspace:
+                DeleteSubscriberWorkspace();
+                break;
             case ReceiveCredentialsDatabase:
                 ReceiveCredentialsDatabase();
                 break;
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 6ebcaeb3..4676102d 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1215;
+    public static final int version = 1216;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
index 4ea797c7..55b4ca1c 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerDialog.java
@@ -13,8 +13,12 @@ public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
         super(CompilerFields.class);
     }
     @Override
+    public int getDefaultWidth() {
+        return 600;
+    }
+    @Override
     public int getDefaultHeight() {
-        return 300;
+        return 450;
     }
     @Override
     public void validateFields() {
diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form
index 59e448de..b15bf969 100644
--- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form
+++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.form
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.Compiler.UI.CompilerFields">
-  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="7" 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="13" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="500" height="437"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <component id="87831" class="javax.swing.JTextField" binding="tfHome" custom-create="true">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -18,21 +18,12 @@
       </component>
       <vspacer id="44b33">
         <constraints>
-          <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <component id="627cc" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <font name="Times New Roman" size="16" style="2"/>
-          <text value="расположение"/>
-        </properties>
-      </component>
       <component id="48916" class="javax.swing.JButton" binding="bBrowse">
         <constraints>
-          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <enabled value="true"/>
@@ -42,29 +33,48 @@
       </component>
       <component id="d58a0" class="javax.swing.JTextField" binding="tfCallCommand" custom-create="true">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
         <properties/>
       </component>
-      <component id="f3f87" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <font name="Times New Roman" size="16" style="2"/>
-          <text value="команда вызова"/>
-        </properties>
-      </component>
       <component id="87234" class="javax.swing.JTextField" binding="tfDescription" custom-create="true">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
         <properties/>
       </component>
+      <component id="ac56f" class="javax.swing.JTextField" binding="tfVersionCommand" custom-create="true">
+        <constraints>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <editable value="false"/>
+        </properties>
+      </component>
+      <component id="b2235" class="javax.swing.JTextField" binding="tfHelpCommand" custom-create="true">
+        <constraints>
+          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <editable value="false"/>
+        </properties>
+      </component>
+      <component id="673a2" class="javax.swing.JComboBox" binding="cbCompilerType" custom-create="true">
+        <constraints>
+          <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <toolTipText value="выберите тип компилятора"/>
+        </properties>
+      </component>
       <component id="d1e8b" class="javax.swing.JLabel">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
@@ -74,38 +84,36 @@
           <text value="описание"/>
         </properties>
       </component>
-      <component id="ac56f" class="javax.swing.JTextField" binding="tfVersionCommand" custom-create="true">
+      <component id="627cc" class="javax.swing.JLabel">
         <constraints>
-          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="150" height="-1"/>
-          </grid>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <editable value="false"/>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="расположение"/>
+        </properties>
+      </component>
+      <component id="f3f87" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="команда вызова"/>
         </properties>
       </component>
       <component id="34097" class="javax.swing.JLabel">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
           <text value="запрос версии"/>
         </properties>
       </component>
-      <component id="b2235" class="javax.swing.JTextField" binding="tfHelpCommand" custom-create="true">
-        <constraints>
-          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="150" height="-1"/>
-          </grid>
-        </constraints>
-        <properties>
-          <editable value="false"/>
-        </properties>
-      </component>
       <component id="8982d" class="javax.swing.JLabel">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
@@ -114,21 +122,13 @@
       </component>
       <component id="19a71" class="javax.swing.JLabel">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
           <text value="тип"/>
         </properties>
       </component>
-      <component id="673a2" class="javax.swing.JComboBox" binding="cbCompilerType" custom-create="true">
-        <constraints>
-          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <toolTipText value="выберите тип компилятора"/>
-        </properties>
-      </component>
     </children>
   </grid>
 </form>
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java b/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java
index 7c768ba4..a70af8d7 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachineDialog.java
@@ -8,8 +8,12 @@ public class MachineDialog extends DBObjectDialog<Machine, MachineFields> {
         super(MachineFields.class);
     }
     @Override
+    public int getDefaultWidth() {
+        return 600;
+    }
+    @Override
     public int getDefaultHeight() {
-        return 250;
+        return 350;
     }
     @Override
     public void validateFields() {
diff --git a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.form b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.form
index 27ec02ea..e549983d 100644
--- a/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.form
+++ b/src/_VisualDVM/GlobalData/Machine/UI/MachineFields.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.Machine.UI.MachineFields">
-  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
@@ -10,7 +10,7 @@
     <children>
       <component id="1bb3c" class="javax.swing.JTextField" binding="tfName" custom-create="true">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -18,12 +18,12 @@
       </component>
       <vspacer id="aac20">
         <constraints>
-          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="44036" class="javax.swing.JTextField" binding="tfAddress" custom-create="true">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -31,13 +31,21 @@
       </component>
       <component id="a00bb" class="javax.swing.JSpinner" binding="sPort">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="100" height="30"/>
             <maximum-size width="100" height="30"/>
           </grid>
         </constraints>
         <properties/>
       </component>
+      <component id="7aab4" class="javax.swing.JComboBox" binding="cbMachineType" custom-create="true">
+        <constraints>
+          <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <toolTipText value="выберите тип машины"/>
+        </properties>
+      </component>
       <component id="ee3e1" class="javax.swing.JLabel">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
@@ -49,7 +57,7 @@
       </component>
       <component id="22dab" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
@@ -58,7 +66,7 @@
       </component>
       <component id="2dde3" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
@@ -67,21 +75,13 @@
       </component>
       <component id="9d873" class="javax.swing.JLabel">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
           <text value="тип"/>
         </properties>
       </component>
-      <component id="7aab4" class="javax.swing.JComboBox" binding="cbMachineType" custom-create="true">
-        <constraints>
-          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <toolTipText value="выберите тип машины"/>
-        </properties>
-      </component>
     </children>
   </grid>
 </form>
diff --git a/src/_VisualDVM/GlobalData/User/UI/UserDialog.java b/src/_VisualDVM/GlobalData/User/UI/UserDialog.java
index a6e646dd..41e3ce8e 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UserDialog.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UserDialog.java
@@ -36,7 +36,11 @@ public class UserDialog extends DBObjectDialog<User, UserFields> {
         Result.password = new String(fields.tfPassword.getPassword());
     }
     @Override
+    public int getDefaultWidth() {
+        return 600;
+    }
+    @Override
     public int getDefaultHeight() {
-        return 250;
+        return 400;
     }
 }
diff --git a/src/_VisualDVM/GlobalData/User/UI/UserFields.form b/src/_VisualDVM/GlobalData/User/UI/UserFields.form
index 2e6dcbd2..16b95eb0 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UserFields.form
+++ b/src/_VisualDVM/GlobalData/User/UI/UserFields.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="_VisualDVM.GlobalData.User.UI.UserFields">
-  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="content" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
@@ -10,7 +10,7 @@
     <children>
       <component id="374e0" class="javax.swing.JTextField" binding="tfLogin" custom-create="true">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -18,21 +18,12 @@
       </component>
       <vspacer id="9bcf9">
         <constraints>
-          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <component id="33ebe" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <font name="Times New Roman" size="16" style="2"/>
-          <text value="логин"/>
-        </properties>
-      </component>
       <tabbedpane id="936e5" binding="AuthenticationTabs">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <minimum-size width="-1" height="80"/>
             <preferred-size width="200" height="80"/>
             <maximum-size width="-1" height="80"/>
@@ -75,15 +66,36 @@
                     <preferred-size width="150" height="-1"/>
                   </grid>
                 </constraints>
-                <properties/>
+                <properties>
+                  <editable value="true"/>
+                </properties>
               </component>
             </children>
           </grid>
         </children>
       </tabbedpane>
+      <component id="e064b" class="javax.swing.JTextField" binding="tfWorkspace" custom-create="true">
+        <constraints>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties>
+          <editable value="false"/>
+        </properties>
+      </component>
+      <component id="33ebe" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font name="Times New Roman" size="16" style="2"/>
+          <text value="логин"/>
+        </properties>
+      </component>
       <component id="be99c" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
@@ -92,23 +104,13 @@
           <verticalTextPosition value="0"/>
         </properties>
       </component>
-      <component id="e064b" class="javax.swing.JTextField" binding="tfWorkspace" custom-create="true">
-        <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="150" height="-1"/>
-          </grid>
-        </constraints>
-        <properties>
-          <editable value="false"/>
-        </properties>
-      </component>
       <component id="7bee1" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
         </constraints>
         <properties>
           <font name="Times New Roman" size="16" style="2"/>
-          <text value="папка"/>
+          <text value="раб.пространство"/>
           <toolTipText value="рабочая папка визуализатора"/>
         </properties>
       </component>
diff --git a/src/_VisualDVM/GlobalData/User/UI/UserFields.java b/src/_VisualDVM/GlobalData/User/UI/UserFields.java
index e38ecc19..97f60d4c 100644
--- a/src/_VisualDVM/GlobalData/User/UI/UserFields.java
+++ b/src/_VisualDVM/GlobalData/User/UI/UserFields.java
@@ -4,6 +4,9 @@ import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.TextField.StyledPasswordField;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Windows.Dialog.DialogFields;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
+import _VisualDVM.Passes.PassCode;
 
 import javax.swing.*;
 import java.awt.*;
@@ -16,6 +19,8 @@ public class UserFields implements DialogFields {
     public JPanel PasswordTab;
     public JPasswordField tfPassword;
     public JTextField tfWorkspace;
+    public JTextField tfRoot;
+    public JButton bBrowse;
     char mask;
     char unmask = (char) 0;
     boolean password_visible = false;
@@ -30,6 +35,23 @@ public class UserFields implements DialogFields {
                 bPasswordVisibility.setIcon(Utils_.getIcon("/icons/" + (password_visible ? "Show" : "Hide") + "Password.png"));
             }
         });
+        /*
+        bBrowse.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String dst;
+                if (Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true)) {
+                    String root= Global.mainModule.getRemoteFile().full_name;
+                    tfRoot.setText(root);
+                    if (!tfWorkspace.getText().isEmpty()){
+                        RemoteFile workspace=new RemoteFile(tfWorkspace.getText(), true);
+                        tfWorkspace.setText(root+"/"+workspace.name);
+                    }
+                }
+            }
+        });
+         */
+
     }
     @Override
     public Component getContent() {
diff --git a/src/_VisualDVM/Passes/All/InitialiseUser.java b/src/_VisualDVM/Passes/All/InitialiseUser.java
index 088b5e63..2bbb1caf 100644
--- a/src/_VisualDVM/Passes/All/InitialiseUser.java
+++ b/src/_VisualDVM/Passes/All/InitialiseUser.java
@@ -2,6 +2,7 @@ package _VisualDVM.Passes.All;
 import Common.MainModule_;
 import Common.Passes.Pass;
 import Common.Passes.PassException;
+import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
@@ -9,6 +10,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.GlobalData.User.UserState;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Utils;
 public class InitialiseUser extends Pass {
     @Override
     public String getIconPath() {
@@ -42,6 +44,12 @@ public class InitialiseUser extends Pass {
                             workspace.login = user.login;
                             workspace.path = ((RemoteFile) Global.mainModule.getPass(PassCode.RemoteInitialiseUser).target).full_name;
                             //---
+                            System.out.println("==");
+                            System.out.println(Utils_.Brackets(workspace.email));
+                            System.out.println(Utils_.Brackets(workspace.URL));
+                            System.out.println(Utils_.Brackets(workspace.login));
+                            System.out.println(Utils_.Brackets(workspace.path));
+                            System.out.println("==");
                             if (Global.mainModule.getPass(PassCode.PublishRemoteWorkspace).Do(workspace)) {
                                 user.workspace = workspace.path;
                                 user.state = UserState.ready_to_work;
diff --git a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
index 12a33fbb..0689fabf 100644
--- a/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
+++ b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java
@@ -6,6 +6,6 @@ public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorks
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (SubscriberWorkspace) args[0];
-        return SendRequest(ServerCode.PublishObject, "", target);
+        return SendRequest(ServerCode.PublishSubscriberWorkspace, "", target);
     }
 }
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index f78d2ce9..6e16c187 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -71,9 +71,19 @@ public enum ServerCode {
     GetDVMPackageCredentials,
     CreateBackUp,
     GetFirstEmailToSend,
-    SynchronizeSapforRepoitory;
+    SynchronizeSapforRepoitory,
+    PublishSubscriberWorkspace,
+    EditSubcriberWorkpace,
+    DeleteSubscriberWorkspace
+    ;
     public String getDescription() {
         switch (this) {
+            case PublishSubscriberWorkspace:
+                return "Публикация рабочего пространства пользователя на сервере";
+            case EditSubcriberWorkpace:
+                return "Редактировние рабочего пространства пользователя на сервере";
+            case DeleteSubscriberWorkspace:
+                return "Удаление рабочего пространства пользователя на сервере";
             case SynchronizeSapforRepoitory:
                 return "Синхронизация репозитория SAPFOR на сервере";
             case Email: