M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "no message"

Browse Source 
This reverts commit 48d96d51d7.
This commit is contained in:
02090095
2024-10-25 13:01:54 +03:00
parent 48d96d51d7
commit ffcad7a620
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -6,7 +6,10 @@
</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$/.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" />
</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" />

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

@@ -13,7 +13,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
Class<K> k; //класс первичного ключа. Class<K> k; //класс первичного ключа.
//- //-
DataSetControlForm<D> ui = null; DataSetControlForm ui = null;
//-- //--
public DataSet(Class<K> k_in, Class<D> d_in) { public DataSet(Class<K> k_in, Class<D> d_in) {
k = k_in; k = k_in;
@@ -27,7 +27,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
return ""; return "";
} }
//--- //---
protected DataSetControlForm<D> createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return null; return null;
} }
//БАЗА ДАННЫХ //БАЗА ДАННЫХ

2
src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java
View File

@@ -17,7 +17,7 @@ public class ArraysDBTable extends DBTable<String, DBArray> {
return "сохранённые состояния"; return "сохранённые состояния";
} }
@Override @Override
protected DataSetControlForm<DBArray> createUI(JPanel mountPanel) { protected DataSetControlForm createUI(JPanel mountPanel) {
return new DBArraysForm(this, mountPanel); return new DBArraysForm(this, mountPanel);
} }
} }