no message
This commit is contained in:
3
.idea/workspace.xml
generated
3
.idea/workspace.xml
generated
@@ -8,9 +8,6 @@
|
|||||||
<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$/.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/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
|||||||
user.connection = new UserConnection(machine, user);
|
user.connection = new UserConnection(machine, user);
|
||||||
Print("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
|
Print("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
|
||||||
Print("Проверка инициализации..");
|
Print("Проверка инициализации..");
|
||||||
user.connection.CheckUserInitialization();
|
user.connection.CheckUserInitialization(testingPackage.sender_address);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Print(ex.toString());
|
Print(ex.toString());
|
||||||
user.connection = null;
|
user.connection = null;
|
||||||
|
|||||||
@@ -492,7 +492,7 @@ public class UserConnection {
|
|||||||
return readFromFile(outFile).replace("\n", "").replace("\r", "");
|
return readFromFile(outFile).replace("\n", "").replace("\r", "");
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
public void CheckUserInitialization() throws Exception {
|
public void CheckUserInitialization(String email) throws Exception {
|
||||||
RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
|
RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
|
||||||
if (!Exists(userWorkspace)){
|
if (!Exists(userWorkspace)){
|
||||||
System.out.println("создание папки пользователя");
|
System.out.println("создание папки пользователя");
|
||||||
@@ -520,10 +520,9 @@ public class UserConnection {
|
|||||||
String modules_log = compileModules(modulesDirectory);
|
String modules_log = compileModules(modulesDirectory);
|
||||||
if (!modules_log.isEmpty())
|
if (!modules_log.isEmpty())
|
||||||
throw new PassException(modules_log);
|
throw new PassException(modules_log);
|
||||||
/*
|
|
||||||
RemoteFile info = new RemoteFile(userWorkspace, user.email);
|
RemoteFile info = new RemoteFile(userWorkspace, email);
|
||||||
user.connection.writeToFile("", info);
|
user.connection.writeToFile("", info);
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user