рефакторинг
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
package GlobalData.RunConfiguration;
|
||||
import Common.Constants.Constants;
|
||||
import Common.Current;
|
||||
import Common.Database.iDBObject;
|
||||
import Common.Global;
|
||||
@@ -22,7 +23,7 @@ public class RunConfiguration extends iDBObject {
|
||||
public int machine_id;
|
||||
//---------------------------------------->
|
||||
@Description("DEFAULT -1")
|
||||
public int compiler_id = Utils.Nan;
|
||||
public int compiler_id = Constants.Nan;
|
||||
public String LauncherCall = ""; //например DVM или mpirun
|
||||
public String LauncherOptions = ""; //например run
|
||||
//--------------------------------------
|
||||
@@ -175,7 +176,7 @@ public class RunConfiguration extends iDBObject {
|
||||
}
|
||||
public String getLaunchShortDescription() {
|
||||
String res = "";
|
||||
if (compiler_id != Utils.Nan) {
|
||||
if (compiler_id != Constants.Nan) {
|
||||
res += getCompiler().description;
|
||||
if (!LauncherOptions.isEmpty())
|
||||
res += " " + LauncherOptions;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package GlobalData.RunConfiguration;
|
||||
import Common.Constants.Constants;
|
||||
import Common.Current;
|
||||
import Common.Database.*;
|
||||
import Common.Global;
|
||||
import Common.UI.DataSetControlForm;
|
||||
import Common.UI.UI;
|
||||
import Common.UI.Windows.Dialog.DBObjectDialog;
|
||||
import Common.Utils.Utils;
|
||||
import GlobalData.Compiler.Compiler;
|
||||
import GlobalData.Compiler.CompilerType;
|
||||
import GlobalData.DVMParameter.DVMParameter;
|
||||
@@ -68,7 +68,7 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
|
||||
Result.LauncherOptions = (String) fields.cbLaunchOptions.getSelectedItem();
|
||||
if (fields.cbLauncherCall.getSelectedItem() instanceof Compiler) {
|
||||
Result.compiler_id = ((Compiler) (fields.cbLauncherCall.getSelectedItem())).id;
|
||||
} else Result.compiler_id = Utils.Nan;
|
||||
} else Result.compiler_id = Constants.Nan;
|
||||
//-
|
||||
Result.dim = (int) fields.sMaxDim.getValue();
|
||||
Result.minMatrix = fields.minMatrixBar.pack(Result.dim);
|
||||
|
||||
Reference in New Issue
Block a user