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 17:37:59 +03:00
parent e34778d6be
commit 01d366e256
4 changed files with 17 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
.idea/workspace.xml generated
View File

@@ -7,70 +7,10 @@
</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 afterPath="$PROJECT_DIR$/src/Common/MainModules/_MainModule.java" afterDir="false" />
<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/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
<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/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/AddObjectPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Visual/ControlWithCurrentForm.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/DeleteObjectsPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/EditObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectsPass.java" 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/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Menus/GraphMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Menus/GraphMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Trees/StyledTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/SapforProfile/SapforProfilesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateEmptyProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRunTasks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RenameFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerHelp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCompilerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowTestingServerFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/ChangeFilePass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Project/ChangeFilePass.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/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.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/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/ArraysDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/RegionsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/ComponentsSet.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.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" />

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

@@ -277,9 +277,6 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
} }
return true; return true;
} }
public boolean hasCurrent() {
return MainModule_.instance.get(CurrentName()) != null;
}
public void dropCurrent() { public void dropCurrent() {
MainModule_.instance.set(CurrentName(), null); MainModule_.instance.set(CurrentName(), null);
} }

19
src/Common/Visual/ControlWithCurrentForm.java
View File

@@ -1,19 +0,0 @@
package Common.Visual;
import Common.Current_;
import java.awt.*;
public class ControlWithCurrentForm<C extends Component> extends ControlForm<C> {
public ControlWithCurrentForm(Class<C> class_in) {
super(class_in);
}
//-
public Current_ CurrentName() {
return null;
}
public void ShowCurrentObject() throws Exception {
}
public void ShowNoCurrentObject() throws Exception {
}
public void MouseAction2() throws Exception {
}
}

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

@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class DataSetControlForm extends ControlWithCurrentForm<DataTable> { public class DataSetControlForm extends ControlForm<DataTable> {
protected JPanel dataPanel; protected JPanel dataPanel;
protected DataSet dataSource; protected DataSet dataSource;
protected int current_row_i; protected int current_row_i;
@@ -57,18 +57,11 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
super.Clear(); super.Clear();
UI.Clear(dataPanel); UI.Clear(dataPanel);
} }
public DataSet getDataSource() {
return dataSource;
}
@Override
public Current_ CurrentName() {
return getDataSource().CurrentName();
}
public void SaveColumns() { public void SaveColumns() {
if (MainModule_.instance.getDb() != null) { if (MainModule_.instance.getDb() != null) {
try { try {
if ((CurrentName() != null)) { if (dataSource.CurrentName() != null) {
String tableName = CurrentName().toString(); String tableName = dataSource.CurrentName().toString();
Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new)); Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
String packed = String.join("|", widths); String packed = String.join("|", widths);
TableVisualData tableVisualData; TableVisualData tableVisualData;
@@ -94,13 +87,13 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
} }
protected void CreateColumnsInfo() { protected void CreateColumnsInfo() {
columns.clear(); columns.clear();
columns.add(new ColumnInfo(getDataSource().getPKName())); columns.add(new ColumnInfo(dataSource.getPKName()));
if (hasCheckBox()) { if (hasCheckBox()) {
columns.add(new ColumnInfo("", DBObjectSelectionRenderer.class, DBObjectSelector.class)); columns.add(new ColumnInfo("", DBObjectSelectionRenderer.class, DBObjectSelector.class));
columns.get(1).setMinWidth(25); columns.get(1).setMinWidth(25);
columns.get(1).setMaxWidth(25); columns.get(1).setMaxWidth(25);
} }
Arrays.stream(getDataSource().getUIColumnNames()).forEach(name -> columns.add(new ColumnInfo(name))); Arrays.stream(dataSource.getUIColumnNames()).forEach(name -> columns.add(new ColumnInfo(name)));
AdditionalInitColumns(); AdditionalInitColumns();
} }
protected void AdditionalInitColumns() { protected void AdditionalInitColumns() {
@@ -117,10 +110,10 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
Object key = data.get(rowIndex); Object key = data.get(rowIndex);
if (columnIndex == 0) if (columnIndex == 0)
return key; return key;
DBObject object = getDataSource().get((key)); DBObject object = dataSource.get((key));
if ((columnIndex == 1) && hasCheckBox()) if ((columnIndex == 1) && hasCheckBox())
return object.isSelected(); return object.isSelected();
return getDataSource().getFieldAt(object, columnIndex); return dataSource.getFieldAt(object, columnIndex);
} }
@Override @Override
public boolean isCellEditable(int row, int col) { public boolean isCellEditable(int row, int col) {
@@ -145,16 +138,16 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
//из таблицы можно пользоваться только getValueAt //из таблицы можно пользоваться только getValueAt
//иначе сортировка не будет работать. //иначе сортировка не будет работать.
Object key = getValueAt(rowIndex, 0); Object key = getValueAt(rowIndex, 0);
return getDataSource().get(key); return dataSource.get(key);
} }
//-----------------------------NEW------------------------------------- //-----------------------------NEW-------------------------------------
@Override @Override
public void CorrectColumnsSizes() { public void CorrectColumnsSizes() {
if ((MainModule_.instance.getDb() != null) if ((MainModule_.instance.getDb() != null)
&& CurrentName() != null && dataSource.CurrentName() != null
&& MainModule_.instance.getDb().tablesVisualData.containsKey(CurrentName().toString())) { && MainModule_.instance.getDb().tablesVisualData.containsKey(dataSource.CurrentName().toString())) {
if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) { if (!getColumnsProfile().equalsIgnoreCase(colNamesAndSizes)) {
TableVisualData grid = MainModule_.instance.getDb().tablesVisualData.get(CurrentName().toString()); TableVisualData grid = MainModule_.instance.getDb().tablesVisualData.get(dataSource.CurrentName().toString());
String[] data = grid.sizes.split("\\|"); String[] data = grid.sizes.split("\\|");
for (int i = 0; i < columns.size(); ++i) { for (int i = 0; i < columns.size(); ++i) {
if (i <= (data.length - 1)) { if (i <= (data.length - 1)) {
@@ -210,7 +203,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
//------------------------->> //------------------------->>
} }
}; };
if (CurrentName() != null) { if (dataSource.CurrentName() != null) {
current_row_i = CommonConstants.Nan; current_row_i = CommonConstants.Nan;
ListSelectionModel selModel = control.getSelectionModel(); ListSelectionModel selModel = control.getSelectionModel();
selModel.addListSelectionListener(e -> { selModel.addListSelectionListener(e -> {
@@ -218,7 +211,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
if ((row >= 0)) { if ((row >= 0)) {
if (row != current_row_i) { if (row != current_row_i) {
current_row_i = row; current_row_i = row;
getDataSource().setCurrent(control.getRowObject(row)); dataSource.setCurrent(control.getRowObject(row));
if (events_on) { if (events_on) {
try { try {
ShowCurrentObject(); ShowCurrentObject();
@@ -229,7 +222,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
} }
} else { } else {
current_row_i = CommonConstants.Nan; current_row_i = CommonConstants.Nan;
getDataSource().dropCurrent(); dataSource.dropCurrent();
if (events_on) { if (events_on) {
try { try {
ShowNoCurrentObject(); ShowNoCurrentObject();
@@ -274,7 +267,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
); );
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//при переотображении таблицы скидываем текущий объект!! //при переотображении таблицы скидываем текущий объект!!
getDataSource().dropCurrent(); dataSource.dropCurrent();
try { try {
ShowNoCurrentObject(); ShowNoCurrentObject();
} catch (Exception e) { } catch (Exception e) {
@@ -301,7 +294,6 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
public int getRowCount() { public int getRowCount() {
return control.getRowCount(); return control.getRowCount();
} }
@Override
public void ShowCurrentObject() throws Exception { public void ShowCurrentObject() throws Exception {
if (dataSource instanceof DBTable) { if (dataSource instanceof DBTable) {
DBTable table = (DBTable) dataSource; DBTable table = (DBTable) dataSource;
@@ -317,7 +309,6 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
} }
} }
} }
@Override
public void ShowNoCurrentObject() throws Exception { public void ShowNoCurrentObject() throws Exception {
if (dataSource instanceof DBTable) { if (dataSource instanceof DBTable) {
DBTable table = (DBTable) dataSource; DBTable table = (DBTable) dataSource;
@@ -333,4 +324,5 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
} }
} }
} }
public void MouseAction2() throws Exception{}
} }