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-17 22:41:43 +03:00
parent b871d2673b
commit afea3e0233
9 changed files with 127 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/workspace.xml generated
View File

@@ -7,15 +7,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.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/DataSetFiltersMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetFiltersMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnHeaderTextFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.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/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Errors/ErrorsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/MessagesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Notes/NotesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Warnings/WarningsDBTable.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

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

@@ -167,13 +167,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return Data.values().stream().filter(DBObject::isSelected).map(d -> (K) d.getPK()).collect(Collectors.toCollection(Vector::new));
}
//--
// применить значение фильтра к фильру объекта напирмер Message.filterValue = text;
public void changeColumnFilterValue(int columnIndex, String text) {
}
public Object getColumnFilterValue(int columnIndex) {
return "";
}
//--
public void ShowUI() {
if (ui != null) {
ui.Show();

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

@@ -297,6 +297,12 @@ public class DataSetControlForm extends ControlForm<DataTable> {
//могут быть и другие фильтры ( например свои/активные). перенести их сюда и обобщить
return applyFiltersMenus(object);
}
// применить значение фильтра к фильру объекта напирмер Message.filterValue = text;
public void changeHeaderFilterValue(int columnIndex, String text) {
}
public Object getHeaderFilterValue(int columnIndex) {
return "";
}
@Override
protected void redrawControl() {
control.CorrectSizes();

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

@@ -24,12 +24,12 @@ public class HeaderTextFilter {
getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
dataSet.changeColumnFilterValue(columnIndex, getText());
dataSet.getUI().changeHeaderFilterValue(columnIndex, getText());
dataSet.ShowUI();
}
@Override
public void removeUpdate(DocumentEvent e) {
dataSet.changeColumnFilterValue(columnIndex, getText());
dataSet.getUI().changeHeaderFilterValue(columnIndex, getText());
dataSet.ShowUI();
}
@Override
@@ -52,7 +52,7 @@ public class HeaderTextFilter {
setBackground(dataSet.getUI().getControl().getTableHeader().getBackground());
setFont(dataSet.getUI().getControl().getTableHeader().getFont());
setBorder(new MatteBorder(0, 0, 1, 1, Color.DARK_GRAY));
setText("текст : " + dataSet.getColumnFilterValue(columnIndex));
setText("текст : " + dataSet.getUI().getHeaderFilterValue(columnIndex));
}
});
//--
@@ -67,7 +67,7 @@ public class HeaderTextFilter {
popup.setPreferredSize(d);
popup.setMaximumSize(d);
popup.show(dataSet.getUI().getControl().getTableHeader(), columnRectangle.x + 72, 0);
textField.setText(dataSet.getColumnFilterValue(columnIndex).toString());
textField.setText(dataSet.getUI().getHeaderFilterValue(columnIndex).toString());
textField.requestFocusInWindow();
textField.selectAll();
}

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

@@ -1,6 +1,10 @@
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);
@@ -14,11 +18,18 @@ public class ErrorsDBTable extends MessagesDBTable<MessageError> {
public Current CurrentName() {
return Current.Errors;
}
public void changeColumnFilterValue(int columnIndex, String text) {
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel){
@Override
public void changeHeaderFilterValue(int columnIndex, String text) {
if (columnIndex == 3)
MessageError.filterValue = text;
}
public Object getColumnFilterValue(int columnIndex) {
@Override
public Object getHeaderFilterValue(int columnIndex) {
return MessageError.filterValue;
}
};
}
}

59
src/_VisualDVM/ProjectData/Messages/MessagesControlForm.java Normal file
View File

@@ -0,0 +1,59 @@
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 {
public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
public String[] getUIColumnNames() {
return new String[]{
"группа",
"строка",
"текст"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getFile().form.getEditor().gotoLine(((Message)dataSource.getCurrent()).line);
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setMinWidth(700);
columns.get(3).setRendererClass(RendererWrapText.class);
}
@Override
public void MouseAction2() throws Exception {
ShowCurrentObject();
}
@Override
protected void createControl() {
super.createControl();
headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
control.setRowSorter(null);
TableRowSorter<TableModel> sorter = new TableRowSorter<>(control.getModel());
sorter.setSortable(3, false);
control.setRowSorter(sorter);
/*
List<RowSorter.SortKey> sortKeys = new ArrayList<>();
for (int i = 0; i < 6; ++i)
sorter.setSortable(i, false);
sortKeys.add(new RowSorter.SortKey(6, SortOrder.DESCENDING));
sortKeys.add(new RowSorter.SortKey(7, SortOrder.DESCENDING));
*/
// sorter.setSortKeys(sortKeys);
// sorter.sort();
}
@Override
public boolean hasMenuBar() {
return false;
}
}

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

@@ -18,56 +18,6 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
super(d_in);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
DataSet dataset = this;
return new DataSetControlForm(this, mountPanel) {
@Override
public String[] getUIColumnNames() {
return new String[]{
"группа",
"строка",
"текст"};
}
@Override
public void ShowCurrentObject() throws Exception {
super.ShowCurrentObject();
Global.mainModule.getFile().form.getEditor().gotoLine(getCurrent().line);
}
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
columns.get(3).setMinWidth(700);
columns.get(3).setRendererClass(RendererWrapText.class);
}
@Override
public void MouseAction2() throws Exception {
ShowCurrentObject();
}
@Override
protected void createControl() {
super.createControl();
headersTextFilters.put(3, new HeaderTextFilter(dataset, 3));
control.setRowSorter(null);
TableRowSorter<TableModel> sorter = new TableRowSorter<>(control.getModel());
sorter.setSortable(3, false);
control.setRowSorter(sorter);
/*
List<RowSorter.SortKey> sortKeys = new ArrayList<>();
for (int i = 0; i < 6; ++i)
sorter.setSortable(i, false);
sortKeys.add(new RowSorter.SortKey(6, SortOrder.DESCENDING));
sortKeys.add(new RowSorter.SortKey(7, SortOrder.DESCENDING));
*/
// sorter.setSortKeys(sortKeys);
// sorter.sort();
}
@Override
public boolean hasMenuBar() {
return false;
}
};
}
@Override
public Object getFieldAt(M object, int columnIndex) {
switch (columnIndex) {
case 1:

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

@@ -1,6 +1,10 @@
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);
@@ -14,11 +18,18 @@ public class NotesDBTable extends MessagesDBTable<MessageNote> {
public Current CurrentName() {
return Current.Notes;
}
public void changeColumnFilterValue(int columnIndex, String text) {
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel) {
@Override
public void changeHeaderFilterValue(int columnIndex, String text) {
if (columnIndex == 3)
MessageNote.filterValue = text;
}
public Object getColumnFilterValue(int columnIndex) {
@Override
public Object getHeaderFilterValue(int columnIndex) {
return MessageNote.filterValue;
}
};
}
}

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

@@ -1,6 +1,10 @@
package _VisualDVM.ProjectData.Messages.Warnings;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
import javax.swing.*;
public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
//https://stackoverflow.com/questions/13079777/editable-jtableheader
public WarningsDBTable() {
@@ -14,12 +18,18 @@ public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
public Current CurrentName() {
return Current.Warnings;
}
// применить значение фильтра к фильру объекта напирмер Message.filterValue = text;
public void changeColumnFilterValue(int columnIndex, String text) {
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel){
@Override
public void changeHeaderFilterValue(int columnIndex, String text) {
if (columnIndex == 3)
MessageWarning.filterValue = text;
}
public Object getColumnFilterValue(int columnIndex) {
@Override
public Object getHeaderFilterValue(int columnIndex) {
return MessageWarning.filterValue;
}
};
}
}