no message
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
package Common.Database;
|
||||
import Common.CommonConstants;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Database.Tables.DBTable;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.DataSet;
|
||||
import Common.Database.Objects.iDBObject;
|
||||
import _VisualDVM.Repository.RepositoryRefuseException;
|
||||
import Common.Database.Tables.DBTable;
|
||||
import Common.Database.Tables.DataSet;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.Repository.RepositoryRefuseException;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Common.Database.Objects;
|
||||
import Common.Utils.Index;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.Selectable;
|
||||
import Common.Utils.Index;
|
||||
import com.sun.org.glassfish.gmbal.Description;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -10,6 +10,12 @@ public abstract class DBObject implements Selectable, Serializable {
|
||||
//<editor-fold desc="Selectable">
|
||||
@Description("IGNORE")
|
||||
private boolean selected = false;
|
||||
//------
|
||||
public DBObject() {
|
||||
}
|
||||
public DBObject(DBObject src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
@Override
|
||||
public boolean isSelected() {
|
||||
return selected;
|
||||
@@ -50,13 +56,8 @@ public abstract class DBObject implements Selectable, Serializable {
|
||||
return getBDialogName();
|
||||
}
|
||||
//---
|
||||
public void SynchronizeFields(DBObject src){
|
||||
public void SynchronizeFields(DBObject src) {
|
||||
selected = src.selected;
|
||||
}
|
||||
//------
|
||||
public DBObject(){}
|
||||
public DBObject(DBObject src){
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
//---------
|
||||
}
|
||||
|
||||
@@ -20,5 +20,4 @@ public class PassStatsDBTable extends DBTable<String, PassStats> {
|
||||
getDb().Insert(passStats);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,11 @@ public class iDBObject extends DBObject {
|
||||
@Expose
|
||||
@Description("PRIMARY KEY,AUTOINCREMENT")
|
||||
public int id;
|
||||
public iDBObject() {
|
||||
}
|
||||
public iDBObject(iDBObject src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
@Override
|
||||
public Object getPK() {
|
||||
return id;
|
||||
@@ -19,10 +24,6 @@ public class iDBObject extends DBObject {
|
||||
@Override
|
||||
public void SynchronizeFields(DBObject src) {
|
||||
super.SynchronizeFields(src);
|
||||
id = ((iDBObject)src).id;
|
||||
}
|
||||
public iDBObject(){}
|
||||
public iDBObject(iDBObject src){
|
||||
this.SynchronizeFields(src);
|
||||
id = ((iDBObject) src).id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,11 @@ import com.sun.org.glassfish.gmbal.Description;
|
||||
public abstract class nDBObject extends DBObject {
|
||||
@Description("PRIMARY KEY, UNIQUE")
|
||||
public String id = "";
|
||||
public nDBObject(nDBObject src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
public nDBObject() {
|
||||
}
|
||||
@Override
|
||||
public Object getPK() {
|
||||
return id;
|
||||
@@ -19,10 +24,6 @@ public abstract class nDBObject extends DBObject {
|
||||
@Override
|
||||
public void SynchronizeFields(DBObject src) {
|
||||
super.SynchronizeFields(src);
|
||||
id = ((nDBObject)src).id;
|
||||
id = ((nDBObject) src).id;
|
||||
}
|
||||
public nDBObject(nDBObject src){
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
public nDBObject(){}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,11 @@ public class rDBObject extends nDBObject {
|
||||
//-
|
||||
public long date = 0;
|
||||
public long change_date;
|
||||
public rDBObject(rDBObject src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
public rDBObject() {
|
||||
}
|
||||
public Date getDate() {
|
||||
return new Date(date);
|
||||
}
|
||||
@@ -24,9 +29,4 @@ public class rDBObject extends nDBObject {
|
||||
date = r.date;
|
||||
change_date = r.change_date;
|
||||
}
|
||||
public rDBObject(rDBObject src) {
|
||||
this.SynchronizeFields(src);
|
||||
}
|
||||
public rDBObject() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package Common.Database.SQLITE;
|
||||
import Common.Database.Database;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Database.Tables.DBTable;
|
||||
import Common.Database.Tables.DBTableColumn;
|
||||
import Common.Database.Database;
|
||||
import Common.Passes.PassException;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Passes.PassException;
|
||||
import javafx.util.Pair;
|
||||
|
||||
import java.io.File;
|
||||
@@ -15,12 +15,12 @@ import java.util.Vector;
|
||||
|
||||
import static Common.Utils.Utils_.requireNonNullElse;
|
||||
public abstract class SQLiteDatabase extends Database {
|
||||
protected Connection conn = null;
|
||||
protected Statement statement = null;
|
||||
protected ResultSet resSet = null;
|
||||
public LinkedHashMap<Class<? extends DBObject>, PreparedStatement> insertStatements = new LinkedHashMap<>();
|
||||
public LinkedHashMap<Class<? extends DBObject>, PreparedStatement> updateStatements = new LinkedHashMap<>();
|
||||
public LinkedHashMap<Class<? extends DBObject>, PreparedStatement> deleteStatements = new LinkedHashMap<>();
|
||||
protected Connection conn = null;
|
||||
protected Statement statement = null;
|
||||
protected ResultSet resSet = null;
|
||||
//->>
|
||||
public SQLiteDatabase(File file_in) {
|
||||
super(file_in);
|
||||
@@ -255,5 +255,4 @@ public abstract class SQLiteDatabase extends Database {
|
||||
}
|
||||
//--
|
||||
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
|
||||
|
||||
}
|
||||
@@ -1,15 +1,15 @@
|
||||
package Common.Database.Tables;
|
||||
import Common.Current_;
|
||||
import Common.Visual.DataSetFilter;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.TextLog;
|
||||
import Common.Visual.DataSetControlForm;
|
||||
import Common.Visual.DataSetFilter;
|
||||
import Common.Visual.FilterInterface;
|
||||
import Common.Visual.Menus.DataMenuBar;
|
||||
import Common.Visual.Tables.ColumnFilter;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.Windows.Dialog.DBObjectDialog;
|
||||
import Common.Visual.Windows.Dialog.DialogFields;
|
||||
import Common.Utils.TextLog;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Visual.UI_;
|
||||
import Common.Visual.FilterInterface;
|
||||
import _VisualDVM.Global;
|
||||
|
||||
import javax.swing.*;
|
||||
@@ -28,29 +28,29 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
||||
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
|
||||
//-
|
||||
public DataSetControlForm ui_;
|
||||
protected FilterInterface f_ui; // отображение количества объектов
|
||||
//-
|
||||
public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
|
||||
protected FilterInterface f_ui; // отображение количества объектов
|
||||
//--
|
||||
protected Vector<DataSetFilter<D>> filters = new Vector<>();
|
||||
protected void createFilters() {
|
||||
}
|
||||
//--
|
||||
public DataSet(Class<K> k_in, Class<D> d_in) {
|
||||
k = k_in;
|
||||
d = d_in;
|
||||
Name = d.getSimpleName();
|
||||
}
|
||||
protected void createFilters() {
|
||||
}
|
||||
public void mountUI(JPanel content_in) {
|
||||
UI_.Clear(content_in);
|
||||
//-->
|
||||
ui_ = createUI();
|
||||
ui_.setContent(content_in);
|
||||
//-->
|
||||
if ( UI_.menuBars.containsKey(getClass())) {
|
||||
DataMenuBar bar = UI_.menuBars.get(getClass());
|
||||
if (UI_.menuBars.containsKey(getClass())) {
|
||||
DataMenuBar bar = UI_.menuBars.get(getClass());
|
||||
content_in.add(bar, BorderLayout.NORTH);
|
||||
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
|
||||
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
|
||||
if (ui_.hasCheckBox())
|
||||
bar.createSelectionButtons(this);
|
||||
}
|
||||
@@ -58,7 +58,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
||||
//----
|
||||
createFilters();
|
||||
if (!filters.isEmpty()) {
|
||||
DataMenuBar menuBar = UI_.menuBars.get(getClass());
|
||||
DataMenuBar menuBar = UI_.menuBars.get(getClass());
|
||||
for (DataSetFilter<D> filter : filters)
|
||||
menuBar.addMenus(filter.menu);
|
||||
}
|
||||
@@ -264,7 +264,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
|
||||
if (getCheckedCount() > 0)
|
||||
res = getCheckedItems();
|
||||
else {
|
||||
if (CurrentName()!=null) {
|
||||
if (CurrentName() != null) {
|
||||
if (getCurrent() != null) {
|
||||
res.add(getCurrent());
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package Common.Database;
|
||||
import Common.Database.SQLITE.SQLiteDatabase;
|
||||
import Common.Database.Objects.DBForm.FormsDBTable;
|
||||
import Common.Database.Objects.PassStats.PassStatsDBTable;
|
||||
import Common.Database.SQLITE.SQLiteDatabase;
|
||||
import _VisualDVM.GlobalData.Grid.TablesVisualDatasDBTable;
|
||||
import _VisualDVM.GlobalData.Splitter.SplittersDBTable;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
|
||||
Reference in New Issue
Block a user