no message
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
|
||||
import Common.Utils.TextLog;
|
||||
import _VisualDVM.ProjectData.LanguageName;
|
||||
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
|
||||
@@ -42,26 +41,4 @@ public class SapforConfiguration extends Configuration {
|
||||
//-
|
||||
return Log.isEmpty();
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(int columnIndex) {
|
||||
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return description;
|
||||
case 3:
|
||||
return sender_name;
|
||||
case 4:
|
||||
return printAuto();
|
||||
case 5:
|
||||
return kernels;
|
||||
case 6:
|
||||
return cache.settingsSummary;
|
||||
case 7:
|
||||
return cache.groupsSummary;
|
||||
case 8:
|
||||
return cache.getTestsCount();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Tables.RendererMultiline;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
|
||||
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
|
||||
@@ -30,6 +32,28 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(SapforConfiguration object, int columnIndex) {
|
||||
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return object.description;
|
||||
case 3:
|
||||
return object.sender_name;
|
||||
case 4:
|
||||
return object.printAuto();
|
||||
case 5:
|
||||
return object.kernels;
|
||||
case 6:
|
||||
return cache.settingsSummary;
|
||||
case 7:
|
||||
return cache.groupsSummary;
|
||||
case 8:
|
||||
return cache.getTestsCount();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
columns.get(4).setRendererClass(RendererConfigurationAuto.class);
|
||||
columns.get(4).setEditorClass(SwitcherConfigurationAuto.class);
|
||||
|
||||
@@ -7,7 +7,6 @@ import _VisualDVM.Global;
|
||||
import _VisualDVM.GlobalData.Account.Account;
|
||||
import _VisualDVM.GlobalData.Tasks.TaskState;
|
||||
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
|
||||
import _VisualDVM.ServerObjectsCache.PackageCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.Common.TasksPackageState;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
@@ -18,7 +17,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Vector;
|
||||
public class SapforPackage extends TestingPackage<SapforPackage_json> {
|
||||
@@ -114,30 +112,4 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
|
||||
description = "Выполнено на " + ((int) percent) + "%\n" +
|
||||
"Всего задач: " + tasksCount + ", из них с ошибками " + bad;
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(int columnIndex) {
|
||||
PackageCache cache = (PackageCache) VisualCaches.GetCache(this);
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return sender_name;
|
||||
case 3:
|
||||
return version;
|
||||
case 4:
|
||||
return cache.getConfigurationsDescriptions();
|
||||
case 5:
|
||||
return tasksCount;
|
||||
case 6:
|
||||
return kernels;
|
||||
case 7:
|
||||
return progress;
|
||||
case 8:
|
||||
return new Date(StartDate);
|
||||
case 9:
|
||||
return new Date(ChangeDate);
|
||||
case 10:
|
||||
return state;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.Comparator;
|
||||
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
|
||||
public static boolean filterMyOnly = false;
|
||||
public static boolean filterActive = false;
|
||||
|
||||
@@ -10,11 +10,14 @@ import Common.Visual.Tables.RendererProgressBar;
|
||||
import Common.Visual.Tables.RendererStatusEnum;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.ServerObjectsCache.PackageCache;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
|
||||
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
|
||||
super(dataSource_in, mountPanel_in);
|
||||
@@ -38,6 +41,32 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(SapforPackage object, int columnIndex) {
|
||||
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return object.sender_name;
|
||||
case 3:
|
||||
return object.version;
|
||||
case 4:
|
||||
return cache.getConfigurationsDescriptions();
|
||||
case 5:
|
||||
return object.tasksCount;
|
||||
case 6:
|
||||
return object.kernels;
|
||||
case 7:
|
||||
return object.progress;
|
||||
case 8:
|
||||
return new Date(object.StartDate);
|
||||
case 9:
|
||||
return new Date(object.ChangeDate);
|
||||
case 10:
|
||||
return object.state;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
columns.get(4).setRendererClass(RendererMultiline.class);
|
||||
columns.get(7).setRendererClass(RendererProgressBar.class);
|
||||
@@ -104,7 +133,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(SapforPackage object) {
|
||||
return super.isObjectVisible(object)&&
|
||||
return super.isObjectVisible(object) &&
|
||||
(!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
|
||||
(!SapforPackageDBTable.filterActive || object.state.isActive());
|
||||
}
|
||||
|
||||
@@ -102,17 +102,4 @@ public class SapforSettings extends Settings {
|
||||
//-
|
||||
return res;
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return description;
|
||||
case 3:
|
||||
return sender_name;
|
||||
case 4:
|
||||
return flags;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,11 +7,11 @@ import Common.Database.Tables.iDBTable;
|
||||
import Common.Passes.PassCode_;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsFields;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsForm;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -34,28 +34,7 @@ public class SapforSettingsDBTable extends iDBTable<SapforSettings> {
|
||||
}
|
||||
@Override
|
||||
protected DataSetControlForm createUI(JPanel mountPanel) {
|
||||
return new DataSetControlForm(this, mountPanel) {
|
||||
@Override
|
||||
public boolean hasCheckBox() {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public String[] getUIColumnNames() {
|
||||
return new String[]{
|
||||
"имя",
|
||||
"автор",
|
||||
"флаги"
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public DataMenuBar createMenuBar() {
|
||||
return new DataMenuBar(getPluralDescription(),
|
||||
PassCode.PublishSapforSettings,
|
||||
PassCode.CloneSapforSettings,
|
||||
PassCode.EditSapforSettings,
|
||||
PassCode.DeleteSapforSettings);
|
||||
}
|
||||
};
|
||||
return new SapforSettingsForm(this, mountPanel);
|
||||
}
|
||||
//-
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
|
||||
import Common.Database.Tables.DataSet;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
|
||||
|
||||
import javax.swing.*;
|
||||
public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
|
||||
public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
|
||||
super(dataSource_in, mountPanel_in);
|
||||
}
|
||||
@Override
|
||||
public boolean hasCheckBox() {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public String[] getUIColumnNames() {
|
||||
return new String[]{
|
||||
"имя",
|
||||
"автор",
|
||||
"флаги"
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(SapforSettings object, int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return object.description;
|
||||
case 3:
|
||||
return object.sender_name;
|
||||
case 4:
|
||||
return object.flags;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public DataMenuBar createMenuBar() {
|
||||
return new DataMenuBar(dataSource.getPluralDescription(),
|
||||
PassCode.PublishSapforSettings,
|
||||
PassCode.CloneSapforSettings,
|
||||
PassCode.EditSapforSettings,
|
||||
PassCode.DeleteSapforSettings);
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
|
||||
import Common.CommonConstants;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Objects.riDBObject;
|
||||
import Common.MainModule_;
|
||||
import _VisualDVM.Current;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
public class SapforSettingsCommand extends riDBObject {
|
||||
@@ -23,13 +20,4 @@ public class SapforSettingsCommand extends riDBObject {
|
||||
sapforsettings_id = c.sapforsettings_id;
|
||||
passCode = c.passCode;
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return passCode.getDescription();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand;
|
||||
import Common.Database.Tables.iDBTable;
|
||||
import Common.MainModule_;
|
||||
import Common.Passes.PassCode_;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.UI;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import _VisualDVM.Current;
|
||||
|
||||
@@ -23,15 +23,23 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(SapforSettingsCommand object, int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return object.passCode.getDescription();
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public DataMenuBar createMenuBar() {
|
||||
return new DataMenuBar(dataSource.getPluralDescription(),
|
||||
PassCode.PublishSapforSettingsCommand,
|
||||
PassCode.EditSapforSettingsCommand,
|
||||
PassCode.DeleteSapforSettingsCommand);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isObjectVisible(SapforSettingsCommand object) {
|
||||
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
|
||||
return super.isObjectVisible(object) && MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,18 +47,4 @@ public class ServerSapfor extends riDBObject {
|
||||
public String getVersionCommand() {
|
||||
return Utils_.DQuotes(call_command) + " " + version_command;
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return version;
|
||||
case 3:
|
||||
return sender_name;
|
||||
case 4:
|
||||
return getBuildDate();
|
||||
case 5:
|
||||
return state;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.Comparator;
|
||||
public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
|
||||
public ServerSapforsDBTable() {
|
||||
super(ServerSapfor.class);
|
||||
|
||||
@@ -28,6 +28,20 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
|
||||
};
|
||||
}
|
||||
@Override
|
||||
public Object getFieldAt(ServerSapfor object, int columnIndex) {
|
||||
switch (columnIndex) {
|
||||
case 2:
|
||||
return object.version;
|
||||
case 3:
|
||||
return object.sender_name;
|
||||
case 4:
|
||||
return object.getBuildDate();
|
||||
case 5:
|
||||
return object.state;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
protected void AdditionalInitColumns() {
|
||||
columns.get(4).setRendererClass(RendererDate.class);
|
||||
columns.get(5).setRendererClass(RendererStatusEnum.class);
|
||||
|
||||
Reference in New Issue
Block a user