no message
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -8,13 +8,6 @@
|
|||||||
<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/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/FilterFlag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/FilterFlag.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/FilterFlagMenuItem.java" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Common/Visual/MenuButtonFilterFlag.java" beforeDir="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/DVM/DVMTasks/UI/DVMRunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.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" />
|
||||||
|
|||||||
@@ -2,7 +2,9 @@ package Common.Visual;
|
|||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
public interface DBObjectFilter_<D extends DBObject> {
|
public interface DBObjectFilter_<D extends DBObject> {
|
||||||
boolean Validate(D dbObject);
|
boolean Validate(D dbObject);
|
||||||
default void DropMatchesCount(){}
|
default void DropMatchesCount() {
|
||||||
default void ShowMatchesCount(){}
|
}
|
||||||
|
default void ShowMatchesCount() {
|
||||||
|
}
|
||||||
//-------
|
//-------
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import Common.Database.Tables.DataSet;
|
|||||||
import Common.Database.Tables.FKBehaviour;
|
import Common.Database.Tables.FKBehaviour;
|
||||||
import Common.MainModule_;
|
import Common.MainModule_;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.Controls.MenuBarButton;
|
|
||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import Common.Visual.Menus.TableMenu;
|
import Common.Visual.Menus.TableMenu;
|
||||||
import Common.Visual.Tables.*;
|
import Common.Visual.Tables.*;
|
||||||
@@ -34,19 +33,6 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
|
|||||||
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
|
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
|
||||||
//-
|
//-
|
||||||
protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
|
protected Vector<DBObjectFilter_<D>> allFilters = new Vector<>();
|
||||||
<M> Vector<M> getFilters(Class<M> f){
|
|
||||||
Vector<M> res = new Vector<>();
|
|
||||||
for (DBObjectFilter_ filter_: allFilters){
|
|
||||||
//либо М, либо наследует от М
|
|
||||||
if (filter_.getClass().equals(f)||filter_.getClass().getSuperclass().equals(f)){
|
|
||||||
res.add((M) filter_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
public void AddFilter(DBObjectFilter_<D> filter_in){
|
|
||||||
allFilters.add(filter_in);
|
|
||||||
}
|
|
||||||
//---
|
//---
|
||||||
//фильтры и подсчеты. todo слить с баром (?)
|
//фильтры и подсчеты. todo слить с баром (?)
|
||||||
MatchesCounter counter_ui = null;
|
MatchesCounter counter_ui = null;
|
||||||
@@ -87,6 +73,19 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
|
|||||||
}
|
}
|
||||||
System.out.println("found " + allFilters.size() + " filters for ui " + this.getClass().getSimpleName());
|
System.out.println("found " + allFilters.size() + " filters for ui " + this.getClass().getSimpleName());
|
||||||
}
|
}
|
||||||
|
<M> Vector<M> getFilters(Class<M> f) {
|
||||||
|
Vector<M> res = new Vector<>();
|
||||||
|
for (DBObjectFilter_ filter_ : allFilters) {
|
||||||
|
//либо М, либо наследует от М
|
||||||
|
if (filter_.getClass().equals(f) || filter_.getClass().getSuperclass().equals(f)) {
|
||||||
|
res.add((M) filter_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
public void AddFilter(DBObjectFilter_<D> filter_in) {
|
||||||
|
allFilters.add(filter_in);
|
||||||
|
}
|
||||||
public ColumnInfo getColumnInfo(int i) {
|
public ColumnInfo getColumnInfo(int i) {
|
||||||
return columns.get(i);
|
return columns.get(i);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ public abstract class DataSetFiltersMenu<D extends DBObject> extends VisualiserM
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
//-------
|
//-------
|
||||||
|
|
||||||
void selectAll(boolean flag) {
|
void selectAll(boolean flag) {
|
||||||
for (FilterFlag filter : field_filters)
|
for (FilterFlag filter : field_filters)
|
||||||
filter.setActive(flag);
|
filter.setActive(flag);
|
||||||
|
|||||||
@@ -9,16 +9,10 @@ import javax.swing.*;
|
|||||||
//фильтр флаг. либо в меню, либо на баре. текста нет.
|
//фильтр флаг. либо в меню, либо на баре. текста нет.
|
||||||
public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<D> {
|
public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<D> {
|
||||||
protected AbstractButton control = null;
|
protected AbstractButton control = null;
|
||||||
String description; //описание фильтра
|
|
||||||
protected boolean active = true; //включен ли фильтр
|
protected boolean active = true; //включен ли фильтр
|
||||||
int count = 0;
|
|
||||||
protected DataSet<?, D> dataSet = null; ///источник данных
|
protected DataSet<?, D> dataSet = null; ///источник данных
|
||||||
protected String getNotActiveIconPath() {
|
String description; //описание фильтра
|
||||||
return "/Common/icons/NotPick.png";
|
int count = 0;
|
||||||
}
|
|
||||||
protected String getActiveIconPath() {
|
|
||||||
return "/Common/icons/Pick.png";
|
|
||||||
}
|
|
||||||
public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
|
public FilterFlag(DataSet<?, D> dataSet_in, AbstractButton control_in, boolean active_in) {
|
||||||
dataSet = dataSet_in;
|
dataSet = dataSet_in;
|
||||||
active = active_in;
|
active = active_in;
|
||||||
@@ -33,7 +27,15 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
|
|||||||
Mark();
|
Mark();
|
||||||
control.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
|
control.setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreePlain));
|
||||||
}
|
}
|
||||||
public AbstractButton getControl(){return control;}
|
protected String getNotActiveIconPath() {
|
||||||
|
return "/Common/icons/NotPick.png";
|
||||||
|
}
|
||||||
|
protected String getActiveIconPath() {
|
||||||
|
return "/Common/icons/Pick.png";
|
||||||
|
}
|
||||||
|
public AbstractButton getControl() {
|
||||||
|
return control;
|
||||||
|
}
|
||||||
public void Mark() {
|
public void Mark() {
|
||||||
control.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
|
control.setIcon(Utils_.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
|
||||||
}
|
}
|
||||||
@@ -56,5 +58,4 @@ public abstract class FilterFlag<D extends DBObject> implements DBObjectFilter_<
|
|||||||
public void DropMatchesCount() {
|
public void DropMatchesCount() {
|
||||||
count = 0;
|
count = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,5 +5,4 @@ public class DVMParameter extends EnvironmentValue {
|
|||||||
public String toString() {
|
public String toString() {
|
||||||
return name + "=" + value + ";";
|
return name + "=" + value + ";";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,6 @@
|
|||||||
package _VisualDVM.ProjectData.Messages.Warnings;
|
package _VisualDVM.ProjectData.Messages.Warnings;
|
||||||
import Common.Database.Objects.DBObject;
|
|
||||||
import Common.Visual.DataSetControlForm;
|
|
||||||
import Common.Visual.Tables.HeaderTextFilter;
|
|
||||||
import _VisualDVM.Current;
|
import _VisualDVM.Current;
|
||||||
import _VisualDVM.ProjectData.Messages.Message;
|
|
||||||
import _VisualDVM.ProjectData.Messages.MessagesControlForm;
|
|
||||||
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
|
import _VisualDVM.ProjectData.Messages.MessagesDBTable;
|
||||||
|
|
||||||
import javax.swing.*;
|
|
||||||
public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
|
public class WarningsDBTable extends MessagesDBTable<MessageWarning> {
|
||||||
//https://stackoverflow.com/questions/13079777/editable-jtableheader
|
//https://stackoverflow.com/questions/13079777/editable-jtableheader
|
||||||
public WarningsDBTable() {
|
public WarningsDBTable() {
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import Common.Visual.DataSetControlForm;
|
|||||||
import Common.Visual.DataSetFiltersMenu;
|
import Common.Visual.DataSetFiltersMenu;
|
||||||
import Common.Visual.FilterFlag;
|
import Common.Visual.FilterFlag;
|
||||||
import Common.Visual.FilterMenuFlag;
|
import Common.Visual.FilterMenuFlag;
|
||||||
import Common.Visual.Fonts.VisualiserFonts;
|
|
||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
|
package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
|
||||||
import Common.Database.Tables.DataSet;
|
import Common.Database.Tables.DataSet;
|
||||||
import Common.Utils.Utils_;
|
|
||||||
import Common.Visual.Controls.MenuBarButton;
|
import Common.Visual.Controls.MenuBarButton;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import Common.Visual.FilterFlag;
|
import Common.Visual.FilterFlag;
|
||||||
import Common.Visual.Fonts.VisualiserFonts;
|
|
||||||
import Common.Visual.Menus.DataMenuBar;
|
import Common.Visual.Menus.DataMenuBar;
|
||||||
import Common.Visual.Tables.RendererDate;
|
import Common.Visual.Tables.RendererDate;
|
||||||
import Common.Visual.Tables.RendererMultiline;
|
import Common.Visual.Tables.RendererMultiline;
|
||||||
@@ -14,8 +12,6 @@ import _VisualDVM.Global;
|
|||||||
import _VisualDVM.Passes.PassCode;
|
import _VisualDVM.Passes.PassCode;
|
||||||
import _VisualDVM.ServerObjectsCache.PackageCache;
|
import _VisualDVM.ServerObjectsCache.PackageCache;
|
||||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
|
||||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
|
||||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@@ -116,7 +112,6 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
|
|||||||
PassCode.DeleteDVMPackage);
|
PassCode.DeleteDVMPackage);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void createFilters() {
|
protected void createFilters() {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import Common.Database.Tables.DataSet;
|
|||||||
import Common.Visual.Controls.StableMenuItem;
|
import Common.Visual.Controls.StableMenuItem;
|
||||||
import Common.Visual.DataSetControlForm;
|
import Common.Visual.DataSetControlForm;
|
||||||
import Common.Visual.DataSetFiltersMenu;
|
import Common.Visual.DataSetFiltersMenu;
|
||||||
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.RendererProgressBar;
|
import Common.Visual.Tables.RendererProgressBar;
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ import _VisualDVM.Passes.PassCode;
|
|||||||
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
import _VisualDVM.ProjectData.Files.DBProjectFile;
|
||||||
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
|
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
|
||||||
import _VisualDVM.ProjectData.LanguageName;
|
import _VisualDVM.ProjectData.LanguageName;
|
||||||
import _VisualDVM.ProjectData.Messages.Errors.MessageError;
|
|
||||||
import _VisualDVM.ProjectData.Messages.Notes.MessageNote;
|
|
||||||
import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning;
|
|
||||||
import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
|
import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree;
|
||||||
import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
|
import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree;
|
||||||
import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
|
import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree;
|
||||||
|
|||||||
Reference in New Issue
Block a user