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 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
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 {
void EditUserAccount() throws Exception {
UserAccount new_object = (UserAccount) request.object;
credentials_db.UpdateWithCheck(new_object);
+ afterEditAction(new_object);
}
void DeleteUserAccount() throws Exception {
Pair to_delete = (Pair) 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 to_delete = (Pair) 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 {
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 {
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 @@
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 {
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 @@
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 {
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -92,23 +104,13 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
+
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