M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-20 17:44:30 +03:00
parent 3f42f61c76
commit a042f24833
59 changed files with 34 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Database/Objects/DBObject.java
View File

@@ -60,7 +60,7 @@ public abstract class DBObject implements Selectable, Serializable {
selected = src.selected;
}
//---------для отображения.
public Object getFieldAt(int coulmnIndex){
public Object getFieldAt(int coulmnIndex) {
return null;
}
}

2
src/Common/Database/Tables/DataSet.java
View File

@@ -116,7 +116,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
}
//public Object getFieldAt(D object, int columnIndex) {
// return null;
// }
// }
public void clear() {
Data.clear();
}

13
src/Common/Visual/DataSetControlForm.java
View File

@@ -32,9 +32,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected boolean events_on = true;
protected String colNamesAndSizes = "";
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
public ColumnInfo getColumnInfo(int i) {
return columns.get(i);
}
protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>();
protected LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
//фильтры и подсчеты. todo слить с баром (?)
@@ -43,7 +40,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
Object savedCurrentKey = null;
Vector<Object> savedSelectedKeys = new Vector<>();
//--
public DataSetControlForm(DataSet<?,D> dataSource_in, JPanel mountPanel_in) {
public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
super(DataTable.class, mountPanel_in);
dataSource = dataSource_in;
createFilters();
@@ -70,6 +67,9 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
}
}
}
public ColumnInfo getColumnInfo(int i) {
return columns.get(i);
}
protected String[] getUIColumnNames() {
return new String[]{};
}
@@ -122,12 +122,12 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
} else {
Vector<Object> raw = new Vector<>();
for (Object object : dataSource.Data.values()) {
if (((DBObject)object).isVisible())
if (((DBObject) object).isVisible())
raw.add(object);
}
raw.sort(comparator);
for (Object object : raw)
res.add(((DBObject)object).getPK());
res.add(((DBObject) object).getPK());
}
return res;
}
@@ -365,7 +365,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
public int getRowCount() {
return control.getRowCount();
}
public void ShowCurrentObject() throws Exception {
if (dataSource instanceof DBTable) {
DBTable table = (DBTable) dataSource;

16
src/Common/Visual/Tables/HeaderTextFilter.java
View File

@@ -14,11 +14,11 @@ import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class HeaderTextFilter {
DataSet dataSet= null; //таблица к интерфейсу которой относится фильтр.
private String filterValue = "";
DataSet dataSet = null; //таблица к интерфейсу которой относится фильтр.
int columnIndex = CommonConstants.Nan; //номер столбца к которому привязан фильтр.
JTextField textField = null;
JPopupMenu popup = null;
private String filterValue = "";
//при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра.
public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in) {
dataSet = dataSet_in;
@@ -41,13 +41,13 @@ public class HeaderTextFilter {
@Override
public void insertUpdate(DocumentEvent e) {
setFilterValue(getText());
// dataSet.getUI().changeHeaderFilterValue(columnIndex, getText());
// dataSet.getUI().changeHeaderFilterValue(columnIndex, getText());
dataSet.getUI().Show();
}
@Override
public void removeUpdate(DocumentEvent e) {
setFilterValue(getText());
// dataSet.getUI().changeHeaderFilterValue(columnIndex, getText());
// dataSet.getUI().changeHeaderFilterValue(columnIndex, getText());
dataSet.getUI().Show();
}
@Override
@@ -71,7 +71,7 @@ public class HeaderTextFilter {
setFont(control.getTableHeader().getFont());
setBorder(new MatteBorder(0, 0, 1, 1, Color.DARK_GRAY));
setText(dataSet.getUI().getColumnInfo(columnIndex).getName() + " : " + getFilterValue());
// setText(dataSet.getUI().getColumnInfo(columnIndex).getName() + " : " + dataSet.getUI().getHeaderFilterValue(columnIndex));
// setText(dataSet.getUI().getColumnInfo(columnIndex).getName() + " : " + dataSet.getUI().getHeaderFilterValue(columnIndex));
}
});
//--
@@ -89,7 +89,7 @@ public class HeaderTextFilter {
popup.show(control.getTableHeader(), columnRectangle.x + 72, 0);
//-
textField.setText(getFilterValue());
// textField.setText(dataSet.getUI().getHeaderFilterValue(columnIndex).toString());
// textField.setText(dataSet.getUI().getHeaderFilterValue(columnIndex).toString());
textField.requestFocusInWindow();
textField.selectAll();
}
@@ -98,11 +98,11 @@ public class HeaderTextFilter {
});
}
public String getFilterValue() {
// System.out.println("get filter value ="+Utils_.Brackets(filterValue));
// System.out.println("get filter value ="+Utils_.Brackets(filterValue));
return filterValue;
}
public void setFilterValue(String filterValue_in) {
this.filterValue = filterValue_in;
System.out.println("set filter value ="+Utils_.Brackets(filterValue));
System.out.println("set filter value =" + Utils_.Brackets(filterValue));
}
}

1
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;

3
src/_VisualDVM/GlobalData/CompilerEnvironment/CompilerEnvironmentsSet.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.GlobalData.CompilerEnvironment;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueEditor;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentValueRenderer;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
import javax.swing.*;

3
src/_VisualDVM/GlobalData/CompilerOption/CompilerOptionsSet.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterNameRenderer;
import _VisualDVM.GlobalData.CompilerOption.UI.CompilerOptionParameterValueRenderer;
import javax.swing.*;
public class CompilerOptionsSet extends DataSet<String, CompilerOption> {

1
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;

1
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
View File

@@ -17,7 +17,6 @@ public class EnvironmentValue extends iDBObject {
public String toString() {
return name + "=" + Utils_.DQuotes(value);
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -3,7 +3,6 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;

1
src/_VisualDVM/GlobalData/FileObject/DirInfo.java
View File

@@ -20,7 +20,6 @@ public class DirInfo extends DBObject {
public File getFile() {
return dir;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererDate;
import _VisualDVM.GlobalData.FileObject.UI.DirInfosForm;
import javax.swing.*;

1
src/_VisualDVM/GlobalData/Machine/Machine.java
View File

@@ -63,7 +63,6 @@ public class Machine extends iDBObject {
"--help"
));
*/
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/Makefile/Makefile.java
View File

@@ -200,7 +200,6 @@ public class Makefile extends ModuleAnchestor {
}
}
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -6,7 +6,6 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Makefile.UI.MakefilesForm;

2
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -1,13 +1,11 @@
package _VisualDVM.GlobalData.Module;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
import _VisualDVM.GlobalData.Module.UI.ModulesForm;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class ModulesDBTable extends iDBTable<Module> {

1
src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -256,7 +256,6 @@ public class RunConfiguration extends iDBObject {
}
return res;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -7,7 +7,6 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;

1
src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
View File

@@ -8,7 +8,6 @@ public class SapforProfile extends iDBObject {
public String description = "";
@Description("DEFAULT 0")
public long creationDate = 0;
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java
View File

@@ -14,7 +14,6 @@ import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Date;
import java.util.LinkedHashMap;
public class SapforProfilesDBTable extends iDBTable<SapforProfile> {
public SapforProfilesDBTable() {

2
src/_VisualDVM/GlobalData/SapforProfileSetting/SapforProfileSetting.java
View File

@@ -17,7 +17,7 @@ public class SapforProfileSetting extends iDBObject {
return Global.mainModule.matchCurrentID(Current.SapforProfile, sapforprofile_id);
}
@Override
public Object getFieldAt( int columnIndex) {
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 1:
return name.getDescription();

1
src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTask.java
View File

@@ -113,7 +113,6 @@ public class CompilationTask extends Task {
return "compilation_task_id";
}
//-
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

1
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTask.java
View File

@@ -158,7 +158,6 @@ public class RunTask extends Task {
!config.getParList().isEmpty()
;
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

4
src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java
View File

@@ -2,11 +2,7 @@ package _VisualDVM.GlobalData.Tasks.RunTask;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.RunTask.UI.RunTasksForm;
import _VisualDVM.Passes.PassCode;

2
src/_VisualDVM/GlobalData/User/UsersDBTable.java
View File

@@ -6,8 +6,6 @@ import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;

2
src/_VisualDVM/Passes/All/AddBugReport.java
View File

@@ -7,8 +7,8 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Component.ComponentType;
import java.io.File;

2
src/_VisualDVM/Passes/All/PublishBugReport.java
View File

@@ -6,8 +6,8 @@ import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.EmailMessage;
import java.io.File;

2
src/_VisualDVM/Passes/All/SendBugReport.java
View File

@@ -2,8 +2,8 @@ package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
public class SendBugReport extends ComponentsRepositoryPass {

2
src/_VisualDVM/Passes/All/UpdateBugReportField.java
View File

@@ -5,8 +5,8 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

2
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -1,8 +1,6 @@
package _VisualDVM.ProjectData.DBArray;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.DBArray.UI.DBArraysForm;

1
src/_VisualDVM/ProjectData/DBArray/DBArray.java
View File

@@ -25,7 +25,6 @@ public class DBArray extends DBObject {
public ImageIcon GetSelectionIcon() {
return State.GetIcon();
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

4
src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java
View File

@@ -1,10 +1,6 @@
package _VisualDVM.ProjectData.Messages.Errors;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public ErrorsDBTable() {
super(MessageError.class);

5
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -2,12 +2,10 @@ package _VisualDVM.ProjectData.Messages;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Mode;
import _VisualDVM.ProjectData.SapforData.FileObject;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import java.util.HashMap;
import java.util.Map;
@@ -445,9 +443,6 @@ public class Message extends FileObject {
break;
}
}
@Override
public boolean isVisible() {
return true;

6
src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java
View File

@@ -1,13 +1,10 @@
package _VisualDVM.ProjectData.Messages;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
public class MessagesControlForm extends DataSetControlForm<Message> {
public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -22,7 +19,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getFile().form.getEditor().gotoLine(((Message)dataSource.getCurrent()).line);
Global.mainModule.getFile().form.getEditor().gotoLine(((Message) dataSource.getCurrent()).line);
}
@Override
protected void AdditionalInitColumns() {
@@ -41,7 +38,6 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
}
*/
@Override
public boolean hasMenuBar() {
return false;

6
src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java
View File

@@ -1,14 +1,8 @@
package _VisualDVM.ProjectData.Messages;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import java.util.Comparator;
//https://stackoverflow.com/questions/2026965/can-i-add-a-button-to-a-jtable-column-header
//https://stackoverflow.com/questions/7137786/how-can-i-put-a-control-in-the-jtableheader-of-a-jtable/29963916#29963916

4
src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java
View File

@@ -1,10 +1,6 @@
package _VisualDVM.ProjectData.Messages.Notes;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class NotesDBTable extends MessagesDBTable<MessageNote> {
public NotesDBTable() {
super(MessageNote.class);

1
src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.ProjectData.Messages.Recommendations;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;

1
src/_VisualDVM/ProjectData/Messages/Warnings/MessageWarning.java
View File

@@ -8,7 +8,6 @@ public class MessageWarning extends Message {
}
public MessageWarning() {
}
@Override
public boolean isVisible() {
return super.isVisible() && Global.mainModule.getProject().db.warnings.getUI().ApplyFilters(this);

11
src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java
View File

@@ -23,7 +23,7 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this,mountPanel){
return new MessagesControlForm(this, mountPanel) {
@Override
protected void createFilters() {
super.createFilters();
@@ -31,13 +31,14 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
}
@Override
public boolean ApplyFilters(DBObject object) {
if (super.ApplyFilters(object)){
System.out.println("apply warnings tet filter for message "+object.getPK());
Message message = (MessageWarning)object;
if (super.ApplyFilters(object)) {
System.out.println("apply warnings tet filter for message " + object.getPK());
Message message = (MessageWarning) object;
return message.value.contains(headersTextFilters.get(3).getFilterValue());
}
return false;
};
}
;
};
}
}

2
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -23,8 +23,8 @@ import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
import _VisualDVM.ProjectData.Messages.Recommendations.MessageRecommendation;
import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
import _VisualDVM.ProjectData.ProjectDatabase;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArraysSet;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArraysSet;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;

4
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegionsSet.java
View File

@@ -1,8 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererTopLeft;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionsForm;
@@ -27,6 +25,6 @@ public class ParallelRegionsSet extends DataSet<BigInteger, ParallelRegion> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ParallelRegionsForm(this, mountPanel) ;
return new ParallelRegionsForm(this, mountPanel);
}
}

1
src/_VisualDVM/Repository/BugReport/BugReport.java
View File

@@ -73,7 +73,6 @@ public class BugReport extends rDBObject {
public boolean isVisible() {
return BugReportInterface.isVisible(this);
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

8
src/_VisualDVM/Repository/Component/ComponentsSet.java
View File

@@ -1,15 +1,7 @@
package _VisualDVM.Repository.Component;
import Common.Database.Tables.DataSet;
import Common.MainModule_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import javax.swing.*;

1
src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspaceDBTable.java
View File

@@ -51,5 +51,4 @@ public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSubscriberWorkspace;
}
}

1
src/_VisualDVM/Repository/Subscribes/Subscriber.java
View File

@@ -36,7 +36,6 @@ public class Subscriber extends DBObject {
public Object getEmptyFK() {
return "";
}
@Override
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {

3
src/_VisualDVM/Repository/Subscribes/SubsribersDBTable.java
View File

@@ -6,11 +6,8 @@ import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Repository.Subscribes.UI.SubscriberFields;

1
src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java
View File

@@ -56,7 +56,6 @@ public class TestDBTable extends iDBTable<Test> {
}
};
}
@Override
public Current CurrentName() {
return Current.Test;

4
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -3,14 +3,10 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.DVMConfigurationsForm;

11
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -1,24 +1,13 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm;
import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;

1
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -28,7 +28,6 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
return "параметры тестирования";
}
//--
//-
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {

7
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -1,14 +1,7 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.Database.Tables.DataSet;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.UI.DVMRunTasksForm;

6
src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java
View File

@@ -3,17 +3,11 @@ import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Utils.Vector_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationFields;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI.SapforConfigurationsForm;
import _VisualDVM.Visual.Tables.RendererConfigurationAuto;
import _VisualDVM.Visual.Tables.SwitcherConfigurationAuto;
import javax.swing.*;
import java.util.Vector;

12
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java
View File

@@ -1,24 +1,13 @@
package _VisualDVM.TestingSystem.SAPFOR.SapforPackage;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Utils.Utils_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Tables.RendererProgressBar;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm;
import javax.swing.*;
import java.util.Comparator;
import java.util.Date;
public class SapforPackageDBTable extends iDBTable<SapforPackage> {
public static boolean filterMyOnly = false;
public static boolean filterActive = false;
@@ -41,7 +30,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new SapforPackagesForm(this, mountPanel);
}
@Override
public Comparator<SapforPackage> getComparator() {
return new Comparator<SapforPackage>() {

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java
View File

@@ -25,7 +25,6 @@ public class SapforSettingsCommandsDBTable extends iDBTable<SapforSettingsComman
public String getPluralDescription() {
return "команды";
}
@Override
public Current CurrentName() {
return Current.SapforSettingsCommand;

2
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapfor.java
View File

@@ -48,7 +48,7 @@ public class ServerSapfor extends riDBObject {
return Utils_.DQuotes(call_command) + " " + version_command;
}
@Override
public Object getFieldAt( int columnIndex) {
public Object getFieldAt(int columnIndex) {
switch (columnIndex) {
case 2:
return version;

5
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsDBTable.java
View File

@@ -2,11 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor;
import Common.Database.Tables.iDBTable;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererStatusEnum;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.UI.ServerSapforsForm;
@@ -28,7 +24,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
public Current CurrentName() {
return Current.ServerSapfor;
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new ServerSapforsForm(this, mountPanel);

2
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -8,8 +8,8 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Repository.BugReport.BugReportState;
import _VisualDVM.Repository.BugReport.UI.BugReportInterface;
import _VisualDVM.Visual.Editor.BaseEditor;
import _VisualDVM.Visual.Editor.Viewer;
import _VisualDVM.Visual.Interface.CallbackWindow;

2
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -339,7 +339,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
@Override
public void ShowFirstError() {
if (file.father.db.errors.getUI().getRowCount() > 0)
((DataTable)file.father.db.errors.getUI().getControl()).SelectRow(0);
((DataTable) file.father.db.errors.getUI().getControl()).SelectRow(0);
}
@Override
public void ShowCompilationOutput() {