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

продолжение рефакторинга и проверка на занятость файлов

Browse Source
This commit is contained in:
02090095
2024-10-07 20:04:11 +03:00
parent e7f661f7ad
commit 7fac84740d
41 changed files with 164 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Common/Visual/DBObjectFilter.java
View File

@@ -1,7 +1,6 @@
package Common.Visual;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.Utils.Utils;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet;
@@ -21,7 +20,7 @@ public abstract class DBObjectFilter<D extends DBObject> {
return "/Common/icons/Pick.png";
}
void Mark() {
menuItem.setIcon(Utils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
menuItem.setIcon(CommonUtils.getIcon(active ? getActiveIconPath() : getNotActiveIconPath()));
}
//-------
public boolean Validate(D object) {

6
src/Common/Visual/Selectable.java
View File

@@ -1,5 +1,5 @@
package Common.Visual;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import javax.swing.*;
public interface Selectable {
@@ -13,11 +13,11 @@ public interface Selectable {
default ImageIcon GetSelectionIcon() {
return
isSelectionEnabled() ?
Utils.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") :
CommonUtils.getIcon("/Common/icons/" + (isSelected() ? "Pick" : "NotPick") + ".png") :
GetDisabledIcon();
}
default ImageIcon GetDisabledIcon() {
return Utils.getIcon("/Common/icons/Arrays/Unknown.png");
return CommonUtils.getIcon("/Common/icons/Arrays/Unknown.png");
}
default void SwitchSelection() {
Select(!isSelected());