промежуточный. частичный рефакторинг с прицелом на библиотечную часть

This commit is contained in:
2024-10-07 00:58:29 +03:00
parent c211ffb82b
commit 6b1576461d
798 changed files with 3007 additions and 2344 deletions

View File

@@ -1,8 +1,8 @@
package Repository.BugReport;
import Common.Current;
import Common.Database.DBObject;
import Common.Database.rDBObject;
import Common.Global;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.rDBObject;
import _VisualDVM.Global;
import Repository.Component.ComponentType;
import com.sun.org.glassfish.gmbal.Description;

View File

@@ -1,15 +1,13 @@
package Repository.BugReport;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import Repository.RepositoryServer;
import Repository.Subscribes.Subscriber;
import java.io.File;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Vector;
public class BugReportInterface {
public static String filterKey = "";

View File

@@ -1,9 +1,7 @@
package Repository.BugReport;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;
import Common_old.UI.StatusEnum;
import Common_old.UI.Themes.VisualiserFonts;
import java.awt.*;
import java.io.Serializable;
public enum BugReportState implements Serializable, StatusEnum {
active,

View File

@@ -1,8 +1,8 @@
package Repository.BugReport;
import Common.Current;
import Common.Database.DBTable;
import Common.UI.DataSetControlForm;
import Common.UI.UI;
import Common_old.Current;
import Common.Database.Tables.DBTable;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.UI;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -13,7 +13,7 @@ import java.util.Comparator;
import java.util.Vector;
import java.util.stream.Collectors;
import static Common.UI.Tables.TableRenderers.*;
import static Common_old.UI.Tables.TableRenderers.*;
public class BugReportsDBTable extends DBTable<String, BugReport> {
public BugReportsDBTable() {
super(String.class, BugReport.class);

View File

@@ -1,5 +1,5 @@
package Repository.BugReport;
import Common.UI.Menus_2023.DataMenuBar;
import Common_old.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class BugReportsMenuBar extends DataMenuBar {
public BugReportsMenuBar() {

View File

@@ -1,6 +1,6 @@
package Repository;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Global;
import _VisualDVM.Global;
import Repository.BugReport.BugReport;
import Repository.BugReport.BugReportsDBTable;
import Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable;

View File

@@ -1,10 +1,10 @@
package Repository.Component;
import Common.Constants;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.Files.VFileChooser;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import Common_old.Utils.Files.VFileChooser;
import Common.Utils.TextLog;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.UI.Interface.Loggable;

View File

@@ -1,9 +1,6 @@
package Repository.Component;
import Common.Current;
import Common.UI.StatusEnum;
import Common.UI.Themes.VisualiserFonts;
import java.awt.*;
import Common_old.UI.StatusEnum;
import Common_old.UI.Themes.VisualiserFonts;
public enum ComponentState implements StatusEnum {
Undefined,
Actual,

View File

@@ -1,8 +1,8 @@
package Repository.Component;
import Common.Current;
import Common.UI.Menus_2023.DataMenuBar;
import Common.UI.Menus_2023.VisualiserMenu;
import Common.UI.Themes.VisualiserFonts;
import Common_old.Current;
import Common_old.UI.Menus_2023.DataMenuBar;
import Common_old.UI.Menus_2023.VisualiserMenu;
import Common_old.UI.Themes.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class ComponentsMenuBar extends DataMenuBar {

View File

@@ -1,12 +1,12 @@
package Repository.Component;
import Common.Current;
import Common.Database.DataSet;
import Common.UI.DataSetControlForm;
import Common_old.Current;
import Common.Database.Tables.DataSet;
import Common_old.UI.DataSetControlForm;
import java.util.Vector;
import static Common.UI.Tables.TableRenderers.RendererMaskedInt;
import static Common.UI.Tables.TableRenderers.RendererStatusEnum;
import static Common_old.UI.Tables.TableRenderers.RendererMaskedInt;
import static Common_old.UI.Tables.TableRenderers.RendererStatusEnum;
public class ComponentsSet extends DataSet<ComponentType, Component> {
public ComponentsSet() {
super(ComponentType.class, Component.class);

View File

@@ -1,6 +1,6 @@
package Repository.Component;
import Common.Global;
import Common.Utils.Utils;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import java.text.DateFormat;
import java.text.SimpleDateFormat;

View File

@@ -1,5 +1,5 @@
package Repository.Component;
import Common.Global;
import _VisualDVM.Global;
public abstract class OSDComponent extends Component {
@Override
public String getFileName() {

View File

@@ -1,9 +1,9 @@
package Repository.Component.PerformanceAnalyzer;
import Common.Current;
import Common.Global;
import Common_old.Current;
import _VisualDVM.Global;
import analyzer.common.MessageJtoJ;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Repository.Component.Component;
import Repository.Component.ComponentType;

View File

@@ -1,6 +1,6 @@
package Repository.Component.Sapfor;
import Common.Current;
import Common.Global;
import Common_old.Current;
import _VisualDVM.Global;
import java.io.BufferedReader;
import java.io.InputStreamReader;

View File

@@ -1,9 +1,9 @@
package Repository.Component.Sapfor;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import Common_old.Constants;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import GlobalData.Settings.SettingName;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.LanguageStyle;

View File

@@ -1,5 +1,5 @@
package Repository.Component.Sapfor;
import Common.Global;
import _VisualDVM.Global;
import Repository.Component.ComponentType;
import java.io.File;

View File

@@ -1,6 +1,6 @@
package Repository.Component.UI;
import Common.Global;
import Common.UI.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import Common_old.UI.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

View File

@@ -1,6 +1,6 @@
package Repository.Component.UI;
import Common.Global;
import Common.UI.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import Common_old.UI.Windows.Dialog.Dialog;
import java.awt.*;
public class ComponentsForm extends Dialog<Object, ComponentsFields> {

View File

@@ -1,5 +1,5 @@
package Repository.Component.UI;
import Common.UI.Windows.Dialog.DialogFields;
import Common_old.UI.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

View File

@@ -1,6 +1,6 @@
package Repository.Component.UI;
import Common.UI.Editor.BaseEditor;
import Common.UI.Windows.Dialog.DialogFields;
import Common_old.UI.Editor.BaseEditor;
import Common_old.UI.Windows.Dialog.DialogFields;
import javax.swing.*;
import java.awt.*;

View File

@@ -1,5 +1,5 @@
package Repository.Component.UI;
import Common.UI.Windows.Dialog.Dialog;
import Common_old.UI.Windows.Dialog.Dialog;
public class PublishForm extends Dialog<String, PublishFields> {
public PublishForm() {
super(PublishFields.class);

View File

@@ -1,5 +1,5 @@
package Repository.Component;
import Common.Global;
import _VisualDVM.Global;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

View File

@@ -1,7 +1,7 @@
package Repository.Component;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassException;
import java.io.BufferedReader;

View File

@@ -1,5 +1,5 @@
package Repository;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import java.io.File;
import java.io.Serializable;

View File

@@ -1,17 +1,13 @@
package Repository;
import Common.Constants;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import Visual_DVM_2021.Passes.PassException;
import Visual_DVM_2021.Passes.Server.TestingSystemPass;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.FileWriter;
import java.io.Serializable;
import java.util.Date;
import java.util.Vector;
public abstract class RepositoryClient {
//--
protected int getSleepMillis() {

View File

@@ -1,15 +1,14 @@
package Repository;
import Common.Constants;
import Common.Database.DBObject;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import Common.Database.Database;
import Common.Global;
import _VisualDVM.Global;
import Common.Utils.InterruptThread;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import Repository.Server.DiagnosticSignalHandler;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import sun.misc.SignalHandler;
import javax.activation.DataHandler;

View File

@@ -1,8 +1,7 @@
package Repository.Server;
import Common.Constants;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.Utils;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.Account.Account;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;

View File

@@ -1,5 +1,5 @@
package Repository.Server;
import Common.Utils.Utils;
import Common_old.Utils.Utils;
import java.io.File;
import java.io.Serializable;

View File

@@ -1,7 +1,5 @@
package Repository.SubscriberRights;
import Common.Database.DBObject;
import GlobalData.Account.AccountRole;
import com.sun.org.glassfish.gmbal.Description;
import Common.Database.Objects.DBObject;
public class SubscriberRights extends DBObject {
public String email; //почта

View File

@@ -1,6 +1,6 @@
package Repository.SubscriberWorkspace;
import Common.Current;
import Common.Database.iDBObject;
import Common_old.Current;
import Common.Database.Objects.iDBObject;
public class SubscriberWorkspace extends iDBObject {
public String email; //почта
public String URL; //адрес:порт машины

View File

@@ -1,7 +1,7 @@
package Repository.SubscriberWorkspace;
import Common.Current;
import Common.Database.iDBTable;
import Common.UI.DataSetControlForm;
import Common_old.Current;
import Common.Database.Tables.iDBTable;
import Common_old.UI.DataSetControlForm;
public class SubscriberWorkspaceDBTable extends iDBTable<SubscriberWorkspace> {
public SubscriberWorkspaceDBTable() {
super(SubscriberWorkspace.class);

View File

@@ -1,5 +1,5 @@
package Repository.SubscriberWorkspace;
import Common.UI.Menus_2023.DataMenuBar;
import Common_old.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscriberWorkspacesMenuBar extends DataMenuBar {
public SubscriberWorkspacesMenuBar() {

View File

@@ -1,5 +1,5 @@
package Repository.Subscribes;
import Common.Database.DBObject;
import Common.Database.Objects.DBObject;
import GlobalData.Account.AccountRole;
import com.sun.org.glassfish.gmbal.Description;
public class Subscriber extends DBObject {

View File

@@ -1,5 +1,5 @@
package Repository.Subscribes;
import Common.UI.Menus_2023.DataMenuBar;
import Common_old.UI.Menus_2023.DataMenuBar;
import Visual_DVM_2021.Passes.PassCode_2021;
public class SubscribersMenuBar extends DataMenuBar {
public SubscribersMenuBar() {

View File

@@ -1,8 +1,12 @@
package Repository.Subscribes;
import Common.Current;
import Common.Database.*;
import Common.UI.DataSetControlForm;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Current;
import Common_old.UI.DataSetControlForm;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import GlobalData.Account.AccountRole;
import Repository.SubscriberWorkspace.SubscriberWorkspace;
import Repository.Subscribes.UI.SubscriberFields;

View File

@@ -1,6 +1,6 @@
package Repository.Subscribes.UI;
import Common.UI.TextField.StyledTextField;
import Common.UI.Windows.Dialog.DialogFields;
import Common_old.UI.TextField.StyledTextField;
import Common_old.UI.Windows.Dialog.DialogFields;
import GlobalData.Account.AccountRole;
import javax.swing.*;

View File

@@ -1,8 +1,8 @@
package Repository.Subscribes.UI;
import Common.Global;
import Common.UI.UI;
import Common.UI.Windows.Dialog.DBObjectDialog;
import Common.Utils.Utils;
import _VisualDVM.Global;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.Account.AccountRole;
import Repository.Subscribes.Subscriber;
public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields> {