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 20:44:11 +03:00
parent 7b56eae371
commit debc1a6cae
9 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -6,7 +6,16 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<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$/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/Tables/ColumnFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/ColumnFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddSubscriber.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
</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" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

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

@@ -28,7 +28,13 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public Class<D> d; //класс объектов. public Class<D> d; //класс объектов.
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
//- //-
public DataSetControlForm ui_; protected DataSetControlForm ui= null;
public DataSetControlForm getUI() {
return ui;
}
public void setUI(DataSetControlForm ui_in) {
this.ui = ui_in;
}
//- //-
public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
protected FilterInterface f_ui; // отображение количества объектов protected FilterInterface f_ui; // отображение количества объектов
@@ -51,14 +57,14 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public void mountUI(JPanel mountPanel_in) { public void mountUI(JPanel mountPanel_in) {
UI.Clear(mountPanel_in); UI.Clear(mountPanel_in);
//--> //-->
ui_ = createUI(mountPanel_in); setUI(createUI(mountPanel_in));
//--> //-->
if (hasMenuBar()) { if (hasMenuBar()) {
try { try {
DataMenuBar bar = null; DataMenuBar bar = null;
if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) { if (!MainModule_.instance.getUI().menuBars.containsKey(getClass())) {
bar = createMenuBar(); bar = createMenuBar();
if (ui_.hasCheckBox()) if (getUI().hasCheckBox())
bar.createSelectionButtons(this); bar.createSelectionButtons(this);
MainModule_.instance.getUI().menuBars.put(getClass(), bar); MainModule_.instance.getUI().menuBars.put(getClass(), bar);
} else { } else {
@@ -81,30 +87,30 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
} }
} }
public DataSetControlForm getUi() { public DataSetControlForm getUi() {
return ui_; return getUI();
} }
public void setFilterUI(FilterInterface ui_in) { public void setFilterUI(FilterInterface ui_in) {
f_ui = ui_in; f_ui = ui_in;
} }
public void ClearUI() { public void ClearUI() {
if ((ui_ != null) && ui_.isShown()) { if ((getUI() != null) && getUI().isShown()) {
ui_.ClearSelection(); getUI().ClearSelection();
ui_.Clear(); getUI().Clear();
if (f_ui != null) if (f_ui != null)
f_ui.ShowNoMatches(); f_ui.ShowNoMatches();
} }
} }
public void RefreshUI() { public void RefreshUI() {
if (ui_ != null) ui_.Refresh(); if (getUI() != null) getUI().Refresh();
} }
public int getRowCountUI() { public int getRowCountUI() {
return ui_.getRowCount(); return getUI().getRowCount();
} }
public void SetCurrentObjectUI(Object pk) { public void SetCurrentObjectUI(Object pk) {
if (ui_ != null) { if (getUI() != null) {
//todo возможно проверить, что текущий объект уже соответствует ключу, и если да, то ничего делать. //todo возможно проверить, что текущий объект уже соответствует ключу, и если да, то ничего делать.
ui_.ClearSelection(); //сброс текущего объекта и всего что с ним связано. getUI().ClearSelection(); //сброс текущего объекта и всего что с ним связано.
ui_.Select(pk); getUI().Select(pk);
} }
} }
public String[] getUIColumnNames() { public String[] getUIColumnNames() {
@@ -114,7 +120,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return null; return null;
} }
public boolean hasUI() { public boolean hasUI() {
return ui_ != null; return getUI() != null;
} }
public void SelectAll(boolean flag) { public void SelectAll(boolean flag) {
for (D object : Data.values()) { for (D object : Data.values()) {
@@ -231,8 +237,8 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
for (DataSetFilter<D> filter : filters) for (DataSetFilter<D> filter : filters)
filter.Drop(); filter.Drop();
//-- //--
if (ui_ != null) { if (getUI() != null) {
ui_.Show(); getUI().Show();
if (f_ui != null) if (f_ui != null)
f_ui.ShowMatchesCount(getRowCountUI()); f_ui.ShowMatchesCount(getRowCountUI());
} }
@@ -244,8 +250,8 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
for (DataSetFilter<D> filter : filters) for (DataSetFilter<D> filter : filters)
filter.Drop(); filter.Drop();
//-- //--
if (ui_ != null) { if (getUI() != null) {
ui_.Show(key); getUI().Show(key);
if (f_ui != null) if (f_ui != null)
f_ui.ShowMatchesCount(getRowCountUI()); f_ui.ShowMatchesCount(getRowCountUI());
} }
@@ -320,7 +326,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
if (hasUI()) { if (hasUI()) {
Object lastPk = selections.get(getClass()); Object lastPk = selections.get(getClass());
if ((CurrentName() != null) && (lastPk != null)) { if ((CurrentName() != null) && (lastPk != null)) {
ui_.Select(lastPk); getUI().Select(lastPk);
} }
} }
} }

2
src/Common/Visual/Tables/ColumnFilter.java
View File

@@ -19,7 +19,7 @@ public class ColumnFilter {
setBorder(null); setBorder(null);
addActionListener(e -> { addActionListener(e -> {
popup.setVisible(false); popup.setVisible(false);
dataSet.ui_.getControl().getTableHeader().repaint(); dataSet.getUI().getControl().getTableHeader().repaint();
}); });
getDocument().addDocumentListener(new DocumentListener() { getDocument().addDocumentListener(new DocumentListener() {
@Override @Override

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

@@ -34,6 +34,6 @@ public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
super.showDone(); super.showDone();
server.db.subscribers.ui_.Show(target.getPK()); server.db.subscribers.getUI().Show(target.getPK());
} }
} }

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

@@ -41,7 +41,7 @@ public class UpdateSelectedComponents extends Pass<Vector<Component>> {
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
for (Component component : target) { for (Component component : target) {
Global.Components.ui_.Select(component.getPK()); Global.Components.getUI().Select(component.getPK());
Global.mainModule.getPass(PassCode.UpdateComponent).Do(); Global.mainModule.getPass(PassCode.UpdateComponent).Do();
} }
} }

2
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -37,6 +37,6 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
} }
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
getDb().getTable(d).ui_.Show(); getDb().getTable(d).getUI().Show();
} }
} }

2
src/_VisualDVM/Passes/Server/EditServerObject.java
View File

@@ -26,6 +26,6 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
VisualCaches.RefreshCache(target); VisualCaches.RefreshCache(target);
getDb().getTable(d).ui_.Show(target.getPK()); getDb().getTable(d).getUI().Show(target.getPK());
} }
} }

2
src/_VisualDVM/Passes/Server/PublishServerObject.java
View File

@@ -41,6 +41,6 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
@Override @Override
protected void showDone() throws Exception { protected void showDone() throws Exception {
super.showDone(); super.showDone();
getDb().getTable(d).ui_.Show(pk); getDb().getTable(d).getUI().Show(pk);
} }
} }

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

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