no message
This commit is contained in:
15
.idea/workspace.xml
generated
15
.idea/workspace.xml
generated
@@ -7,9 +7,20 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<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$/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/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.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/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>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"ServerUserPassword": "mprit_2011",
|
"ServerUserPassword": "mprit_2011",
|
||||||
"OfferRegistrationOnStart": true,
|
"OfferRegistrationOnStart": true,
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\Tests\\Downloads",
|
"ProjectsSearchDirectory": "E:\\BUG",
|
||||||
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
||||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
"CompleteRunEnvironments": true,
|
"CompleteRunEnvironments": true,
|
||||||
"CreateEthalonTasks": true,
|
"CreateEthalonTasks": true,
|
||||||
"ErasePackageWorkspace": true,
|
"ErasePackageWorkspace": true,
|
||||||
"lastMachineId": 29,
|
"lastMachineId": 1,
|
||||||
"lastUserId": 37,
|
"lastUserId": 40,
|
||||||
"lastCompilerId": -1,
|
"lastCompilerId": -1,
|
||||||
"RegisterOn": false,
|
"RegisterOn": false,
|
||||||
"SpacesOn": false,
|
"SpacesOn": false,
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
|
|||||||
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
import _VisualDVM.ComponentsServer.Component.ComponentType;
|
||||||
import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
|
import _VisualDVM.ComponentsServer.Component.Json.ComponentPublicationInfoJson;
|
||||||
import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
|
import _VisualDVM.ComponentsServer.Component.Json.ComponentVersionsInfoJson;
|
||||||
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
|
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
|
||||||
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
|
||||||
import _VisualDVM.Constants;
|
import _VisualDVM.Constants;
|
||||||
@@ -294,11 +295,24 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
void EditUserAccount() throws Exception {
|
void EditUserAccount() throws Exception {
|
||||||
UserAccount new_object = (UserAccount) request.object;
|
UserAccount new_object = (UserAccount) request.object;
|
||||||
credentials_db.UpdateWithCheck(new_object);
|
credentials_db.UpdateWithCheck(new_object);
|
||||||
|
afterEditAction(new_object);
|
||||||
}
|
}
|
||||||
void DeleteUserAccount() throws Exception {
|
void DeleteUserAccount() throws Exception {
|
||||||
Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
|
Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
|
||||||
afterDeleteAction(credentials_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
|
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
|
@Override
|
||||||
protected void UnsafeSession() throws Exception {
|
protected void UnsafeSession() throws Exception {
|
||||||
@@ -338,6 +352,15 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
case EditUserAccount:
|
case EditUserAccount:
|
||||||
EditUserAccount();
|
EditUserAccount();
|
||||||
break;
|
break;
|
||||||
|
case PublishSubscriberWorkspace:
|
||||||
|
PublishSubscriberWorkspace();
|
||||||
|
break;
|
||||||
|
case EditSubcriberWorkpace:
|
||||||
|
EditSubcriberWorkpace();
|
||||||
|
break;
|
||||||
|
case DeleteSubscriberWorkspace:
|
||||||
|
DeleteSubscriberWorkspace();
|
||||||
|
break;
|
||||||
case ReceiveCredentialsDatabase:
|
case ReceiveCredentialsDatabase:
|
||||||
ReceiveCredentialsDatabase();
|
ReceiveCredentialsDatabase();
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
|
|||||||
|
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class Constants {
|
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 planner_version = 24;
|
||||||
public static final int testingMaxKernels = 64;
|
public static final int testingMaxKernels = 64;
|
||||||
//--
|
//--
|
||||||
|
|||||||
@@ -13,8 +13,12 @@ public class CompilerDialog extends DBObjectDialog<Compiler, CompilerFields> {
|
|||||||
super(CompilerFields.class);
|
super(CompilerFields.class);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
public int getDefaultWidth() {
|
||||||
|
return 600;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
public int getDefaultHeight() {
|
public int getDefaultHeight() {
|
||||||
return 300;
|
return 450;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void validateFields() {
|
public void validateFields() {
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<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"/>
|
<margin top="0" left="0" bottom="0" right="0"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<xy x="20" y="20" width="500" height="400"/>
|
<xy x="20" y="20" width="500" height="437"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties/>
|
<properties/>
|
||||||
<border type="none"/>
|
<border type="none"/>
|
||||||
<children>
|
<children>
|
||||||
<component id="87831" class="javax.swing.JTextField" binding="tfHome" custom-create="true">
|
<component id="87831" class="javax.swing.JTextField" binding="tfHome" custom-create="true">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
@@ -18,21 +18,12 @@
|
|||||||
</component>
|
</component>
|
||||||
<vspacer id="44b33">
|
<vspacer id="44b33">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
</vspacer>
|
</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">
|
<component id="48916" class="javax.swing.JButton" binding="bBrowse">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<enabled value="true"/>
|
<enabled value="true"/>
|
||||||
@@ -42,29 +33,48 @@
|
|||||||
</component>
|
</component>
|
||||||
<component id="d58a0" class="javax.swing.JTextField" binding="tfCallCommand" custom-create="true">
|
<component id="d58a0" class="javax.swing.JTextField" binding="tfCallCommand" custom-create="true">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties/>
|
<properties/>
|
||||||
</component>
|
</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">
|
<component id="87234" class="javax.swing.JTextField" binding="tfDescription" custom-create="true">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties/>
|
<properties/>
|
||||||
</component>
|
</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">
|
<component id="d1e8b" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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"/>
|
<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="описание"/>
|
<text value="описание"/>
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
<component id="ac56f" class="javax.swing.JTextField" binding="tfVersionCommand" custom-create="true">
|
<component id="627cc" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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">
|
<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"/>
|
||||||
<preferred-size width="150" height="-1"/>
|
|
||||||
</grid>
|
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties>
|
<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>
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
<component id="34097" class="javax.swing.JLabel">
|
<component id="34097" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
<text value="запрос версии"/>
|
<text value="запрос версии"/>
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</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">
|
<component id="8982d" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
@@ -114,21 +122,13 @@
|
|||||||
</component>
|
</component>
|
||||||
<component id="19a71" class="javax.swing.JLabel">
|
<component id="19a71" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
<text value="тип"/>
|
<text value="тип"/>
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</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>
|
</children>
|
||||||
</grid>
|
</grid>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -8,8 +8,12 @@ public class MachineDialog extends DBObjectDialog<Machine, MachineFields> {
|
|||||||
super(MachineFields.class);
|
super(MachineFields.class);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
public int getDefaultWidth() {
|
||||||
|
return 600;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
public int getDefaultHeight() {
|
public int getDefaultHeight() {
|
||||||
return 250;
|
return 350;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void validateFields() {
|
public void validateFields() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<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"/>
|
<margin top="0" left="0" bottom="0" right="0"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<xy x="20" y="20" width="500" height="400"/>
|
<xy x="20" y="20" width="500" height="400"/>
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
<children>
|
<children>
|
||||||
<component id="1bb3c" class="javax.swing.JTextField" binding="tfName" custom-create="true">
|
<component id="1bb3c" class="javax.swing.JTextField" binding="tfName" custom-create="true">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
@@ -18,12 +18,12 @@
|
|||||||
</component>
|
</component>
|
||||||
<vspacer id="aac20">
|
<vspacer id="aac20">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
</vspacer>
|
</vspacer>
|
||||||
<component id="44036" class="javax.swing.JTextField" binding="tfAddress" custom-create="true">
|
<component id="44036" class="javax.swing.JTextField" binding="tfAddress" custom-create="true">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
@@ -31,13 +31,21 @@
|
|||||||
</component>
|
</component>
|
||||||
<component id="a00bb" class="javax.swing.JSpinner" binding="sPort">
|
<component id="a00bb" class="javax.swing.JSpinner" binding="sPort">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="100" height="30"/>
|
||||||
<maximum-size width="100" height="30"/>
|
<maximum-size width="100" height="30"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties/>
|
<properties/>
|
||||||
</component>
|
</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">
|
<component id="ee3e1" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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"/>
|
<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>
|
||||||
<component id="22dab" class="javax.swing.JLabel">
|
<component id="22dab" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
@@ -58,7 +66,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component id="2dde3" class="javax.swing.JLabel">
|
<component id="2dde3" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
@@ -67,21 +75,13 @@
|
|||||||
</component>
|
</component>
|
||||||
<component id="9d873" class="javax.swing.JLabel">
|
<component id="9d873" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
<text value="тип"/>
|
<text value="тип"/>
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</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>
|
</children>
|
||||||
</grid>
|
</grid>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -36,7 +36,11 @@ public class UserDialog extends DBObjectDialog<User, UserFields> {
|
|||||||
Result.password = new String(fields.tfPassword.getPassword());
|
Result.password = new String(fields.tfPassword.getPassword());
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
public int getDefaultWidth() {
|
||||||
|
return 600;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
public int getDefaultHeight() {
|
public int getDefaultHeight() {
|
||||||
return 250;
|
return 400;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<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"/>
|
<margin top="0" left="0" bottom="0" right="0"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<xy x="20" y="20" width="500" height="400"/>
|
<xy x="20" y="20" width="500" height="400"/>
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
<children>
|
<children>
|
||||||
<component id="374e0" class="javax.swing.JTextField" binding="tfLogin" custom-create="true">
|
<component id="374e0" class="javax.swing.JTextField" binding="tfLogin" custom-create="true">
|
||||||
<constraints>
|
<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"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
@@ -18,21 +18,12 @@
|
|||||||
</component>
|
</component>
|
||||||
<vspacer id="9bcf9">
|
<vspacer id="9bcf9">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
</vspacer>
|
</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">
|
<tabbedpane id="936e5" binding="AuthenticationTabs">
|
||||||
<constraints>
|
<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"/>
|
<minimum-size width="-1" height="80"/>
|
||||||
<preferred-size width="200" height="80"/>
|
<preferred-size width="200" height="80"/>
|
||||||
<maximum-size width="-1" height="80"/>
|
<maximum-size width="-1" height="80"/>
|
||||||
@@ -75,15 +66,36 @@
|
|||||||
<preferred-size width="150" height="-1"/>
|
<preferred-size width="150" height="-1"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties/>
|
<properties>
|
||||||
|
<editable value="true"/>
|
||||||
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
</children>
|
</children>
|
||||||
</grid>
|
</grid>
|
||||||
</children>
|
</children>
|
||||||
</tabbedpane>
|
</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">
|
<component id="be99c" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
@@ -92,23 +104,13 @@
|
|||||||
<verticalTextPosition value="0"/>
|
<verticalTextPosition value="0"/>
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</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">
|
<component id="7bee1" class="javax.swing.JLabel">
|
||||||
<constraints>
|
<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>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<font name="Times New Roman" size="16" style="2"/>
|
<font name="Times New Roman" size="16" style="2"/>
|
||||||
<text value="папка"/>
|
<text value="раб.пространство"/>
|
||||||
<toolTipText value="рабочая папка визуализатора"/>
|
<toolTipText value="рабочая папка визуализатора"/>
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import Common.Visual.Menus.TextEditorMenu;
|
|||||||
import Common.Visual.TextField.StyledPasswordField;
|
import Common.Visual.TextField.StyledPasswordField;
|
||||||
import Common.Visual.TextField.StyledTextField;
|
import Common.Visual.TextField.StyledTextField;
|
||||||
import Common.Visual.Windows.Dialog.DialogFields;
|
import Common.Visual.Windows.Dialog.DialogFields;
|
||||||
|
import _VisualDVM.Global;
|
||||||
|
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
||||||
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
@@ -16,6 +19,8 @@ public class UserFields implements DialogFields {
|
|||||||
public JPanel PasswordTab;
|
public JPanel PasswordTab;
|
||||||
public JPasswordField tfPassword;
|
public JPasswordField tfPassword;
|
||||||
public JTextField tfWorkspace;
|
public JTextField tfWorkspace;
|
||||||
|
public JTextField tfRoot;
|
||||||
|
public JButton bBrowse;
|
||||||
char mask;
|
char mask;
|
||||||
char unmask = (char) 0;
|
char unmask = (char) 0;
|
||||||
boolean password_visible = false;
|
boolean password_visible = false;
|
||||||
@@ -30,6 +35,23 @@ public class UserFields implements DialogFields {
|
|||||||
bPasswordVisibility.setIcon(Utils_.getIcon("/icons/" + (password_visible ? "Show" : "Hide") + "Password.png"));
|
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
|
@Override
|
||||||
public Component getContent() {
|
public Component getContent() {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package _VisualDVM.Passes.All;
|
|||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Passes.Pass;
|
import Common.Passes.Pass;
|
||||||
import Common.Passes.PassException;
|
import Common.Passes.PassException;
|
||||||
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.GlobalData.Machine.Machine;
|
import _VisualDVM.GlobalData.Machine.Machine;
|
||||||
@@ -9,6 +10,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
|
|||||||
import _VisualDVM.GlobalData.User.User;
|
import _VisualDVM.GlobalData.User.User;
|
||||||
import _VisualDVM.GlobalData.User.UserState;
|
import _VisualDVM.GlobalData.User.UserState;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
import _VisualDVM.Utils;
|
||||||
public class InitialiseUser extends Pass {
|
public class InitialiseUser extends Pass {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
@@ -42,6 +44,12 @@ public class InitialiseUser extends Pass {
|
|||||||
workspace.login = user.login;
|
workspace.login = user.login;
|
||||||
workspace.path = ((RemoteFile) Global.mainModule.getPass(PassCode.RemoteInitialiseUser).target).full_name;
|
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)) {
|
if (Global.mainModule.getPass(PassCode.PublishRemoteWorkspace).Do(workspace)) {
|
||||||
user.workspace = workspace.path;
|
user.workspace = workspace.path;
|
||||||
user.state = UserState.ready_to_work;
|
user.state = UserState.ready_to_work;
|
||||||
|
|||||||
@@ -6,6 +6,6 @@ public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorks
|
|||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
target = (SubscriberWorkspace) args[0];
|
target = (SubscriberWorkspace) args[0];
|
||||||
return SendRequest(ServerCode.PublishObject, "", target);
|
return SendRequest(ServerCode.PublishSubscriberWorkspace, "", target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,9 +71,19 @@ public enum ServerCode {
|
|||||||
GetDVMPackageCredentials,
|
GetDVMPackageCredentials,
|
||||||
CreateBackUp,
|
CreateBackUp,
|
||||||
GetFirstEmailToSend,
|
GetFirstEmailToSend,
|
||||||
SynchronizeSapforRepoitory;
|
SynchronizeSapforRepoitory,
|
||||||
|
PublishSubscriberWorkspace,
|
||||||
|
EditSubcriberWorkpace,
|
||||||
|
DeleteSubscriberWorkspace
|
||||||
|
;
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
|
case PublishSubscriberWorkspace:
|
||||||
|
return "Публикация рабочего пространства пользователя на сервере";
|
||||||
|
case EditSubcriberWorkpace:
|
||||||
|
return "Редактировние рабочего пространства пользователя на сервере";
|
||||||
|
case DeleteSubscriberWorkspace:
|
||||||
|
return "Удаление рабочего пространства пользователя на сервере";
|
||||||
case SynchronizeSapforRepoitory:
|
case SynchronizeSapforRepoitory:
|
||||||
return "Синхронизация репозитория SAPFOR на сервере";
|
return "Синхронизация репозитория SAPFOR на сервере";
|
||||||
case Email:
|
case Email:
|
||||||
|
|||||||
Reference in New Issue
Block a user