рефакторинг форм таблиц и заполнения информации о столбцах

This commit is contained in:
2024-10-26 14:34:55 +03:00
parent ffcad7a620
commit a79816082a
43 changed files with 1607 additions and 1189 deletions

41
.idea/workspace.xml generated
View File

@@ -8,7 +8,48 @@
<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/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.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/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/HeaderTextFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendereEditableHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendereEditableHeader.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/UI/CompilersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/DVMParameter/UI/DVMParametersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/EnvironmentValue/UI/EnvironmentsValuesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/UI/MakefilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Module/UI/ModulesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/UI/SapforProfilesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfileSetting/UI/SapforProfileSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/User/UI/UsersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/UI/DBArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/UI/RecommendationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ParallelRegionsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/UI/ComponentsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Subscribes/UI/SubsribersForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.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/DVMSettings/UI/DVMSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.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" />

View File

@@ -267,7 +267,6 @@ public class Pass<T> {
//--- //---
form = null; form = null;
MainModule_.instance.getUI().DropPassForm(); MainModule_.instance.getUI().DropPassForm();
;
System.gc(); System.gc();
//-- //--
form = MainModule_.instance.getUI().SetPassForm(new PassForm(this)); form = MainModule_.instance.getUI().SetPassForm(new PassForm(this));

View File

@@ -40,7 +40,6 @@ public class Utils_ {
//-- //--
public static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().create(); public static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().create();
static String HomePath = System.getProperty("user.dir"); static String HomePath = System.getProperty("user.dir");
;
//Текущая оперционная система //Текущая оперционная система
public static boolean isWindows() { public static boolean isWindows() {
return System.getProperty("os.name").startsWith("Windows"); return System.getProperty("os.name").startsWith("Windows");

View File

@@ -21,7 +21,7 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.Arrays; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -33,8 +33,8 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected int current_row_i; //индекс текущей строки. protected int current_row_i; //индекс текущей строки.
protected boolean events_on = true; protected boolean events_on = true;
protected String colNamesAndSizes = ""; protected String colNamesAndSizes = "";
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>(); protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
Vector<ColumnInfo<D>> columns = new Vector<>(); //информация о столбцах и их оформлении
MatchesCounter counter_ui = null; MatchesCounter counter_ui = null;
//-- //--
Object savedCurrentKey = null; Object savedCurrentKey = null;
@@ -43,6 +43,12 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) { public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
super(DataTable.class, mountPanel_in); super(DataTable.class, mountPanel_in);
dataSource = dataSource_in; dataSource = dataSource_in;
//--
columns.clear();
columns.add(createPKColumn());
if (hasCheckBox())
columns.add(createCheckBoxColummn());
//--
createFilters(); createFilters();
//-- //--
if (hasMenuBar()) { if (hasMenuBar()) {
@@ -72,6 +78,38 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
} }
} }
protected ColumnInfo<D> createPKColumn() {
return new ColumnInfo<D>(dataSource.getPKName()) {
@Override
public Object getFieldAt(D object) {
return object.getPK();
}
};
}
protected ColumnInfo<D> createCheckBoxColummn() {
return new ColumnInfo<D>("") {
@Override
public Object getFieldAt(D object) {
return object.isSelected();
}
@Override
public int getMinWidth() {
return 25;
}
@Override
public int getMaxWidth() {
return 25;
}
@Override
public Class getRendererClass() {
return DBObjectSelectionRenderer.class;
}
@Override
public Class getEditorClass() {
return DBObjectSelector.class;
}
};
}
<M> Vector<M> getFilters(Class<M> f) { <M> Vector<M> getFilters(Class<M> f) {
Vector<M> res = new Vector<>(); Vector<M> res = new Vector<>();
for (DBObjectFilter_ filter_ : allFilters) { for (DBObjectFilter_ filter_ : allFilters) {
@@ -85,17 +123,13 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected void AddFilter(DBObjectFilter_<D> filter_in) { protected void AddFilter(DBObjectFilter_<D> filter_in) {
allFilters.add(filter_in); allFilters.add(filter_in);
} }
public ColumnInfo getColumnInfo(int i) { protected final void AddColumns(ColumnInfo<D>... new_columns) {
Collections.addAll(columns, new_columns);
}
public ColumnInfo<D> getColumnInfo(int i) {
return columns.get(i); return columns.get(i);
} }
//-- //--
protected String[] getUIColumnNames() {
return new String[]{};
}
public Object getFieldAt(D object, int columnIndex) {
return null;
}
//-
void SaveColumns() { void SaveColumns() {
if (MainModule_.instance.getDb() != null) { if (MainModule_.instance.getDb() != null) {
try { try {
@@ -103,7 +137,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new)); Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
String packed = String.join("|", widths); String packed = String.join("|", widths);
TableVisualData tableVisualData; TableVisualData tableVisualData;
//todo метод сохрания к бд отнести, как с окнами и проходами. (?)
if (MainModule_.instance.getDb().tablesVisualData.containsKey(getCurrentName())) { if (MainModule_.instance.getDb().tablesVisualData.containsKey(getCurrentName())) {
tableVisualData = MainModule_.instance.getDb().tablesVisualData.get(getCurrentName()); tableVisualData = MainModule_.instance.getDb().tablesVisualData.get(getCurrentName());
} else { } else {
@@ -121,20 +154,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
Vector<String> getHeaders() { Vector<String> getHeaders() {
return columns.stream().map(ColumnInfo::getName).collect(Collectors.toCollection(Vector::new)); return columns.stream().map(ColumnInfo::getName).collect(Collectors.toCollection(Vector::new));
} }
void CreateColumnsInfo() {
columns.clear();
columns.add(new ColumnInfo(dataSource.getPKName()));
if (hasCheckBox()) {
columns.add(new ColumnInfo("", DBObjectSelectionRenderer.class, DBObjectSelector.class));
columns.get(1).setMinWidth(25);
columns.get(1).setMaxWidth(25);
}
Arrays.stream(getUIColumnNames()).forEach(name -> columns.add(new ColumnInfo(name)));
AdditionalInitColumns();
}
protected void AdditionalInitColumns() {
//уточнение инфы по столбцам.
}
protected Comparator<D> getDefaultComparator() { protected Comparator<D> getDefaultComparator() {
return null; return null;
} }
@@ -160,18 +179,13 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} }
@Override @Override
protected void createControl() { protected void createControl() {
CreateColumnsInfo();
GridAnchestor table_data_model = new GridAnchestor(getHeaders(), getVisibleKeys()) { GridAnchestor table_data_model = new GridAnchestor(getHeaders(), getVisibleKeys()) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public Object getValueAt(int rowIndex, int columnIndex) { public Object getValueAt(int rowIndex, int columnIndex) {
Object key = data.get(rowIndex); Object key = data.get(rowIndex);
if (columnIndex == 0)
return key;
D object = dataSource.get((key)); D object = dataSource.get((key));
if ((columnIndex == 1) && hasCheckBox()) return columns.get(columnIndex).getFieldAt(object);
return object.isSelected();
return getFieldAt(object, columnIndex);
} }
@Override @Override
public boolean isCellEditable(int row, int col) { public boolean isCellEditable(int row, int col) {

View File

@@ -1,26 +1,13 @@
package Common.Visual.Tables; package Common.Visual.Tables;
import Common.CommonConstants; import Common.CommonConstants;
public class ColumnInfo { public abstract class ColumnInfo<D> {
private String Name = "?"; private String Name = "?";
private boolean visible = true; private boolean visible = true;
private boolean editable = false; private boolean editable = false;
private Class rendererClass = null;
private Class editorClass = null;
private int maxWidth = CommonConstants.Nan;
private int minWidth = CommonConstants.Nan;
public ColumnInfo(String name_in) { public ColumnInfo(String name_in) {
setName(name_in); setName(name_in);
} }
public ColumnInfo(String name_in, Class renderer_in, Class editor_in) { public abstract Object getFieldAt(D object);
setName(name_in);
setRendererClass(renderer_in);
setEditable(true);
setEditorClass(editor_in);
}
public ColumnInfo(String name_in, Class renderer_in) {
setName(name_in);
setRendererClass(renderer_in);
}
public String getName() { public String getName() {
return Name; return Name;
} }
@@ -34,23 +21,13 @@ public class ColumnInfo {
this.visible = visible_in; this.visible = visible_in;
} }
public boolean isEditable() { public boolean isEditable() {
return editable; return getEditorClass() != null;
}
public void setEditable(boolean editable_in) {
this.editable = editable_in;
} }
public Class getRendererClass() { public Class getRendererClass() {
return rendererClass; return null;
}
public void setRendererClass(Class renderer_in) {
this.rendererClass = renderer_in;
} }
public Class getEditorClass() { public Class getEditorClass() {
return editorClass; return null;
}
public void setEditorClass(Class editor_in) {
this.editorClass = editor_in;
setEditable(editorClass != null);
} }
public boolean hasRenderer() { public boolean hasRenderer() {
return getRendererClass() != null; return getRendererClass() != null;
@@ -59,22 +36,16 @@ public class ColumnInfo {
return getEditorClass() != null; return getEditorClass() != null;
} }
public int getMaxWidth() { public int getMaxWidth() {
return maxWidth; return CommonConstants.Nan;
}
public void setMaxWidth(int maxWidth_in) {
this.maxWidth = maxWidth_in;
} }
public boolean hasMaxWidth() { public boolean hasMaxWidth() {
return maxWidth != CommonConstants.Nan; return getMaxWidth() != CommonConstants.Nan;
} }
//- //-
public int getMinWidth() { public int getMinWidth() {
return minWidth; return CommonConstants.Nan;
}
public void setMinWidth(int minWidth_in) {
this.minWidth = minWidth_in;
} }
public boolean hasMinWidth() { public boolean hasMinWidth() {
return minWidth != CommonConstants.Nan; return getMinWidth() != CommonConstants.Nan;
} }
} }

View File

@@ -28,7 +28,7 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
} }
@Override @Override
public boolean Validate(D object) { public boolean Validate(D object) {
Object field = dataSet.getUI().getFieldAt(object, columnIndex); Object field = dataSet.getUI().getColumnInfo(columnIndex).getFieldAt(object);
return (field instanceof String) && field.toString().toLowerCase().contains(filterValue); return (field instanceof String) && field.toString().toLowerCase().contains(filterValue);
} }
//--- //---

View File

@@ -6,9 +6,9 @@ import java.awt.*;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
public class RendereEditableHeader implements TableCellRenderer { public class RendereEditableHeader implements TableCellRenderer {
private final JComponent editor;
private JTable table = null; private JTable table = null;
private MouseEventReposter reporter = null; private MouseEventReposter reporter = null;
private JComponent editor;
public RendereEditableHeader(JComponent editor) { public RendereEditableHeader(JComponent editor) {
this.editor = editor; this.editor = editor;
this.editor.setBorder(UIManager.getBorder("TableHeader.cellBorder")); this.editor.setBorder(UIManager.getBorder("TableHeader.cellBorder"));
@@ -30,10 +30,10 @@ public class RendereEditableHeader implements TableCellRenderer {
return this.editor; return this.editor;
} }
static public class MouseEventReposter extends MouseAdapter { static public class MouseEventReposter extends MouseAdapter {
private final JTableHeader header;
private final Component editor;
private Component dispatchComponent; private Component dispatchComponent;
private JTableHeader header;
private int column = -1; private int column = -1;
private Component editor;
public MouseEventReposter(JTableHeader header, int column, Component editor) { public MouseEventReposter(JTableHeader header, int column, Component editor) {
this.header = header; this.header = header;
this.column = column; this.column = column;

View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.Compiler.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -12,32 +13,32 @@ import javax.swing.*;
public class CompilersForm extends DataSetControlForm<Compiler> { public class CompilersForm extends DataSetControlForm<Compiler> {
public CompilersForm(DataSet<?, Compiler> dataSource_in, JPanel mountPanel_in) { public CompilersForm(DataSet<?, Compiler> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Compiler>("описание") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Compiler object) {
return new String[]{
"описание",
"команда вызова",
"версия",
"ревизия"};
}
@Override
public Object getFieldAt(Compiler object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3: }
},
new ColumnInfo<Compiler>("команда вызова") {
@Override
public Object getFieldAt(Compiler object) {
return object.call_command; return object.call_command;
case 4: }
},
new ColumnInfo<Compiler>("версия") {
@Override
public Object getFieldAt(Compiler object) {
return object.version; return object.version;
case 5: }
},
new ColumnInfo<Compiler>("ревизия") {
@Override
public Object getFieldAt(Compiler object) {
return object.revision; return object.revision;
} }
return null;
} }
@Override );
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {

View File

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI; package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
@@ -8,28 +9,31 @@ import javax.swing.*;
public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnvironment> { public class CompilerEnvironmentsForm extends DataSetControlForm<CompilerEnvironment> {
public CompilerEnvironmentsForm(DataSet<?, CompilerEnvironment> dataSource_in, JPanel mountPanel_in) { public CompilerEnvironmentsForm(DataSet<?, CompilerEnvironment> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<CompilerEnvironment>("Значение") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(CompilerEnvironment object) {
return new String[]{
"Значение", "Описание"
};
}
@Override
public Object getFieldAt(CompilerEnvironment object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.value; return object.value;
case 3:
return object.description;
default:
return null;
}
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(2).setRendererClass(CompilerEnvironmentValueRenderer.class); return CompilerEnvironmentValueRenderer.class;
columns.get(2).setEditorClass(CompilerEnvironmentValueEditor.class); }
columns.get(3).setRendererClass(RendererMultiline.class); @Override
public Class getEditorClass() {
return CompilerEnvironmentValueEditor.class;
}
},
new ColumnInfo<CompilerEnvironment>("Описание") {
@Override
public Object getFieldAt(CompilerEnvironment object) {
return object.description;
}
@Override
public Class getRendererClass() {
return RendererMultiline.class;
}
}
);
} }
} }

View File

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI; package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption; import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
@@ -8,33 +9,41 @@ import javax.swing.*;
public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> { public class CompilerOptionsForm extends DataSetControlForm<CompilerOption> {
public CompilerOptionsForm(DataSet<?, CompilerOption> dataSource_in, JPanel mountPanel_in) { public CompilerOptionsForm(DataSet<?, CompilerOption> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<CompilerOption>("Параметр") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(CompilerOption object) {
return new String[]{
"Параметр",
"Значение",
"Описание"
};
}
@Override
public Object getFieldAt(CompilerOption object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.parameterName + object.parameterSeparator; return object.parameterName + object.parameterSeparator;
case 3:
return object.parameterValue;
case 4:
return object.description;
default:
return null;
}
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(2).setRendererClass(CompilerOptionParameterNameRenderer.class); return CompilerOptionParameterNameRenderer.class;
columns.get(3).setRendererClass(CompilerOptionParameterValueRenderer.class); }
columns.get(3).setEditorClass(CompilerOptionParameterValueRenderer.class); },
columns.get(4).setRendererClass(RendererMultiline.class); new ColumnInfo<CompilerOption>("Значение") {
@Override
public Object getFieldAt(CompilerOption object) {
return object.parameterValue;
}
@Override
public Class getRendererClass() {
return CompilerOptionParameterValueRenderer.class;
}
@Override
public Class getEditorClass() {
return CompilerOptionParameterValueRenderer.class;
}
},
new ColumnInfo<CompilerOption>("Описание") {
@Override
public Object getFieldAt(CompilerOption object) {
return object.description;
}
@Override
public Class getRendererClass() {
return RendererMultiline.class;
}
}
);
} }
} }

View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.DVMParameter.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -11,33 +12,26 @@ import javax.swing.*;
public class DVMParametersForm extends DataSetControlForm<DVMParameter> { public class DVMParametersForm extends DataSetControlForm<DVMParameter> {
public DVMParametersForm(DataSet<?, DVMParameter> dataSource_in, JPanel mountPanel_in) { public DVMParametersForm(DataSet<?, DVMParameter> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<DVMParameter>("имя") {
@Override
public Object getFieldAt(DVMParameter object) {
return object.name;
}
},
new ColumnInfo<DVMParameter>("значение") {
@Override
public Object getFieldAt(DVMParameter object) {
return object.value;
}
}
);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"
};
}
@Override
public Object getFieldAt(DVMParameter object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddDVMParameter, PassCode.AddDVMParameter,

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
@@ -13,32 +14,26 @@ import javax.swing.*;
public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue> { public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue> {
public EnvironmentsValuesForm(DataSet<?, EnvironmentValue> dataSource_in, JPanel mountPanel_in) { public EnvironmentsValuesForm(DataSet<?, EnvironmentValue> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<EnvironmentValue>("имя") {
@Override
public Object getFieldAt(EnvironmentValue object) {
return object.name;
}
},
new ColumnInfo<EnvironmentValue>("значение") {
@Override
public Object getFieldAt(EnvironmentValue object) {
return object.value;
}
}
);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"};
}
@Override
public Object getFieldAt(EnvironmentValue object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name;
case 2:
return object.value;
}
return null;
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddEnvironmentValue, PassCode.AddEnvironmentValue,

View File

@@ -1,6 +1,7 @@
package _VisualDVM.GlobalData.FileObject.UI; package _VisualDVM.GlobalData.FileObject.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import _VisualDVM.GlobalData.FileObject.DirInfo; import _VisualDVM.GlobalData.FileObject.DirInfo;
@@ -8,6 +9,18 @@ import javax.swing.*;
public class DirInfosForm extends DataSetControlForm<DirInfo> { public class DirInfosForm extends DataSetControlForm<DirInfo> {
public DirInfosForm(DataSet<?, DirInfo> dataSource_in, JPanel mountPanel_in) { public DirInfosForm(DataSet<?, DirInfo> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<DirInfo>("дата изменения") {
@Override
public Object getFieldAt(DirInfo object) {
return object.getDate();
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
}
);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
@@ -17,22 +30,4 @@ public class DirInfosForm extends DataSetControlForm<DirInfo> {
protected boolean needsCurrent() { protected boolean needsCurrent() {
return false; return false;
} }
@Override
public String[] getUIColumnNames() {
return new String[]{
"дата изменения"};
}
@Override
public Object getFieldAt(DirInfo object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.getDate();
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRendererClass(RendererDate.class);
}
} }

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.Visual.Controls.MenuBarButton; import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -15,20 +16,15 @@ import java.awt.event.ActionListener;
public class MachinesForm extends DataSetControlForm<Machine> { public class MachinesForm extends DataSetControlForm<Machine> {
public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) { public MachinesForm(DataSet<?, Machine> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Machine>("URL") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Machine object) {
return new String[]{"URL"};
}
@Override
public Object getFieldAt(Machine object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getURL(); return object.getURL();
default:
return null;
} }
} }
);
}
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
@@ -42,10 +38,6 @@ public class MachinesForm extends DataSetControlForm<Machine> {
Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine(); Global.mainModule.getUI().getCredentialsMenuBar().ShowNoMachine();
} }
@Override @Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.AddMachine, PassCode.AddMachine,

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
@@ -14,31 +15,26 @@ import javax.swing.*;
public class MakefilesForm extends DataSetControlForm<Makefile> { public class MakefilesForm extends DataSetControlForm<Makefile> {
public MakefilesForm(DataSet<?, Makefile> dataSource_in, JPanel mountPanel_in) { public MakefilesForm(DataSet<?, Makefile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Makefile>("Линковщик") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Makefile object) {
return new String[]{
"Линковщик",
"Команда",
"Флаги"
};
}
@Override
public Object getFieldAt(Makefile object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getCompilerDescription(); return object.getCompilerDescription();
case 3:
return object.command;
case 4:
return object.flags;
default:
return null;
}
} }
},
new ColumnInfo<Makefile>("Команда") {
@Override @Override
protected void AdditionalInitColumns() { public Object getFieldAt(Makefile object) {
columns.get(0).setVisible(false); return object.command;
}
},
new ColumnInfo<Makefile>("Флаги") {
@Override
public Object getFieldAt(Makefile object) {
return object.flags;
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Makefile.Makefile;
@@ -13,34 +14,33 @@ import javax.swing.*;
public class ModulesForm extends DataSetControlForm<Module> { public class ModulesForm extends DataSetControlForm<Module> {
public ModulesForm(DataSet<?, Module> dataSource_in, JPanel mountPanel_in) { public ModulesForm(DataSet<?, Module> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Module>("Язык") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Module object) {
return new String[]{
"Язык",
"Компилятор",
"Команда",
"Флаги"
};
}
@Override
public Object getFieldAt(Module object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.language.getDescription(); return object.language.getDescription();
case 3:
return object.getCompilerDescription();
case 4:
return object.command;
case 5:
return object.flags;
default:
return null;
}
} }
},
new ColumnInfo<Module>("Компилятор") {
@Override @Override
protected void AdditionalInitColumns() { public Object getFieldAt(Module object) {
columns.get(0).setVisible(false); return object.getCompilerDescription();
}
},
new ColumnInfo<Module>("Команда") {
@Override
public Object getFieldAt(Module object) {
return object.command;
}
},
new ColumnInfo<Module>("Флаги") {
@Override
public Object getFieldAt(Module object) {
return object.flags;
}
}
);
getColumnInfo(0).setVisible(false);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
@@ -12,49 +13,56 @@ import javax.swing.*;
public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration> { public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration> {
public RunConfigurationsForm(DataSet<?, RunConfiguration> dataSource_in, JPanel mountPanel_in) { public RunConfigurationsForm(DataSet<?, RunConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<RunConfiguration>("Команда") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.LauncherCall;
}
},
new ColumnInfo<RunConfiguration>("Опции") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.LauncherOptions;
}
},
new ColumnInfo<RunConfiguration>("Разм.") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.dim;
}
},
new ColumnInfo<RunConfiguration>("Куб") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.printCube();
}
},
new ColumnInfo<RunConfiguration>("Min") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.minMatrix;
}
},
new ColumnInfo<RunConfiguration>("Max") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.maxMatrix;
}
},
new ColumnInfo<RunConfiguration>("Аргументы") {
@Override
public Object getFieldAt(RunConfiguration object) {
return object.args;
}
}
);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{
"Команда",
"Опции",
"Разм.",
"Куб",
"Min",
"Max",
"Аргументы"
};
}
@Override
public Object getFieldAt(RunConfiguration object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.LauncherCall;
case 2:
return object.LauncherOptions;
case 3:
return object.dim;
case 4:
return object.printCube();
case 5:
return object.minMatrix;
case 6:
return object.maxMatrix;
case 7:
return object.args;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),
PassCode.Run, PassCode.Run,

View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.SapforProfile.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
@@ -12,24 +13,20 @@ import java.util.Date;
public class SapforProfilesForm extends DataSetControlForm<SapforProfile> { public class SapforProfilesForm extends DataSetControlForm<SapforProfile> {
public SapforProfilesForm(DataSet<?, SapforProfile> dataSource_in, JPanel mountPanel_in) { public SapforProfilesForm(DataSet<?, SapforProfile> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<SapforProfile>("Описание") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(SapforProfile object) {
return new String[]{
"Описание",
"Дата создания"
};
}
@Override
public Object getFieldAt(SapforProfile object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3:
return new Date(object.creationDate);
default:
return null;
} }
},
new ColumnInfo<SapforProfile>("Дата создания") {
@Override
public Object getFieldAt(SapforProfile object) {
return new Date(object.creationDate);
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.SapforProfileSetting.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfile.SapforProfile;
import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
@@ -9,34 +10,27 @@ import javax.swing.*;
public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileSetting> { public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileSetting> {
public SapforProfileSettingsForm(DataSet<?, SapforProfileSetting> dataSource_in, JPanel mountPanel_in) { public SapforProfileSettingsForm(DataSet<?, SapforProfileSetting> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<SapforProfileSetting>("имя") {
@Override
public Object getFieldAt(SapforProfileSetting object) {
return object.name.getDescription();
}
},
new ColumnInfo<SapforProfileSetting>("значение") {
@Override
public Object getFieldAt(SapforProfileSetting object) {
return object.value;
}
}
);
getColumnInfo(0).setVisible(false);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{
"имя",
"значение"
};
}
@Override
public Object getFieldAt(SapforProfileSetting object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.name.getDescription();
case 2:
return object.value;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
@Override
protected boolean hasMenuBar() { protected boolean hasMenuBar() {
return false; return false;
} }

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -15,59 +16,88 @@ import javax.swing.*;
public class CompilationTasksForm extends DataSetControlForm<CompilationTask> { public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
public CompilationTasksForm(DataSet<?, CompilationTask> dataSource_in, JPanel mountPanel_in) { public CompilationTasksForm(DataSet<?, CompilationTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<CompilationTask>("сборка") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(CompilationTask object) {
return new String[]{
"сборка",
"",
"Fortran",
"",
"С",
"",
"С++",
"",
"Лимит(c)",
"Время(c)",
"Дата",
"Статус"
};
}
@Override
public Object getFieldAt(CompilationTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.linkerDescription; return object.linkerDescription;
case 3:
return object.linkFlags;
case 4:
return object.fortranCompilerDescription;
case 5:
return object.fortranFlags;
case 6:
return object.cCompilerDescription;
case 7:
return object.cFlags;
case 8:
return object.cppCompilerDescription;
case 9:
return object.cppFlags;
case 10:
return object.maxtime;
case 11:
return object.Time;
case 12:
return object.getEndDate();
case 13:
return object.state;
default:
return null;
} }
},
new ColumnInfo<CompilationTask>("") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.linkFlags;
}
},
new ColumnInfo<CompilationTask>("Fortran") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.fortranCompilerDescription;
}
},
new ColumnInfo<CompilationTask>("") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.fortranFlags;
}
},
new ColumnInfo<CompilationTask>("С") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.cCompilerDescription;
}
},
new ColumnInfo<CompilationTask>("") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.cFlags;
}
},
new ColumnInfo<CompilationTask>("С++") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.cppCompilerDescription;
}
},
new ColumnInfo<CompilationTask>("") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.cppFlags;
}
},
new ColumnInfo<CompilationTask>("Лимит(c)") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.maxtime;
}
},
new ColumnInfo<CompilationTask>("Время(c)") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.Time;
}
},
new ColumnInfo<CompilationTask>("Дата") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.getEndDate();
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(12).setRendererClass(RendererDate.class); return RendererDate.class;
columns.get(13).setRendererClass(RendererStatusEnum.class); }
},
new ColumnInfo<CompilationTask>("Статус") {
@Override
public Object getFieldAt(CompilationTask object) {
return object.state;
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
}
);
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -17,40 +18,52 @@ import javax.swing.*;
public class RunTasksForm extends DataSetControlForm<RunTask> { public class RunTasksForm extends DataSetControlForm<RunTask> {
public RunTasksForm(DataSet<?, RunTask> dataSource_in, JPanel mountPanel_in) { public RunTasksForm(DataSet<?, RunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<RunTask>("Матрица") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(RunTask object) {
return new String[]{
"Матрица",
"Лимит(с)",
"Время(с)",
"Чистое время",
"Дата",
"Статус"};
}
@Override
public Object getFieldAt(RunTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.matrix; return object.matrix;
case 3:
return object.maxtime;
case 4:
return object.Time;
case 5:
return object.CleanTime;
case 6:
return object.getEndDate();
case 7:
return object.state;
default:
return null;
} }
},
new ColumnInfo<RunTask>("Лимит(с)") {
@Override
public Object getFieldAt(RunTask object) {
return object.maxtime;
}
},
new ColumnInfo<RunTask>("Время(с)") {
@Override
public Object getFieldAt(RunTask object) {
return object.Time;
}
},
new ColumnInfo<RunTask>("Чистое время") {
@Override
public Object getFieldAt(RunTask object) {
return object.CleanTime;
}
},
new ColumnInfo<RunTask>("Дата") {
@Override
public Object getFieldAt(RunTask object) {
return object.getEndDate();
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(6).setRendererClass(RendererDate.class); return RendererDate.class;
columns.get(7).setRendererClass(RendererStatusEnum.class); }
},
new ColumnInfo<RunTask>("Статус") {
@Override
public Object getFieldAt(RunTask object) {
return object.state;
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
}
);
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {

View File

@@ -3,6 +3,7 @@ import Common.Database.Tables.DataSet;
import Common.MainModule_; import Common.MainModule_;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -14,28 +15,24 @@ import javax.swing.*;
public class UsersForm extends DataSetControlForm<User> { public class UsersForm extends DataSetControlForm<User> {
public UsersForm(DataSet<?, User> dataSource_in, JPanel mountPanel_in) { public UsersForm(DataSet<?, User> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<User>("Логин") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(User object) {
return new String[]{
"Логин",
"Статус"};
}
@Override
public Object getFieldAt(User object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.login; return object.login;
case 3:
return object.state;
default:
return null;
} }
},
new ColumnInfo<User>("Статус") {
@Override
public Object getFieldAt(User object) {
return object.state;
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(0).setVisible(false); return RendererStatusEnum.class;
columns.get(3).setRendererClass(RendererStatusEnum.class); }
}
);
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {

View File

@@ -2,31 +2,47 @@ package _VisualDVM.ProjectData.DBArray.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.DBObjectSelectionRenderer;
import _VisualDVM.ProjectData.DBArray.DBArray; import _VisualDVM.ProjectData.DBArray.DBArray;
import javax.swing.*; import javax.swing.*;
public class DBArraysForm extends DataSetControlForm<DBArray> { public class DBArraysForm extends DataSetControlForm<DBArray> {
public DBArraysForm(DataSet<?, DBArray> dataSource_in, JPanel mountPanel_in) { public DBArraysForm(DataSet<?, DBArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<DBArray>("Имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(DBArray object) {
return new String[]{"Имя"};
}
@Override
public Object getFieldAt(DBArray object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.State;
case 2:
return object.shortName; return object.shortName;
default:
return null;
} }
} }
);
}
@Override @Override
protected void AdditionalInitColumns() { protected ColumnInfo<DBArray> createCheckBoxColummn() {
columns.get(1).setEditable(false); return new ColumnInfo<DBArray>("") {
@Override
public Object getFieldAt(DBArray object) {
return object.State;
}
@Override
public int getMinWidth() {
return 25;
}
@Override
public int getMaxWidth() {
return 25;
}
@Override
public Class getRendererClass() {
return DBObjectSelectionRenderer.class;
}
@Override
public boolean isEditable() {
return false;
}
};
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.Messages; package _VisualDVM.ProjectData.Messages;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererWrapText; import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current; import _VisualDVM.Current;
@@ -12,43 +13,46 @@ import java.util.Comparator;
public class MessagesControlForm extends DataSetControlForm<Message> { public class MessagesControlForm extends DataSetControlForm<Message> {
public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) { public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<Message>("группа") {
@Override
public Object getFieldAt(Message object) {
return object.group_s;
}
},
new ColumnInfo<Message>("строка") {
@Override
public Object getFieldAt(Message object) {
return object.line;
}
},
new ColumnInfo<Message>("текст") {
@Override
public Object getFieldAt(Message object) {
return object.value;
}
@Override
public Class getRendererClass() {
return RendererWrapText.class;
}
@Override
public int getMinWidth() {
return 700;
}
}
);
getColumnInfo(0).setVisible(false);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{
"группа",
"строка",
"текст"};
}
@Override
public Object getFieldAt(Message object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.group_s;
case 2:
return object.line;
case 3:
return object.value;
default:
return null;
}
}
@Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
Global.mainModule.getFile().form.getEditor().gotoLine(getCurrent().line); Global.mainModule.getFile().form.getEditor().gotoLine(getCurrent().line);
} }
@Override @Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setMinWidth(700);
columns.get(3).setRendererClass(RendererWrapText.class);
}
@Override
protected void MouseAction2() throws Exception { protected void MouseAction2() throws Exception {
ShowCurrentObject(); ShowCurrentObject();
} }

View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.Messages.Recommendations.UI; package _VisualDVM.ProjectData.Messages.Recommendations.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter; import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererWrapText; import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation; import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
@@ -9,31 +10,29 @@ import javax.swing.*;
public class RecommendationsForm extends DataSetControlForm<MessageRecommendation> { public class RecommendationsForm extends DataSetControlForm<MessageRecommendation> {
public RecommendationsForm(DataSet<?, MessageRecommendation> dataSource_in, JPanel mountPanel_in) { public RecommendationsForm(DataSet<?, MessageRecommendation> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<MessageRecommendation>("текст") {
@Override
public Object getFieldAt(MessageRecommendation object) {
return object.text;
}
@Override
public Class getRendererClass() {
return RendererWrapText.class;
}
@Override
public int getMinWidth() {
return 700;
}
}
);
getColumnInfo(0).setVisible(false);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{"текст"};
}
@Override
public Object getFieldAt(MessageRecommendation object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.text;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(1).setMinWidth(700);
columns.get(1).setRendererClass(RendererWrapText.class);
}
@Override
protected void createFilters() { protected void createFilters() {
AddFilter(new HeaderTextFilter(dataSource, 1, 72)); AddFilter(new HeaderTextFilter(dataSource, 1, 72));
} }

View File

@@ -1,6 +1,10 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI; package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.CommonConstants;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.DBObjectSelectionRenderer;
import Common.Visual.Tables.DBObjectSelector;
import Common.Visual.Tables.RendererHiddenList; import Common.Visual.Tables.RendererHiddenList;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.GlobalData.Settings.SettingName;
@@ -21,31 +25,85 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
//-- //--
public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) { public ProjectArraysForm(DataSet<?, ProjectArray> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
//-- new ColumnInfo<ProjectArray>("Имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(ProjectArray object) {
return new String[]{ return object.GetShortNameWithDim();
"Имя", }
"Область описания", },
"Файлы объявления", new ColumnInfo<ProjectArray>("Область описания") {
"Размерность", @Override
"Размер элемента(байт)", public Object getFieldAt(ProjectArray object) {
"Область распараллеливания" return object.locName + " : " + object.location;
}
},
new ColumnInfo<ProjectArray>("Файлы объявления") {
@Override
public Object getFieldAt(ProjectArray object) {
return object.GetDeclPlacesList();
}
@Override
public Class getRendererClass() {
//todo все настройки переделать в проперти(?)
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? RendererHyperlinks.class : RendererHiddenList.class;
}
@Override
public Class getEditorClass() {
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? EditorFilesHyperlinks.class : null;
}
@Override
public int getMaxWidth() {
return (Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean() ? CommonConstants.Nan : 200;
}
},
new ColumnInfo<ProjectArray>("Размерность") {
@Override
public Object getFieldAt(ProjectArray object) {
return object.dimSize;
}
},
new ColumnInfo<ProjectArray>("Размер элемента(байт)") {
@Override
public Object getFieldAt(ProjectArray object) {
return object.typeSize;
}
},
new ColumnInfo<ProjectArray>("Область распараллеливания") {
@Override
public Object getFieldAt(ProjectArray object) {
return object.GetRegionsText();
}
}
);
getColumnInfo(0).setVisible(false);
}
@Override
protected ColumnInfo<ProjectArray> createCheckBoxColummn() {
return new ColumnInfo<ProjectArray>("") {
@Override
public Object getFieldAt(ProjectArray object) {
return object.State;
}
@Override
public int getMinWidth() {
return 25;
}
@Override
public int getMaxWidth() {
return 25;
}
@Override
public Class getRendererClass() {
return DBObjectSelectionRenderer.class;
}
@Override
public Class getEditorClass() {
return DBObjectSelector.class;
}
}; };
} }
@Override @Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if ((Global.mainModule.getDb()).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRendererClass(RendererHyperlinks.class);
columns.get(4).setEditorClass(EditorFilesHyperlinks.class);
} else {
columns.get(4).setRendererClass(RendererHiddenList.class);
columns.get(4).setMaxWidth(200);
}
}
@Override
public boolean isObjectVisible(ProjectArray object) { public boolean isObjectVisible(ProjectArray object) {
if (super.isObjectVisible(object)) { if (super.isObjectVisible(object)) {
if (object.isTemplFlag > 0) return true; if (object.isTemplFlag > 0) return true;
@@ -58,27 +116,6 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
return false; return false;
} }
@Override @Override
public Object getFieldAt(ProjectArray object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.State;
case 2:
return object.GetShortNameWithDim();
case 3:
return object.locName + " : " + object.location;
case 4:
return object.GetDeclPlacesList();
case 5:
return object.dimSize;
case 6:
return object.typeSize;
case 7:
return object.GetRegionsText();
default:
return null;
}
}
@Override
public void SelectAll(boolean flag) { public void SelectAll(boolean flag) {
Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag, Global.mainModule.getPass(PassCode.MassSelectArrays).Do(flag,
new Vector(Global.mainModule.getProject().declaratedArrays.Data.values())); new Vector(Global.mainModule.getProject().declaratedArrays.Data.values()));

View File

@@ -1,6 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Regions.UI; package _VisualDVM.ProjectData.SapforData.Regions.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft; import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -9,48 +10,77 @@ import javax.swing.*;
public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> { public class ParallelRegionsForm extends DataSetControlForm<ParallelRegion> {
public ParallelRegionsForm(DataSet<?, ParallelRegion> dataSource_in, JPanel mountPanel_in) { public ParallelRegionsForm(DataSet<?, ParallelRegion> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<ParallelRegion>("Имя") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.originalName;
}
},
new ColumnInfo<ParallelRegion>("Строк кода") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.lines_count;
}
@Override
public Class getRendererClass() {
return RendererTopLeft.class;
}
},
new ColumnInfo<ParallelRegion>("Массивов") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.arrays_count;
}
@Override
public Class getRendererClass() {
return RendererTopLeft.class;
}
},
new ColumnInfo<ParallelRegion>("Циклов") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.loops_count;
}
@Override
public Class getRendererClass() {
return RendererTopLeft.class;
}
},
new ColumnInfo<ParallelRegion>("Объявлений процедур") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.fd_count;
}
@Override
public Class getRendererClass() {
return RendererTopLeft.class;
}
},
new ColumnInfo<ParallelRegion>("Вызовов процедур") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.fc_count;
}
@Override
public Class getRendererClass() {
return RendererTopLeft.class;
}
},
new ColumnInfo<ParallelRegion>("Фрагменты") {
@Override
public Object getFieldAt(ParallelRegion object) {
return object.fragments;
}
@Override
public Class getRendererClass() {
return RendererMultiline.class;
}
}
);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override
public String[] getUIColumnNames() {
return new String[]{
"Имя",
"Строк кода",
"Массивов",
"Циклов",
"Объявлений процедур",
"Вызовов процедур",
"Фрагменты"};
}
@Override
public Object getFieldAt(ParallelRegion object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.originalName;
case 2:
return object.lines_count;
case 3:
return object.arrays_count;
case 4:
return object.loops_count;
case 5:
return object.fd_count;
case 6:
return object.fc_count;
case 7:
return object.fragments;
default:
return null;
}
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
for (int i = 1; i < 7; ++i)
columns.get(i).setRendererClass(RendererTopLeft.class);
columns.get(7).setRendererClass(RendererMultiline.class);
}
} }

View File

@@ -2,6 +2,7 @@ package _VisualDVM.ProjectData.SapforData.Variants.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMaskedNanInteger; import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
@@ -12,62 +13,125 @@ import javax.swing.*;
public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> { public class ParallelVariantsForm extends DataSetControlForm<ParallelVariant> {
public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) { public ParallelVariantsForm(DataSet<?, ParallelVariant> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<ParallelVariant>("Распределение") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(ParallelVariant object) {
return new String[]{
"Распределение",
"PARALLEL",
"REMOTE",
"REDISTRIBUTE",
"INTERVALS",
"PS.REMOTE",
"PS.SHADOW",
"PS.REDUCTION",
"PS.ACROSS",
"Оценка",
"Дата оценки",
"Версия"};
}
@Override
public Object getFieldAt(ParallelVariant object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.templates_description; return object.templates_description;
case 3:
return object.stats.ParallelCount;
case 4:
return object.stats.RemoteCount;
case 5:
return object.stats.RedistributeCount;
case 6:
return object.stats.IntervalCount;
case 7:
return object.stats.PS_RemoteCount;
case 8:
return object.stats.PS_ShadowCount;
case 9:
return object.stats.PS_ReductionCount;
case 10:
return object.stats.PS_AcrossCount;
case 11:
return object.stats.Rank;
case 12:
return object.stats.getPredictionDate();
case 13:
return object.stats.last_version;
default:
return null;
}
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(0).setVisible(false); return RendererMultiline.class;
columns.get(2).setRendererClass(RendererMultiline.class); }
for (int i = 3; i < columns.size() - 3; ++i) },
columns.get(i).setRendererClass(RendererMaskedNanInteger.class); new ColumnInfo<ParallelVariant>("PARALLEL") {
columns.get(columns.size() - 3).setRendererClass(RendererVariantRank.class); @Override
columns.get(columns.size() - 2).setRendererClass(RendererDate.class); public Object getFieldAt(ParallelVariant object) {
return object.stats.ParallelCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("REMOTE") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.RemoteCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("REDISTRIBUTE") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.RedistributeCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("INTERVALS") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.IntervalCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("PS.REMOTE") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.PS_RemoteCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("PS.SHADOW") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.PS_ShadowCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("PS.REDUCTION") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.PS_ReductionCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("PS.ACROSS") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.PS_AcrossCount;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<ParallelVariant>("Оценка") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.Rank;
}
@Override
public Class getRendererClass() {
return RendererVariantRank.class;
}
},
new ColumnInfo<ParallelVariant>("Дата оценки") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.getPredictionDate();
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<ParallelVariant>("Версия") {
@Override
public Object getFieldAt(ParallelVariant object) {
return object.stats.last_version;
}
}
);
getColumnInfo(0).setVisible(false);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.BugReport.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
@@ -27,24 +28,81 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
//- //-
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) { public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<BugReport>("Описание") {
@Override
public Object getFieldAt(BugReport object) {
return object.getDescriptionHeader();
}
@Override
public int getMaxWidth() {
return 600;
}
},
new ColumnInfo<BugReport>("Отправитель") {
@Override
public Object getFieldAt(BugReport object) {
return object.sender_name;
}
},
new ColumnInfo<BugReport>("Исполнитель") {
@Override
public Object getFieldAt(BugReport object) {
return object.executor;
}
},
new ColumnInfo<BugReport>("Проект") {
@Override
public Object getFieldAt(BugReport object) {
return object.project_version;
}
},
new ColumnInfo<BugReport>("Завершенность") {
@Override
public Object getFieldAt(BugReport object) {
return object.percentage;
}
@Override
public Class getRendererClass() {
return RendererProgressBar.class;
}
},
new ColumnInfo<BugReport>("Дата создания") {
@Override
public Object getFieldAt(BugReport object) {
return object.getDate();
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<BugReport>("Дата изменения") {
@Override
public Object getFieldAt(BugReport object) {
return object.getChangeDate();
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<BugReport>("Статус") {
@Override
public Object getFieldAt(BugReport object) {
return object.state;
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
}
);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
//--
@Override
public String[] getUIColumnNames() {
return new String[]{
"Описание",
"Отправитель",
"Исполнитель",
"Проект",
"Завершенность",
"Дата создания",
"Дата изменения",
"Статус"};
}
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {
super.ShowCurrentObject(); super.ShowCurrentObject();
@@ -56,14 +114,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport(); Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowNoCurrentBugReport();
} }
@Override @Override
protected void AdditionalInitColumns() {
columns.get(1).setMaxWidth(600);
columns.get(5).setRendererClass(RendererProgressBar.class);
columns.get(6).setRendererClass(RendererDate.class);
columns.get(7).setRendererClass(RendererDate.class);
columns.get(8).setRendererClass(RendererStatusEnum.class);
}
@Override
protected void MouseAction2() throws Exception { protected void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do(); Global.mainModule.getPass(PassCode.OpenBugReportTestProject).Do();
} }
@@ -116,27 +166,4 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
) )
); );
} }
@Override
public Object getFieldAt(BugReport object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.getDescriptionHeader();
case 2:
return object.sender_name;
case 3:
return object.executor;
case 4:
return object.project_version;
case 5:
return object.percentage;
case 6:
return object.getDate();
case 7:
return object.getChangeDate();
case 8:
return object.state;
default:
return null;
}
}
} }

View File

@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu; import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMaskedNanInteger; import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -16,39 +17,50 @@ import java.util.Vector;
public class ComponentsForm extends DataSetControlForm<Component> { public class ComponentsForm extends DataSetControlForm<Component> {
public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) { public ComponentsForm(DataSet<?, Component> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Component>("Компонент") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Component object) {
return new String[]{
"Компонент",
"Текущая версия",
"Актуальная версия",
"Дата сборки",
"Статус"};
}
@Override
public Object getFieldAt(Component object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.getComponentType().getDescription(); return object.getComponentType().getDescription();
case 3:
return object.version;
case 4:
return object.actual_version;
case 5:
return object.date_text;
case 6:
return object.getState();
default:
return null;
} }
},
new ColumnInfo<Component>("Текущая версия") {
@Override
public Object getFieldAt(Component object) {
return object.version;
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(0).setVisible(false); return RendererMaskedNanInteger.class;
columns.get(3).setRendererClass(RendererMaskedNanInteger.class); }
columns.get(4).setRendererClass(RendererMaskedNanInteger.class); },
columns.get(6).setRendererClass(RendererStatusEnum.class); new ColumnInfo<Component>("Актуальная версия") {
@Override
public Object getFieldAt(Component object) {
return object.actual_version;
}
@Override
public Class getRendererClass() {
return RendererMaskedNanInteger.class;
}
},
new ColumnInfo<Component>("Дата сборки") {
@Override
public Object getFieldAt(Component object) {
return object.date_text;
}
},
new ColumnInfo<Component>("Статус") {
@Override
public Object getFieldAt(Component object) {
return object.getState();
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.SubscriberWorkspace.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
@@ -11,31 +12,33 @@ import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> { public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {
public SubscriberWorkspacesForm(DataSet<?, SubscriberWorkspace> dataSource_in, JPanel mountPanel_in) { public SubscriberWorkspacesForm(DataSet<?, SubscriberWorkspace> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
AddColumns(
new ColumnInfo<SubscriberWorkspace>("URL") {
@Override
public Object getFieldAt(SubscriberWorkspace object) {
return object.URL;
}
},
new ColumnInfo<SubscriberWorkspace>("пользователь") {
@Override
public Object getFieldAt(SubscriberWorkspace object) {
return object.login;
}
},
new ColumnInfo<SubscriberWorkspace>("папка") {
@Override
public Object getFieldAt(SubscriberWorkspace object) {
return object.path;
}
}
);
getColumnInfo(0).setVisible(false);
} }
@Override @Override
protected boolean hasCheckBox() { protected boolean hasCheckBox() {
return false; return false;
} }
@Override @Override
public String[] getUIColumnNames() {
return new String[]{
"URL",
"пользователь",
"папка"};
}
@Override
public Object getFieldAt(SubscriberWorkspace object, int columnIndex) {
switch (columnIndex) {
case 1:
return object.URL;
case 2:
return object.login;
case 3:
return object.path;
}
return null;
}
@Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace); return new DataMenuBar(dataSource.getPluralDescription(), PassCode.DeleteSubscriberWorkspace);
} }

View File

@@ -2,6 +2,7 @@ package _VisualDVM.Repository.Subscribes.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -13,33 +14,51 @@ import javax.swing.*;
public class SubsribersForm extends DataSetControlForm<Subscriber> { public class SubsribersForm extends DataSetControlForm<Subscriber> {
public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) { public SubsribersForm(DataSet<?, Subscriber> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Subscriber>("Имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Subscriber object) {
return new String[]{
"Имя",
"Роль",
"Рассылка"};
}
@Override
public Object getFieldAt(Subscriber object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.name; return object.name;
case 3: }
@Override
public boolean isVisible() {
return Global.componentsServer.db.bugReports.getUI().getCurrent() != null;
}
},
new ColumnInfo<Subscriber>("Роль") {
@Override
public Object getFieldAt(Subscriber object) {
return object.role.getDescription(); return object.role.getDescription();
case 4: }
@Override
public boolean isVisible() {
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
}
},
new ColumnInfo<Subscriber>("Рассылка") {
@Override
public Object getFieldAt(Subscriber object) {
return (object.mailOn == 0) ? "выключена" : "включена"; return (object.mailOn == 0) ? "выключена" : "включена";
} }
return object.name; @Override
public boolean isVisible() {
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
}
}
);
} }
@Override @Override
protected void AdditionalInitColumns() { protected ColumnInfo<Subscriber> createPKColumn() {
boolean admin = Global.mainModule.getAccount().role.equals(AccountRole.Admin); return new ColumnInfo<Subscriber>(dataSource.getPKName()) {
columns.get(0).setVisible(admin); @Override
columns.get(1).setVisible(Global.componentsServer.db.bugReports.getUI().getCurrent() != null); public Object getFieldAt(Subscriber object) {
columns.get(3).setVisible(admin); return object.getPK();
columns.get(4).setVisible(admin); }
@Override
public boolean isVisible() {
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
}
};
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -7,6 +7,7 @@ import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag; import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag; import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -19,30 +20,32 @@ public class GroupsForm extends DataSetControlForm<Group> {
public static boolean filterMyOnly = false; public static boolean filterMyOnly = false;
public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) { public GroupsForm(DataSet<?, Group> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Group>("имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Group object) {
return new String[]{
"имя",
"автор",
"тип",
"язык"
};
}
@Override
public Object getFieldAt(Group object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3:
return object.sender_name;
case 4:
return object.type.getDescription();
case 5:
return object.language.getDescription();
default:
return null;
} }
},
new ColumnInfo<Group>("автор") {
@Override
public Object getFieldAt(Group object) {
return object.sender_name;
}
},
new ColumnInfo<Group>("тип") {
@Override
public Object getFieldAt(Group object) {
return object.type.getDescription();
}
},
new ColumnInfo<Group>("язык") {
@Override
public Object getFieldAt(Group object) {
return object.language.getDescription();
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.Common.Test.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -12,33 +13,32 @@ import javax.swing.*;
public class TestsForm extends DataSetControlForm<Test> { public class TestsForm extends DataSetControlForm<Test> {
public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) { public TestsForm(DataSet<?, Test> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<Test>("имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(Test object) {
return new String[]{
"имя",
"min_dim",
"max_dim",
"файлы"
};
}
@Override
public Object getFieldAt(Test object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3:
return object.min_dim;
case 4:
return object.max_dim;
case 5:
return object.getFilesForTable();
default:
return null;
}
} }
},
new ColumnInfo<Test>("min_dim") {
@Override @Override
protected void AdditionalInitColumns() { public Object getFieldAt(Test object) {
return object.min_dim;
}
},
new ColumnInfo<Test>("max_dim") {
@Override
public Object getFieldAt(Test object) {
return object.max_dim;
}
},
new ColumnInfo<Test>("файлы") {
@Override
public Object getFieldAt(Test object) {
return object.getFilesForTable();
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -14,48 +15,64 @@ import javax.swing.*;
public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> { public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) { public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<DVMConfiguration>("имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(DVMConfiguration object) {
return new String[]{
"имя",
"автор",
"ядра",
"параметры",
"группы",
"тестов",
"компиляция(с)",
"запуск(с)"
};
}
@Override
public Object getFieldAt(DVMConfiguration object, int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3:
return object.sender_name;
case 4:
return object.kernels;
case 5:
return cache.settingsSummary;
case 6:
return cache.groupsSummary;
case 7:
return cache.getTestsCount();
case 8:
return object.c_maxtime;
case 9:
return object.maxtime;
default:
return null;
} }
},
new ColumnInfo<DVMConfiguration>("автор") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return object.sender_name;
}
},
new ColumnInfo<DVMConfiguration>("ядра") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return object.kernels;
}
},
new ColumnInfo<DVMConfiguration>("параметры") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).settingsSummary;
}
},
new ColumnInfo<DVMConfiguration>("группы") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).groupsSummary;
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(6).setRendererClass(RendererMultiline.class); return RendererMultiline.class;
columns.get(6).setMaxWidth(500); }
@Override
public int getMaxWidth() {
return 700;
}
},
new ColumnInfo<DVMConfiguration>("тестов") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
}
},
new ColumnInfo<DVMConfiguration>("компиляция(с)") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return object.c_maxtime;
}
},
new ColumnInfo<DVMConfiguration>("запуск(с)") {
@Override
public Object getFieldAt(DVMConfiguration object) {
return object.maxtime;
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -4,10 +4,7 @@ import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag; import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.*;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -20,60 +17,94 @@ import java.util.Date;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> { public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) { public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<DVMPackage>("Автор") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(DVMPackage object) {
return new String[]{
"Автор",
"Машина",
"Пользователь",
"DVM",
"Конфигурации",
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
};
}
@Override
public Object getFieldAt(DVMPackage object, int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.sender_name; return object.sender_name;
case 3:
return object.machine_address + ":" + object.machine_port;
case 4:
return object.user_name;
case 5:
return object.version;
case 6:
return cache.getConfigurationsDescriptions();
case 7:
return object.tasksCount;
case 8:
return object.kernels;
case 9:
return object.progress;
case 10:
return new Date(object.StartDate);
case 11:
return new Date(object.ChangeDate);
case 12:
return object.state;
default:
return null;
} }
},
new ColumnInfo<DVMPackage>("Машина") {
@Override
public Object getFieldAt(DVMPackage object) {
return object.machine_address + ":" + object.machine_port;
}
},
new ColumnInfo<DVMPackage>("Пользователь") {
@Override
public Object getFieldAt(DVMPackage object) {
return object.user_name;
}
},
new ColumnInfo<DVMPackage>("DVM") {
@Override
public Object getFieldAt(DVMPackage object) {
return object.version;
}
},
new ColumnInfo<DVMPackage>("Конфигурации") {
@Override
public Object getFieldAt(DVMPackage object) {
return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(6).setRendererClass(RendererMultiline.class); return RendererMultiline.class;
columns.get(9).setRendererClass(RendererProgressBar.class); }
columns.get(10).setRendererClass(RendererDate.class); },
columns.get(11).setRendererClass(RendererDate.class); new ColumnInfo<DVMPackage>("Задач") {
columns.get(12).setRendererClass(RendererStatusEnum.class); @Override
public Object getFieldAt(DVMPackage object) {
return object.tasksCount;
}
},
new ColumnInfo<DVMPackage>("Ядер") {
@Override
public Object getFieldAt(DVMPackage object) {
return object.kernels;
}
},
new ColumnInfo<DVMPackage>("Прогресс") {
@Override
public Object getFieldAt(DVMPackage object) {
return object.progress;
}
@Override
public Class getRendererClass() {
return RendererProgressBar.class;
}
},
new ColumnInfo<DVMPackage>("Начало") {
@Override
public Object getFieldAt(DVMPackage object) {
return new Date(object.StartDate);
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<DVMPackage>("Изменено") {
@Override
public Object getFieldAt(DVMPackage object) {
return new Date(object.ChangeDate);
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<DVMPackage>("Статус") {
@Override
public Object getFieldAt(DVMPackage object) {
return object.state;
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
}
);
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -11,45 +12,62 @@ import javax.swing.*;
public class DVMSettingsForm extends DataSetControlForm<DVMSettings> { public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) { public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<DVMSettings>("имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(DVMSettings object) {
return new String[]{
"имя",
"автор",
"флаги",
"окружение",
"usr.par",
"куб",
"max",
"min dim",
"max dim"
};
}
@Override
public Object getFieldAt(DVMSettings object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3:
return object.sender_name;
case 4:
return object.flags;
case 5:
return object.environments;
case 6:
return object.printUsrPar();
case 7:
return object.cube;
case 8:
return object.max_proc_count;
case 9:
return object.min_dim_proc_count;
case 10:
return object.max_dim_proc_count;
default:
return null;
} }
},
new ColumnInfo<DVMSettings>("автор") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.sender_name;
}
},
new ColumnInfo<DVMSettings>("флаги") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.flags;
}
},
new ColumnInfo<DVMSettings>("окружение") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.environments;
}
},
new ColumnInfo<DVMSettings>("usr.par") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.printUsrPar();
}
},
new ColumnInfo<DVMSettings>("куб") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.cube;
}
},
new ColumnInfo<DVMSettings>("max") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.max_proc_count;
}
},
new ColumnInfo<DVMSettings>("min dim") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.min_dim_proc_count;
}
},
new ColumnInfo<DVMSettings>("max dim") {
@Override
public Object getFieldAt(DVMSettings object) {
return object.max_dim_proc_count;
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -5,6 +5,7 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu; import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterMenuFlag; import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererProgressBar; import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.GlobalData.Tasks.TaskState;
@@ -16,60 +17,92 @@ import java.util.Comparator;
public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> { public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) { public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<DVMRunTask>("Тест") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(DVMRunTask object) {
return new String[]{
"Тест",
"Язык",
"Флаги",
"Компиляция",
"Запуск",
"Матрица",
"Окружение",
"usr.par",
"Время компиляции (с)",
"Время запуска (с)",
"Чистое время (с)",
"Прогресс",
};
}
@Override
public Object getFieldAt(DVMRunTask object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.test_description; return object.test_description;
case 3:
return object.language;
case 4:
return object.flags;
case 5:
return object.compilation_state;
case 6:
return object.state;
case 7:
return object.matrix;
case 8:
return object.getEnvironments();
case 9:
return object.getUsrPar();
case 10:
return object.compilation_time;
case 11:
return object.Time;
case 12:
return object.CleanTime;
case 13:
return object.progress;
default:
return null;
} }
},
new ColumnInfo<DVMRunTask>("Язык") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.language;
}
},
new ColumnInfo<DVMRunTask>("Флаги") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.flags;
}
},
new ColumnInfo<DVMRunTask>("Компиляция") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.compilation_state;
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(5).setRendererClass(RendererStatusEnum.class); return RendererStatusEnum.class;
columns.get(6).setRendererClass(RendererStatusEnum.class); }
columns.get(13).setRendererClass(RendererProgressBar.class); },
new ColumnInfo<DVMRunTask>("Запуск") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.state;
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
},
new ColumnInfo<DVMRunTask>("Матрица") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.matrix;
}
},
new ColumnInfo<DVMRunTask>("Окружение") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.getEnvironments();
}
},
new ColumnInfo<DVMRunTask>("usr.par") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.getUsrPar();
}
},
new ColumnInfo<DVMRunTask>("Время компиляции (с)") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.compilation_time;
}
},
new ColumnInfo<DVMRunTask>("Время запуска (с)") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.Time;
}
},
new ColumnInfo<DVMRunTask>("Чистое время (с)") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.CleanTime;
}
},
new ColumnInfo<DVMRunTask>("Прогресс") {
@Override
public Object getFieldAt(DVMRunTask object) {
return object.progress;
}
@Override
public Class getRendererClass() {
return RendererProgressBar.class;
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMultiline; import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -15,50 +16,78 @@ import javax.swing.*;
public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> { public class SapforConfigurationsForm extends DataSetControlForm<SapforConfiguration> {
public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) { public SapforConfigurationsForm(DataSet<?, SapforConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<SapforConfiguration>("имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(SapforConfiguration object) {
return new String[]{
"имя",
"автор",
"",
"ядра",
"параметры",
"группы",
"тестов"
};
}
@Override
public Object getFieldAt(SapforConfiguration object, int columnIndex) {
ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.description; 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;
} }
},
new ColumnInfo<SapforConfiguration>("автор") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return object.sender_name;
}
},
new ColumnInfo<SapforConfiguration>("") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return object.printAuto();
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(4).setRendererClass(RendererConfigurationAuto.class); return RendererConfigurationAuto.class;
columns.get(4).setEditorClass(SwitcherConfigurationAuto.class); }
columns.get(4).setMinWidth(25); @Override
columns.get(4).setMaxWidth(25); public Class getEditorClass() {
columns.get(6).setMaxWidth(500); return SwitcherConfigurationAuto.class;
columns.get(7).setRendererClass(RendererMultiline.class); }
columns.get(7).setMaxWidth(500); @Override
public int getMinWidth() {
return 25;
}
@Override
public int getMaxWidth() {
return 25;
}
},
new ColumnInfo<SapforConfiguration>("ядра") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return object.kernels;
}
},
new ColumnInfo<SapforConfiguration>("параметры") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).settingsSummary;
}
@Override
public int getMaxWidth() {
return 500;
}
},
new ColumnInfo<SapforConfiguration>("группы") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).groupsSummary;
}
@Override
public int getMaxWidth() {
return 500;
}
@Override
public Class getRendererClass() {
return RendererMultiline.class;
}
},
new ColumnInfo<SapforConfiguration>("тестов") {
@Override
public Object getFieldAt(SapforConfiguration object) {
return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -4,10 +4,7 @@ import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag; import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.*;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.PackageCache;
@@ -20,54 +17,82 @@ import java.util.Date;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> { public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) { public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<SapforPackage>("Автор") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(SapforPackage object) {
return new String[]{
"Автор",
"SAPFOR",
"Конфигурации",
"Задач",
"Ядер",
"Прогресс",
"Начало",
"Изменено",
"Статус"
};
}
@Override
public Object getFieldAt(SapforPackage object, int columnIndex) {
PackageCache cache = (PackageCache) VisualCaches.GetCache(object);
switch (columnIndex) {
case 2:
return object.sender_name; 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;
} }
},
new ColumnInfo<SapforPackage>("SAPFOR") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.version;
}
},
new ColumnInfo<SapforPackage>("Конфигурации") {
@Override
public Object getFieldAt(SapforPackage object) {
return ((PackageCache) VisualCaches.GetCache(object)).getConfigurationsDescriptions();
} }
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(4).setRendererClass(RendererMultiline.class); return RendererMultiline.class;
columns.get(7).setRendererClass(RendererProgressBar.class); }
columns.get(8).setRendererClass(RendererDate.class); },
columns.get(9).setRendererClass(RendererDate.class); new ColumnInfo<SapforPackage>("Задач") {
columns.get(10).setRendererClass(RendererStatusEnum.class); @Override
public Object getFieldAt(SapforPackage object) {
return object.tasksCount;
}
},
new ColumnInfo<SapforPackage>("Ядер") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.kernels;
}
},
new ColumnInfo<SapforPackage>("Прогресс") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.progress;
}
@Override
public Class getRendererClass() {
return RendererProgressBar.class;
}
},
new ColumnInfo<SapforPackage>("Начало") {
@Override
public Object getFieldAt(SapforPackage object) {
return new Date(object.StartDate);
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<SapforPackage>("Изменено") {
@Override
public Object getFieldAt(SapforPackage object) {
return new Date(object.ChangeDate);
}
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<SapforPackage>("Статус") {
@Override
public Object getFieldAt(SapforPackage object) {
return object.state;
}
@Override
public Class getRendererClass() {
return RendererStatusEnum.class;
}
}
);
} }
@Override @Override
protected void MouseAction2() throws Exception { protected void MouseAction2() throws Exception {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
@@ -10,27 +11,26 @@ import javax.swing.*;
public class SapforSettingsForm extends DataSetControlForm<SapforSettings> { public class SapforSettingsForm extends DataSetControlForm<SapforSettings> {
public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) { public SapforSettingsForm(DataSet<?, SapforSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<SapforSettings>("имя") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(SapforSettings object) {
return new String[]{
"имя",
"автор",
"флаги"
};
}
@Override
public Object getFieldAt(SapforSettings object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.description; return object.description;
case 3:
return object.sender_name;
case 4:
return object.flags;
default:
return null;
} }
},
new ColumnInfo<SapforSettings>("автор") {
@Override
public Object getFieldAt(SapforSettings object) {
return object.sender_name;
}
},
new ColumnInfo<SapforSettings>("флаги") {
@Override
public Object getFieldAt(SapforSettings object) {
return object.flags;
}
}
);
} }
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Windows.Dialog.DBObjectDialog; import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
@@ -12,22 +13,16 @@ import javax.swing.*;
public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> { public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSettingsCommand> {
public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) { public SapforSettingsCommandsForm(DataSet<?, SapforSettingsCommand> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<SapforSettingsCommand>("Проход") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(SapforSettingsCommand object) {
return new String[]{
"Проход"
};
}
@Override
public Object getFieldAt(SapforSettingsCommand object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.passCode.getDescription(); return object.passCode.getDescription();
default:
return null;
} }
} }
);
getColumnInfo(0).setVisible(false);
}
@Override @Override
public DataMenuBar createMenuBar() { public DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), return new DataMenuBar(dataSource.getPluralDescription(),

View File

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI;
import Common.Database.Tables.DataSet; import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm; import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar; import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate; import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum; import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Global; import _VisualDVM.Global;
@@ -13,34 +14,40 @@ import java.util.Comparator;
public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> { public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) { public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in); super(dataSource_in, mountPanel_in);
} AddColumns(
new ColumnInfo<ServerSapfor>("версия") {
@Override @Override
public String[] getUIColumnNames() { public Object getFieldAt(ServerSapfor object) {
return new String[]{
"версия",
"автор",
"дата сборки",
"сборка"
};
}
@Override
public Object getFieldAt(ServerSapfor object, int columnIndex) {
switch (columnIndex) {
case 2:
return object.version; return object.version;
case 3: }
},
new ColumnInfo<ServerSapfor>("автор") {
@Override
public Object getFieldAt(ServerSapfor object) {
return object.sender_name; return object.sender_name;
case 4: }
},
new ColumnInfo<ServerSapfor>("дата сборки") {
@Override
public Object getFieldAt(ServerSapfor object) {
return object.getBuildDate(); return object.getBuildDate();
case 5: }
@Override
public Class getRendererClass() {
return RendererDate.class;
}
},
new ColumnInfo<ServerSapfor>("сборка") {
@Override
public Object getFieldAt(ServerSapfor object) {
return object.state; return object.state;
} }
return null;
}
@Override @Override
protected void AdditionalInitColumns() { public Class getRendererClass() {
columns.get(4).setRendererClass(RendererDate.class); return RendererStatusEnum.class;
columns.get(5).setRendererClass(RendererStatusEnum.class); }
}
);
} }
@Override @Override
protected void ShowCurrentObject() throws Exception { protected void ShowCurrentObject() throws Exception {