v++
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -8,9 +8,12 @@
|
||||
<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/Common/Utils/Loggable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Loggable.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMilliseconds.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererMilliseconds.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/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
"Kernels": 8,
|
||||
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
|
||||
"CheckTestingIntervalSeconds": 10,
|
||||
"AutoCheckTesting": true,
|
||||
"AutoCheckTesting": false,
|
||||
"EmailOnTestingProgress": true,
|
||||
"lastMachineId": 13,
|
||||
"lastUserId": 34,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package Common.Utils;
|
||||
import Common.Visual.UI;
|
||||
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
@@ -34,8 +35,10 @@ public interface Loggable {
|
||||
ex.printStackTrace(writer);
|
||||
writer.flush();
|
||||
Print(out.toString());
|
||||
if (UI.isActive())
|
||||
UI.Error("Возникло исключение. Подробности в файле журнала\n" +
|
||||
Utils_.Brackets(getLogFile().getAbsolutePath()));
|
||||
Utils_.CopyToClipboard(out.toString());
|
||||
if (UI.isActive()) {
|
||||
ReadOnlyMultilineTextForm ff = new ReadOnlyMultilineTextForm();
|
||||
ff.ShowDialog("Возникло исключение", out.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -488,6 +488,16 @@ public class Utils_ {
|
||||
//--
|
||||
return hours + " часов, " + minutes + " минут, " + seconds + " секунд";
|
||||
}
|
||||
public static String printSplittedDateIntervalShort(long milliseconds) {
|
||||
//--
|
||||
long seconds = milliseconds / 1000;
|
||||
long hours = seconds / 3600;
|
||||
seconds = seconds - hours * 3600;
|
||||
long minutes = (seconds) / 60;
|
||||
seconds = seconds - minutes * 60;
|
||||
//--
|
||||
return hours + ":" + minutes + ":" + seconds;
|
||||
}
|
||||
//Синхронизация
|
||||
public static void sleep(long millis) {
|
||||
try {
|
||||
|
||||
@@ -13,8 +13,7 @@ public class RendererMilliseconds extends RendererCell<Long>{
|
||||
@Override
|
||||
public void Display() {
|
||||
if (value != null) {
|
||||
setText(Utils_.printSplittedDateInterval(value));
|
||||
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain).deriveFont(12.0f));
|
||||
setText(Utils_.printSplittedDateIntervalShort(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ import Common.Utils.Vector_;
|
||||
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1190;
|
||||
public static final int planner_version = 11;
|
||||
public static final int version = 1191;
|
||||
public static final int planner_version = 12;
|
||||
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
|
||||
//--
|
||||
public static final String ApplicationFileName = "VisualSapfor.jar";
|
||||
|
||||
@@ -41,7 +41,8 @@ public class TestPass extends Pass {
|
||||
}
|
||||
@Override
|
||||
protected void body() throws Exception {
|
||||
System.out.println(Global.componentsServer.credentials_db.userAccounts.getPackedActiveRecipients());
|
||||
int a= 1/0;
|
||||
// System.out.println(Global.componentsServer.credentials_db.userAccounts.getPackedActiveRecipients());
|
||||
// String cpuId = getMotherboardSN();
|
||||
// UI.Info(cpuId);
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user