v++
This commit is contained in:
6
.idea/workspace.xml
generated
6
.idea/workspace.xml
generated
@@ -8,13 +8,11 @@
|
|||||||
<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$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.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" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.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" />
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class Global {
|
|||||||
public static MainModule mainModule = null;
|
public static MainModule mainModule = null;
|
||||||
//Режим
|
//Режим
|
||||||
public static Mode mode = Mode.Undefined;
|
public static Mode mode = Mode.Undefined;
|
||||||
//--------------------------------------------------
|
//setAdminRights-------------
|
||||||
public static VisualDVMProperties properties= null;
|
public static VisualDVMProperties properties= null;
|
||||||
public static NormalProperties normalProperties = null;
|
public static NormalProperties normalProperties = null;
|
||||||
public static ComponentsServerProperties componentsServerProperties = null;
|
public static ComponentsServerProperties componentsServerProperties = null;
|
||||||
|
|||||||
@@ -35,7 +35,8 @@ public class MainModule extends MainModule_<GlobalDatabase, MainUI> {
|
|||||||
PassCode.ShutdownTestingServer,
|
PassCode.ShutdownTestingServer,
|
||||||
PassCode.StartTestingServer,
|
PassCode.StartTestingServer,
|
||||||
PassCode.PublishTestingServer,
|
PassCode.PublishTestingServer,
|
||||||
PassCode.CreateTestsGroupFromSelectedVersions
|
PassCode.CreateTestsGroupFromSelectedVersions,
|
||||||
|
PassCode.RefreshDVMPackageResults
|
||||||
);
|
);
|
||||||
public MainModule() throws Exception {
|
public MainModule() throws Exception {
|
||||||
super(GlobalDatabase.class, MainUI.class);
|
super(GlobalDatabase.class, MainUI.class);
|
||||||
|
|||||||
@@ -25,6 +25,10 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
|
|||||||
return "/icons/Menu/Undo.png";
|
return "/icons/Menu/Undo.png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
protected boolean needsAnimation() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (!Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log))
|
if (!Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log))
|
||||||
return false;
|
return false;
|
||||||
@@ -47,8 +51,10 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
|
|||||||
int rt_count = 0;
|
int rt_count = 0;
|
||||||
int good = 0;
|
int good = 0;
|
||||||
//--
|
//--
|
||||||
|
int i = 0;
|
||||||
for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
|
for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
|
||||||
for (DVMRunTask runTask : compilationTask.runTasks) {
|
for (DVMRunTask runTask : compilationTask.runTasks) {
|
||||||
|
ShowProgress(runTasks.size(), i, true);
|
||||||
rt_count++;
|
rt_count++;
|
||||||
if (compilationTask.state != TaskState.Done) {
|
if (compilationTask.state != TaskState.Done) {
|
||||||
runTask.state = TaskState.Canceled;
|
runTask.state = TaskState.Canceled;
|
||||||
@@ -100,12 +106,9 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
|
|||||||
target.description = "Выполнено на " + ((int) percent) + "%\n" +
|
target.description = "Выполнено на " + ((int) percent) + "%\n" +
|
||||||
"Всего задач: " + target.tasksCount + ", из них с ошибками " + (target.tasksCount - good);
|
"Всего задач: " + target.tasksCount + ", из них с ошибками " + (target.tasksCount - good);
|
||||||
//--
|
//--
|
||||||
//Global.testingServer.db.Update(target);
|
}
|
||||||
// RemoteFile remoteJson = new RemoteFile(target.get)
|
@Override
|
||||||
/*
|
protected void performDone() throws Exception {
|
||||||
SendRequest(ServerCode.EditObject, "", target);
|
|
||||||
SendRequest(ServerCode.SendFile)
|
|
||||||
*/
|
|
||||||
SendRequest(ServerCode.ReplaceDVMPackageResults,"",
|
SendRequest(ServerCode.ReplaceDVMPackageResults,"",
|
||||||
new Pair<>(
|
new Pair<>(
|
||||||
target,
|
target,
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
|
|||||||
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
|
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
|
||||||
@Override
|
@Override
|
||||||
public void GetVersionInfo() {
|
public void GetVersionInfo() {
|
||||||
version = 1159;
|
version = 1160;
|
||||||
String pattern = "MMM dd yyyy HH:mm:ss";
|
String pattern = "MMM dd yyyy HH:mm:ss";
|
||||||
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
|
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
|
||||||
date_text = df.format(getClassBuildTime());
|
date_text = df.format(getClassBuildTime());
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
|
|||||||
addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
|
addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
|
||||||
addSeparator();
|
addSeparator();
|
||||||
addPasses(PassCode.DownloadDVMPackage,
|
addPasses(PassCode.DownloadDVMPackage,
|
||||||
// PassCode.RefreshDVMPackageResults,
|
PassCode.RefreshDVMPackageResults,
|
||||||
PassCode.ExportDVMPackageToExcel,
|
PassCode.ExportDVMPackageToExcel,
|
||||||
PassCode.DeleteDVMPackage);
|
PassCode.DeleteDVMPackage);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user