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:54:09 +03:00
parent a042f24833
commit f6da288ec5
15 changed files with 82 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,9 +127,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return Data.containsKey(key);
}
//-
public Comparator<D> getComparator() {
return null;
}
public int getSelectedCount() {
return (int) Data.values().stream().filter(d -> d.isVisible() && d.isSelected()).count();
}

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

@@ -32,7 +32,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected boolean events_on = true;
protected String colNamesAndSizes = "";
protected Vector<ColumnInfo> columns = new Vector<>(); //информация о столбцах и их оформлении
protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>();
protected Vector<DataSetFiltersMenu> filtersMenus = new Vector<>(); //выпадающие меню фильтрации
protected LinkedHashMap<Integer, HeaderTextFilter> headersTextFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
//фильтры и подсчеты. todo слить с баром (?)
MatchesCounter f_ui = null;
@@ -112,24 +112,28 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
protected void AdditionalInitColumns() {
//уточнение инфы по столбцам.
}
public Comparator getDefaultComparator() {
return null;
}
Vector<Object> getVisibleKeys() {
Comparator comparator = dataSource.getComparator();
Vector<Object> res = new Vector<>();
Comparator comparator = getDefaultComparator();
Vector<Object> res_keys = new Vector<>();
if (comparator == null) {
for (Object key : dataSource.Data.keySet())
if (dataSource.get(key).isVisible())
res.add(key);
res_keys.add(key);
} else {
Vector<Object> raw = new Vector<>();
Vector<D> raw = new Vector<>();
for (Object object : dataSource.Data.values()) {
if (((DBObject) object).isVisible())
raw.add(object);
D object1 = (D) object;
if (object1.isVisible())
raw.add(object1);
}
raw.sort(comparator);
for (Object object : raw)
res.add(((DBObject) object).getPK());
for (D object : raw)
res_keys.add(object.getPK());
}
return res;
return res_keys;
}
@SuppressWarnings("unchecked")
@Override

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

@@ -5,6 +5,7 @@ import Common.Visual.Tables.RendererWrapText;
import _VisualDVM.Global;
import javax.swing.*;
import java.util.Comparator;
public class MessagesControlForm extends DataSetControlForm<Message> {
public MessagesControlForm(DataSet dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -38,6 +39,10 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
headersTextFilters.put(3, new HeaderTextFilter(dataSource, 3));
}
*/
@Override
public Comparator<Message> getDefaultComparator() {
return Comparator.comparingInt(o -> o.line);
}
@Override
public boolean hasMenuBar() {
return false;

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

@@ -12,10 +12,6 @@ public class MessagesDBTable<M extends Message> extends iDBTable<M> {
super(d_in);
}
@Override
public Comparator<M> getComparator() {
return Comparator.comparingInt(o -> o.line);
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new MessagesControlForm(this, mountPanel);
}

4
src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java
View File

@@ -27,10 +27,6 @@ public class BugReportsDBTable extends DBTable<String, BugReport> {
return new BugReportsForm(this, mountPanel);
}
@Override
public Comparator<BugReport> getComparator() {
return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
}
@Override
public Current CurrentName() {
return Current.BugReport;
}

5
src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java
View File

@@ -12,6 +12,7 @@ import _VisualDVM.Repository.BugReport.BugReport;
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Comparator;
public class BugReportsForm extends DataSetControlForm<BugReport> {
public BugReportsForm(DataSet<?, BugReport> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -77,4 +78,8 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
PassCode.CloseBugReport,
PassCode.DeleteBugReport);
}
@Override
public Comparator<BugReport> getDefaultComparator() {
return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
}
}

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

@@ -30,16 +30,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
protected DataSetControlForm createUI(JPanel mountPanel) {
return new DVMPackagesForm(this, mountPanel);
}
@Override
public Comparator<DVMPackage> getComparator() {
return new Comparator<DVMPackage>() {
@Override
public int compare(DVMPackage o1, DVMPackage o2) {
return o2.id - o1.id;
}
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteDVMPackage;

10
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -14,6 +14,7 @@ import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackageDBTable;
import javax.swing.*;
import java.util.Comparator;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -109,4 +110,13 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}
};
}
@Override
public Comparator<DVMPackage> getDefaultComparator() {
return new Comparator<DVMPackage>() {
@Override
public int compare(DVMPackage o1, DVMPackage o2) {
return o2.id - o1.id;
}
};
}
}

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

@@ -56,14 +56,5 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
Data.clear();
target = null;
}
@Override
public Comparator<DVMRunTask> getComparator() {
return new Comparator<DVMRunTask>() {
@Override
public int compare(DVMRunTask o1, DVMRunTask o2) {
return o1.state.ordinal() - o2.state.ordinal();
}
};
// return Comparator.comparingInt(o -> o.).reversed();
}
}

10
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -11,6 +11,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import javax.swing.*;
import java.util.Comparator;
public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
public DVMRunTasksForm(DataSet<?, DVMRunTask> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -79,4 +80,13 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
}
});
}
@Override
public Comparator<DVMRunTask> getDefaultComparator() {
return new Comparator<DVMRunTask>() {
@Override
public int compare(DVMRunTask o1, DVMRunTask o2) {
return o1.state.ordinal() - o2.state.ordinal();
}
};
}
}

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

@@ -31,16 +31,6 @@ public class SapforPackageDBTable extends iDBTable<SapforPackage> {
return new SapforPackagesForm(this, mountPanel);
}
@Override
public Comparator<SapforPackage> getComparator() {
return new Comparator<SapforPackage>() {
@Override
public int compare(SapforPackage o1, SapforPackage o2) {
return o2.id - o1.id;
}
};
// return Comparator.comparingInt(o -> o.).reversed();
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteSapforPackage;
}

10
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -14,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
import javax.swing.*;
import java.util.Comparator;
public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
public SapforPackagesForm(DataSet<?, SapforPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -92,4 +93,13 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
}
};
}
@Override
public Comparator<SapforPackage> getDefaultComparator() {
return new Comparator<SapforPackage>() {
@Override
public int compare(SapforPackage o1, SapforPackage o2) {
return o2.id - o1.id;
}
};
}
}

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

@@ -29,15 +29,6 @@ public class ServerSapforsDBTable extends iDBTable<ServerSapfor> {
return new ServerSapforsForm(this, mountPanel);
}
@Override
public Comparator<ServerSapfor> getComparator() {
return new Comparator<ServerSapfor>() {
@Override
public int compare(ServerSapfor o1, ServerSapfor o2) {
return o2.id - o1.id;
}
};
}
@Override
public PassCode_ getDeletePassCode() {
return PassCode.DeleteServerSapfor;
}

10
src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java
View File

@@ -9,6 +9,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import javax.swing.*;
import java.util.Comparator;
public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
public ServerSapforsForm(DataSet<?, ServerSapfor> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
@@ -49,4 +50,13 @@ public class ServerSapforsForm extends DataSetControlForm<ServerSapfor> {
PassCode.ShowSapforCompilationErr,
PassCode.DeleteServerSapfor);
}
@Override
public Comparator<ServerSapfor> getDefaultComparator() {
return new Comparator<ServerSapfor>() {
@Override
public int compare(ServerSapfor o1, ServerSapfor o2) {
return o2.id - o1.id;
}
};
}
}