diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 37a446e3..73619879 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,18 +7,471 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/src/Common/Database/Database.java b/src/Common/Database/Database.java index 63282c63..8b355585 100644 --- a/src/Common/Database/Database.java +++ b/src/Common/Database/Database.java @@ -6,7 +6,7 @@ import Common.Database.Objects.DBObject; import Common.Database.Tables.DataSet; import Common.Database.Objects.iDBObject; import _VisualDVM.Repository.RepositoryRefuseException; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.io.File; import java.util.LinkedHashMap; diff --git a/src/Common/Database/VisualiserDatabase.java b/src/Common/Database/VisualiserDatabase.java index 54a170e1..9e0cbf00 100644 --- a/src/Common/Database/VisualiserDatabase.java +++ b/src/Common/Database/VisualiserDatabase.java @@ -4,7 +4,7 @@ import Common.Database.Objects.DBForm.FormsDBTable; import Common.Database.Objects.PassStats.PassStatsDBTable; import _VisualDVM.GlobalData.Grid.TablesVisualDatasDBTable; import _VisualDVM.GlobalData.Splitter.SplittersDBTable; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.io.File; public class VisualiserDatabase extends SQLiteDatabase { diff --git a/src/Common/Passes/Pass.java b/src/Common/Passes/Pass.java index 8e0e2b23..c0ccc850 100644 --- a/src/Common/Passes/Pass.java +++ b/src/Common/Passes/Pass.java @@ -4,7 +4,7 @@ import Common.Utils.Stopwatch; import Common.Utils.TextLog; import Common.Visual.UI_; import MainModule_.MainModule_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Visual.Windows.PassForm; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Common/Visual/Menus/DataMenuBar.java b/src/Common/Visual/Menus/DataMenuBar.java index f061ef01..8bc03af5 100644 --- a/src/Common/Visual/Menus/DataMenuBar.java +++ b/src/Common/Visual/Menus/DataMenuBar.java @@ -2,7 +2,7 @@ package Common.Visual.Menus; import Common.Database.Tables.DataSet; import Common.Visual.Controls.MenuBarButton; import _VisualDVM.Visual.Menus.VisualiserMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.*; diff --git a/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java b/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java index f75e7450..68dc2c87 100644 --- a/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java +++ b/src/Common/Visual/Tables/ConfigurationAutoSwitcher.java @@ -5,7 +5,7 @@ import _VisualDVM.TestingSystem.Common.Configuration.Configuration; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import Common.Passes.Pass; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class ConfigurationAutoSwitcher extends DBObjectEditor { @Override public void Action() { diff --git a/src/MainModule_/MainModule_.java b/src/MainModule_/MainModule_.java index cad3f4ff..9a24ad97 100644 --- a/src/MainModule_/MainModule_.java +++ b/src/MainModule_/MainModule_.java @@ -28,7 +28,7 @@ public abstract class MainModule_ { passes= new LinkedHashMap<>(); for (Object code: getPassCodesEnum().getEnumConstants()){ try { - Class clazz = Class.forName("Visual_DVM_2021.Passes.All." + code.toString()); + Class clazz = Class.forName(getAllPassesClassPrefix() + code.toString()); Pass pass = ((Pass) clazz.newInstance()); passes.put((PassCode_) code, pass); } catch (Exception ex) { @@ -53,6 +53,7 @@ public abstract class MainModule_ { System.out.println("main module created"); } public abstract Class getPassCodesEnum(); + public abstract String getAllPassesClassPrefix(); public void ActivateDB() throws Exception { db = db_class.newInstance(); db.Connect(); diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ConvertStructures.java b/src/Visual_DVM_2021/Passes/All/SPF_ConvertStructures.java deleted file mode 100644 index 4d68664e..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_ConvertStructures.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_ConvertStructures extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CorrectCodeStylePass.java b/src/Visual_DVM_2021/Passes/All/SPF_CorrectCodeStylePass.java deleted file mode 100644 index d18cf050..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_CorrectCodeStylePass.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_CorrectCodeStylePass extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateCheckpoints.java b/src/Visual_DVM_2021/Passes/All/SPF_CreateCheckpoints.java deleted file mode 100644 index c5b4857d..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_CreateCheckpoints.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_CreateCheckpoints extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateIntervalsTree.java b/src/Visual_DVM_2021/Passes/All/SPF_CreateIntervalsTree.java deleted file mode 100644 index 7904f606..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_CreateIntervalsTree.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_CreateIntervalsTree extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_DuplicateFunctionChains.java b/src/Visual_DVM_2021/Passes/All/SPF_DuplicateFunctionChains.java deleted file mode 100644 index 8691578e..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_DuplicateFunctionChains.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_DuplicateFunctionChains extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ExpressionSubstitution.java b/src/Visual_DVM_2021/Passes/All/SPF_ExpressionSubstitution.java deleted file mode 100644 index e653e580..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_ExpressionSubstitution.java +++ /dev/null @@ -1,3 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_ExpressionSubstitution extends SapforTransformation {} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InitDeclsWithZero.java b/src/Visual_DVM_2021/Passes/All/SPF_InitDeclsWithZero.java deleted file mode 100644 index 183c8c9f..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_InitDeclsWithZero.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_InitDeclsWithZero extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertDvmhRegions.java b/src/Visual_DVM_2021/Passes/All/SPF_InsertDvmhRegions.java deleted file mode 100644 index ddfd4218..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_InsertDvmhRegions.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_InsertDvmhRegions extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertImplicitNone.java b/src/Visual_DVM_2021/Passes/All/SPF_InsertImplicitNone.java deleted file mode 100644 index 4e7a4e9e..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_InsertImplicitNone.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_InsertImplicitNone extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java b/src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java deleted file mode 100644 index 6727d658..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_InsertPrivateFromGUI.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_InsertPrivateFromGUI extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopEndDoConverterPass.java b/src/Visual_DVM_2021/Passes/All/SPF_LoopEndDoConverterPass.java deleted file mode 100644 index 1f46dac2..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_LoopEndDoConverterPass.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_LoopEndDoConverterPass extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopFission.java b/src/Visual_DVM_2021/Passes/All/SPF_LoopFission.java deleted file mode 100644 index 9ffbe7c7..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_LoopFission.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_LoopFission extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnion.java b/src/Visual_DVM_2021/Passes/All/SPF_LoopUnion.java deleted file mode 100644 index 349e514a..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnion.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_LoopUnion extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnrolling.java b/src/Visual_DVM_2021/Passes/All/SPF_LoopUnrolling.java deleted file mode 100644 index b8c3984f..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnrolling.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_LoopUnrolling extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_PrivateExpansion.java b/src/Visual_DVM_2021/Passes/All/SPF_PrivateExpansion.java deleted file mode 100644 index 2ecc50d3..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_PrivateExpansion.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_PrivateExpansion extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_PrivateRemoving.java b/src/Visual_DVM_2021/Passes/All/SPF_PrivateRemoving.java deleted file mode 100644 index 50432a4d..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_PrivateRemoving.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_PrivateRemoving extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_PrivateShrinking.java b/src/Visual_DVM_2021/Passes/All/SPF_PrivateShrinking.java deleted file mode 100644 index 78cbc019..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_PrivateShrinking.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_PrivateShrinking extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveComments.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveComments.java deleted file mode 100644 index 9e19706a..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveComments.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveComments extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDeadCode.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveDeadCode.java deleted file mode 100644 index 8fd796a5..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDeadCode.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveDeadCode extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmDirectives.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmDirectives.java deleted file mode 100644 index fae17d03..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmDirectives.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveDvmDirectives extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmDirectivesToComments.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmDirectivesToComments.java deleted file mode 100644 index 5e6e4584..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmDirectivesToComments.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveDvmDirectivesToComments extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmIntervals.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmIntervals.java deleted file mode 100644 index 935683ee..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveDvmIntervals.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveDvmIntervals extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveOmpDirectives.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveOmpDirectives.java deleted file mode 100644 index 6cf01176..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveOmpDirectives.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveOmpDirectives extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RemoveUnusedFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_RemoveUnusedFunctions.java deleted file mode 100644 index acac59b0..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RemoveUnusedFunctions.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RemoveUnusedFunctions extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_RenameIncludes.java b/src/Visual_DVM_2021/Passes/All/SPF_RenameIncludes.java deleted file mode 100644 index 32717dc5..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_RenameIncludes.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_RenameIncludes extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ResolveCommonBlockConflicts.java b/src/Visual_DVM_2021/Passes/All/SPF_ResolveCommonBlockConflicts.java deleted file mode 100644 index a687c730..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_ResolveCommonBlockConflicts.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_ResolveCommonBlockConflicts extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ResolveParallelRegionConflicts.java b/src/Visual_DVM_2021/Passes/All/SPF_ResolveParallelRegionConflicts.java deleted file mode 100644 index 8804ec40..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_ResolveParallelRegionConflicts.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_ResolveParallelRegionConflicts extends SapforTransformation { -} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_SharedMemoryParallelization.java b/src/Visual_DVM_2021/Passes/All/SPF_SharedMemoryParallelization.java deleted file mode 100644 index 8314cb6f..00000000 --- a/src/Visual_DVM_2021/Passes/All/SPF_SharedMemoryParallelization.java +++ /dev/null @@ -1,4 +0,0 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforTransformation; -public class SPF_SharedMemoryParallelization extends SapforTransformation { -} diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java index 96714885..91ec5001 100644 --- a/src/_VisualDVM/Constants.java +++ b/src/_VisualDVM/Constants.java @@ -1,6 +1,5 @@ package _VisualDVM; import Common.Utils.Vector_; -import Visual_DVM_2021.Passes.PassCode; import java.util.Vector; public class Constants { diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java index 0dd73e2f..4ee1278a 100644 --- a/src/_VisualDVM/Global.java +++ b/src/_VisualDVM/Global.java @@ -1,11 +1,10 @@ package _VisualDVM; import Common.Database.Tables.DataSet; import Common.Mode; -import Common.Passes.Pass; import Common.Utils.Loggable; import Common.Utils.Utils_; import Common.Visual.UI_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.GlobalData.Settings.DBSetting; diff --git a/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java b/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java index 4a15ced3..1f8fa643 100644 --- a/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java +++ b/src/_VisualDVM/GlobalData/Compiler/CompilersMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.Compiler; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class CompilersMenuBar extends DataMenuBar { public CompilersMenuBar() { super("компиляторы", diff --git a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java index c824b40f..0f51e90a 100644 --- a/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java +++ b/src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java @@ -1,14 +1,12 @@ package _VisualDVM.GlobalData.Compiler.UI; import Common.Visual.UI_; -import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import Common.Visual.Windows.Dialog.DialogFields; import Common.Visual.Windows.Dialog.VDirectoryChooser; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.Machine.MachineType; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import javax.swing.event.DocumentEvent; diff --git a/src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java b/src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java index 08844266..7b442c04 100644 --- a/src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java +++ b/src/_VisualDVM/GlobalData/DVMParameter/DVMParametersMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.DVMParameter; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class DVMParametersMenuBar extends DataMenuBar { public DVMParametersMenuBar() { super("параметры", diff --git a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java index 2a55ea53..fca00854 100644 --- a/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java +++ b/src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.EnvironmentValue; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class EnvironmentValuesMenuBar extends DataMenuBar { public EnvironmentValuesMenuBar() { super("переменные окружения", PassCode.AddEnvironmentValue, diff --git a/src/_VisualDVM/GlobalData/GlobalDatabase.java b/src/_VisualDVM/GlobalData/GlobalDatabase.java index fe87e3f7..80a58dad 100644 --- a/src/_VisualDVM/GlobalData/GlobalDatabase.java +++ b/src/_VisualDVM/GlobalData/GlobalDatabase.java @@ -26,7 +26,7 @@ import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable; import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable; import _VisualDVM.GlobalData.User.UsersDBTable; import _VisualDVM.Repository.Component.ComponentType; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.nio.file.Paths; import java.util.Date; diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java b/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java index 988b97aa..84bb4e1a 100644 --- a/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java +++ b/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java @@ -1,7 +1,7 @@ package _VisualDVM.GlobalData.Machine; import Common.Visual.Controls.MenuBarButton; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import java.awt.event.ActionEvent; diff --git a/src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java b/src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java index d3731b3e..b38680ad 100644 --- a/src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java +++ b/src/_VisualDVM/GlobalData/Makefile/MakefilesMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.Makefile; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class MakefilesMenuBar extends DataMenuBar { public MakefilesMenuBar() { super("мейкфайлы", diff --git a/src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java b/src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java index e06a4363..9bae2bfa 100644 --- a/src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java +++ b/src/_VisualDVM/GlobalData/Module/ModulesMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.Module; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class ModulesMenuBar extends DataMenuBar { public ModulesMenuBar() { super("языковые модули", PassCode.EditModule); diff --git a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java index e582fbde..5c7e1cb3 100644 --- a/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java +++ b/src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java @@ -1,6 +1,5 @@ package _VisualDVM.GlobalData.Module.UI; import Common.Visual.UI_; -import _VisualDVM.Current; import Common.Visual.Controls.StyledTextComboBox; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Global; @@ -9,7 +8,7 @@ import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Module.Module; import _VisualDVM.GlobalData.Module.ModuleAnchestor; import _VisualDVM.ProjectData.LanguageName; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java index 21440fad..f8666d33 100644 --- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java +++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java @@ -1,12 +1,11 @@ package _VisualDVM.GlobalData.RemoteFile.UI; -import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import Visual_DVM_2021.Passes.SSH.ConnectionPass; +import _VisualDVM.Passes.SSH.ConnectionPass; import com.jcraft.jsch.ChannelSftp.LsEntry; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java index db9ed7f2..86165cfd 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java +++ b/src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.RunConfiguration; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; public class RunConfigurationsMenuBar extends DataMenuBar { diff --git a/src/_VisualDVM/GlobalData/Settings/DBSetting.java b/src/_VisualDVM/GlobalData/Settings/DBSetting.java index 0a5fd428..b9adea7d 100644 --- a/src/_VisualDVM/GlobalData/Settings/DBSetting.java +++ b/src/_VisualDVM/GlobalData/Settings/DBSetting.java @@ -1,7 +1,7 @@ package _VisualDVM.GlobalData.Settings; import Common.Database.Objects.DBObject; import Common.Utils.Utils_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Visual.Menus.StableMenuItem; diff --git a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java index 33a1dd64..f64babca 100644 --- a/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java +++ b/src/_VisualDVM/GlobalData/Tasks/CompilationTask/CompilationTasksDBTable.java @@ -6,7 +6,7 @@ import Common.Database.Tables.FKDataBehaviour; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.TableMenu; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; diff --git a/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java b/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java index 4370f43b..a72f44ec 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java +++ b/src/_VisualDVM/GlobalData/Tasks/Passes/TaskLocalPass.java @@ -1,9 +1,8 @@ package _VisualDVM.GlobalData.Tasks.Passes; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor; -import Visual_DVM_2021.Passes.ProcessPass; +import _VisualDVM.Passes.ProcessPass; public abstract class TaskLocalPass extends ProcessPass { public S supervisor; //инициализация идет в конструкторе потомка. public TaskLocalPass(Class s_class) { diff --git a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java index 51955ff1..b8285620 100644 --- a/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java +++ b/src/_VisualDVM/GlobalData/Tasks/RunTask/RunTasksDBTable.java @@ -2,7 +2,7 @@ package _VisualDVM.GlobalData.Tasks.RunTask; import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Menus.TableMenu; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; diff --git a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java index cf257cfc..2f1e0af3 100644 --- a/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java +++ b/src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java @@ -5,7 +5,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.Tasks.Supervisor.TaskSupervisor; import _VisualDVM.GlobalData.Tasks.Task; import _VisualDVM.GlobalData.Tasks.TaskState; -import Visual_DVM_2021.Passes.SSH.ConnectionPass; +import _VisualDVM.Passes.SSH.ConnectionPass; public abstract class RemoteTaskSupervisor extends TaskSupervisor { protected RemoteFile getRemoteProjectsPath() { return new RemoteFile(pass.user.getRemoteProjectsPath(), true); diff --git a/src/_VisualDVM/GlobalData/User/UsersMenuBar.java b/src/_VisualDVM/GlobalData/User/UsersMenuBar.java index 6b21c1ae..dcd75795 100644 --- a/src/_VisualDVM/GlobalData/User/UsersMenuBar.java +++ b/src/_VisualDVM/GlobalData/User/UsersMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.GlobalData.User; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class UsersMenuBar extends DataMenuBar { public UsersMenuBar() { super("пользователи", PassCode.AddUser, diff --git a/src/_VisualDVM/GlobalProperties.java b/src/_VisualDVM/GlobalProperties.java index ad839a3f..81340d1c 100644 --- a/src/_VisualDVM/GlobalProperties.java +++ b/src/_VisualDVM/GlobalProperties.java @@ -1,8 +1,7 @@ package _VisualDVM; import Common.Utils.Utils_; import _VisualDVM.Visual.Menus.StableMenuItem; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import com.google.gson.annotations.Expose; import javax.swing.*; diff --git a/src/_VisualDVM/MainModule.java b/src/_VisualDVM/MainModule.java index 4030da7d..0b052bbf 100644 --- a/src/_VisualDVM/MainModule.java +++ b/src/_VisualDVM/MainModule.java @@ -1,7 +1,7 @@ package _VisualDVM; import Common.Utils.Vector_; import MainModule_.MainModule_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Visual.Windows.PassForm; import _VisualDVM.GlobalData.Account.Account; import _VisualDVM.GlobalData.Compiler.Compiler; @@ -47,6 +47,10 @@ public class MainModule extends MainModule_ { public Class getPassCodesEnum() { return PassCode.class; } + @Override + public String getAllPassesClassPrefix() { + return "_VisualDVM.Passes.All."; + } //-- public boolean HasProject() { return get(Current.Project) != null; diff --git a/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java b/src/_VisualDVM/Passes/All/AbortDVMPackage.java similarity index 74% rename from src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java rename to src/_VisualDVM/Passes/All/AbortDVMPackage.java index 5d3904ab..2a53695c 100644 --- a/src/Visual_DVM_2021/Passes/All/AbortDVMPackage.java +++ b/src/_VisualDVM/Passes/All/AbortDVMPackage.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.AbortTestingPackage; +import _VisualDVM.Passes.Testing.AbortTestingPackage; public class AbortDVMPackage extends AbortTestingPackage { @Override public Current currentName() { diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java b/src/_VisualDVM/Passes/All/AbortSapforPackage.java similarity index 74% rename from src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java rename to src/_VisualDVM/Passes/All/AbortSapforPackage.java index 3afe3b75..2e4e50ed 100644 --- a/src/Visual_DVM_2021/Passes/All/AbortSapforPackage.java +++ b/src/_VisualDVM/Passes/All/AbortSapforPackage.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.AbortTestingPackage; +import _VisualDVM.Passes.Testing.AbortTestingPackage; public class AbortSapforPackage extends AbortTestingPackage { @Override public Current currentName() { diff --git a/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java b/src/_VisualDVM/Passes/All/ActualizeDVMPackages.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java rename to src/_VisualDVM/Passes/All/ActualizeDVMPackages.java index c61d2208..1d955ca2 100644 --- a/src/Visual_DVM_2021/Passes/All/ActualizeDVMPackages.java +++ b/src/_VisualDVM/Passes/All/ActualizeDVMPackages.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; -import Visual_DVM_2021.Passes.ActualizeTestingPackages; +import _VisualDVM.Passes.Testing.ActualizeTestingPackages; public class ActualizeDVMPackages extends ActualizeTestingPackages { public ActualizeDVMPackages() { super(DVMPackage.class); diff --git a/src/Visual_DVM_2021/Passes/All/ActualizePackages.java b/src/_VisualDVM/Passes/All/ActualizePackages.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/ActualizePackages.java rename to src/_VisualDVM/Passes/All/ActualizePackages.java index 4f9586c5..270b8a1e 100644 --- a/src/Visual_DVM_2021/Passes/All/ActualizePackages.java +++ b/src/_VisualDVM/Passes/All/ActualizePackages.java @@ -1,5 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import _VisualDVM.Global; public class ActualizePackages extends Pass { diff --git a/src/Visual_DVM_2021/Passes/All/ActualizeSapforPackages.java b/src/_VisualDVM/Passes/All/ActualizeSapforPackages.java similarity index 81% rename from src/Visual_DVM_2021/Passes/All/ActualizeSapforPackages.java rename to src/_VisualDVM/Passes/All/ActualizeSapforPackages.java index 8fc43dc8..27870a7e 100644 --- a/src/Visual_DVM_2021/Passes/All/ActualizeSapforPackages.java +++ b/src/_VisualDVM/Passes/All/ActualizeSapforPackages.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; -import Visual_DVM_2021.Passes.ActualizeTestingPackages; +import _VisualDVM.Passes.Testing.ActualizeTestingPackages; public class ActualizeSapforPackages extends ActualizeTestingPackages { public ActualizeSapforPackages() { super(SapforPackage.class); diff --git a/src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.java b/src/_VisualDVM/Passes/All/ActualizeServerSapfors.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.java rename to src/_VisualDVM/Passes/All/ActualizeServerSapfors.java index 06f7ca98..62475791 100644 --- a/src/Visual_DVM_2021/Passes/All/ActualizeServerSapfors.java +++ b/src/_VisualDVM/Passes/All/ActualizeServerSapfors.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class ActualizeServerSapfors extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/AddBugReport.java rename to src/_VisualDVM/Passes/All/AddBugReport.java index 3ec5a425..fd9f7f82 100644 --- a/src/Visual_DVM_2021/Passes/All/AddBugReport.java +++ b/src/_VisualDVM/Passes/All/AddBugReport.java @@ -1,9 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; import Common.Database.Database; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.GlobalData.Account.AccountRole; import _VisualDVM.Repository.BugReport.BugReport; @@ -11,7 +9,7 @@ import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.Component.ComponentType; import Common.Passes.AddObjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.io.File; import java.nio.file.Files; diff --git a/src/Visual_DVM_2021/Passes/All/AddCompiler.java b/src/_VisualDVM/Passes/All/AddCompiler.java similarity index 76% rename from src/Visual_DVM_2021/Passes/All/AddCompiler.java rename to src/_VisualDVM/Passes/All/AddCompiler.java index ae9af8a1..be7898cc 100644 --- a/src/Visual_DVM_2021/Passes/All/AddCompiler.java +++ b/src/_VisualDVM/Passes/All/AddCompiler.java @@ -1,8 +1,5 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Database.Objects.DBObject; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Machine.Machine; import Common.Passes.AddObjectPass; diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java b/src/_VisualDVM/Passes/All/AddDVMParameter.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/AddDVMParameter.java rename to src/_VisualDVM/Passes/All/AddDVMParameter.java index c8679c2c..957c137f 100644 --- a/src/Visual_DVM_2021/Passes/All/AddDVMParameter.java +++ b/src/_VisualDVM/Passes/All/AddDVMParameter.java @@ -1,8 +1,5 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Database.Objects.DBObject; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.AddObjectPass; diff --git a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java b/src/_VisualDVM/Passes/All/AddDVMParameterForTesting.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java rename to src/_VisualDVM/Passes/All/AddDVMParameterForTesting.java index a222d621..a2b85749 100644 --- a/src/Visual_DVM_2021/Passes/All/AddDVMParameterForTesting.java +++ b/src/_VisualDVM/Passes/All/AddDVMParameterForTesting.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Utils; diff --git a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java b/src/_VisualDVM/Passes/All/AddEnvironmentValue.java similarity index 73% rename from src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java rename to src/_VisualDVM/Passes/All/AddEnvironmentValue.java index d0ba730b..3c8cf7b3 100644 --- a/src/Visual_DVM_2021/Passes/All/AddEnvironmentValue.java +++ b/src/_VisualDVM/Passes/All/AddEnvironmentValue.java @@ -1,7 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; +package _VisualDVM.Passes.All; import Common.Passes.AddObjectPass; -import _VisualDVM.Global; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; public class AddEnvironmentValue extends AddObjectPass { public AddEnvironmentValue() { diff --git a/src/Visual_DVM_2021/Passes/All/AddFile.java b/src/_VisualDVM/Passes/All/AddFile.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/AddFile.java rename to src/_VisualDVM/Passes/All/AddFile.java index e4260f8a..fe8dbd1b 100644 --- a/src/Visual_DVM_2021/Passes/All/AddFile.java +++ b/src/_VisualDVM/Passes/All/AddFile.java @@ -1,13 +1,12 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; -import Visual_DVM_2021.Passes.ChangeFilePass; +import _VisualDVM.Passes.Project.ChangeFilePass; import org.apache.commons.io.FileUtils; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/Visual_DVM_2021/Passes/All/AddMachine.java b/src/_VisualDVM/Passes/All/AddMachine.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/AddMachine.java rename to src/_VisualDVM/Passes/All/AddMachine.java index 0f6497b4..9cfe8539 100644 --- a/src/Visual_DVM_2021/Passes/All/AddMachine.java +++ b/src/_VisualDVM/Passes/All/AddMachine.java @@ -1,10 +1,7 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.User.User; diff --git a/src/Visual_DVM_2021/Passes/All/AddMakefile.java b/src/_VisualDVM/Passes/All/AddMakefile.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/AddMakefile.java rename to src/_VisualDVM/Passes/All/AddMakefile.java index d6361102..753ba579 100644 --- a/src/Visual_DVM_2021/Passes/All/AddMakefile.java +++ b/src/_VisualDVM/Passes/All/AddMakefile.java @@ -1,8 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; +package _VisualDVM.Passes.All; import Common.Database.Objects.DBObject; import Common.Passes.AddObjectPass; -import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Makefile.Makefile; import _VisualDVM.GlobalData.Module.Module; diff --git a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java b/src/_VisualDVM/Passes/All/AddRunConfiguration.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java rename to src/_VisualDVM/Passes/All/AddRunConfiguration.java index 9953996d..ec2db3c8 100644 --- a/src/Visual_DVM_2021/Passes/All/AddRunConfiguration.java +++ b/src/_VisualDVM/Passes/All/AddRunConfiguration.java @@ -1,8 +1,5 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Database.Objects.DBObject; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.AddObjectPass; diff --git a/src/Visual_DVM_2021/Passes/All/AddSubscriber.java b/src/_VisualDVM/Passes/All/AddSubscriber.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/AddSubscriber.java rename to src/_VisualDVM/Passes/All/AddSubscriber.java index 2a61ea20..03f7c916 100644 --- a/src/Visual_DVM_2021/Passes/All/AddSubscriber.java +++ b/src/_VisualDVM/Passes/All/AddSubscriber.java @@ -1,10 +1,10 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Subscribes.Subscriber; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.PassCode; public class AddSubscriber extends ComponentsRepositoryPass { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/AddUser.java b/src/_VisualDVM/Passes/All/AddUser.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/AddUser.java rename to src/_VisualDVM/Passes/All/AddUser.java index 202af592..0b2dfc17 100644 --- a/src/Visual_DVM_2021/Passes/All/AddUser.java +++ b/src/_VisualDVM/Passes/All/AddUser.java @@ -1,14 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import Common.Database.Objects.DBObject; -import Common.Database.Database; import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.User.User; import Common.Passes.AddObjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class AddUser extends AddObjectPass { public AddUser() { super(User.class); diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java b/src/_VisualDVM/Passes/All/AppendBugReportComment.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java rename to src/_VisualDVM/Passes/All/AppendBugReportComment.java index 06792c25..1be9e7b3 100644 --- a/src/Visual_DVM_2021/Passes/All/AppendBugReportComment.java +++ b/src/_VisualDVM/Passes/All/AppendBugReportComment.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; public class AppendBugReportComment extends AppendBugReportField { diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java b/src/_VisualDVM/Passes/All/AppendBugReportDescription.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java rename to src/_VisualDVM/Passes/All/AppendBugReportDescription.java index 73c37563..f114f684 100644 --- a/src/Visual_DVM_2021/Passes/All/AppendBugReportDescription.java +++ b/src/_VisualDVM/Passes/All/AppendBugReportDescription.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Visual.UI; public class AppendBugReportDescription extends AppendBugReportField { @Override diff --git a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/AppendBugReportField.java rename to src/_VisualDVM/Passes/All/AppendBugReportField.java index 9cb77b2e..d186970c 100644 --- a/src/Visual_DVM_2021/Passes/All/AppendBugReportField.java +++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -9,8 +8,8 @@ import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.PassCode; import javafx.util.Pair; import java.util.Date; diff --git a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java rename to src/_VisualDVM/Passes/All/ApplyBugReportSettings.java index 8c37e482..fc96dd36 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyBugReportSettings.java +++ b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Repository.BugReport.BugReport; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.LinkedHashMap; diff --git a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java b/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java rename to src/_VisualDVM/Passes/All/ApplyCurrentFunction.java index 99aebc71..fc8ac348 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyCurrentFunction.java +++ b/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.ComboTextDialog; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Comparator; diff --git a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java b/src/_VisualDVM/Passes/All/ApplyProfile.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/ApplyProfile.java rename to src/_VisualDVM/Passes/All/ApplyProfile.java index acadadd7..09b62479 100644 --- a/src/Visual_DVM_2021/Passes/All/ApplyProfile.java +++ b/src/_VisualDVM/Passes/All/ApplyProfile.java @@ -1,12 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import _VisualDVM.GlobalData.SapforProfileSetting.SapforProfileSetting; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java b/src/_VisualDVM/Passes/All/ArchivesBackupPass.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java rename to src/_VisualDVM/Passes/All/ArchivesBackupPass.java index c9da25ee..76f2cc1b 100644 --- a/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java +++ b/src/_VisualDVM/Passes/All/ArchivesBackupPass.java @@ -1,10 +1,10 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.User.User; -import Visual_DVM_2021.Passes.SSH.ConnectionPass; +import _VisualDVM.Passes.SSH.ConnectionPass; import com.jcraft.jsch.ChannelSftp; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/BuildComponent.java b/src/_VisualDVM/Passes/All/BuildComponent.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/BuildComponent.java rename to src/_VisualDVM/Passes/All/BuildComponent.java index 62a9acef..5c232998 100644 --- a/src/Visual_DVM_2021/Passes/All/BuildComponent.java +++ b/src/_VisualDVM/Passes/All/BuildComponent.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.Repository.Component.Component; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.ProcessPass; +import _VisualDVM.Passes.ProcessPass; import java.nio.file.Files; import java.nio.file.StandardCopyOption; diff --git a/src/Visual_DVM_2021/Passes/All/CheckAccount.java b/src/_VisualDVM/Passes/All/CheckAccount.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/CheckAccount.java rename to src/_VisualDVM/Passes/All/CheckAccount.java index 947b5d39..507658e7 100644 --- a/src/Visual_DVM_2021/Passes/All/CheckAccount.java +++ b/src/_VisualDVM/Passes/All/CheckAccount.java @@ -1,8 +1,7 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class CheckAccount extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java similarity index 81% rename from src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java rename to src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java index 45d0048f..04d9f41c 100644 --- a/src/Visual_DVM_2021/Passes/All/CheckRegistrationOnServer.java +++ b/src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Subscribes.Subscriber; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class CheckRegistrationOnServer extends ComponentsRepositoryPass { @Override protected void ServerAction() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java rename to src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java index ef3c51ae..5a06e45b 100644 --- a/src/Visual_DVM_2021/Passes/All/CheckRemoteWorkspace.java +++ b/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class CheckRemoteWorkspace extends ComponentsRepositoryPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java b/src/_VisualDVM/Passes/All/CleanAnalyses.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/CleanAnalyses.java rename to src/_VisualDVM/Passes/All/CleanAnalyses.java index f1187ff5..4b2fd2aa 100644 --- a/src/Visual_DVM_2021/Passes/All/CleanAnalyses.java +++ b/src/_VisualDVM/Passes/All/CleanAnalyses.java @@ -1,8 +1,7 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Passes.Project.CurrentProjectPass; public class CleanAnalyses extends CurrentProjectPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java b/src/_VisualDVM/Passes/All/CloneCurrentDVMConfiguration.java similarity index 82% rename from src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java rename to src/_VisualDVM/Passes/All/CloneCurrentDVMConfiguration.java index faab1f0e..6ee1fc49 100644 --- a/src/Visual_DVM_2021/Passes/All/CloneCurrentDVMConfiguration.java +++ b/src/_VisualDVM/Passes/All/CloneCurrentDVMConfiguration.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import Common.Passes.Pass; public class CloneCurrentDVMConfiguration extends Pass { diff --git a/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java b/src/_VisualDVM/Passes/All/CloneDVMSettings.java similarity index 82% rename from src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java rename to src/_VisualDVM/Passes/All/CloneDVMSettings.java index b4a61d3a..d8c63a9f 100644 --- a/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java +++ b/src/_VisualDVM/Passes/All/CloneDVMSettings.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import Visual_DVM_2021.Passes.Server.CloneServerObject; +import _VisualDVM.Passes.Server.CloneServerObject; public class CloneDVMSettings extends CloneServerObject { public CloneDVMSettings() { super(Global.testingServer, DVMSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java b/src/_VisualDVM/Passes/All/CloneSapforSettings.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java rename to src/_VisualDVM/Passes/All/CloneSapforSettings.java index 16b23ba7..89010352 100644 --- a/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java +++ b/src/_VisualDVM/Passes/All/CloneSapforSettings.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import Common.Database.Objects.DBObject; import _VisualDVM.Global; @@ -7,8 +7,8 @@ import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Server.CloneServerObject; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.CloneServerObject; //автоматической import java.util.Vector; public class CloneSapforSettings extends CloneServerObject { diff --git a/src/Visual_DVM_2021/Passes/All/CloseBugReport.java b/src/_VisualDVM/Passes/All/CloseBugReport.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/CloseBugReport.java rename to src/_VisualDVM/Passes/All/CloseBugReport.java index b28bcb06..b148e0cd 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseBugReport.java +++ b/src/_VisualDVM/Passes/All/CloseBugReport.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.BugReport.BugReportState; public class CloseBugReport extends UpdateBugReportField { @Override diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java b/src/_VisualDVM/Passes/All/CloseCurrentFile.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java rename to src/_VisualDVM/Passes/All/CloseCurrentFile.java index 5b74ffe5..047f060d 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseCurrentFile.java +++ b/src/_VisualDVM/Passes/All/CloseCurrentFile.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Utils.Utils_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.Visual.UI; diff --git a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java b/src/_VisualDVM/Passes/All/CloseCurrentProject.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java rename to src/_VisualDVM/Passes/All/CloseCurrentProject.java index 6875c2d4..1c011b37 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseCurrentProject.java +++ b/src/_VisualDVM/Passes/All/CloseCurrentProject.java @@ -1,11 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/CloseProject.java b/src/_VisualDVM/Passes/All/CloseProject.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/CloseProject.java rename to src/_VisualDVM/Passes/All/CloseProject.java index 274cabd9..667ec76a 100644 --- a/src/Visual_DVM_2021/Passes/All/CloseProject.java +++ b/src/_VisualDVM/Passes/All/CloseProject.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/All/CombineFiles.java b/src/_VisualDVM/Passes/All/CombineFiles.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/CombineFiles.java rename to src/_VisualDVM/Passes/All/CombineFiles.java index 7c3e29a1..4155ba1c 100644 --- a/src/Visual_DVM_2021/Passes/All/CombineFiles.java +++ b/src/_VisualDVM/Passes/All/CombineFiles.java @@ -1,12 +1,12 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import Common.Visual.Windows.Dialog.Text.ComboTextDialog; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Transformation; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.Transformation; import _VisualDVM.Visual.Windows.CombineFilesDialog; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java rename to src/_VisualDVM/Passes/All/CompareDVMRunTasks.java index a5563756..f365fe20 100644 --- a/src/Visual_DVM_2021/Passes/All/CompareDVMRunTasks.java +++ b/src/_VisualDVM/Passes/All/CompareDVMRunTasks.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; diff --git a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java b/src/_VisualDVM/Passes/All/CompareSapforPackages.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java rename to src/_VisualDVM/Passes/All/CompareSapforPackages.java index d13b8076..086f04a4 100644 --- a/src/Visual_DVM_2021/Passes/All/CompareSapforPackages.java +++ b/src/_VisualDVM/Passes/All/CompareSapforPackages.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; diff --git a/src/Visual_DVM_2021/Passes/All/Compile.java b/src/_VisualDVM/Passes/All/Compile.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/Compile.java rename to src/_VisualDVM/Passes/All/Compile.java index 3d763326..38e3d835 100644 --- a/src/Visual_DVM_2021/Passes/All/Compile.java +++ b/src/_VisualDVM/Passes/All/Compile.java @@ -1,17 +1,15 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.GlobalData.User.UserState; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; public class Compile extends Pass { diff --git a/src/Visual_DVM_2021/Passes/All/CompileServerSapfor.java b/src/_VisualDVM/Passes/All/CompileServerSapfor.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/CompileServerSapfor.java rename to src/_VisualDVM/Passes/All/CompileServerSapfor.java index fa24b6cd..52214b4d 100644 --- a/src/Visual_DVM_2021/Passes/All/CompileServerSapfor.java +++ b/src/_VisualDVM/Passes/All/CompileServerSapfor.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class CompileServerSapfor extends PublishServerObject { public CompileServerSapfor() { super(Global.testingServer, ServerSapfor.class); diff --git a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java rename to src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java index ad48be32..4b4a077b 100644 --- a/src/Visual_DVM_2021/Passes/All/ConvertCorrectnessTests.java +++ b/src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java @@ -1,13 +1,12 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.TestingSystemPass; import java.io.File; public class ConvertCorrectnessTests extends TestingSystemPass { diff --git a/src/Visual_DVM_2021/Passes/All/CopyProject.java b/src/_VisualDVM/Passes/All/CopyProject.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/CopyProject.java rename to src/_VisualDVM/Passes/All/CopyProject.java index fa83a519..7be46a18 100644 --- a/src/Visual_DVM_2021/Passes/All/CopyProject.java +++ b/src/_VisualDVM/Passes/All/CopyProject.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Global; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Utils; -import Visual_DVM_2021.Passes.CurrentProjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.CurrentProjectPass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Windows.CopyProjectFields; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/CreateComponentBackUp.java b/src/_VisualDVM/Passes/All/CreateComponentBackUp.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/CreateComponentBackUp.java rename to src/_VisualDVM/Passes/All/CreateComponentBackUp.java index 23fed722..b39c9941 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateComponentBackUp.java +++ b/src/_VisualDVM/Passes/All/CreateComponentBackUp.java @@ -1,5 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.CurrentComponentPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.CurrentComponentPass; import java.nio.file.Files; import java.nio.file.StandardCopyOption; diff --git a/src/Visual_DVM_2021/Passes/All/CreateDVMPackageFromCurrentProject.java b/src/_VisualDVM/Passes/All/CreateDVMPackageFromCurrentProject.java similarity index 71% rename from src/Visual_DVM_2021/Passes/All/CreateDVMPackageFromCurrentProject.java rename to src/_VisualDVM/Passes/All/CreateDVMPackageFromCurrentProject.java index 445a596e..4c52979a 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateDVMPackageFromCurrentProject.java +++ b/src/_VisualDVM/Passes/All/CreateDVMPackageFromCurrentProject.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; public class CreateDVMPackageFromCurrentProject extends Pass { } diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java b/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java rename to src/_VisualDVM/Passes/All/CreateEmptyDirectory.java index 0db921c1..770ff4f0 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java +++ b/src/_VisualDVM/Passes/All/CreateEmptyDirectory.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; -import Visual_DVM_2021.Passes.ChangeFilePass; +import _VisualDVM.Passes.Project.ChangeFilePass; import Common.Passes.PassException; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java b/src/_VisualDVM/Passes/All/CreateEmptyProject.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java rename to src/_VisualDVM/Passes/All/CreateEmptyProject.java index bc1058f7..10306c8b 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java +++ b/src/_VisualDVM/Passes/All/CreateEmptyProject.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Global; import Common.Visual.Windows.Dialog.Text.FileNameForm; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java rename to src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java index c8c04881..70947d53 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java +++ b/src/_VisualDVM/Passes/All/CreateGroupFromDirectory.java @@ -1,13 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; -import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VDirectoryChooser; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.io.File; import java.util.Arrays; diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java rename to src/_VisualDVM/Passes/All/CreateGroupFromFiles.java index a57da842..02356d51 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromFiles.java +++ b/src/_VisualDVM/Passes/All/CreateGroupFromFiles.java @@ -1,14 +1,12 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; -import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.TestingSystem.Common.Group.Group; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.io.File; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java b/src/_VisualDVM/Passes/All/CreateParallelVariants.java similarity index 84% rename from src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java rename to src/_VisualDVM/Passes/All/CreateParallelVariants.java index b6dffbd7..4e8512ec 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateParallelVariants.java +++ b/src/_VisualDVM/Passes/All/CreateParallelVariants.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.VariantsMassPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.VariantsMassPass; public class CreateParallelVariants extends VariantsMassPass { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java rename to src/_VisualDVM/Passes/All/CreateTestFromDirectory.java index e3a7e20e..ba400c30 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromDirectory.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; @@ -12,7 +11,7 @@ import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/_VisualDVM/Passes/All/CreateTestFromFile.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java rename to src/_VisualDVM/Passes/All/CreateTestFromFile.java index 763f962a..625f2353 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromFile.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.FileType; diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java b/src/_VisualDVM/Passes/All/CreateTestFromProject.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java rename to src/_VisualDVM/Passes/All/CreateTestFromProject.java index 0d97c39b..a01ed077 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromProject.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromProject.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.FileState; diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java b/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java rename to src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java index ac7d9a95..4d1dba67 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestFromSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Utils; diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java rename to src/_VisualDVM/Passes/All/CreateTestsFromFiles.java index dd0bf8da..de72279d 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestsFromFiles.java +++ b/src/_VisualDVM/Passes/All/CreateTestsFromFiles.java @@ -1,12 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.io.File; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java rename to src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java index 149a9483..7dafb7ed 100644 --- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java +++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java b/src/_VisualDVM/Passes/All/DVMConvertProject.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/DVMConvertProject.java rename to src/_VisualDVM/Passes/All/DVMConvertProject.java index e0f220c2..ecda2523 100644 --- a/src/Visual_DVM_2021/Passes/All/DVMConvertProject.java +++ b/src/_VisualDVM/Passes/All/DVMConvertProject.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -11,8 +11,8 @@ import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.PassCode; import org.apache.commons.io.FileUtils; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java b/src/_VisualDVM/Passes/All/DeleteBugReport.java similarity index 88% rename from src/Visual_DVM_2021/Passes/All/DeleteBugReport.java rename to src/_VisualDVM/Passes/All/DeleteBugReport.java index d7e4c379..3fa97e0b 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteBugReport.java +++ b/src/_VisualDVM/Passes/All/DeleteBugReport.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import Common.Database.Database; import _VisualDVM.Global; import _VisualDVM.Repository.BugReport.BugReport; import Common.Passes.DeleteObjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class DeleteBugReport extends DeleteObjectPass { public DeleteBugReport() { super(BugReport.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java rename to src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java index e315d312..d4ac55b0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteBugReportFromServer.java +++ b/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class DeleteBugReportFromServer extends ComponentsRepositoryPass { @Override protected boolean canStart(Object... args) { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java b/src/_VisualDVM/Passes/All/DeleteCompiler.java similarity index 69% rename from src/Visual_DVM_2021/Passes/All/DeleteCompiler.java rename to src/_VisualDVM/Passes/All/DeleteCompiler.java index ffb6d9b1..79ea00b6 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteCompiler.java +++ b/src/_VisualDVM/Passes/All/DeleteCompiler.java @@ -1,7 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; +package _VisualDVM.Passes.All; import Common.Passes.DeleteObjectPass; -import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; public class DeleteCompiler extends DeleteObjectPass { public DeleteCompiler() { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java b/src/_VisualDVM/Passes/All/DeleteConfiguration.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java rename to src/_VisualDVM/Passes/All/DeleteConfiguration.java index d67d0a19..172669db 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteConfiguration.java +++ b/src/_VisualDVM/Passes/All/DeleteConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteConfiguration extends DeleteServerObjects { public DeleteConfiguration() { super(Global.testingServer, DVMConfiguration.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java b/src/_VisualDVM/Passes/All/DeleteDVMPackage.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java rename to src/_VisualDVM/Passes/All/DeleteDVMPackage.java index 78d80873..3f76bf3b 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDVMPackage.java +++ b/src/_VisualDVM/Passes/All/DeleteDVMPackage.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; -import Visual_DVM_2021.Passes.DeleteTestingPackages; +import _VisualDVM.Passes.Testing.DeleteTestingPackages; import java.io.File; public class DeleteDVMPackage extends DeleteTestingPackages { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java b/src/_VisualDVM/Passes/All/DeleteDVMParameter.java similarity index 66% rename from src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java rename to src/_VisualDVM/Passes/All/DeleteDVMParameter.java index 54cc3c73..5ed18ada 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDVMParameter.java +++ b/src/_VisualDVM/Passes/All/DeleteDVMParameter.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import Common.Passes.DeleteObjectPass; public class DeleteDVMParameter extends DeleteObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDVMSettings.java b/src/_VisualDVM/Passes/All/DeleteDVMSettings.java similarity index 77% rename from src/Visual_DVM_2021/Passes/All/DeleteDVMSettings.java rename to src/_VisualDVM/Passes/All/DeleteDVMSettings.java index a904c7ee..c95206b2 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDVMSettings.java +++ b/src/_VisualDVM/Passes/All/DeleteDVMSettings.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteDVMSettings extends DeleteServerObjects { public DeleteDVMSettings() { super(Global.testingServer, DVMSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java b/src/_VisualDVM/Passes/All/DeleteDebugResults.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java rename to src/_VisualDVM/Passes/All/DeleteDebugResults.java index 1bb6220d..bdbd2a08 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDebugResults.java +++ b/src/_VisualDVM/Passes/All/DeleteDebugResults.java @@ -1,10 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Utils; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.Task; -import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Passes.Project.CurrentProjectPass; import java.util.Vector; import java.util.stream.Collectors; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java b/src/_VisualDVM/Passes/All/DeleteDirectory.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/DeleteDirectory.java rename to src/_VisualDVM/Passes/All/DeleteDirectory.java index ea0f0377..b9460752 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDirectory.java +++ b/src/_VisualDVM/Passes/All/DeleteDirectory.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -7,8 +6,8 @@ import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.ChangeFilePass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.ChangeFilePass; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java b/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java rename to src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java index 140e0703..9707b591 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteDownloadedBugReports.java +++ b/src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java @@ -1,15 +1,12 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Utils; import _VisualDVM.GlobalData.FileObject.DirInfo; import _VisualDVM.GlobalData.FileObject.DirInfosDataSet; import _VisualDVM.GlobalData.FileObject.DirInfosFields; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java b/src/_VisualDVM/Passes/All/DeleteEnvironmentValue.java similarity index 73% rename from src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java rename to src/_VisualDVM/Passes/All/DeleteEnvironmentValue.java index b76112d1..c489bc7a 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteEnvironmentValue.java +++ b/src/_VisualDVM/Passes/All/DeleteEnvironmentValue.java @@ -1,7 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; +package _VisualDVM.Passes.All; import Common.Passes.DeleteObjectPass; -import _VisualDVM.Global; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; public class DeleteEnvironmentValue extends DeleteObjectPass { public DeleteEnvironmentValue() { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteFile.java b/src/_VisualDVM/Passes/All/DeleteFile.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/DeleteFile.java rename to src/_VisualDVM/Passes/All/DeleteFile.java index 21d1781f..79b45632 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteFile.java +++ b/src/_VisualDVM/Passes/All/DeleteFile.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -7,8 +6,8 @@ import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.ChangeFilePass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.ChangeFilePass; +import _VisualDVM.Passes.PassCode; public class DeleteFile extends ChangeFilePass { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java b/src/_VisualDVM/Passes/All/DeleteGroup.java similarity index 75% rename from src/Visual_DVM_2021/Passes/All/DeleteGroup.java rename to src/_VisualDVM/Passes/All/DeleteGroup.java index d99a4fc4..ee4bd912 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteGroup.java +++ b/src/_VisualDVM/Passes/All/DeleteGroup.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteGroup extends DeleteServerObjects { public DeleteGroup() { super(Global.testingServer, Group.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java b/src/_VisualDVM/Passes/All/DeleteLonelyM.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java rename to src/_VisualDVM/Passes/All/DeleteLonelyM.java index fb131e44..52521a95 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java +++ b/src/_VisualDVM/Passes/All/DeleteLonelyM.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java b/src/_VisualDVM/Passes/All/DeleteMachine.java similarity index 63% rename from src/Visual_DVM_2021/Passes/All/DeleteMachine.java rename to src/_VisualDVM/Passes/All/DeleteMachine.java index f39be2ec..441365b0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteMachine.java +++ b/src/_VisualDVM/Passes/All/DeleteMachine.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Machine.Machine; import Common.Passes.DeleteObjectPass; public class DeleteMachine extends DeleteObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java b/src/_VisualDVM/Passes/All/DeleteMakefile.java similarity index 64% rename from src/Visual_DVM_2021/Passes/All/DeleteMakefile.java rename to src/_VisualDVM/Passes/All/DeleteMakefile.java index e813fb13..73393185 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteMakefile.java +++ b/src/_VisualDVM/Passes/All/DeleteMakefile.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Makefile.Makefile; import Common.Passes.DeleteObjectPass; public class DeleteMakefile extends DeleteObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java b/src/_VisualDVM/Passes/All/DeleteProfile.java similarity index 66% rename from src/Visual_DVM_2021/Passes/All/DeleteProfile.java rename to src/_VisualDVM/Passes/All/DeleteProfile.java index b2a20f37..0a791825 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteProfile.java +++ b/src/_VisualDVM/Passes/All/DeleteProfile.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import Common.Passes.DeleteObjectPass; public class DeleteProfile extends DeleteObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java b/src/_VisualDVM/Passes/All/DeleteRunConfiguration.java similarity index 68% rename from src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java rename to src/_VisualDVM/Passes/All/DeleteRunConfiguration.java index 0559e4dc..e71fd66f 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteRunConfiguration.java +++ b/src/_VisualDVM/Passes/All/DeleteRunConfiguration.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.DeleteObjectPass; public class DeleteRunConfiguration extends DeleteObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java b/src/_VisualDVM/Passes/All/DeleteSapforConfiguration.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java rename to src/_VisualDVM/Passes/All/DeleteSapforConfiguration.java index fcb66817..de7a9a76 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSapforConfiguration.java +++ b/src/_VisualDVM/Passes/All/DeleteSapforConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteSapforConfiguration extends DeleteServerObjects { public DeleteSapforConfiguration() { super(Global.testingServer, SapforConfiguration.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java b/src/_VisualDVM/Passes/All/DeleteSapforPackage.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java rename to src/_VisualDVM/Passes/All/DeleteSapforPackage.java index 083e8815..02aba074 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSapforPackage.java +++ b/src/_VisualDVM/Passes/All/DeleteSapforPackage.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; -import Visual_DVM_2021.Passes.DeleteTestingPackages; +import _VisualDVM.Passes.Testing.DeleteTestingPackages; import java.io.File; public class DeleteSapforPackage extends DeleteTestingPackages { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforSettings.java b/src/_VisualDVM/Passes/All/DeleteSapforSettings.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/DeleteSapforSettings.java rename to src/_VisualDVM/Passes/All/DeleteSapforSettings.java index 00b99bf0..c890b6fc 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSapforSettings.java +++ b/src/_VisualDVM/Passes/All/DeleteSapforSettings.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteSapforSettings extends DeleteServerObjects { public DeleteSapforSettings() { super(Global.testingServer, SapforSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforSettingsCommand.java b/src/_VisualDVM/Passes/All/DeleteSapforSettingsCommand.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/DeleteSapforSettingsCommand.java rename to src/_VisualDVM/Passes/All/DeleteSapforSettingsCommand.java index d5bc03b0..7b1b7bbf 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSapforSettingsCommand.java +++ b/src/_VisualDVM/Passes/All/DeleteSapforSettingsCommand.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteSapforSettingsCommand extends DeleteServerObjects { public DeleteSapforSettingsCommand() { super(Global.testingServer, SapforSettingsCommand.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java b/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java rename to src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java index 188c4739..73fe81aa 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedCompilationTasks.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java @@ -1,8 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Utils; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java rename to src/_VisualDVM/Passes/All/DeleteSelectedFiles.java index 1739e9a4..2fb329d8 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class DeleteSelectedFiles extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java b/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java rename to src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java index c06953b2..f0ff38ca 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedRunTasks.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java @@ -1,8 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Utils; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java b/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java rename to src/_VisualDVM/Passes/All/DeleteSelectedVersions.java index bdedd6b3..e5dc3da1 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSelectedVersions.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java b/src/_VisualDVM/Passes/All/DeleteServerSapfor.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java rename to src/_VisualDVM/Passes/All/DeleteServerSapfor.java index d0834bf0..dae4c48f 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteServerSapfor.java +++ b/src/_VisualDVM/Passes/All/DeleteServerSapfor.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.DeleteServerObject; +import _VisualDVM.Passes.Server.DeleteServerObject; public class DeleteServerSapfor extends DeleteServerObject { public DeleteServerSapfor() { super(Global.testingServer, ServerSapfor.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java b/src/_VisualDVM/Passes/All/DeleteSubscriber.java similarity index 77% rename from src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java rename to src/_VisualDVM/Passes/All/DeleteSubscriber.java index fb3fdfc4..015293ce 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSubscriber.java +++ b/src/_VisualDVM/Passes/All/DeleteSubscriber.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Subscribes.Subscriber; -import Visual_DVM_2021.Passes.Server.DeleteServerObject; +import _VisualDVM.Passes.Server.DeleteServerObject; public class DeleteSubscriber extends DeleteServerObject { public DeleteSubscriber() { super(Global.componentsServer, Subscriber.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java b/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java rename to src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java index 94120078..05000c0a 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSubscriberWorkspace.java +++ b/src/_VisualDVM/Passes/All/DeleteSubscriberWorkspace.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; -import Visual_DVM_2021.Passes.Server.DeleteServerObject; +import _VisualDVM.Passes.Server.DeleteServerObject; public class DeleteSubscriberWorkspace extends DeleteServerObject { public DeleteSubscriberWorkspace() { super(Global.componentsServer, SubscriberWorkspace.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSubversions.java b/src/_VisualDVM/Passes/All/DeleteSubversions.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/DeleteSubversions.java rename to src/_VisualDVM/Passes/All/DeleteSubversions.java index 492aea2e..0fa4a021 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteSubversions.java +++ b/src/_VisualDVM/Passes/All/DeleteSubversions.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.CurrentProjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.CurrentProjectPass; +import _VisualDVM.Passes.PassCode; import java.util.Vector; public class DeleteSubversions extends CurrentProjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteTest.java b/src/_VisualDVM/Passes/All/DeleteTest.java similarity index 75% rename from src/Visual_DVM_2021/Passes/All/DeleteTest.java rename to src/_VisualDVM/Passes/All/DeleteTest.java index 0390b3dd..77ed1f76 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteTest.java +++ b/src/_VisualDVM/Passes/All/DeleteTest.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; public class DeleteTest extends DeleteServerObjects { public DeleteTest() { super(Global.testingServer, Test.class); diff --git a/src/Visual_DVM_2021/Passes/All/DeleteUser.java b/src/_VisualDVM/Passes/All/DeleteUser.java similarity index 61% rename from src/Visual_DVM_2021/Passes/All/DeleteUser.java rename to src/_VisualDVM/Passes/All/DeleteUser.java index 2d758f20..17b88d74 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteUser.java +++ b/src/_VisualDVM/Passes/All/DeleteUser.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.User.User; import Common.Passes.DeleteObjectPass; public class DeleteUser extends DeleteObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java b/src/_VisualDVM/Passes/All/DeleteVersion.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/DeleteVersion.java rename to src/_VisualDVM/Passes/All/DeleteVersion.java index e4d93f57..4e2ee3f0 100644 --- a/src/Visual_DVM_2021/Passes/All/DeleteVersion.java +++ b/src/_VisualDVM/Passes/All/DeleteVersion.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -7,7 +6,7 @@ import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class DeleteVersion extends Pass { db_project_info parent; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java b/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java rename to src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java index aa9311cd..ae2ece5a 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadAllBugReportsArchives.java +++ b/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.PassCode; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java b/src/_VisualDVM/Passes/All/DownloadBugReport.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/DownloadBugReport.java rename to src/_VisualDVM/Passes/All/DownloadBugReport.java index db48fbcd..6b6c4af6 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadBugReport.java +++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Utils; @@ -6,7 +6,7 @@ import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class DownloadBugReport extends ComponentsRepositoryPass { @Override protected boolean canStart(Object... args) { diff --git a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java b/src/_VisualDVM/Passes/All/DownloadComponent.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/DownloadComponent.java rename to src/_VisualDVM/Passes/All/DownloadComponent.java index c28ffade..dd3519ca 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadComponent.java +++ b/src/_VisualDVM/Passes/All/DownloadComponent.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class DownloadComponent extends ComponentsRepositoryPass { @Override protected void ServerAction() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java b/src/_VisualDVM/Passes/All/DownloadDVMPackage.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java rename to src/_VisualDVM/Passes/All/DownloadDVMPackage.java index b9ecf128..699d0ddd 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java +++ b/src/_VisualDVM/Passes/All/DownloadDVMPackage.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Constants; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java rename to src/_VisualDVM/Passes/All/DownloadDVMPackages.java index b2b68362..b61676b0 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackages.java +++ b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Global; @@ -6,9 +6,9 @@ import _VisualDVM.Utils; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import javafx.util.Pair; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadProject.java b/src/_VisualDVM/Passes/All/DownloadProject.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/DownloadProject.java rename to src/_VisualDVM/Passes/All/DownloadProject.java index 3cfca322..929d0add 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadProject.java +++ b/src/_VisualDVM/Passes/All/DownloadProject.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -7,9 +6,9 @@ import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass; +import _VisualDVM.Passes.SSH.CurrentConnectionPass; import java.io.File; import java.nio.file.Paths; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java b/src/_VisualDVM/Passes/All/DownloadRepository.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/DownloadRepository.java rename to src/_VisualDVM/Passes/All/DownloadRepository.java index 8ce7ac50..dca4e37b 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadRepository.java +++ b/src/_VisualDVM/Passes/All/DownloadRepository.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Utils; -import Visual_DVM_2021.Passes.ProcessPass; +import _VisualDVM.Passes.ProcessPass; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java rename to src/_VisualDVM/Passes/All/DownloadSapforPackage.java index 2fb43c3d..13c2383f 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadSapforPackage.java +++ b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Global; @@ -6,9 +6,9 @@ import _VisualDVM.Utils; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java b/src/_VisualDVM/Passes/All/DownloadTaskTest.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java rename to src/_VisualDVM/Passes/All/DownloadTaskTest.java index 6297f97e..2aa244a1 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadTaskTest.java +++ b/src/_VisualDVM/Passes/All/DownloadTaskTest.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; diff --git a/src/Visual_DVM_2021/Passes/All/DownloadTest.java b/src/_VisualDVM/Passes/All/DownloadTest.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/DownloadTest.java rename to src/_VisualDVM/Passes/All/DownloadTest.java index 2abfebd7..9a75e275 100644 --- a/src/Visual_DVM_2021/Passes/All/DownloadTest.java +++ b/src/_VisualDVM/Passes/All/DownloadTest.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -8,8 +7,8 @@ import _VisualDVM.Utils; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.TestingSystemPass; public class DownloadTest extends TestingSystemPass { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java b/src/_VisualDVM/Passes/All/DropAnalyses.java similarity index 76% rename from src/Visual_DVM_2021/Passes/All/DropAnalyses.java rename to src/_VisualDVM/Passes/All/DropAnalyses.java index 19f05c2c..5651063e 100644 --- a/src/Visual_DVM_2021/Passes/All/DropAnalyses.java +++ b/src/_VisualDVM/Passes/All/DropAnalyses.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; -import Visual_DVM_2021.Passes.CurrentProjectPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.Global; public class DropAnalyses extends CurrentProjectPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java b/src/_VisualDVM/Passes/All/DropFastAccess.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/DropFastAccess.java rename to src/_VisualDVM/Passes/All/DropFastAccess.java index 03bc3a00..a84caf5a 100644 --- a/src/Visual_DVM_2021/Passes/All/DropFastAccess.java +++ b/src/_VisualDVM/Passes/All/DropFastAccess.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Database.Objects.PassStats.PassStats; import _VisualDVM.Global; import _VisualDVM.Visual.UI; diff --git a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java b/src/_VisualDVM/Passes/All/DropLastProjects.java similarity index 81% rename from src/Visual_DVM_2021/Passes/All/DropLastProjects.java rename to src/_VisualDVM/Passes/All/DropLastProjects.java index 0b5b67b2..239fb68c 100644 --- a/src/Visual_DVM_2021/Passes/All/DropLastProjects.java +++ b/src/_VisualDVM/Passes/All/DropLastProjects.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalData.DBLastProject.DBLastProject; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/DropSavedArrays.java b/src/_VisualDVM/Passes/All/DropSavedArrays.java similarity index 82% rename from src/Visual_DVM_2021/Passes/All/DropSavedArrays.java rename to src/_VisualDVM/Passes/All/DropSavedArrays.java index 5b8bb672..0e56a89b 100644 --- a/src/Visual_DVM_2021/Passes/All/DropSavedArrays.java +++ b/src/_VisualDVM/Passes/All/DropSavedArrays.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.ProjectData.DBArray.DBArray; -import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Passes.Project.CurrentProjectPass; public class DropSavedArrays extends CurrentProjectPass { @Override public String getButtonText() { diff --git a/src/Visual_DVM_2021/Passes/All/EditAccount.java b/src/_VisualDVM/Passes/All/EditAccount.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/EditAccount.java rename to src/_VisualDVM/Passes/All/EditAccount.java index ab204313..26b5ab7e 100644 --- a/src/Visual_DVM_2021/Passes/All/EditAccount.java +++ b/src/_VisualDVM/Passes/All/EditAccount.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Subscribes.Subscriber; diff --git a/src/Visual_DVM_2021/Passes/All/EditCompiler.java b/src/_VisualDVM/Passes/All/EditCompiler.java similarity index 63% rename from src/Visual_DVM_2021/Passes/All/EditCompiler.java rename to src/_VisualDVM/Passes/All/EditCompiler.java index cae50d83..f275b5d4 100644 --- a/src/Visual_DVM_2021/Passes/All/EditCompiler.java +++ b/src/_VisualDVM/Passes/All/EditCompiler.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Compiler.Compiler; import Common.Passes.EditObjectPass; public class EditCompiler extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditConfiguration.java b/src/_VisualDVM/Passes/All/EditConfiguration.java similarity index 79% rename from src/Visual_DVM_2021/Passes/All/EditConfiguration.java rename to src/_VisualDVM/Passes/All/EditConfiguration.java index 304b813f..12a3a0ab 100644 --- a/src/Visual_DVM_2021/Passes/All/EditConfiguration.java +++ b/src/_VisualDVM/Passes/All/EditConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditConfiguration extends EditServerObject { public EditConfiguration() { super(Global.testingServer, DVMConfiguration.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java b/src/_VisualDVM/Passes/All/EditDVMParameter.java similarity index 65% rename from src/Visual_DVM_2021/Passes/All/EditDVMParameter.java rename to src/_VisualDVM/Passes/All/EditDVMParameter.java index 4345a5c3..74c80f84 100644 --- a/src/Visual_DVM_2021/Passes/All/EditDVMParameter.java +++ b/src/_VisualDVM/Passes/All/EditDVMParameter.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.DVMParameter.DVMParameter; import Common.Passes.EditObjectPass; public class EditDVMParameter extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditDVMSettings.java b/src/_VisualDVM/Passes/All/EditDVMSettings.java similarity index 77% rename from src/Visual_DVM_2021/Passes/All/EditDVMSettings.java rename to src/_VisualDVM/Passes/All/EditDVMSettings.java index f9a78302..4727bae0 100644 --- a/src/Visual_DVM_2021/Passes/All/EditDVMSettings.java +++ b/src/_VisualDVM/Passes/All/EditDVMSettings.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditDVMSettings extends EditServerObject { public EditDVMSettings() { super(Global.testingServer, DVMSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java b/src/_VisualDVM/Passes/All/EditEnvironmentValue.java similarity index 67% rename from src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java rename to src/_VisualDVM/Passes/All/EditEnvironmentValue.java index 290fb3a4..72e5bb7a 100644 --- a/src/Visual_DVM_2021/Passes/All/EditEnvironmentValue.java +++ b/src/_VisualDVM/Passes/All/EditEnvironmentValue.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; import Common.Passes.EditObjectPass; public class EditEnvironmentValue extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditGroup.java b/src/_VisualDVM/Passes/All/EditGroup.java similarity index 75% rename from src/Visual_DVM_2021/Passes/All/EditGroup.java rename to src/_VisualDVM/Passes/All/EditGroup.java index 5d891809..d04fc611 100644 --- a/src/Visual_DVM_2021/Passes/All/EditGroup.java +++ b/src/_VisualDVM/Passes/All/EditGroup.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditGroup extends EditServerObject { public EditGroup() { super(Global.testingServer, Group.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditMachine.java b/src/_VisualDVM/Passes/All/EditMachine.java similarity index 62% rename from src/Visual_DVM_2021/Passes/All/EditMachine.java rename to src/_VisualDVM/Passes/All/EditMachine.java index 51d851f1..d90fbbaf 100644 --- a/src/Visual_DVM_2021/Passes/All/EditMachine.java +++ b/src/_VisualDVM/Passes/All/EditMachine.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Machine.Machine; import Common.Passes.EditObjectPass; public class EditMachine extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditMakefile.java b/src/_VisualDVM/Passes/All/EditMakefile.java similarity index 63% rename from src/Visual_DVM_2021/Passes/All/EditMakefile.java rename to src/_VisualDVM/Passes/All/EditMakefile.java index 6927d85f..5321f638 100644 --- a/src/Visual_DVM_2021/Passes/All/EditMakefile.java +++ b/src/_VisualDVM/Passes/All/EditMakefile.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Makefile.Makefile; import Common.Passes.EditObjectPass; public class EditMakefile extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditModule.java b/src/_VisualDVM/Passes/All/EditModule.java similarity index 62% rename from src/Visual_DVM_2021/Passes/All/EditModule.java rename to src/_VisualDVM/Passes/All/EditModule.java index d158785d..8260dc95 100644 --- a/src/Visual_DVM_2021/Passes/All/EditModule.java +++ b/src/_VisualDVM/Passes/All/EditModule.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Module.Module; import Common.Passes.EditObjectPass; public class EditModule extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditProfile.java b/src/_VisualDVM/Passes/All/EditProfile.java similarity index 65% rename from src/Visual_DVM_2021/Passes/All/EditProfile.java rename to src/_VisualDVM/Passes/All/EditProfile.java index f6fadae0..222eed62 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProfile.java +++ b/src/_VisualDVM/Passes/All/EditProfile.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import Common.Passes.EditObjectPass; public class EditProfile extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java b/src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java similarity index 88% rename from src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java rename to src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java index b2b220de..20ff04bf 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProjectCompilationMaxtime.java +++ b/src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import Common.Visual.Windows.Dialog.SessionMaxtimeDialog; -import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.Global; public class EditProjectCompilationMaxtime extends CurrentProjectPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java b/src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java rename to src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java index 4b5137a9..c250a07c 100644 --- a/src/Visual_DVM_2021/Passes/All/EditProjectRunMaxtime.java +++ b/src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import Common.Visual.Windows.Dialog.SessionMaxtimeDialog; -import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.Global; public class EditProjectRunMaxtime extends CurrentProjectPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java b/src/_VisualDVM/Passes/All/EditRunConfiguration.java similarity index 67% rename from src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java rename to src/_VisualDVM/Passes/All/EditRunConfiguration.java index e85bccce..a413c43a 100644 --- a/src/Visual_DVM_2021/Passes/All/EditRunConfiguration.java +++ b/src/_VisualDVM/Passes/All/EditRunConfiguration.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; import Common.Passes.EditObjectPass; public class EditRunConfiguration extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java b/src/_VisualDVM/Passes/All/EditSapforConfiguration.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java rename to src/_VisualDVM/Passes/All/EditSapforConfiguration.java index 246d9b7a..40bdd1ef 100644 --- a/src/Visual_DVM_2021/Passes/All/EditSapforConfiguration.java +++ b/src/_VisualDVM/Passes/All/EditSapforConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditSapforConfiguration extends EditServerObject { public EditSapforConfiguration() { super(Global.testingServer, SapforConfiguration.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforSettings.java b/src/_VisualDVM/Passes/All/EditSapforSettings.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/EditSapforSettings.java rename to src/_VisualDVM/Passes/All/EditSapforSettings.java index c97d4e54..8c80f370 100644 --- a/src/Visual_DVM_2021/Passes/All/EditSapforSettings.java +++ b/src/_VisualDVM/Passes/All/EditSapforSettings.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditSapforSettings extends EditServerObject { public EditSapforSettings() { super(Global.testingServer, SapforSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java b/src/_VisualDVM/Passes/All/EditSapforSettingsCommand.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java rename to src/_VisualDVM/Passes/All/EditSapforSettingsCommand.java index fa5bd54c..48798a49 100644 --- a/src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java +++ b/src/_VisualDVM/Passes/All/EditSapforSettingsCommand.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditSapforSettingsCommand extends EditServerObject { public EditSapforSettingsCommand() { super(Global.testingServer,SapforSettingsCommand.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditSubscriber.java b/src/_VisualDVM/Passes/All/EditSubscriber.java similarity index 77% rename from src/Visual_DVM_2021/Passes/All/EditSubscriber.java rename to src/_VisualDVM/Passes/All/EditSubscriber.java index f2f3f217..6a013ccf 100644 --- a/src/Visual_DVM_2021/Passes/All/EditSubscriber.java +++ b/src/_VisualDVM/Passes/All/EditSubscriber.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Subscribes.Subscriber; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditSubscriber extends EditServerObject { public EditSubscriber() { super(Global.componentsServer, Subscriber.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditTest.java b/src/_VisualDVM/Passes/All/EditTest.java similarity index 75% rename from src/Visual_DVM_2021/Passes/All/EditTest.java rename to src/_VisualDVM/Passes/All/EditTest.java index a94ff2b3..2ecf1516 100644 --- a/src/Visual_DVM_2021/Passes/All/EditTest.java +++ b/src/_VisualDVM/Passes/All/EditTest.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; public class EditTest extends EditServerObject { public EditTest() { super(Global.testingServer, Test.class); diff --git a/src/Visual_DVM_2021/Passes/All/EditUser.java b/src/_VisualDVM/Passes/All/EditUser.java similarity index 60% rename from src/Visual_DVM_2021/Passes/All/EditUser.java rename to src/_VisualDVM/Passes/All/EditUser.java index f728be92..53e5d446 100644 --- a/src/Visual_DVM_2021/Passes/All/EditUser.java +++ b/src/_VisualDVM/Passes/All/EditUser.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; -import Common.Utils.Utils_; -import _VisualDVM.Global; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.User.User; import Common.Passes.EditObjectPass; public class EditUser extends EditObjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/Email.java b/src/_VisualDVM/Passes/All/Email.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/Email.java rename to src/_VisualDVM/Passes/All/Email.java index 696811e3..76fb8dc7 100644 --- a/src/Visual_DVM_2021/Passes/All/Email.java +++ b/src/_VisualDVM/Passes/All/Email.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Subscribes.Subscriber; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import java.util.Vector; //http://java-online.ru/javax-mail.xhtml diff --git a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java b/src/_VisualDVM/Passes/All/EraseBadSymbols.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java rename to src/_VisualDVM/Passes/All/EraseBadSymbols.java index 32f7e517..7ec5c930 100644 --- a/src/Visual_DVM_2021/Passes/All/EraseBadSymbols.java +++ b/src/_VisualDVM/Passes/All/EraseBadSymbols.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.Transformation; +import _VisualDVM.Passes.Sapfor.Transformation; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java b/src/_VisualDVM/Passes/All/ExcludeFile.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/ExcludeFile.java rename to src/_VisualDVM/Passes/All/ExcludeFile.java index e70cb497..189fc09b 100644 --- a/src/Visual_DVM_2021/Passes/All/ExcludeFile.java +++ b/src/_VisualDVM/Passes/All/ExcludeFile.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; diff --git a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java b/src/_VisualDVM/Passes/All/ExcludeSelectedFiles.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java rename to src/_VisualDVM/Passes/All/ExcludeSelectedFiles.java index 86aa8ee5..f4de8a51 100644 --- a/src/Visual_DVM_2021/Passes/All/ExcludeSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/ExcludeSelectedFiles.java @@ -1,8 +1,7 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java similarity index 99% rename from src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java rename to src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java index eecd08e3..d79e6747 100644 --- a/src/Visual_DVM_2021/Passes/All/ExportDVMPackageToExcel.java +++ b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Constants; @@ -12,7 +11,7 @@ import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import org.apache.commons.io.FileUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; diff --git a/src/Visual_DVM_2021/Passes/All/ExtractRecipients.java b/src/_VisualDVM/Passes/All/ExtractRecipients.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/ExtractRecipients.java rename to src/_VisualDVM/Passes/All/ExtractRecipients.java index 1fdb14f0..69a6f9fe 100644 --- a/src/Visual_DVM_2021/Passes/All/ExtractRecipients.java +++ b/src/_VisualDVM/Passes/All/ExtractRecipients.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/FinishApplication.java b/src/_VisualDVM/Passes/All/FinishApplication.java similarity index 79% rename from src/Visual_DVM_2021/Passes/All/FinishApplication.java rename to src/_VisualDVM/Passes/All/FinishApplication.java index 21ccd09c..75d6c8d8 100644 --- a/src/Visual_DVM_2021/Passes/All/FinishApplication.java +++ b/src/_VisualDVM/Passes/All/FinishApplication.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; public class FinishApplication extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/GCOV.java b/src/_VisualDVM/Passes/All/GCOV.java similarity index 99% rename from src/Visual_DVM_2021/Passes/All/GCOV.java rename to src/_VisualDVM/Passes/All/GCOV.java index 6f133cd3..9c27d6ac 100644 --- a/src/Visual_DVM_2021/Passes/All/GCOV.java +++ b/src/_VisualDVM/Passes/All/GCOV.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Utils; diff --git a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java b/src/_VisualDVM/Passes/All/GenerateParallelVariants.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java rename to src/_VisualDVM/Passes/All/GenerateParallelVariants.java index 2254d75d..a8a9d9d1 100644 --- a/src/Visual_DVM_2021/Passes/All/GenerateParallelVariants.java +++ b/src/_VisualDVM/Passes/All/GenerateParallelVariants.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.CurrentProjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.CurrentProjectPass; +import _VisualDVM.Passes.PassCode; import java.math.BigInteger; public class GenerateParallelVariants extends CurrentProjectPass { diff --git a/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java rename to src/_VisualDVM/Passes/All/GetComponentsActualVersions.java index 73a1fed8..2ec5bed7 100644 --- a/src/Visual_DVM_2021/Passes/All/GetComponentsActualVersions.java +++ b/src/_VisualDVM/Passes/All/GetComponentsActualVersions.java @@ -1,10 +1,10 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Component.ComponentType; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import java.util.LinkedHashMap; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java rename to src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java index 3e387da7..5977e540 100644 --- a/src/Visual_DVM_2021/Passes/All/GetComponentsBackupsFromServer.java +++ b/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import java.io.File; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java b/src/_VisualDVM/Passes/All/GetOldBugReports.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/GetOldBugReports.java rename to src/_VisualDVM/Passes/All/GetOldBugReports.java index 3fc05b26..748a6c26 100644 --- a/src/Visual_DVM_2021/Passes/All/GetOldBugReports.java +++ b/src/_VisualDVM/Passes/All/GetOldBugReports.java @@ -1,6 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; -import _VisualDVM.GlobalData.GlobalDatabase; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.FileObject.DirInfo; diff --git a/src/Visual_DVM_2021/Passes/All/ImportFiles.java b/src/_VisualDVM/Passes/All/ImportFiles.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/ImportFiles.java rename to src/_VisualDVM/Passes/All/ImportFiles.java index 738822de..bacca90f 100644 --- a/src/Visual_DVM_2021/Passes/All/ImportFiles.java +++ b/src/_VisualDVM/Passes/All/ImportFiles.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Visual.Windows.Dialog.VFileChooser; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/IncludeFile.java b/src/_VisualDVM/Passes/All/IncludeFile.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/IncludeFile.java rename to src/_VisualDVM/Passes/All/IncludeFile.java index 402017ac..3ad37fcf 100644 --- a/src/Visual_DVM_2021/Passes/All/IncludeFile.java +++ b/src/_VisualDVM/Passes/All/IncludeFile.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; diff --git a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java b/src/_VisualDVM/Passes/All/IncludeSelectedFiles.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java rename to src/_VisualDVM/Passes/All/IncludeSelectedFiles.java index e0a771b7..5181df77 100644 --- a/src/Visual_DVM_2021/Passes/All/IncludeSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/IncludeSelectedFiles.java @@ -1,8 +1,7 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java b/src/_VisualDVM/Passes/All/InitialiseUser.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/InitialiseUser.java rename to src/_VisualDVM/Passes/All/InitialiseUser.java index ed75b716..8ceb915a 100644 --- a/src/Visual_DVM_2021/Passes/All/InitialiseUser.java +++ b/src/_VisualDVM/Passes/All/InitialiseUser.java @@ -1,13 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.GlobalData.User.UserState; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; public class InitialiseUser extends Pass { diff --git a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java b/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java rename to src/_VisualDVM/Passes/All/InstallComponentFromFolder.java index f094c295..8b378fff 100644 --- a/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java +++ b/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalProperties; import Common.Visual.Windows.Dialog.VFileChooser; -import Visual_DVM_2021.Passes.CurrentComponentPass; +import _VisualDVM.Passes.CurrentComponentPass; import java.io.File; import java.nio.file.Files; diff --git a/src/Visual_DVM_2021/Passes/All/LinuxLocalCompilation.java b/src/_VisualDVM/Passes/All/LinuxLocalCompilation.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/LinuxLocalCompilation.java rename to src/_VisualDVM/Passes/All/LinuxLocalCompilation.java index 3c3946d6..928a8ba0 100644 --- a/src/Visual_DVM_2021/Passes/All/LinuxLocalCompilation.java +++ b/src/_VisualDVM/Passes/All/LinuxLocalCompilation.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.Passes.TaskLocalPass; import _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux.LinuxLocalCompilationSupervisor; diff --git a/src/Visual_DVM_2021/Passes/All/LinuxLocalRun.java b/src/_VisualDVM/Passes/All/LinuxLocalRun.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/LinuxLocalRun.java rename to src/_VisualDVM/Passes/All/LinuxLocalRun.java index deae5f60..d8cd28de 100644 --- a/src/Visual_DVM_2021/Passes/All/LinuxLocalRun.java +++ b/src/_VisualDVM/Passes/All/LinuxLocalRun.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.Passes.TaskLocalPass; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.Supervisor.Local.Linux.LinuxLocalRunSupervisor; diff --git a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java b/src/_VisualDVM/Passes/All/LocalInitaliseUser.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java rename to src/_VisualDVM/Passes/All/LocalInitaliseUser.java index 03193568..36fadfe0 100644 --- a/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java +++ b/src/_VisualDVM/Passes/All/LocalInitaliseUser.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.GlobalData.User.User; import _VisualDVM.GlobalData.User.UserState; -import Visual_DVM_2021.Passes.ProcessPass; +import _VisualDVM.Passes.ProcessPass; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java b/src/_VisualDVM/Passes/All/LocalSingleCommand.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java rename to src/_VisualDVM/Passes/All/LocalSingleCommand.java index 0f6760c2..14eb0f5a 100644 --- a/src/Visual_DVM_2021/Passes/All/LocalSingleCommand.java +++ b/src/_VisualDVM/Passes/All/LocalSingleCommand.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Utils; -import Visual_DVM_2021.Passes.ProcessPass; +import _VisualDVM.Passes.ProcessPass; public class LocalSingleCommand extends ProcessPass { String command = ""; @Override diff --git a/src/Visual_DVM_2021/Passes/All/MVSRun.java b/src/_VisualDVM/Passes/All/MVSRun.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/MVSRun.java rename to src/_VisualDVM/Passes/All/MVSRun.java index 1df4bbde..c29e5534 100644 --- a/src/Visual_DVM_2021/Passes/All/MVSRun.java +++ b/src/_VisualDVM/Passes/All/MVSRun.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.Supervisor.Remote.MVSRunSupervisor; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.SSH.TaskConnectionPass; +import _VisualDVM.Passes.SSH.TaskConnectionPass; public class MVSRun extends TaskConnectionPass { public MVSRun() { super(MVSRunSupervisor.class); diff --git a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java b/src/_VisualDVM/Passes/All/MakeScreenShot.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/MakeScreenShot.java rename to src/_VisualDVM/Passes/All/MakeScreenShot.java index 4ca1fb58..96bc6e0c 100644 --- a/src/Visual_DVM_2021/Passes/All/MakeScreenShot.java +++ b/src/_VisualDVM/Passes/All/MakeScreenShot.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import Visual_DVM_2021.Passes.CurrentProjectPass; +import _VisualDVM.Passes.Project.CurrentProjectPass; import javax.imageio.ImageIO; import java.awt.*; diff --git a/src/Visual_DVM_2021/Passes/All/MassSelectArrays.java b/src/_VisualDVM/Passes/All/MassSelectArrays.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/MassSelectArrays.java rename to src/_VisualDVM/Passes/All/MassSelectArrays.java index c747d6f8..cf57a9df 100644 --- a/src/Visual_DVM_2021/Passes/All/MassSelectArrays.java +++ b/src/_VisualDVM/Passes/All/MassSelectArrays.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforModification; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforModification; import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Arrays.ArrayState; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReport.java b/src/_VisualDVM/Passes/All/OpenBugReport.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/OpenBugReport.java rename to src/_VisualDVM/Passes/All/OpenBugReport.java index 0d7f1e19..90083677 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenBugReport.java +++ b/src/_VisualDVM/Passes/All/OpenBugReport.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.BugReport.BugReportState; public class OpenBugReport extends UpdateBugReportField { @Override diff --git a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java rename to src/_VisualDVM/Passes/All/OpenBugReportTestProject.java index cb553aa9..014f760e 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenBugReportTestProject.java +++ b/src/_VisualDVM/Passes/All/OpenBugReportTestProject.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportInterface; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java b/src/_VisualDVM/Passes/All/OpenCurrentFile.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java rename to src/_VisualDVM/Passes/All/OpenCurrentFile.java index b112bd5c..3b687d5c 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java +++ b/src/_VisualDVM/Passes/All/OpenCurrentFile.java @@ -1,11 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class OpenCurrentFile extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java b/src/_VisualDVM/Passes/All/OpenCurrentProject.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java rename to src/_VisualDVM/Passes/All/OpenCurrentProject.java index d77c6229..c203f4ab 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java +++ b/src/_VisualDVM/Passes/All/OpenCurrentProject.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; @@ -8,12 +7,11 @@ import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.VDirectoryChooser; import _VisualDVM.Utils; import _VisualDVM.GlobalData.DBLastProject.DBLastProject; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.Files.LanguageStyle; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.ProjectView; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/OpenProject.java b/src/_VisualDVM/Passes/All/OpenProject.java similarity index 90% rename from src/Visual_DVM_2021/Passes/All/OpenProject.java rename to src/_VisualDVM/Passes/All/OpenProject.java index 4df84eae..3df56ab8 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenProject.java +++ b/src/_VisualDVM/Passes/All/OpenProject.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class OpenProject extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java b/src/_VisualDVM/Passes/All/OpenSapforEtalonVersion.java similarity index 69% rename from src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java rename to src/_VisualDVM/Passes/All/OpenSapforEtalonVersion.java index efed1376..57884b57 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenSapforEtalonVersion.java +++ b/src/_VisualDVM/Passes/All/OpenSapforEtalonVersion.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.OpenSapforVersionPass; +import _VisualDVM.Passes.Sapfor.OpenSapforVersionPass; public class OpenSapforEtalonVersion extends OpenSapforVersionPass { @Override public Current getCurrentName() { diff --git a/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java b/src/_VisualDVM/Passes/All/OpenSapforVersion.java similarity index 67% rename from src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java rename to src/_VisualDVM/Passes/All/OpenSapforVersion.java index e9f35ed3..96b109cc 100644 --- a/src/Visual_DVM_2021/Passes/All/OpenSapforVersion.java +++ b/src/_VisualDVM/Passes/All/OpenSapforVersion.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.OpenSapforVersionPass; +import _VisualDVM.Passes.Sapfor.OpenSapforVersionPass; public class OpenSapforVersion extends OpenSapforVersionPass { @Override public Current getCurrentName() { diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java b/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java rename to src/_VisualDVM/Passes/All/PickCompilerEnvironments.java index 3624e7e4..95e08500 100644 --- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironments.java +++ b/src/_VisualDVM/Passes/All/PickCompilerEnvironments.java @@ -1,7 +1,5 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.CommonConstants; -import Common.Current_; -import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Global; @@ -10,9 +8,8 @@ import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment; import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java b/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java rename to src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java index 5525107f..472b57f6 100644 --- a/src/Visual_DVM_2021/Passes/All/PickCompilerEnvironmentsForTesting.java +++ b/src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java @@ -1,13 +1,12 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Dialog; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment; import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java b/src/_VisualDVM/Passes/All/PickCompilerOptions.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java rename to src/_VisualDVM/Passes/All/PickCompilerOptions.java index bbb69aec..b7c5f3e7 100644 --- a/src/Visual_DVM_2021/Passes/All/PickCompilerOptions.java +++ b/src/_VisualDVM/Passes/All/PickCompilerOptions.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Visual.Windows.Dialog.Dialog; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Compiler.CompilerType; diff --git a/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java b/src/_VisualDVM/Passes/All/PingComponentsServer.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/PingComponentsServer.java rename to src/_VisualDVM/Passes/All/PingComponentsServer.java index 4fc27451..85e871c5 100644 --- a/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java +++ b/src/_VisualDVM/Passes/All/PingComponentsServer.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import java.net.ConnectException; public class PingComponentsServer extends ComponentsRepositoryPass { diff --git a/src/Visual_DVM_2021/Passes/All/PingTestingServer.java b/src/_VisualDVM/Passes/All/PingTestingServer.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/PingTestingServer.java rename to src/_VisualDVM/Passes/All/PingTestingServer.java index 5558bade..e33a958f 100644 --- a/src/Visual_DVM_2021/Passes/All/PingTestingServer.java +++ b/src/_VisualDVM/Passes/All/PingTestingServer.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import java.net.ConnectException; public class PingTestingServer extends TestingSystemPass { diff --git a/src/Visual_DVM_2021/Passes/All/Precompilation.java b/src/_VisualDVM/Passes/All/Precompilation.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/Precompilation.java rename to src/_VisualDVM/Passes/All/Precompilation.java index c98f9f98..dba538fd 100644 --- a/src/Visual_DVM_2021/Passes/All/Precompilation.java +++ b/src/_VisualDVM/Passes/All/Precompilation.java @@ -1,10 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.CommonConstants; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Constants; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; @@ -16,7 +14,7 @@ import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java b/src/_VisualDVM/Passes/All/PredictParallelVariants.java similarity index 73% rename from src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java rename to src/_VisualDVM/Passes/All/PredictParallelVariants.java index b36cef7f..bf8a6626 100644 --- a/src/Visual_DVM_2021/Passes/All/PredictParallelVariants.java +++ b/src/_VisualDVM/Passes/All/PredictParallelVariants.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.VariantsMassPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.VariantsMassPass; public class PredictParallelVariants extends VariantsMassPass { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java rename to src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java index ba736c93..25b80826 100644 --- a/src/Visual_DVM_2021/Passes/All/PrepareForModulesAssembly.java +++ b/src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Transformation; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.Transformation; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/PublishBugReport.java rename to src/_VisualDVM/Passes/All/PublishBugReport.java index ff68ac49..0ded2247 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishBugReport.java +++ b/src/_VisualDVM/Passes/All/PublishBugReport.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -9,7 +8,7 @@ import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.EmailMessage; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/PublishComponent.java rename to src/_VisualDVM/Passes/All/PublishComponent.java index 39d9456d..1adc1793 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishComponent.java +++ b/src/_VisualDVM/Passes/All/PublishComponent.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -12,9 +11,8 @@ import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.PassCode; import java.util.Date; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java b/src/_VisualDVM/Passes/All/PublishComponentsServer.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java rename to src/_VisualDVM/Passes/All/PublishComponentsServer.java index 1d73c1c4..bc8233e2 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java +++ b/src/_VisualDVM/Passes/All/PublishComponentsServer.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass; +import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import java.io.File; public class PublishComponentsServer extends RepositoryServerSSHPass { diff --git a/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java b/src/_VisualDVM/Passes/All/PublishConfiguration.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/PublishConfiguration.java rename to src/_VisualDVM/Passes/All/PublishConfiguration.java index 70a55e04..567006ad 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishConfiguration.java +++ b/src/_VisualDVM/Passes/All/PublishConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishConfiguration extends PublishServerObject { public PublishConfiguration() { super(Global.testingServer, DVMConfiguration.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishDVMSettings.java b/src/_VisualDVM/Passes/All/PublishDVMSettings.java similarity index 77% rename from src/Visual_DVM_2021/Passes/All/PublishDVMSettings.java rename to src/_VisualDVM/Passes/All/PublishDVMSettings.java index e1cb75cc..d5e00eee 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishDVMSettings.java +++ b/src/_VisualDVM/Passes/All/PublishDVMSettings.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishDVMSettings extends PublishServerObject { public PublishDVMSettings() { super(Global.testingServer, DVMSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishGroup.java b/src/_VisualDVM/Passes/All/PublishGroup.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/PublishGroup.java rename to src/_VisualDVM/Passes/All/PublishGroup.java index 576022ef..157b4d50 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishGroup.java +++ b/src/_VisualDVM/Passes/All/PublishGroup.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishGroup extends PublishServerObject { String group_description; public PublishGroup() { diff --git a/src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.java b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.java rename to src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java index 9d00106c..b2bdd58e 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishRemoteWorkspace.java +++ b/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class PublishRemoteWorkspace extends ComponentsRepositoryPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java b/src/_VisualDVM/Passes/All/PublishSapforConfiguration.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java rename to src/_VisualDVM/Passes/All/PublishSapforConfiguration.java index a6d618a5..a881191d 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishSapforConfiguration.java +++ b/src/_VisualDVM/Passes/All/PublishSapforConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishSapforConfiguration extends PublishServerObject { public PublishSapforConfiguration() { super(Global.testingServer, SapforConfiguration.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforSettings.java b/src/_VisualDVM/Passes/All/PublishSapforSettings.java similarity index 78% rename from src/Visual_DVM_2021/Passes/All/PublishSapforSettings.java rename to src/_VisualDVM/Passes/All/PublishSapforSettings.java index 3d8f8ab2..89ae8d9c 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishSapforSettings.java +++ b/src/_VisualDVM/Passes/All/PublishSapforSettings.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishSapforSettings extends PublishServerObject { public PublishSapforSettings() { super(Global.testingServer, SapforSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java b/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java rename to src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java index a6340b19..6a108349 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java +++ b/src/_VisualDVM/Passes/All/PublishSapforSettingsCommand.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishSapforSettingsCommand extends PublishServerObject { public PublishSapforSettingsCommand() { super(Global.testingServer, SapforSettingsCommand.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java b/src/_VisualDVM/Passes/All/PublishServerSapfor.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java rename to src/_VisualDVM/Passes/All/PublishServerSapfor.java index 8e9b9578..10236cad 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishServerSapfor.java +++ b/src/_VisualDVM/Passes/All/PublishServerSapfor.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishServerSapfor extends PublishServerObject { public PublishServerSapfor() { super(Global.testingServer, ServerSapfor.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishTest.java b/src/_VisualDVM/Passes/All/PublishTest.java similarity index 82% rename from src/Visual_DVM_2021/Passes/All/PublishTest.java rename to src/_VisualDVM/Passes/All/PublishTest.java index ddf8859b..d2b264a0 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishTest.java +++ b/src/_VisualDVM/Passes/All/PublishTest.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class PublishTest extends PublishServerObject { public PublishTest() { super(Global.testingServer, Test.class); diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java b/src/_VisualDVM/Passes/All/PublishTestingServer.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/PublishTestingServer.java rename to src/_VisualDVM/Passes/All/PublishTestingServer.java index 39784896..8ca6b62e 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java +++ b/src/_VisualDVM/Passes/All/PublishTestingServer.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass; +import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import java.io.File; public class PublishTestingServer extends RepositoryServerSSHPass { diff --git a/src/Visual_DVM_2021/Passes/All/PublishTests.java b/src/_VisualDVM/Passes/All/PublishTests.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/PublishTests.java rename to src/_VisualDVM/Passes/All/PublishTests.java index ec254808..b53e566a 100644 --- a/src/Visual_DVM_2021/Passes/All/PublishTests.java +++ b/src/_VisualDVM/Passes/All/PublishTests.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Global; @@ -7,9 +7,9 @@ import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import java.io.File; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java b/src/_VisualDVM/Passes/All/RefreshDVMTests.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java rename to src/_VisualDVM/Passes/All/RefreshDVMTests.java index 65e47349..0468c044 100644 --- a/src/Visual_DVM_2021/Passes/All/RefreshDVMTests.java +++ b/src/_VisualDVM/Passes/All/RefreshDVMTests.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.TestingSystemPass; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; diff --git a/src/Visual_DVM_2021/Passes/All/RemoteCompilation.java b/src/_VisualDVM/Passes/All/RemoteCompilation.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/RemoteCompilation.java rename to src/_VisualDVM/Passes/All/RemoteCompilation.java index 880d77af..65507bde 100644 --- a/src/Visual_DVM_2021/Passes/All/RemoteCompilation.java +++ b/src/_VisualDVM/Passes/All/RemoteCompilation.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.Supervisor.Remote.RemoteCompilationSupervisor; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.SSH.TaskConnectionPass; +import _VisualDVM.Passes.SSH.TaskConnectionPass; public class RemoteCompilation extends TaskConnectionPass { public RemoteCompilation() { super(RemoteCompilationSupervisor.class); diff --git a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java b/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java rename to src/_VisualDVM/Passes/All/RemoteInitialiseUser.java index 29923bf2..23c74a90 100644 --- a/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java +++ b/src/_VisualDVM/Passes/All/RemoteInitialiseUser.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Constants; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.SSH.ConnectionPass; +import _VisualDVM.Passes.SSH.ConnectionPass; import java.util.Vector; public class RemoteInitialiseUser extends ConnectionPass { diff --git a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java b/src/_VisualDVM/Passes/All/RemoteSingleCommand.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java rename to src/_VisualDVM/Passes/All/RemoteSingleCommand.java index 227a4de9..0331041b 100644 --- a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java +++ b/src/_VisualDVM/Passes/All/RemoteSingleCommand.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; -import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass; +import _VisualDVM.Passes.SSH.CurrentConnectionPass; public class RemoteSingleCommand extends CurrentConnectionPass { String command = ""; @Override diff --git a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java b/src/_VisualDVM/Passes/All/RenameDirectory.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/RenameDirectory.java rename to src/_VisualDVM/Passes/All/RenameDirectory.java index b885c9bc..9eb4f9c5 100644 --- a/src/Visual_DVM_2021/Passes/All/RenameDirectory.java +++ b/src/_VisualDVM/Passes/All/RenameDirectory.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -7,8 +6,8 @@ import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.Utils; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.ChangeFilePass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.ChangeFilePass; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import org.apache.commons.io.FileUtils; diff --git a/src/Visual_DVM_2021/Passes/All/RenameFile.java b/src/_VisualDVM/Passes/All/RenameFile.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/RenameFile.java rename to src/_VisualDVM/Passes/All/RenameFile.java index 2cd66acb..bbf66cf6 100644 --- a/src/Visual_DVM_2021/Passes/All/RenameFile.java +++ b/src/_VisualDVM/Passes/All/RenameFile.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -7,8 +6,8 @@ import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; -import Visual_DVM_2021.Passes.ChangeFilePass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.ChangeFilePass; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java b/src/_VisualDVM/Passes/All/ReplaceTestProject.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java rename to src/_VisualDVM/Passes/All/ReplaceTestProject.java index 47c690da..2ce96999 100644 --- a/src/Visual_DVM_2021/Passes/All/ReplaceTestProject.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestProject.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.TestingSystemPass; import java.io.Serializable; public class ReplaceTestProject extends CreateTestFromProject { diff --git a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java rename to src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java index 20e2ebf2..35f8fe43 100644 --- a/src/Visual_DVM_2021/Passes/All/ReplaceTestsFromFiles.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Constants; @@ -12,9 +11,9 @@ import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import java.io.File; import java.util.LinkedHashMap; diff --git a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java b/src/_VisualDVM/Passes/All/ResetCurrentProject.java similarity index 80% rename from src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java rename to src/_VisualDVM/Passes/All/ResetCurrentProject.java index 0c89e292..89e088f8 100644 --- a/src/Visual_DVM_2021/Passes/All/ResetCurrentProject.java +++ b/src/_VisualDVM/Passes/All/ResetCurrentProject.java @@ -1,9 +1,7 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.CurrentProjectPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Project.CurrentProjectPass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; public class ResetCurrentProject extends CurrentProjectPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/RestoreSavedArrays.java b/src/_VisualDVM/Passes/All/RestoreSavedArrays.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/RestoreSavedArrays.java rename to src/_VisualDVM/Passes/All/RestoreSavedArrays.java index 98f6b49e..43be1e86 100644 --- a/src/Visual_DVM_2021/Passes/All/RestoreSavedArrays.java +++ b/src/_VisualDVM/Passes/All/RestoreSavedArrays.java @@ -1,5 +1,5 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.SapforModification; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforModification; import java.util.Vector; public class RestoreSavedArrays extends SapforModification { diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java b/src/_VisualDVM/Passes/All/ResurrectComponent.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/ResurrectComponent.java rename to src/_VisualDVM/Passes/All/ResurrectComponent.java index d9fd416a..4125a878 100644 --- a/src/Visual_DVM_2021/Passes/All/ResurrectComponent.java +++ b/src/_VisualDVM/Passes/All/ResurrectComponent.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.PassMenuItem; import Common.Visual.Windows.Dialog.VFileChooser; -import Visual_DVM_2021.Passes.CurrentComponentPass; +import _VisualDVM.Passes.CurrentComponentPass; import javax.swing.*; import javax.swing.filechooser.FileFilter; diff --git a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java rename to src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java index f3131a22..f4960317 100644 --- a/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java +++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Passes.Pass; import Common.Passes.PassException; import _VisualDVM.Current; @@ -11,8 +10,8 @@ import _VisualDVM.Utils; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.*; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.*; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/Visual_DVM_2021/Passes/All/Run.java b/src/_VisualDVM/Passes/All/Run.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/Run.java rename to src/_VisualDVM/Passes/All/Run.java index 5b87a70a..f0c76687 100644 --- a/src/Visual_DVM_2021/Passes/All/Run.java +++ b/src/_VisualDVM/Passes/All/Run.java @@ -1,16 +1,14 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Machine.MachineType; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java b/src/_VisualDVM/Passes/All/SPF_ChangeSpfIntervals.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java rename to src/_VisualDVM/Passes/All/SPF_ChangeSpfIntervals.java index 9ae394de..457c3b58 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ChangeSpfIntervals.java +++ b/src/_VisualDVM/Passes/All/SPF_ChangeSpfIntervals.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.SapforFilesModification; +import _VisualDVM.Passes.Sapfor.SapforFilesModification; import _VisualDVM.Global; public class SPF_ChangeSpfIntervals extends SapforFilesModification { // SPF_ChangeSpfIntervals (addOpt1_c -> file, addOpt2_c-> int lines, '|' as delimiter) diff --git a/src/_VisualDVM/Passes/All/SPF_ConvertStructures.java b/src/_VisualDVM/Passes/All/SPF_ConvertStructures.java new file mode 100644 index 00000000..e810f89b --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_ConvertStructures.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_ConvertStructures extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_CorrectCodeStylePass.java b/src/_VisualDVM/Passes/All/SPF_CorrectCodeStylePass.java new file mode 100644 index 00000000..47193646 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_CorrectCodeStylePass.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_CorrectCodeStylePass extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_CreateCheckpoints.java b/src/_VisualDVM/Passes/All/SPF_CreateCheckpoints.java new file mode 100644 index 00000000..0e0ef3fe --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_CreateCheckpoints.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_CreateCheckpoints extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_CreateIntervalsTree.java b/src/_VisualDVM/Passes/All/SPF_CreateIntervalsTree.java new file mode 100644 index 00000000..67526971 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_CreateIntervalsTree.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_CreateIntervalsTree extends SapforTransformation { +} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java rename to src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java index bcb20a97..41e807c8 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_CreateParallelVariant.java +++ b/src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java @@ -1,9 +1,9 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforTransformation; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforTransformation; import _VisualDVM.Global; public class SPF_CreateParallelVariant extends SapforTransformation { ParallelVariant variant = null; diff --git a/src/_VisualDVM/Passes/All/SPF_DuplicateFunctionChains.java b/src/_VisualDVM/Passes/All/SPF_DuplicateFunctionChains.java new file mode 100644 index 00000000..2089c46a --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_DuplicateFunctionChains.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_DuplicateFunctionChains extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_ExpressionSubstitution.java b/src/_VisualDVM/Passes/All/SPF_ExpressionSubstitution.java new file mode 100644 index 00000000..bcfb8b12 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_ExpressionSubstitution.java @@ -0,0 +1,3 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_ExpressionSubstitution extends SapforTransformation {} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java rename to src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java index 4f2cbbb5..bb706589 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetAllDeclaratedArrays.java +++ b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Utils.Index; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; import java.math.BigInteger; public class SPF_GetAllDeclaratedArrays extends SapforAnalysis { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java rename to src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java index d3277cf4..2bac7eb8 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java +++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistribution.java @@ -1,14 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Passes.PassCode_; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import Common.Visual.UI_; -import MainModule_.MainModule_; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalysis { @Override protected void performDone() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java rename to src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java index 27049c1a..841bec75 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java +++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java @@ -1,17 +1,13 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import Common.Utils.Vector_; import _VisualDVM.Global; import _VisualDVM.Visual.Controls.PassControl; import _VisualDVM.Visual.UI; import Common.Utils.Index; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; -import java.util.Collections; import java.util.Comparator; import java.util.Vector; public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java rename to src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java index 61e4b07a..01a4af27 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyRegions.java +++ b/src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Visual.UI; import Common.Utils.Index; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis { @Override public String phase() { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.java b/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.java rename to src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java index 707d9e64..de64133e 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.java +++ b/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; -import Visual_DVM_2021.Passes.SilentSapforPass; +import _VisualDVM.Passes.Sapfor.SilentSapforPass; public class SPF_GetArrayLinks extends SilentSapforPass { @Override protected void body() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java b/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java rename to src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java index 414ff86f..0842353a 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetFileLineInfo.java +++ b/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; public class SPF_GetFileLineInfo extends SapforAnalysis { @Override public String phase() { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java rename to src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java index 9df40c58..122d4a42 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java +++ b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Global; import Common.Passes.PassState; import _VisualDVM.Visual.Controls.PassControl; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SilentSapforPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SilentSapforPass; public class SPF_GetGCovInfo extends SilentSapforPass { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java rename to src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java index d78fa108..519669f3 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java +++ b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java @@ -1,13 +1,12 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.SapforData.Functions.FuncCall; import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; import _VisualDVM.ProjectData.SapforData.Functions.FunctionType; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SilentSapforPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SilentSapforPass; import javafx.util.Pair; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java rename to src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java index 07b742a0..05e3b042 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java +++ b/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -9,8 +8,8 @@ import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Functions.FuncCall; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; import _VisualDVM.ProjectData.SapforData.Functions.FunctionType; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; import java.util.LinkedHashMap; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java rename to src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java index a83553e7..4d73de7b 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphLoops.java +++ b/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Utils.Index; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.Loops.Loop; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; import java.util.Vector; public class SPF_GetGraphLoops extends SapforAnalysis { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java rename to src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java index aeacb483..1adc7a76 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetIncludeDependencies.java +++ b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; @@ -10,8 +9,8 @@ import _VisualDVM.ProjectData.Files.LanguageStyle; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo; import _VisualDVM.ProjectData.SapforData.Includes.FileInfo; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; import javax.swing.tree.DefaultMutableTreeNode; public class SPF_GetIncludeDependencies extends SapforAnalysis { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java b/src/_VisualDVM/Passes/All/SPF_GetMaxMinBlockDistribution.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java rename to src/_VisualDVM/Passes/All/SPF_GetMaxMinBlockDistribution.java index e53cf432..7133cae6 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_GetMaxMinBlockDistribution.java +++ b/src/_VisualDVM/Passes/All/SPF_GetMaxMinBlockDistribution.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SilentSapforPass; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SilentSapforPass; public class SPF_GetMaxMinBlockDistribution extends SilentSapforPass { @Override public boolean needsConfirmations() { diff --git a/src/_VisualDVM/Passes/All/SPF_InitDeclsWithZero.java b/src/_VisualDVM/Passes/All/SPF_InitDeclsWithZero.java new file mode 100644 index 00000000..80d62110 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_InitDeclsWithZero.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_InitDeclsWithZero extends SapforTransformation { +} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java b/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java rename to src/_VisualDVM/Passes/All/SPF_InlineProcedure.java index 39f001e6..928043e5 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java +++ b/src/_VisualDVM/Passes/All/SPF_InlineProcedure.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.SapforData.Functions.FuncCall; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforFilesModification; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforFilesModification; public class SPF_InlineProcedure extends SapforFilesModification { FuncCall call = null; // @Override diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java b/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java rename to src/_VisualDVM/Passes/All/SPF_InlineProcedures.java index 7da593f8..5d87351f 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java +++ b/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java @@ -1,12 +1,12 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.SapforData.Functions.FuncCall; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforTransformation; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforTransformation; import java.util.Vector; public class SPF_InlineProcedures extends SapforTransformation { diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java b/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java rename to src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java index c95da0a1..1bdf749f 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java +++ b/src/_VisualDVM/Passes/All/SPF_InlineProceduresH.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.SapforData.Functions.FuncCallH; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforTransformation; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforTransformation; import java.util.Vector; public class SPF_InlineProceduresH extends SapforTransformation { diff --git a/src/_VisualDVM/Passes/All/SPF_InsertDvmhRegions.java b/src/_VisualDVM/Passes/All/SPF_InsertDvmhRegions.java new file mode 100644 index 00000000..46341f4d --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_InsertDvmhRegions.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_InsertDvmhRegions extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_InsertImplicitNone.java b/src/_VisualDVM/Passes/All/SPF_InsertImplicitNone.java new file mode 100644 index 00000000..99302072 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_InsertImplicitNone.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_InsertImplicitNone extends SapforTransformation { +} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java rename to src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java index 81a03e77..131e4981 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java +++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.Selectable; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.SapforData.Includes.DependencyInfo; import _VisualDVM.ProjectData.SapforData.Includes.FileInfo; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforTransformation; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforTransformation; import java.util.Vector; import java.util.stream.Collectors; diff --git a/src/_VisualDVM/Passes/All/SPF_InsertPrivateFromGUI.java b/src/_VisualDVM/Passes/All/SPF_InsertPrivateFromGUI.java new file mode 100644 index 00000000..1b2df6cf --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_InsertPrivateFromGUI.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_InsertPrivateFromGUI extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_LoopEndDoConverterPass.java b/src/_VisualDVM/Passes/All/SPF_LoopEndDoConverterPass.java new file mode 100644 index 00000000..bfaeb56a --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_LoopEndDoConverterPass.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_LoopEndDoConverterPass extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_LoopFission.java b/src/_VisualDVM/Passes/All/SPF_LoopFission.java new file mode 100644 index 00000000..20d5c7ef --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_LoopFission.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_LoopFission extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_LoopUnion.java b/src/_VisualDVM/Passes/All/SPF_LoopUnion.java new file mode 100644 index 00000000..ce41a483 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_LoopUnion.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_LoopUnion extends SapforTransformation { +} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java b/src/_VisualDVM/Passes/All/SPF_LoopUnionCurrent.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java rename to src/_VisualDVM/Passes/All/SPF_LoopUnionCurrent.java index 310c8754..af875ed8 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_LoopUnionCurrent.java +++ b/src/_VisualDVM/Passes/All/SPF_LoopUnionCurrent.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; -import Visual_DVM_2021.Passes.SapforFilesModification; +import _VisualDVM.Passes.Sapfor.SapforFilesModification; import _VisualDVM.Global; // SPF_LoopUnionCurrent (addOpt1_c -> file, addOpt2_c-> line) public class SPF_LoopUnionCurrent extends SapforFilesModification { diff --git a/src/_VisualDVM/Passes/All/SPF_LoopUnrolling.java b/src/_VisualDVM/Passes/All/SPF_LoopUnrolling.java new file mode 100644 index 00000000..e779a9d4 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_LoopUnrolling.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_LoopUnrolling extends SapforTransformation { +} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java b/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java rename to src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java index 01f03217..4ccb267e 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java +++ b/src/_VisualDVM/Passes/All/SPF_ModifyArrayDistribution.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; @@ -9,8 +8,8 @@ import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar; import _VisualDVM.ProjectData.SapforData.Regions.UI.ParallelRegionFields; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforModification; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforModification; import javax.swing.*; import java.awt.*; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java rename to src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java index c688c177..3cf51685 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_ParseFilesWithOrder.java +++ b/src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java @@ -1,8 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; @@ -10,8 +8,8 @@ import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileState; import _VisualDVM.Repository.Component.Sapfor.TransformationPermission; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SapforAnalysis; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; import org.apache.commons.io.FileUtils; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/SPF_PredictParallelVariant.java b/src/_VisualDVM/Passes/All/SPF_PredictParallelVariant.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/SPF_PredictParallelVariant.java rename to src/_VisualDVM/Passes/All/SPF_PredictParallelVariant.java index c96864a6..1cc61e8d 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_PredictParallelVariant.java +++ b/src/_VisualDVM/Passes/All/SPF_PredictParallelVariant.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; -import Visual_DVM_2021.Passes.SilentSapforPass; +import _VisualDVM.Passes.Sapfor.SilentSapforPass; public class SPF_PredictParallelVariant extends SilentSapforPass { String Options = ""; ParallelVariant variant = null; diff --git a/src/_VisualDVM/Passes/All/SPF_PrivateExpansion.java b/src/_VisualDVM/Passes/All/SPF_PrivateExpansion.java new file mode 100644 index 00000000..82dfd672 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_PrivateExpansion.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_PrivateExpansion extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_PrivateRemoving.java b/src/_VisualDVM/Passes/All/SPF_PrivateRemoving.java new file mode 100644 index 00000000..1d792d63 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_PrivateRemoving.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_PrivateRemoving extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_PrivateShrinking.java b/src/_VisualDVM/Passes/All/SPF_PrivateShrinking.java new file mode 100644 index 00000000..d22fba12 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_PrivateShrinking.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_PrivateShrinking extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveComments.java b/src/_VisualDVM/Passes/All/SPF_RemoveComments.java new file mode 100644 index 00000000..ad44fcd8 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveComments.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveComments extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveDeadCode.java b/src/_VisualDVM/Passes/All/SPF_RemoveDeadCode.java new file mode 100644 index 00000000..4733a7aa --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveDeadCode.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveDeadCode extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveDvmDirectives.java b/src/_VisualDVM/Passes/All/SPF_RemoveDvmDirectives.java new file mode 100644 index 00000000..5d802212 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveDvmDirectives.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveDvmDirectives extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveDvmDirectivesToComments.java b/src/_VisualDVM/Passes/All/SPF_RemoveDvmDirectivesToComments.java new file mode 100644 index 00000000..d1fd202c --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveDvmDirectivesToComments.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveDvmDirectivesToComments extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveDvmIntervals.java b/src/_VisualDVM/Passes/All/SPF_RemoveDvmIntervals.java new file mode 100644 index 00000000..d9df5cce --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveDvmIntervals.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveDvmIntervals extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveOmpDirectives.java b/src/_VisualDVM/Passes/All/SPF_RemoveOmpDirectives.java new file mode 100644 index 00000000..5390e4b4 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveOmpDirectives.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveOmpDirectives extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RemoveUnusedFunctions.java b/src/_VisualDVM/Passes/All/SPF_RemoveUnusedFunctions.java new file mode 100644 index 00000000..36f5c42b --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RemoveUnusedFunctions.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RemoveUnusedFunctions extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_RenameIncludes.java b/src/_VisualDVM/Passes/All/SPF_RenameIncludes.java new file mode 100644 index 00000000..078837e5 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_RenameIncludes.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_RenameIncludes extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_ResolveCommonBlockConflicts.java b/src/_VisualDVM/Passes/All/SPF_ResolveCommonBlockConflicts.java new file mode 100644 index 00000000..7598318c --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_ResolveCommonBlockConflicts.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_ResolveCommonBlockConflicts extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_ResolveParallelRegionConflicts.java b/src/_VisualDVM/Passes/All/SPF_ResolveParallelRegionConflicts.java new file mode 100644 index 00000000..768e4966 --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_ResolveParallelRegionConflicts.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_ResolveParallelRegionConflicts extends SapforTransformation { +} diff --git a/src/_VisualDVM/Passes/All/SPF_SharedMemoryParallelization.java b/src/_VisualDVM/Passes/All/SPF_SharedMemoryParallelization.java new file mode 100644 index 00000000..d20e5efc --- /dev/null +++ b/src/_VisualDVM/Passes/All/SPF_SharedMemoryParallelization.java @@ -0,0 +1,4 @@ +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.Sapfor.SapforTransformation; +public class SPF_SharedMemoryParallelization extends SapforTransformation { +} diff --git a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java b/src/_VisualDVM/Passes/All/SPF_StatisticAnalyzer.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java rename to src/_VisualDVM/Passes/All/SPF_StatisticAnalyzer.java index 6ae024cf..fdb62bb5 100644 --- a/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java +++ b/src/_VisualDVM/Passes/All/SPF_StatisticAnalyzer.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; -import Visual_DVM_2021.Passes.SilentSapforPass; +import _VisualDVM.Passes.Sapfor.SilentSapforPass; import java.nio.file.Files; import java.nio.file.StandardCopyOption; diff --git a/src/Visual_DVM_2021/Passes/All/Save.java b/src/_VisualDVM/Passes/All/Save.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/Save.java rename to src/_VisualDVM/Passes/All/Save.java index 03cadece..352aa916 100644 --- a/src/Visual_DVM_2021/Passes/All/Save.java +++ b/src/_VisualDVM/Passes/All/Save.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java b/src/_VisualDVM/Passes/All/SaveBugReportComment.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java rename to src/_VisualDVM/Passes/All/SaveBugReportComment.java index 34e62054..ce917537 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveBugReportComment.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportComment.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Visual.UI; public class SaveBugReportComment extends UpdateBugReportField { @Override diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java b/src/_VisualDVM/Passes/All/SaveBugReportDescription.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java rename to src/_VisualDVM/Passes/All/SaveBugReportDescription.java index a8ef6b16..ca7551a4 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveBugReportDescription.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportDescription.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Visual.UI; public class SaveBugReportDescription extends UpdateBugReportField { @Override diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java rename to src/_VisualDVM/Passes/All/SaveBugReportExecutor.java index 1dc049e0..bc273b85 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveBugReportExecutor.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; public class SaveBugReportExecutor extends UpdateBugReportField { diff --git a/src/Visual_DVM_2021/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/SaveBugReportRecipients.java rename to src/_VisualDVM/Passes/All/SaveBugReportRecipients.java index ed2c7741..f1ebc197 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveBugReportRecipients.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Repository.BugReport.BugReportInterface; public class SaveBugReportRecipients extends UpdateBugReportField { @Override diff --git a/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java b/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java similarity index 83% rename from src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java rename to src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java index d6cf4075..e7cc8df8 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMConfiguration.java +++ b/src/_VisualDVM/Passes/All/SaveCurrentDVMConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import Visual_DVM_2021.Passes.SaveCurrentConfiguration; +import _VisualDVM.Passes.Testing.SaveCurrentConfiguration; public class SaveCurrentDVMConfiguration extends SaveCurrentConfiguration { public SaveCurrentDVMConfiguration() { super(DVMConfiguration.class, DVMSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java b/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java similarity index 84% rename from src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java rename to src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java index 5aa96a4e..69224872 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveCurrentSAPFORConfiguration.java +++ b/src/_VisualDVM/Passes/All/SaveCurrentSAPFORConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; -import Visual_DVM_2021.Passes.SaveCurrentConfiguration; +import _VisualDVM.Passes.Testing.SaveCurrentConfiguration; public class SaveCurrentSAPFORConfiguration extends SaveCurrentConfiguration { public SaveCurrentSAPFORConfiguration() { super(SapforConfiguration.class, SapforSettings.class); diff --git a/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java b/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java rename to src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java index 44a3373e..c1b64975 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveFunctionsGraphCoordinates.java +++ b/src/_VisualDVM/Passes/All/SaveFunctionsGraphCoordinates.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates; diff --git a/src/Visual_DVM_2021/Passes/All/SaveGraph.java b/src/_VisualDVM/Passes/All/SaveGraph.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/SaveGraph.java rename to src/_VisualDVM/Passes/All/SaveGraph.java index 0c538256..c7429e25 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveGraph.java +++ b/src/_VisualDVM/Passes/All/SaveGraph.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm; diff --git a/src/Visual_DVM_2021/Passes/All/SaveProfile.java b/src/_VisualDVM/Passes/All/SaveProfile.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/SaveProfile.java rename to src/_VisualDVM/Passes/All/SaveProfile.java index e3e58f66..41652335 100644 --- a/src/Visual_DVM_2021/Passes/All/SaveProfile.java +++ b/src/_VisualDVM/Passes/All/SaveProfile.java @@ -1,8 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Common.Database.Database; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.SapforProfile.SapforProfile; import Common.Passes.AddObjectPass; diff --git a/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java b/src/_VisualDVM/Passes/All/SelectRemoteFile.java similarity index 87% rename from src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java rename to src/_VisualDVM/Passes/All/SelectRemoteFile.java index 946c8666..3b876eee 100644 --- a/src/Visual_DVM_2021/Passes/All/SelectRemoteFile.java +++ b/src/_VisualDVM/Passes/All/SelectRemoteFile.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass; +import _VisualDVM.Passes.SSH.CurrentConnectionPass; public class SelectRemoteFile extends CurrentConnectionPass { boolean dialogOK; boolean needs_directory = false; diff --git a/src/Visual_DVM_2021/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java similarity index 89% rename from src/Visual_DVM_2021/Passes/All/SendBugReport.java rename to src/_VisualDVM/Passes/All/SendBugReport.java index 9f150858..12b58c85 100644 --- a/src/Visual_DVM_2021/Passes/All/SendBugReport.java +++ b/src/_VisualDVM/Passes/All/SendBugReport.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; public class SendBugReport extends ComponentsRepositoryPass { @Override protected void ServerAction() throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/ServerRun.java b/src/_VisualDVM/Passes/All/ServerRun.java similarity index 84% rename from src/Visual_DVM_2021/Passes/All/ServerRun.java rename to src/_VisualDVM/Passes/All/ServerRun.java index fba892f7..2a5c879d 100644 --- a/src/Visual_DVM_2021/Passes/All/ServerRun.java +++ b/src/_VisualDVM/Passes/All/ServerRun.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.Supervisor.Remote.ServerRunSupervisor; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.SSH.TaskConnectionPass; +import _VisualDVM.Passes.SSH.TaskConnectionPass; public class ServerRun extends TaskConnectionPass { public ServerRun() { super(ServerRunSupervisor.class); diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java b/src/_VisualDVM/Passes/All/SetSelectedFilesLanguage.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java rename to src/_VisualDVM/Passes/All/SetSelectedFilesLanguage.java index 3988926e..0b178e63 100644 --- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesLanguage.java +++ b/src/_VisualDVM/Passes/All/SetSelectedFilesLanguage.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.LanguageName; -import Visual_DVM_2021.Passes.FilesMassPass; +import _VisualDVM.Passes.Project.FilesMassPass; public class SetSelectedFilesLanguage extends FilesMassPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java b/src/_VisualDVM/Passes/All/SetSelectedFilesStyle.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java rename to src/_VisualDVM/Passes/All/SetSelectedFilesStyle.java index fd46a7e5..ed6cc367 100644 --- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesStyle.java +++ b/src/_VisualDVM/Passes/All/SetSelectedFilesStyle.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.LanguageStyle; -import Visual_DVM_2021.Passes.FilesMassPass; +import _VisualDVM.Passes.Project.FilesMassPass; public class SetSelectedFilesStyle extends FilesMassPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java b/src/_VisualDVM/Passes/All/SetSelectedFilesType.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java rename to src/_VisualDVM/Passes/All/SetSelectedFilesType.java index 6ab7e785..a263a84f 100644 --- a/src/Visual_DVM_2021/Passes/All/SetSelectedFilesType.java +++ b/src/_VisualDVM/Passes/All/SetSelectedFilesType.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.FileType; -import Visual_DVM_2021.Passes.FilesMassPass; +import _VisualDVM.Passes.Project.FilesMassPass; public class SetSelectedFilesType extends FilesMassPass { @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java b/src/_VisualDVM/Passes/All/ShowAllParallelVariants.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java rename to src/_VisualDVM/Passes/All/ShowAllParallelVariants.java index 8a56363c..d642b68f 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowAllParallelVariants.java +++ b/src/_VisualDVM/Passes/All/ShowAllParallelVariants.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; public class ShowAllParallelVariants extends GenerateParallelVariants{ @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java rename to src/_VisualDVM/Passes/All/ShowCompilerHelp.java index 73883cb0..94852c8b 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCompilerHelp.java +++ b/src/_VisualDVM/Passes/All/ShowCompilerHelp.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; import _VisualDVM.GlobalData.Machine.MachineType; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class ShowCompilerHelp extends Pass { Pass subpass; diff --git a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java rename to src/_VisualDVM/Passes/All/ShowCompilerVersion.java index 7222a094..25e16a03 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCompilerVersion.java +++ b/src/_VisualDVM/Passes/All/ShowCompilerVersion.java @@ -1,13 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; -import Common.Utils.Utils_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; import _VisualDVM.Global; import _VisualDVM.GlobalData.Compiler.Compiler; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Machine.MachineType; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class ShowCompilerVersion extends Pass { Pass subpass; diff --git a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java rename to src/_VisualDVM/Passes/All/ShowComponentChangesLog.java index b5fc6e55..68e6ef42 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowComponentChangesLog.java +++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; @@ -8,7 +7,7 @@ import _VisualDVM.Utils; import _VisualDVM.Repository.Component.Component; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java b/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java rename to src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java index caf42497..74fc04ef 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java +++ b/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ServerObjectsCache.DVMConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings; -import Visual_DVM_2021.Passes.ShowCurrentConfigurationTests; +import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests; import java.util.Vector; public class ShowCurrentDVMConfigurationTests extends ShowCurrentConfigurationTests { diff --git a/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java rename to src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java index c2796679..32b9bc4d 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowCurrentSAPFORConfigurationTests.java +++ b/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ServerObjectsCache.SapforConfigurationCache; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; -import Visual_DVM_2021.Passes.ShowCurrentConfigurationTests; +import _VisualDVM.Passes.Testing.ShowCurrentConfigurationTests; import java.util.Vector; public class ShowCurrentSAPFORConfigurationTests extends ShowCurrentConfigurationTests { diff --git a/src/Visual_DVM_2021/Passes/All/ShowInstruction.java b/src/_VisualDVM/Passes/All/ShowInstruction.java similarity index 96% rename from src/Visual_DVM_2021/Passes/All/ShowInstruction.java rename to src/_VisualDVM/Passes/All/ShowInstruction.java index e0516ce5..171b40cf 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowInstruction.java +++ b/src/_VisualDVM/Passes/All/ShowInstruction.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Component.ComponentType; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java b/src/_VisualDVM/Passes/All/ShowMakefilePreview.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java rename to src/_VisualDVM/Passes/All/ShowMakefilePreview.java index eec98914..002bd4be 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowMakefilePreview.java +++ b/src/_VisualDVM/Passes/All/ShowMakefilePreview.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Makefile.UI.MakefilePreviewForm; import _VisualDVM.ProjectData.Project.db_project_info; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; public class ShowMakefilePreview extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java b/src/_VisualDVM/Passes/All/ShowParallelVariantsCoverage.java similarity index 91% rename from src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java rename to src/_VisualDVM/Passes/All/ShowParallelVariantsCoverage.java index 66a7a9ce..e86faa1c 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowParallelVariantsCoverage.java +++ b/src/_VisualDVM/Passes/All/ShowParallelVariantsCoverage.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; public class ShowParallelVariantsCoverage extends GenerateParallelVariants { @Override public String getIconPath() { diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java b/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java rename to src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java index 58eba350..7bec6903 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationErr.java +++ b/src/_VisualDVM/Passes/All/ShowSapforCompilationErr.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Constants; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java b/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java similarity index 92% rename from src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java rename to src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java index 4082a9db..dd32f97a 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowSapforCompilationOut.java +++ b/src/_VisualDVM/Passes/All/ShowSapforCompilationOut.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Constants; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java rename to src/_VisualDVM/Passes/All/ShowTestingServerFile.java index 60aa8498..b05789ca 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowTestingServerFile.java +++ b/src/_VisualDVM/Passes/All/ShowTestingServerFile.java @@ -1,11 +1,11 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Visual.Windows.Dialog.Text.ReadOnlyMultilineTextForm; import _VisualDVM.Utils; import _VisualDVM.GlobalData.RemoteFile.RemoteFile; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/ShowVersionsFiles.java b/src/_VisualDVM/Passes/All/ShowVersionsFiles.java similarity index 79% rename from src/Visual_DVM_2021/Passes/All/ShowVersionsFiles.java rename to src/_VisualDVM/Passes/All/ShowVersionsFiles.java index a3182723..84c9699b 100644 --- a/src/Visual_DVM_2021/Passes/All/ShowVersionsFiles.java +++ b/src/_VisualDVM/Passes/All/ShowVersionsFiles.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Passes.Pass; public class ShowVersionsFiles extends Pass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java b/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java rename to src/_VisualDVM/Passes/All/ShutdownComponentsServer.java index cc7839e8..ecfd2200 100644 --- a/src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java +++ b/src/_VisualDVM/Passes/All/ShutdownComponentsServer.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Global; public class ShutdownComponentsServer extends RepositoryServerSSHPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java b/src/_VisualDVM/Passes/All/ShutdownTestingServer.java similarity index 85% rename from src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java rename to src/_VisualDVM/Passes/All/ShutdownTestingServer.java index 6881872b..2ea3991f 100644 --- a/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java +++ b/src/_VisualDVM/Passes/All/ShutdownTestingServer.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Global; public class ShutdownTestingServer extends RepositoryServerSSHPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/StartComponentsServer.java b/src/_VisualDVM/Passes/All/StartComponentsServer.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/StartComponentsServer.java rename to src/_VisualDVM/Passes/All/StartComponentsServer.java index 8057008c..7b1fdb3d 100644 --- a/src/Visual_DVM_2021/Passes/All/StartComponentsServer.java +++ b/src/_VisualDVM/Passes/All/StartComponentsServer.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Global; public class StartComponentsServer extends RepositoryServerSSHPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java rename to src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java index 3dfd37d4..b5c44290 100644 --- a/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java +++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -9,8 +8,8 @@ import _VisualDVM.GlobalData.User.UserState; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration; import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.PublishServerObject; import java.util.Vector; public class StartSelectedDVMConfigurations extends PublishServerObject { diff --git a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java rename to src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java index 6f3dfec0..ff860de5 100644 --- a/src/Visual_DVM_2021/Passes/All/StartSelectedSAPFORConfigurations.java +++ b/src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -7,7 +6,7 @@ import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; import java.io.File; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/StartTestingServer.java b/src/_VisualDVM/Passes/All/StartTestingServer.java similarity index 86% rename from src/Visual_DVM_2021/Passes/All/StartTestingServer.java rename to src/_VisualDVM/Passes/All/StartTestingServer.java index 347a7351..41b88ac1 100644 --- a/src/Visual_DVM_2021/Passes/All/StartTestingServer.java +++ b/src/_VisualDVM/Passes/All/StartTestingServer.java @@ -1,6 +1,6 @@ -package Visual_DVM_2021.Passes.All; -import Visual_DVM_2021.Passes.PassCode; -import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass; +package _VisualDVM.Passes.All; +import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; import _VisualDVM.Global; public class StartTestingServer extends RepositoryServerSSHPass { @Override diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java rename to src/_VisualDVM/Passes/All/SynchronizeBugReports.java index 815d9996..927fa918 100644 --- a/src/Visual_DVM_2021/Passes/All/SynchronizeBugReports.java +++ b/src/_VisualDVM/Passes/All/SynchronizeBugReports.java @@ -1,11 +1,10 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; import org.apache.commons.io.FileUtils; import java.io.File; diff --git a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java b/src/_VisualDVM/Passes/All/SynchronizeTests.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/SynchronizeTests.java rename to src/_VisualDVM/Passes/All/SynchronizeTests.java index 9ab2fe80..5061ec77 100644 --- a/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java +++ b/src/_VisualDVM/Passes/All/SynchronizeTests.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.Controls.PassButton; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import org.apache.commons.io.FileUtils; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/TestPass.java b/src/_VisualDVM/Passes/All/TestPass.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/TestPass.java rename to src/_VisualDVM/Passes/All/TestPass.java index 0d888794..2410f61d 100644 --- a/src/Visual_DVM_2021/Passes/All/TestPass.java +++ b/src/_VisualDVM/Passes/All/TestPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java b/src/_VisualDVM/Passes/All/UnzipFolderPass.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java rename to src/_VisualDVM/Passes/All/UnzipFolderPass.java index 73d52ef9..309a4c0a 100644 --- a/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java +++ b/src/_VisualDVM/Passes/All/UnzipFolderPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Utils; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java rename to src/_VisualDVM/Passes/All/UpdateBugReportField.java index 596c6b3f..eb2f75c2 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportField.java +++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Current; import _VisualDVM.Global; @@ -11,8 +10,8 @@ import _VisualDVM.Repository.BugReport.BugReportState; import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.PassCode; import javafx.util.Pair; import java.io.Serializable; diff --git a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java b/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java similarity index 93% rename from src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java rename to src/_VisualDVM/Passes/All/UpdateBugReportProgress.java index cabcb7f1..68c7d52f 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateBugReportProgress.java +++ b/src/_VisualDVM/Passes/All/UpdateBugReportProgress.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Current_; +package _VisualDVM.Passes.All; import _VisualDVM.Current; import Common.Visual.Windows.Dialog.PercentsForm; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java b/src/_VisualDVM/Passes/All/UpdateComponent.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/UpdateComponent.java rename to src/_VisualDVM/Passes/All/UpdateComponent.java index ff1f5d5a..460518c3 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateComponent.java +++ b/src/_VisualDVM/Passes/All/UpdateComponent.java @@ -1,9 +1,8 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Component; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import Common.Passes.Pass; public class UpdateComponent extends Pass { diff --git a/src/Visual_DVM_2021/Passes/All/UpdateProperty.java b/src/_VisualDVM/Passes/All/UpdateProperty.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/UpdateProperty.java rename to src/_VisualDVM/Passes/All/UpdateProperty.java index c801284d..c9be5af6 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateProperty.java +++ b/src/_VisualDVM/Passes/All/UpdateProperty.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import _VisualDVM.Current; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.GlobalProperties; import _VisualDVM.Visual.UI; diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSelectedComponents.java b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java similarity index 95% rename from src/Visual_DVM_2021/Passes/All/UpdateSelectedComponents.java rename to src/_VisualDVM/Passes/All/UpdateSelectedComponents.java index 11f3a29a..82c060c7 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateSelectedComponents.java +++ b/src/_VisualDVM/Passes/All/UpdateSelectedComponents.java @@ -1,7 +1,7 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Component; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java b/src/_VisualDVM/Passes/All/UpdateSetting.java similarity index 97% rename from src/Visual_DVM_2021/Passes/All/UpdateSetting.java rename to src/_VisualDVM/Passes/All/UpdateSetting.java index e7391b0e..5ec64da8 100644 --- a/src/Visual_DVM_2021/Passes/All/UpdateSetting.java +++ b/src/_VisualDVM/Passes/All/UpdateSetting.java @@ -1,7 +1,4 @@ -package Visual_DVM_2021.Passes.All; -import Common.Utils.Utils_; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; +package _VisualDVM.Passes.All; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Dialog.PercentsForm; @@ -12,7 +9,7 @@ import Common.Visual.Windows.Dialog.VDirectoryChooser; import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Utils; import _VisualDVM.GlobalData.Settings.DBSetting; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/Visual_DVM_2021/Passes/All/WindowsLocalCompilation.java b/src/_VisualDVM/Passes/All/WindowsLocalCompilation.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/WindowsLocalCompilation.java rename to src/_VisualDVM/Passes/All/WindowsLocalCompilation.java index 08a38943..6d733268 100644 --- a/src/Visual_DVM_2021/Passes/All/WindowsLocalCompilation.java +++ b/src/_VisualDVM/Passes/All/WindowsLocalCompilation.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask; import _VisualDVM.GlobalData.Tasks.Passes.TaskLocalPass; import _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows.WindowsLocalCompilationSupervisor; diff --git a/src/Visual_DVM_2021/Passes/All/WindowsLocalRun.java b/src/_VisualDVM/Passes/All/WindowsLocalRun.java similarity index 94% rename from src/Visual_DVM_2021/Passes/All/WindowsLocalRun.java rename to src/_VisualDVM/Passes/All/WindowsLocalRun.java index 05aedf9c..67b52305 100644 --- a/src/Visual_DVM_2021/Passes/All/WindowsLocalRun.java +++ b/src/_VisualDVM/Passes/All/WindowsLocalRun.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.GlobalData.Tasks.Passes.TaskLocalPass; import _VisualDVM.GlobalData.Tasks.RunTask.RunTask; import _VisualDVM.GlobalData.Tasks.Supervisor.Local.Windows.WindowsLocalRunSupervisor; diff --git a/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java b/src/_VisualDVM/Passes/All/ZipFolderPass.java similarity index 98% rename from src/Visual_DVM_2021/Passes/All/ZipFolderPass.java rename to src/_VisualDVM/Passes/All/ZipFolderPass.java index 438ee7b6..09c59496 100644 --- a/src/Visual_DVM_2021/Passes/All/ZipFolderPass.java +++ b/src/_VisualDVM/Passes/All/ZipFolderPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.All; +package _VisualDVM.Passes.All; import _VisualDVM.Utils; import Common.Passes.Pass; diff --git a/src/Visual_DVM_2021/Passes/CurrentComponentPass.java b/src/_VisualDVM/Passes/CurrentComponentPass.java similarity index 89% rename from src/Visual_DVM_2021/Passes/CurrentComponentPass.java rename to src/_VisualDVM/Passes/CurrentComponentPass.java index 24276bd7..29ec57a3 100644 --- a/src/Visual_DVM_2021/Passes/CurrentComponentPass.java +++ b/src/_VisualDVM/Passes/CurrentComponentPass.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes; -import Common.Current_; +package _VisualDVM.Passes; import Common.Passes.Pass; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java similarity index 99% rename from src/Visual_DVM_2021/Passes/PassCode.java rename to src/_VisualDVM/Passes/PassCode.java index 225b8071..0f28ba1a 100644 --- a/src/Visual_DVM_2021/Passes/PassCode.java +++ b/src/_VisualDVM/Passes/PassCode.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes; import Common.Passes.PassCode_; public enum PassCode implements PassCode_ { //- diff --git a/src/Visual_DVM_2021/Passes/ProcessPass.java b/src/_VisualDVM/Passes/ProcessPass.java similarity index 98% rename from src/Visual_DVM_2021/Passes/ProcessPass.java rename to src/_VisualDVM/Passes/ProcessPass.java index dd372921..95e80e0f 100644 --- a/src/Visual_DVM_2021/Passes/ProcessPass.java +++ b/src/_VisualDVM/Passes/ProcessPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes; import Common.CommonConstants; import Common.Passes.Pass; import Common.Passes.PassException; diff --git a/src/Visual_DVM_2021/Passes/ChangeFilePass.java b/src/_VisualDVM/Passes/Project/ChangeFilePass.java similarity index 92% rename from src/Visual_DVM_2021/Passes/ChangeFilePass.java rename to src/_VisualDVM/Passes/Project/ChangeFilePass.java index bb691a42..7b41629b 100644 --- a/src/Visual_DVM_2021/Passes/ChangeFilePass.java +++ b/src/_VisualDVM/Passes/Project/ChangeFilePass.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Project; import Common.Passes.Pass; -import _VisualDVM.Current; import Common.Visual.Windows.Dialog.Text.FileNameForm; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; diff --git a/src/Visual_DVM_2021/Passes/CurrentProjectPass.java b/src/_VisualDVM/Passes/Project/CurrentProjectPass.java similarity index 85% rename from src/Visual_DVM_2021/Passes/CurrentProjectPass.java rename to src/_VisualDVM/Passes/Project/CurrentProjectPass.java index 3673352c..b1b7f138 100644 --- a/src/Visual_DVM_2021/Passes/CurrentProjectPass.java +++ b/src/_VisualDVM/Passes/Project/CurrentProjectPass.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Project; import Common.Passes.Pass; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.ProjectData.Project.db_project_info; public abstract class CurrentProjectPass extends Pass { diff --git a/src/Visual_DVM_2021/Passes/FilesMassPass.java b/src/_VisualDVM/Passes/Project/FilesMassPass.java similarity index 95% rename from src/Visual_DVM_2021/Passes/FilesMassPass.java rename to src/_VisualDVM/Passes/Project/FilesMassPass.java index f746938d..fb7437d8 100644 --- a/src/Visual_DVM_2021/Passes/FilesMassPass.java +++ b/src/_VisualDVM/Passes/Project/FilesMassPass.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Project; import Common.Passes.Pass; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; diff --git a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java b/src/_VisualDVM/Passes/SSH/ConnectionPass.java similarity index 95% rename from src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java rename to src/_VisualDVM/Passes/SSH/ConnectionPass.java index 91f9afb5..51702605 100644 --- a/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java +++ b/src/_VisualDVM/Passes/SSH/ConnectionPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.SSH; +package _VisualDVM.Passes.SSH; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.User.User; import _VisualDVM.TestingSystem.DVM.UserConnection; diff --git a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java b/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java similarity index 90% rename from src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java rename to src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java index 9495ee2d..38d04012 100644 --- a/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java +++ b/src/_VisualDVM/Passes/SSH/CurrentConnectionPass.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.SSH; -import Common.Current_; +package _VisualDVM.Passes.SSH; import _VisualDVM.Current; import _VisualDVM.Global; //завязан на текущие машину и юзера diff --git a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java similarity index 98% rename from src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java rename to src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java index 2baa233e..28d4ceb7 100644 --- a/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java +++ b/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java @@ -1,7 +1,6 @@ -package Visual_DVM_2021.Passes.SSH; +package _VisualDVM.Passes.SSH; import Common.Utils.Utils_; import _VisualDVM.Constants; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Machine.Machine; import _VisualDVM.GlobalData.Machine.MachineType; diff --git a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java b/src/_VisualDVM/Passes/SSH/TaskConnectionPass.java similarity index 95% rename from src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java rename to src/_VisualDVM/Passes/SSH/TaskConnectionPass.java index 7ee5418c..cbccc168 100644 --- a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java +++ b/src/_VisualDVM/Passes/SSH/TaskConnectionPass.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes.SSH; +package _VisualDVM.Passes.SSH; import Common.Utils.Utils_; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.GlobalData.Tasks.Supervisor.Remote.RemoteTaskSupervisor; public abstract class TaskConnectionPass extends ConnectionPass { diff --git a/src/Visual_DVM_2021/Passes/SSH/WorkspaceNotFoundException.java b/src/_VisualDVM/Passes/SSH/WorkspaceNotFoundException.java similarity index 80% rename from src/Visual_DVM_2021/Passes/SSH/WorkspaceNotFoundException.java rename to src/_VisualDVM/Passes/SSH/WorkspaceNotFoundException.java index 47e0bec4..304a7968 100644 --- a/src/Visual_DVM_2021/Passes/SSH/WorkspaceNotFoundException.java +++ b/src/_VisualDVM/Passes/SSH/WorkspaceNotFoundException.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.SSH; +package _VisualDVM.Passes.SSH; public class WorkspaceNotFoundException extends Exception{ public WorkspaceNotFoundException(String message_in){ super(message_in); diff --git a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java b/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java similarity index 95% rename from src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java rename to src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java index c44f8483..5057e092 100644 --- a/src/Visual_DVM_2021/Passes/OpenSapforVersionPass.java +++ b/src/_VisualDVM/Passes/Sapfor/OpenSapforVersionPass.java @@ -1,10 +1,9 @@ -package Visual_DVM_2021.Passes; -import Common.Current_; +package _VisualDVM.Passes.Sapfor; import Common.Passes.Pass; import Common.Utils.Utils_; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Current; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json; import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask; diff --git a/src/Visual_DVM_2021/Passes/SapforAnalysis.java b/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java similarity index 98% rename from src/Visual_DVM_2021/Passes/SapforAnalysis.java rename to src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java index 2e9bf515..e6a8947f 100644 --- a/src/Visual_DVM_2021/Passes/SapforAnalysis.java +++ b/src/_VisualDVM/Passes/Sapfor/SapforAnalysis.java @@ -1,7 +1,8 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Sapfor; import Common.Passes.PassState; import Common.Utils.Utils_; import Common.Visual.UI_; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.Controls.PassControl; import _VisualDVM.Visual.Menus.PassMenuItem; diff --git a/src/Visual_DVM_2021/Passes/SapforFilesModification.java b/src/_VisualDVM/Passes/Sapfor/SapforFilesModification.java similarity index 83% rename from src/Visual_DVM_2021/Passes/SapforFilesModification.java rename to src/_VisualDVM/Passes/Sapfor/SapforFilesModification.java index e1e91827..040e5ffc 100644 --- a/src/Visual_DVM_2021/Passes/SapforFilesModification.java +++ b/src/_VisualDVM/Passes/Sapfor/SapforFilesModification.java @@ -1,8 +1,6 @@ -package Visual_DVM_2021.Passes; -import Common.Utils.Utils_; -import _VisualDVM.Current; +package _VisualDVM.Passes.Sapfor; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; public class SapforFilesModification extends SapforModification { @Override diff --git a/src/Visual_DVM_2021/Passes/SapforModification.java b/src/_VisualDVM/Passes/Sapfor/SapforModification.java similarity index 94% rename from src/Visual_DVM_2021/Passes/SapforModification.java rename to src/_VisualDVM/Passes/Sapfor/SapforModification.java index 79795366..b1b6d207 100644 --- a/src/Visual_DVM_2021/Passes/SapforModification.java +++ b/src/_VisualDVM/Passes/Sapfor/SapforModification.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Sapfor; import _VisualDVM.Global; public class SapforModification extends SapforPass { public String addOpt1 = ""; diff --git a/src/Visual_DVM_2021/Passes/SapforPass.java b/src/_VisualDVM/Passes/Sapfor/SapforPass.java similarity index 94% rename from src/Visual_DVM_2021/Passes/SapforPass.java rename to src/_VisualDVM/Passes/Sapfor/SapforPass.java index 00cd0eb6..a6df15dc 100644 --- a/src/Visual_DVM_2021/Passes/SapforPass.java +++ b/src/_VisualDVM/Passes/Sapfor/SapforPass.java @@ -1,6 +1,5 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Sapfor; import Common.Passes.PassException; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.UI; public class SapforPass extends SilentSapforPass { diff --git a/src/Visual_DVM_2021/Passes/SapforTransformation.java b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java similarity index 98% rename from src/Visual_DVM_2021/Passes/SapforTransformation.java rename to src/_VisualDVM/Passes/Sapfor/SapforTransformation.java index 94a35553..9450458f 100644 --- a/src/Visual_DVM_2021/Passes/SapforTransformation.java +++ b/src/_VisualDVM/Passes/Sapfor/SapforTransformation.java @@ -1,4 +1,5 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Sapfor; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.PassMenuItem; diff --git a/src/Visual_DVM_2021/Passes/SilentSapforPass.java b/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java similarity index 93% rename from src/Visual_DVM_2021/Passes/SilentSapforPass.java rename to src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java index e02dd22a..92c82a8e 100644 --- a/src/Visual_DVM_2021/Passes/SilentSapforPass.java +++ b/src/_VisualDVM/Passes/Sapfor/SilentSapforPass.java @@ -1,5 +1,5 @@ -package Visual_DVM_2021.Passes; -import _VisualDVM.Current; +package _VisualDVM.Passes.Sapfor; +import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Sapfor.Sapfor; public class SilentSapforPass extends CurrentProjectPass { diff --git a/src/Visual_DVM_2021/Passes/Transformation.java b/src/_VisualDVM/Passes/Sapfor/Transformation.java similarity index 96% rename from src/Visual_DVM_2021/Passes/Transformation.java rename to src/_VisualDVM/Passes/Sapfor/Transformation.java index 90980b8d..c9dfc11f 100644 --- a/src/Visual_DVM_2021/Passes/Transformation.java +++ b/src/_VisualDVM/Passes/Sapfor/Transformation.java @@ -1,4 +1,5 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Sapfor; +import _VisualDVM.Passes.Project.CurrentProjectPass; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.PassMenuItem; diff --git a/src/Visual_DVM_2021/Passes/VariantsMassPass.java b/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java similarity index 95% rename from src/Visual_DVM_2021/Passes/VariantsMassPass.java rename to src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java index 16a38980..9d15b000 100644 --- a/src/Visual_DVM_2021/Passes/VariantsMassPass.java +++ b/src/_VisualDVM/Passes/Sapfor/VariantsMassPass.java @@ -1,5 +1,6 @@ -package Visual_DVM_2021.Passes; -import _VisualDVM.Current; +package _VisualDVM.Passes.Sapfor; +import _VisualDVM.Passes.Project.CurrentProjectPass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.DBProjectFile; diff --git a/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java b/src/_VisualDVM/Passes/Server/CloneServerObject.java similarity index 95% rename from src/Visual_DVM_2021/Passes/Server/CloneServerObject.java rename to src/_VisualDVM/Passes/Server/CloneServerObject.java index 929c12ca..df68b97d 100644 --- a/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java +++ b/src/_VisualDVM/Passes/Server/CloneServerObject.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.Server; -import Common.Current_; +package _VisualDVM.Passes.Server; import _VisualDVM.Current; import Common.Database.Objects.riDBObject; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/Server/ComponentsRepositoryPass.java b/src/_VisualDVM/Passes/Server/ComponentsRepositoryPass.java similarity index 87% rename from src/Visual_DVM_2021/Passes/Server/ComponentsRepositoryPass.java rename to src/_VisualDVM/Passes/Server/ComponentsRepositoryPass.java index 20ecc976..bc0ce76f 100644 --- a/src/Visual_DVM_2021/Passes/Server/ComponentsRepositoryPass.java +++ b/src/_VisualDVM/Passes/Server/ComponentsRepositoryPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.Server; +package _VisualDVM.Passes.Server; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ComponentsServer; public abstract class ComponentsRepositoryPass extends RepositoryPass { diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java b/src/_VisualDVM/Passes/Server/DeleteServerObject.java similarity index 97% rename from src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java rename to src/_VisualDVM/Passes/Server/DeleteServerObject.java index 304ea6aa..470f9bf5 100644 --- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObject.java +++ b/src/_VisualDVM/Passes/Server/DeleteServerObject.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.Server; +package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.Repository.RepositoryServer; diff --git a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java similarity index 97% rename from src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java rename to src/_VisualDVM/Passes/Server/DeleteServerObjects.java index 23acbfb2..0e6a0487 100644 --- a/src/Visual_DVM_2021/Passes/Server/DeleteServerObjects.java +++ b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.Server; -import Common.Current_; +package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; import Common.Database.Tables.DBTable; import Common.Database.Database; diff --git a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java similarity index 96% rename from src/Visual_DVM_2021/Passes/Server/EditServerObject.java rename to src/_VisualDVM/Passes/Server/EditServerObject.java index a00f2fb7..6ed6a053 100644 --- a/src/Visual_DVM_2021/Passes/Server/EditServerObject.java +++ b/src/_VisualDVM/Passes/Server/EditServerObject.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.Server; +package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; import _VisualDVM.ServerObjectsCache.VisualCaches; import _VisualDVM.Repository.RepositoryServer; diff --git a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java b/src/_VisualDVM/Passes/Server/PublishServerObject.java similarity index 95% rename from src/Visual_DVM_2021/Passes/Server/PublishServerObject.java rename to src/_VisualDVM/Passes/Server/PublishServerObject.java index 6d66d107..bfe4d378 100644 --- a/src/Visual_DVM_2021/Passes/Server/PublishServerObject.java +++ b/src/_VisualDVM/Passes/Server/PublishServerObject.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes.Server; -import _VisualDVM.Current; +package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java b/src/_VisualDVM/Passes/Server/RepositoryPass.java similarity index 99% rename from src/Visual_DVM_2021/Passes/Server/RepositoryPass.java rename to src/_VisualDVM/Passes/Server/RepositoryPass.java index 085e8479..8c70ec4b 100644 --- a/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java +++ b/src/_VisualDVM/Passes/Server/RepositoryPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.Server; +package _VisualDVM.Passes.Server; import Common.Database.Objects.DBObject; import Common.Utils.Utils_; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java b/src/_VisualDVM/Passes/Server/ServerObjectPass.java similarity index 95% rename from src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java rename to src/_VisualDVM/Passes/Server/ServerObjectPass.java index 3e3fe9ff..7ffb04a2 100644 --- a/src/Visual_DVM_2021/Passes/Server/ServerObjectPass.java +++ b/src/_VisualDVM/Passes/Server/ServerObjectPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.Server; +package _VisualDVM.Passes.Server; import Common.Database.Database; import Common.Database.Objects.DBObject; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java b/src/_VisualDVM/Passes/Server/TestingSystemPass.java similarity index 89% rename from src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java rename to src/_VisualDVM/Passes/Server/TestingSystemPass.java index 548bfee7..6d06f106 100644 --- a/src/Visual_DVM_2021/Passes/Server/TestingSystemPass.java +++ b/src/_VisualDVM/Passes/Server/TestingSystemPass.java @@ -1,4 +1,4 @@ -package Visual_DVM_2021.Passes.Server; +package _VisualDVM.Passes.Server; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingServer; public abstract class TestingSystemPass extends RepositoryPass { diff --git a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java similarity index 94% rename from src/Visual_DVM_2021/Passes/AbortTestingPackage.java rename to src/_VisualDVM/Passes/Testing/AbortTestingPackage.java index 165cc869..981da280 100644 --- a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java +++ b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes; -import Common.Current_; +package _VisualDVM.Passes.Testing; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; public abstract class AbortTestingPackage extends TestingSystemPass { TestingPackageToKill packageToKill = null; @Override diff --git a/src/Visual_DVM_2021/Passes/ActualizeTestingPackages.java b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java similarity index 95% rename from src/Visual_DVM_2021/Passes/ActualizeTestingPackages.java rename to src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java index 279503e5..c13a9b15 100644 --- a/src/Visual_DVM_2021/Passes/ActualizeTestingPackages.java +++ b/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java @@ -1,10 +1,10 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Testing; import Common.Database.Tables.iDBTable; import _VisualDVM.Global; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import javafx.util.Pair; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/CloneConfiguration.java b/src/_VisualDVM/Passes/Testing/CloneConfiguration.java similarity index 79% rename from src/Visual_DVM_2021/Passes/CloneConfiguration.java rename to src/_VisualDVM/Passes/Testing/CloneConfiguration.java index bcfe47ad..65508af7 100644 --- a/src/Visual_DVM_2021/Passes/CloneConfiguration.java +++ b/src/_VisualDVM/Passes/Testing/CloneConfiguration.java @@ -1,8 +1,8 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Testing; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Configuration.Configuration; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public class CloneConfiguration extends PublishServerObject { public CloneConfiguration(Class d_in) { super(Global.testingServer, d_in); diff --git a/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java b/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java similarity index 96% rename from src/Visual_DVM_2021/Passes/DeleteTestingPackages.java rename to src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java index f8e739e1..ca29a840 100644 --- a/src/Visual_DVM_2021/Passes/DeleteTestingPackages.java +++ b/src/_VisualDVM/Passes/Testing/DeleteTestingPackages.java @@ -1,10 +1,10 @@ -package Visual_DVM_2021.Passes; +package _VisualDVM.Passes.Testing; import Common.CommonConstants; import _VisualDVM.Global; import _VisualDVM.Utils; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.DeleteServerObjects; +import _VisualDVM.Passes.Server.DeleteServerObjects; import java.io.File; import java.util.Vector; diff --git a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java similarity index 94% rename from src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java rename to src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java index bc6d664f..910a228d 100644 --- a/src/Visual_DVM_2021/Passes/SaveCurrentConfiguration.java +++ b/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes; -import Common.Current_; +package _VisualDVM.Passes.Testing; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.Configuration.Configuration; @@ -7,7 +6,7 @@ import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Settings.Settings; import _VisualDVM.TestingSystem.Common.Test.Test; import _VisualDVM.TestingSystem.Common.TestingServer; -import Visual_DVM_2021.Passes.Server.EditServerObject; +import _VisualDVM.Passes.Server.EditServerObject; import java.util.Vector; public abstract class SaveCurrentConfiguration extends EditServerObject { diff --git a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java b/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java similarity index 96% rename from src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java rename to src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java index a79535a7..cf1e9065 100644 --- a/src/Visual_DVM_2021/Passes/ShowCurrentConfigurationTests.java +++ b/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java @@ -1,5 +1,4 @@ -package Visual_DVM_2021.Passes; -import Common.Current_; +package _VisualDVM.Passes.Testing; import Common.Passes.Pass; import _VisualDVM.Current; import _VisualDVM.Global; diff --git a/src/Visual_DVM_2021/Passes/StartTestingPackage.java b/src/_VisualDVM/Passes/Testing/StartTestingPackage.java similarity index 93% rename from src/Visual_DVM_2021/Passes/StartTestingPackage.java rename to src/_VisualDVM/Passes/Testing/StartTestingPackage.java index 3103fd6f..49dcbd00 100644 --- a/src/Visual_DVM_2021/Passes/StartTestingPackage.java +++ b/src/_VisualDVM/Passes/Testing/StartTestingPackage.java @@ -1,12 +1,11 @@ -package Visual_DVM_2021.Passes; -import Common.Current_; +package _VisualDVM.Passes.Testing; import Common.Visual.UI_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage; import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.TestingSystem.Common.TasksPackageState; -import Visual_DVM_2021.Passes.Server.PublishServerObject; +import _VisualDVM.Passes.Server.PublishServerObject; public abstract class StartTestingPackage

extends PublishServerObject { public StartTestingPackage(Class

p_in) { super(Global.testingServer, p_in); diff --git a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java index 60060819..9436c66e 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java +++ b/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java @@ -1,7 +1,5 @@ package _VisualDVM.ProjectData.Files.UI.Editor; import Common.Utils.Utils_; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.Editor.BaseEditor; import _VisualDVM.Visual.Editor.CaretInfo; @@ -14,8 +12,7 @@ import _VisualDVM.ProjectData.Files.FileState; import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete; import _VisualDVM.Visual.Menus.MainEditorMenu; import _VisualDVM.ProjectData.SapforData.Loops.Loop; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.SPFEditorInterface; import javafx.util.Pair; import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter; diff --git a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java index 03171389..743709f4 100644 --- a/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java +++ b/src/_VisualDVM/ProjectData/Files/UI/FilesTree.java @@ -1,5 +1,4 @@ package _VisualDVM.ProjectData.Files.UI; -import Common.Current_; import _VisualDVM.Current; import _VisualDVM.Global; import Common.Visual.DragDrop.FileDrop; @@ -9,8 +8,7 @@ import _VisualDVM.Visual.UI; import Common.Visual.Trees.StyledTree; import Common.Visual.Trees.TreeRenderers; import _VisualDVM.ProjectData.Files.DBProjectFile; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java index abc972bd..0ef851da 100644 --- a/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java +++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java @@ -2,7 +2,7 @@ package _VisualDVM.ProjectData.Messages.Recommendations; import Common.Database.Objects.iDBObject; import Common.Utils.Utils_; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import com.sun.org.glassfish.gmbal.Description; public class MessageRecommendation extends iDBObject { //рекомендация может касаться, либо настройки либо прохода. так же может быть просто текстовой. diff --git a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java index d39b13c0..67aa00f6 100644 --- a/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java +++ b/src/_VisualDVM/ProjectData/Messages/Recommendations/RecommendationsDBTable.java @@ -4,7 +4,7 @@ import Common.Database.Tables.iDBTable; import Common.Visual.DataSetControlForm; import Common.Visual.Tables.TableRenderers; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class RecommendationsDBTable extends iDBTable { //group=1 - настройка //group=2 - преобразование diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java index aa90ad88..129b9fe4 100644 --- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java +++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java @@ -1,5 +1,4 @@ package _VisualDVM.ProjectData.Project.UI; -import Common.Current_; import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.GraphMenu; @@ -7,8 +6,7 @@ import _VisualDVM.Visual.Menus.VersionsMenu; import Common.Visual.Selectable; import Common.Visual.Trees.DataTree; import Common.Visual.Trees.TreeRenderers; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.tree.TreePath; import java.awt.event.KeyAdapter; diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java index ccb290a0..b6c621a0 100644 --- a/src/_VisualDVM/ProjectData/Project/db_project_info.java +++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java @@ -1,12 +1,10 @@ package _VisualDVM.ProjectData.Project; import Common.CommonConstants; -import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Constants; import _VisualDVM.Current; import Common.Database.Objects.DBObject; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import Common.Utils.Index; @@ -37,7 +35,7 @@ import _VisualDVM.ProjectData.SapforData.Regions.RegionsSet; import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant; import _VisualDVM.ProjectData.SapforData.Variants.VariantsSet; import _VisualDVM.TestingSystem.Common.Test.ProjectFiles_json; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; import com.mxgraph.swing.mxGraphComponent; import com.sun.org.glassfish.gmbal.Description; diff --git a/src/_VisualDVM/ProjectData/ProjectDatabase.java b/src/_VisualDVM/ProjectData/ProjectDatabase.java index df943c7a..70b86ca4 100644 --- a/src/_VisualDVM/ProjectData/ProjectDatabase.java +++ b/src/_VisualDVM/ProjectData/ProjectDatabase.java @@ -12,7 +12,7 @@ import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatisticsDBTable; import _VisualDVM.ProjectData.Project.ProjectInfoDBTable; import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinatesDBTable; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.tree.DefaultMutableTreeNode; import java.io.File; diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java index 5fdefa0d..20c00f2a 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java @@ -1,13 +1,10 @@ package _VisualDVM.ProjectData.SapforData.Arrays; -import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Database.Tables.DataSet; import Common.Visual.DataSetControlForm; import _VisualDVM.Global; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.util.Vector; diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java index 5f42f158..3cee780d 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java @@ -1,6 +1,5 @@ package _VisualDVM.ProjectData.SapforData.Arrays; import Common.Utils.Utils_; -import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Utils.Index; import _VisualDVM.Global; @@ -12,8 +11,7 @@ import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimensionState import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateLink; import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion; import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javafx.util.Pair; import javax.swing.*; diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java index c78bd3be..737bc83f 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java +++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DistributionMenu.java @@ -1,6 +1,6 @@ package _VisualDVM.ProjectData.SapforData.Arrays.UI; import Common.Visual.Trees.StyledTree; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.GraphMenu; diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java index 2351e1b5..66402e1d 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java @@ -1,7 +1,7 @@ package _VisualDVM.ProjectData.SapforData.Functions; import Common.Utils.Utils_; import Common.Visual.UI_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages; diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java index 809df16d..6ea8fb99 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java @@ -1,7 +1,7 @@ package _VisualDVM.ProjectData.SapforData.Functions; import Common.Utils.Utils_; import Common.Visual.UI_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import java.util.Vector; diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java index dc39588f..01ea8967 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java @@ -1,14 +1,12 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph; -import Common.Current_; import Common.Utils.Utils_; import _VisualDVM.Current; import Common.Visual.Menus.VisualiserMenuItem; import Common.Visual.Menus.StyledPopupMenu; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java index f6c987d5..400bd1df 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java +++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java @@ -1,5 +1,4 @@ package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph; -import Common.Current_; import Common.Utils.Utils_; import Common.Visual.UI_; import _VisualDVM.Current; @@ -7,9 +6,8 @@ import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; import _VisualDVM.ProjectData.SapforData.Functions.FunctionType; -import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions; +import _VisualDVM.Passes.PassCode; import com.mxgraph.model.mxCell; import com.mxgraph.model.mxGeometry; import com.mxgraph.swing.mxGraphComponent; diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java index f04edac7..b03661f7 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java +++ b/src/_VisualDVM/Repository/BugReport/BugReportsDBTable.java @@ -4,8 +4,7 @@ import Common.Database.Tables.DBTable; import Common.Visual.DataSetControlForm; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.event.ActionEvent; diff --git a/src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java b/src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java index 5804a8a0..5d9a532e 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java +++ b/src/_VisualDVM/Repository/BugReport/BugReportsMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.Repository.BugReport; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class BugReportsMenuBar extends DataMenuBar { public BugReportsMenuBar() { super("отчёты об ошибках", diff --git a/src/_VisualDVM/Repository/BugReportsDatabase.java b/src/_VisualDVM/Repository/BugReportsDatabase.java index e4eea602..33160bea 100644 --- a/src/_VisualDVM/Repository/BugReportsDatabase.java +++ b/src/_VisualDVM/Repository/BugReportsDatabase.java @@ -5,7 +5,7 @@ import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportsDBTable; import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspaceDBTable; import _VisualDVM.Repository.Subscribes.SubsribersDBTable; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.nio.file.Paths; import java.util.Vector; diff --git a/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java b/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java index 17e01a19..1337655d 100644 --- a/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java +++ b/src/_VisualDVM/Repository/Component/ComponentsMenuBar.java @@ -2,7 +2,7 @@ package _VisualDVM.Repository.Component; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.Menus.DataMenuBar; import Common.Visual.UI_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenu; public class ComponentsMenuBar extends DataMenuBar { diff --git a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java index 44a375da..ad6abf68 100644 --- a/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java +++ b/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java @@ -2,9 +2,8 @@ package _VisualDVM.Repository.Component.Sapfor; import Common.CommonConstants; import Common.Utils.Utils_; import Common.Visual.UI_; +import _VisualDVM.Passes.Sapfor.SapforAnalysis; import _VisualDVM.Constants; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.UI; import _VisualDVM.Utils; @@ -14,9 +13,8 @@ import _VisualDVM.ProjectData.Files.LanguageStyle; import _VisualDVM.Repository.Component.OSDComponent; import _VisualDVM.Repository.Component.Visualizer_2; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.PassException; -import Common.Passes.Pass; import org.apache.commons.io.FileUtils; import java.io.File; @@ -342,9 +340,9 @@ public abstract class Sapfor extends OSDComponent { Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(cuf); } // - public Visual_DVM_2021.Passes.SapforAnalysis getAnalysisByPhase(String phase) { + public SapforAnalysis getAnalysisByPhase(String phase) { for (PassCode analysis_code : getAnalysesCodes()) { - Visual_DVM_2021.Passes.SapforAnalysis analysis = (Visual_DVM_2021.Passes.SapforAnalysis) Global.mainModule.getPass(analysis_code); + SapforAnalysis analysis = (SapforAnalysis) Global.mainModule.getPass(analysis_code); if (analysis.phase().equals(phase)) return analysis; } return null; diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java index dce18d15..cca3333f 100644 --- a/src/_VisualDVM/Repository/Component/Visualiser.java +++ b/src/_VisualDVM/Repository/Component/Visualiser.java @@ -1,10 +1,7 @@ package _VisualDVM.Repository.Component; -import Common.Utils.Utils_; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.io.File; import java.io.IOException; diff --git a/src/_VisualDVM/Repository/RepositoryClient.java b/src/_VisualDVM/Repository/RepositoryClient.java index 99bf7f62..b0152f68 100644 --- a/src/_VisualDVM/Repository/RepositoryClient.java +++ b/src/_VisualDVM/Repository/RepositoryClient.java @@ -3,7 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import Common.Passes.PassException; -import Visual_DVM_2021.Passes.Server.TestingSystemPass; +import _VisualDVM.Passes.Server.TestingSystemPass; import java.io.FileWriter; import java.io.Serializable; diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java index 7276c5d9..8e8534e8 100644 --- a/src/_VisualDVM/Repository/Server/ComponentsServer.java +++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java @@ -17,9 +17,9 @@ import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.RepositoryRefuseException; import _VisualDVM.Repository.RepositoryServer; import _VisualDVM.Repository.Subscribes.Subscriber; -import Visual_DVM_2021.Passes.All.ArchivesBackupPass; -import Visual_DVM_2021.Passes.All.UnzipFolderPass; -import Visual_DVM_2021.Passes.All.ZipFolderPass; +import _VisualDVM.Passes.All.ArchivesBackupPass; +import _VisualDVM.Passes.All.UnzipFolderPass; +import _VisualDVM.Passes.All.ZipFolderPass; import javafx.util.Pair; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java index e3a87efe..b73bd34c 100644 --- a/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java +++ b/src/_VisualDVM/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.Repository.SubscriberWorkspace; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class SubscriberWorkspacesMenuBar extends DataMenuBar { public SubscriberWorkspacesMenuBar() { super("рабочие пространства", PassCode.DeleteSubscriberWorkspace); diff --git a/src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java b/src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java index 7d8a6da8..60c026da 100644 --- a/src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java +++ b/src/_VisualDVM/Repository/Subscribes/SubscribersMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.Repository.Subscribes; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class SubscribersMenuBar extends DataMenuBar { public SubscribersMenuBar() { super("Адресаты", diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java index 333f5194..b310aaa1 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java @@ -5,7 +5,7 @@ import Common.Visual.Menus.DataMenuBar; import Common.Visual.Controls.MenuBarButton; import _VisualDVM.TestingSystem.Common.Group.UI.AddGroupMenu; import _VisualDVM.TestingSystem.Common.Group.UI.EditGroupMenu; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; public class GroupsMenuBar extends DataMenuBar { diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java index 5476cdfa..20167072 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.Common.Group.UI; import _VisualDVM.Visual.Menus.VisualiserMenu; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class AddGroupMenu extends VisualiserMenu { public AddGroupMenu() { super("", "/icons/RedAdd.png"); diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java index 70d0aaa7..b55c7642 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.Common.Group.UI; import _VisualDVM.Visual.Menus.VisualiserMenu; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class EditGroupMenu extends VisualiserMenu { public EditGroupMenu() { super("", "/icons/Edit.png" ); diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Test.java b/src/_VisualDVM/TestingSystem/Common/Test/Test.java index 6a9ef174..ed0ea552 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/Test.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/Test.java @@ -12,8 +12,8 @@ import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.Repository.RepositoryRefuseException; -import Visual_DVM_2021.Passes.All.UnzipFolderPass; -import Visual_DVM_2021.Passes.All.ZipFolderPass; +import _VisualDVM.Passes.All.UnzipFolderPass; +import _VisualDVM.Passes.All.ZipFolderPass; import com.sun.org.glassfish.gmbal.Description; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java b/src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java index a20043db..06e53b74 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/TestsMenuBar.java @@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.Common.Test; import Common.Visual.Menus.DataMenuBar; import _VisualDVM.TestingSystem.Common.Test.UI.AddTestMenu; import _VisualDVM.TestingSystem.Common.Test.UI.EditTestMenu; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class TestsMenuBar extends DataMenuBar { public TestsMenuBar() { super("тесты"); diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java index 8cd4aeb7..1314ecb3 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java @@ -1,8 +1,7 @@ package _VisualDVM.TestingSystem.Common.Test.UI; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenu; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; public class AddTestMenu extends VisualiserMenu { public AddTestMenu() { super("Добавление теста", "/icons/RedAdd.png", false); diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java index 45406387..5804abd2 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java @@ -1,5 +1,5 @@ package _VisualDVM.TestingSystem.Common.Test.UI; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenu; public class EditTestMenu extends VisualiserMenu { diff --git a/src/_VisualDVM/TestingSystem/Common/TestingBar.java b/src/_VisualDVM/TestingSystem/Common/TestingBar.java index aeda54cf..b6db4026 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingBar.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingBar.java @@ -5,7 +5,7 @@ import _VisualDVM.Global; import Common.Visual.Controls.MenuBarButton; import _VisualDVM.Visual.Menus.VisualiserMenuBar; import Common.Visual.Fonts.VisualiserFonts; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.*; diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java index 4d0d8a0b..714b2a4c 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java @@ -31,10 +31,9 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsComma import _VisualDVM.TestingSystem.SAPFOR.SapforTestingPlanner; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState; -import Visual_DVM_2021.Passes.All.DownloadRepository; -import Visual_DVM_2021.Passes.All.ZipFolderPass; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.All.DownloadRepository; +import _VisualDVM.Passes.All.ZipFolderPass; +import _VisualDVM.Passes.PassCode; import javafx.util.Pair; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java index bd1c2992..2b71c043 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java +++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java @@ -27,8 +27,8 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsComma import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable; -import Visual_DVM_2021.Passes.All.ZipFolderPass; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.All.ZipFolderPass; +import _VisualDVM.Passes.PassCode; import javafx.util.Pair; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java index 5f0b48fa..276a7814 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class DVMConfigurationsMenuBar extends DataMenuBar { public DVMConfigurationsMenuBar() { super("конфигурации"); diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java index 845f3908..75a292a2 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java @@ -6,8 +6,7 @@ import Common.Visual.DataSetControlForm; import _VisualDVM.Visual.UI; import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.VisualCaches; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.util.Comparator; import java.util.Date; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java index 7fce25f1..c38fa9e4 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java @@ -3,7 +3,7 @@ import Common.Utils.Utils_; import _VisualDVM.Global; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Controls.MenuBarButton; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; public class DVMPackagesBar extends DataMenuBar { diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java index 4038a61f..84c6e5e1 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class DVMSettingsBar extends DataMenuBar { public DVMSettingsBar() { super("параметры тестированя", diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java index d99b4bbc..f5dd604e 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java @@ -1,8 +1,7 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI; -import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import Common.Visual.Windows.Dialog.DialogFields; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import _VisualDVM.Global; diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java index 1e71ae13..eecb55ed 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.DVM.DVMTasks; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class DVMRunTasksBar extends DataMenuBar { public DVMRunTasksBar() { super("задачи", diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java index 78eebdc9..7f078d4f 100644 --- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java +++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java @@ -8,7 +8,7 @@ import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.TestingSystem.Common.TasksPackageState; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask; import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask; -import Visual_DVM_2021.Passes.All.UnzipFolderPass; +import _VisualDVM.Passes.All.UnzipFolderPass; import javafx.util.Pair; import org.apache.commons.io.FileUtils; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java index 7d5b607c..5f41ee7d 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java @@ -1,7 +1,7 @@ package _VisualDVM.TestingSystem.SAPFOR.Json; import Common.CommonConstants; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import com.google.gson.annotations.Expose; import java.io.Serializable; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java index ab9693b8..c2596f25 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/PerformSapforTask.java @@ -6,7 +6,7 @@ import _VisualDVM.GlobalData.Tasks.TaskState; import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json; import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import java.io.File; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java index cbe728be..cf330120 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class SapforConfigurationsMenuBar extends DataMenuBar { public SapforConfigurationsMenuBar() { super("конфигурации", diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java index c9d00c67..15c2d068 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java @@ -5,8 +5,7 @@ import Common.Visual.DataSetControlForm; import _VisualDVM.Global; import _VisualDVM.ServerObjectsCache.PackageCache; import _VisualDVM.ServerObjectsCache.VisualCaches; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.util.Comparator; import java.util.Date; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java index 0281b28b..1c7d3a91 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java @@ -5,7 +5,7 @@ import _VisualDVM.Global; import Common.Utils.TextLog; import _VisualDVM.TestingSystem.Common.Settings.Settings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.util.List; import java.util.Vector; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java index c33b6926..ef5da602 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettings; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class SapforSettingsBar extends DataMenuBar { public SapforSettingsBar() { super("параметры тестирования", diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java index e3a386b4..2c2a834f 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsCommandFields.java @@ -3,7 +3,7 @@ import Common.Visual.UI_; import Common.Visual.Tables.StyledCellLabel; import Common.Visual.Windows.Dialog.DialogFields; import _VisualDVM.Repository.Component.Sapfor.Sapfor; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.*; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java index 4ea1d94e..0cff96f3 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommand.java @@ -3,7 +3,7 @@ import Common.CommonConstants; import _VisualDVM.Current; import Common.Database.Objects.DBObject; import Common.Database.Objects.riDBObject; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import com.sun.org.glassfish.gmbal.Description; public class SapforSettingsCommand extends riDBObject { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java index 58b4a949..f585e098 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class SapforSettingsCommandsBar extends DataMenuBar { public SapforSettingsCommandsBar() { super("команды", diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java index 6fc525eb..8dc359a7 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/SapforSettingsCommandsDBTable.java @@ -7,7 +7,7 @@ import Common.Visual.Windows.Dialog.DBObjectDialog; import _VisualDVM.Global; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings; import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.UI.SapforSettingsCommandFields; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import java.util.Vector; public class SapforSettingsCommandsDBTable extends iDBTable { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java index 6add16f1..8ddcb8ae 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTask/SapforTask.java @@ -7,7 +7,7 @@ import _VisualDVM.TestingSystem.SAPFOR.Json.*; import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackageTreeNode; import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTaskNode; import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.VersionNode; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import com.google.gson.annotations.Expose; import com.sun.org.glassfish.gmbal.Description; diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java index 7568f2a6..6d16859c 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java @@ -4,7 +4,7 @@ import _VisualDVM.Global; import Common.Visual.Menus.DataMenuBar; import Common.Visual.Controls.MenuBarButton; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; public class SapforPackagesBar extends DataMenuBar { diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java index e3361e49..55e0ff59 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java @@ -1,6 +1,6 @@ package _VisualDVM.TestingSystem.SAPFOR.ServerSapfor; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class ServerSapforsBar extends DataMenuBar { public ServerSapforsBar() { super("версии SAPFOR", diff --git a/src/_VisualDVM/Visual/Menus/AttachementsMenu.java b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java index 92ae42be..fdc75b12 100644 --- a/src/_VisualDVM/Visual/Menus/AttachementsMenu.java +++ b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java @@ -2,9 +2,7 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.Menus.StyledPopupMenu; import Common.Visual.Menus.VisualiserMenuItem; -import _VisualDVM.Current; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java index cdfdda95..9da44624 100644 --- a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java +++ b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java @@ -1,11 +1,9 @@ package _VisualDVM.Visual.Menus.CredentialsBar; -import _VisualDVM.Current; import Common.Visual.Controls.MenuBarButton; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenuBar; import Common.Visual.Fonts.VisualiserFonts; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java index c1d28000..cfdcd2df 100644 --- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java @@ -3,7 +3,7 @@ import Common.Visual.Controls.MenuBarButton; import _VisualDVM.Visual.Menus.VisualiserMenuBar; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.*; diff --git a/src/_VisualDVM/Visual/Menus/MainEditorMenu.java b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java index 111c2a76..f1232994 100644 --- a/src/_VisualDVM/Visual/Menus/MainEditorMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java @@ -2,7 +2,6 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.Menus.TextEditorMenu; import Common.Visual.Menus.VisualiserMenuItem; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.Editor.CaretInfo; import _VisualDVM.Utils; @@ -12,8 +11,7 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncCall; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; import _VisualDVM.ProjectData.SapforData.Functions.FunctionType; import _VisualDVM.ProjectData.SapforData.Loops.Loop; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java index 91bdebaa..cd43e691 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/AnalysesMenu.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Menus.MainMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.Visual.Menus.VisualiserMenu; diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java index ac3a6070..304d3926 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Menus.MainMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Menus.VisualiserMenu; public class GlobalCleaningMenu extends VisualiserMenu { public GlobalCleaningMenu() { diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java index 1611c964..1d39cf5f 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java @@ -1,13 +1,10 @@ package _VisualDVM.Visual.Menus.MainMenuBar; -import Common.Utils.Utils_; import Common.Visual.Menus.VisualiserMenuItem; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenu; import _VisualDVM.GlobalData.DBLastProject.DBLastProject; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import javax.swing.event.MenuEvent; diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java index 0c33e576..875e7cdd 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java @@ -6,7 +6,7 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar; import _VisualDVM.Visual.Menus.MainMenuBar.VisualiserSettingsMenu.VisualiserSettingsMenu; import _VisualDVM.Visual.UI; import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java index b23333f3..6ec572fd 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/TransformationsMenu.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Menus.MainMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Repository.Component.Sapfor.Sapfor; import _VisualDVM.Visual.Menus.PassesSubMenu; diff --git a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java index 523e6371..8609e6bb 100644 --- a/src/_VisualDVM/Visual/Menus/PassesSubMenu.java +++ b/src/_VisualDVM/Visual/Menus/PassesSubMenu.java @@ -2,8 +2,7 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.UI_; import Common.Visual.Fonts.VisualiserFonts; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java index a1aa915f..030aa204 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java @@ -1,15 +1,13 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.Menus.VisualiserMenuItem; -import _VisualDVM.Current; import _VisualDVM.Global; import Common.Visual.Trees.StyledTree; import _VisualDVM.Visual.UI; import _VisualDVM.ProjectData.Files.FileType; import _VisualDVM.ProjectData.Files.LanguageStyle; import _VisualDVM.ProjectData.LanguageName; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.awt.*; diff --git a/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java b/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java index 2a6ffd43..09cc4e6e 100644 --- a/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/VariantsMenuBar/VariantsMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.Visual.Menus.VariantsMenuBar; import Common.Visual.Menus.DataMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class VariantsMenuBar extends DataMenuBar { public VariantsMenuBar() { super("варианты"); diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenu.java b/src/_VisualDVM/Visual/Menus/VersionsMenu.java index adf91885..0c3df27d 100644 --- a/src/_VisualDVM/Visual/Menus/VersionsMenu.java +++ b/src/_VisualDVM/Visual/Menus/VersionsMenu.java @@ -1,12 +1,10 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.Menus.VisualiserMenuItem; -import _VisualDVM.Current; import _VisualDVM.Global; import Common.Visual.Trees.DataTree; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; public class VersionsMenu extends GraphMenu { VisualiserMenuItem m_select_all; VisualiserMenuItem m_unselect_all; diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java b/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java index 80e3c53b..dc90bed4 100644 --- a/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/VersionsMenuBar/VersionsMenuBar.java @@ -1,6 +1,6 @@ package _VisualDVM.Visual.Menus.VersionsMenuBar; import _VisualDVM.Visual.Menus.VisualiserMenuBar; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; public class VersionsMenuBar extends VisualiserMenuBar { public VersionsMenuBar(){ addPasses(PassCode.CreateTestsGroupFromSelectedVersions); diff --git a/src/_VisualDVM/Visual/Menus/VisualiserMenu.java b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java index e83f01f0..73313830 100644 --- a/src/_VisualDVM/Visual/Menus/VisualiserMenu.java +++ b/src/_VisualDVM/Visual/Menus/VisualiserMenu.java @@ -2,7 +2,7 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.UI_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java index 9c3a0528..7c19d864 100644 --- a/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java @@ -2,7 +2,7 @@ package _VisualDVM.Visual.Menus; import Common.Utils.Utils_; import Common.Visual.Fonts.VisualiserFonts; import Common.Visual.UI_; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/UI.java b/src/_VisualDVM/Visual/UI.java index 5b6490cb..7e23cbb8 100644 --- a/src/_VisualDVM/Visual/UI.java +++ b/src/_VisualDVM/Visual/UI.java @@ -1,9 +1,7 @@ package _VisualDVM.Visual; import Common.Database.Tables.DataSet; -import Common.Utils.Utils_; import Common.Visual.UI_; import Common.Visual.Menus.DataMenuBar; -import _VisualDVM.Current; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar; import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar; @@ -27,7 +25,6 @@ import _VisualDVM.GlobalData.DVMParameter.DVMParameterDBTable; import _VisualDVM.GlobalData.DVMParameter.DVMParametersMenuBar; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesDBTable; import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValuesMenuBar; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Machine.MachinesDBTable; import _VisualDVM.GlobalData.Machine.MachinesMenuBar; import _VisualDVM.GlobalData.Makefile.MakefilesDBTable; @@ -85,7 +82,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforPackagesBar; import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsBar; import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.DebugWindow; import _VisualDVM.Visual.Interface.VersionsWindow; import _VisualDVM.Visual.Windows.DebugForm; diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.java b/src/_VisualDVM/Visual/Windows/CallbackForm.java index 3690ec19..645079f8 100644 --- a/src/_VisualDVM/Visual/Windows/CallbackForm.java +++ b/src/_VisualDVM/Visual/Windows/CallbackForm.java @@ -11,8 +11,7 @@ import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportInterface; import _VisualDVM.Repository.BugReport.BugReportState; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.CallbackWindow; import _VisualDVM.Visual.Interface.CommentInterface; import _VisualDVM.Visual.Interface.DescriptionInterface; diff --git a/src/_VisualDVM/Visual/Windows/CommentFields.java b/src/_VisualDVM/Visual/Windows/CommentFields.java index 68d39772..4bdc42cd 100644 --- a/src/_VisualDVM/Visual/Windows/CommentFields.java +++ b/src/_VisualDVM/Visual/Windows/CommentFields.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Windows; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.Interface.CommentInterface; import _VisualDVM.Visual.Menus.VisualiserMenuBar; diff --git a/src/_VisualDVM/Visual/Windows/CommentTabs.java b/src/_VisualDVM/Visual/Windows/CommentTabs.java index d27da130..1db0da8b 100644 --- a/src/_VisualDVM/Visual/Windows/CommentTabs.java +++ b/src/_VisualDVM/Visual/Windows/CommentTabs.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Windows; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.CommentInterface; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Windows/DescriptionFields.java b/src/_VisualDVM/Visual/Windows/DescriptionFields.java index 95e9e747..f316b063 100644 --- a/src/_VisualDVM/Visual/Windows/DescriptionFields.java +++ b/src/_VisualDVM/Visual/Windows/DescriptionFields.java @@ -1,8 +1,7 @@ package _VisualDVM.Visual.Windows; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenuBar; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.DescriptionInterface; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Windows/DescriptionTabs.java b/src/_VisualDVM/Visual/Windows/DescriptionTabs.java index e69a5c45..bdceb2f1 100644 --- a/src/_VisualDVM/Visual/Windows/DescriptionTabs.java +++ b/src/_VisualDVM/Visual/Windows/DescriptionTabs.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Windows; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.DescriptionInterface; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Windows/FileForm.java b/src/_VisualDVM/Visual/Windows/FileForm.java index e7c8ea68..85631a49 100644 --- a/src/_VisualDVM/Visual/Windows/FileForm.java +++ b/src/_VisualDVM/Visual/Windows/FileForm.java @@ -1,8 +1,6 @@ package _VisualDVM.Visual.Windows; import Common.CommonConstants; -import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.Editor.Viewer; import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar; @@ -18,8 +16,7 @@ import _VisualDVM.ProjectData.Messages.Warnings.MessageWarning; import _VisualDVM.ProjectData.SapforData.Arrays.UI.FileArraysTree; import _VisualDVM.ProjectData.SapforData.Functions.UI.FileFunctionsTree; import _VisualDVM.ProjectData.SapforData.Loops.UI.FileLoopsTree; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.FileWindow; import _VisualDVM.Visual.Interface.FormWithSplitters; import _VisualDVM.Visual.Interface.SPFEditorInterface; diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.java b/src/_VisualDVM/Visual/Windows/FunctionsForm.java index 61c93a40..fc422a23 100644 --- a/src/_VisualDVM/Visual/Windows/FunctionsForm.java +++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.java @@ -1,13 +1,11 @@ package _VisualDVM.Visual.Windows; import Common.Visual.UI_; -import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import _VisualDVM.Global; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm; import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI; -import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.All.SPF_GetGraphFunctionPositions; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.FunctionsWindow; import javafx.util.Pair; diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java index 22471d12..4233e88c 100644 --- a/src/_VisualDVM/Visual/Windows/MainForm.java +++ b/src/_VisualDVM/Visual/Windows/MainForm.java @@ -1,16 +1,13 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow; import _VisualDVM.Visual.UI; import Common.Visual.Windows.Form; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.*; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java index 5bb892d7..b56c0bda 100644 --- a/src/_VisualDVM/Visual/Windows/ProjectForm.java +++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java @@ -1,8 +1,6 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.UI_; -import _VisualDVM.Current; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.Global; import _VisualDVM.Visual.Editor.Viewer; import _VisualDVM.Visual.Menus.ProjectMenuBar.ProjectMenuBar; @@ -15,8 +13,7 @@ import _VisualDVM.ProjectData.ProjectView; import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree; import _VisualDVM.ProjectData.SapforData.Functions.UI.InlineTree2; import _VisualDVM.ProjectData.SapforData.Includes.UI.IncludesTree; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Visual.Interface.*; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java index fc8cda0e..d5531b04 100644 --- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java @@ -1,5 +1,4 @@ package _VisualDVM.Visual.Windows; -import Common.Current_; import Common.Visual.UI_; import _VisualDVM.Current; import Common.Database.Objects.DBObject; @@ -11,7 +10,7 @@ import Common.Utils.TextLog; import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage; import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask; import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforTasksPackageTree; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import Common.Passes.Pass; import javax.swing.*; diff --git a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java index 07856e54..c354e67a 100644 --- a/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java +++ b/src/_VisualDVM/Visual/Windows/SapforVersionsComparisonForm.java @@ -5,12 +5,10 @@ import _VisualDVM.Current; import Common.Visual.Controls.MenuBarButton; import _VisualDVM.Global; import _VisualDVM.Utils; -import _VisualDVM.GlobalData.GlobalDatabase; import _VisualDVM.GlobalData.Settings.SettingName; import _VisualDVM.ProjectData.Files.ProjectFile; import _VisualDVM.TestingSystem.SAPFOR.Json.SapforVersion_json; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javax.swing.*; import java.util.Arrays; diff --git a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java index b21ab94b..74a8e2a5 100644 --- a/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java +++ b/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java @@ -2,13 +2,11 @@ package _VisualDVM.Visual.Windows; import Common.Utils.Utils_; import Common.Visual.UI_; import Common.Visual.Windows.Form; -import _VisualDVM.Current; import Common.Visual.TextField.StyledTextField; import Common.Visual.Trees.StyledTree; import _VisualDVM.Global; import _VisualDVM.Visual.UI; -import Visual_DVM_2021.Passes.PassCode; -import Common.Passes.Pass; +import _VisualDVM.Passes.PassCode; import javafx.util.Pair; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rtextarea.SearchContext; diff --git a/src/_VisualDVM/Visual/Windows/TabToolBar.java b/src/_VisualDVM/Visual/Windows/TabToolBar.java index e2fc363e..12426912 100644 --- a/src/_VisualDVM/Visual/Windows/TabToolBar.java +++ b/src/_VisualDVM/Visual/Windows/TabToolBar.java @@ -1,5 +1,5 @@ package _VisualDVM.Visual.Windows; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import _VisualDVM.Visual.Menus.VisualiserMenuBar; diff --git a/src/_VisualDVM/Visual/Windows/WelcomeForm.java b/src/_VisualDVM/Visual/Windows/WelcomeForm.java index 8daafa74..7a5514f7 100644 --- a/src/_VisualDVM/Visual/Windows/WelcomeForm.java +++ b/src/_VisualDVM/Visual/Windows/WelcomeForm.java @@ -1,6 +1,6 @@ package _VisualDVM.Visual.Windows; import Common.Visual.DragDrop.FileDrop; -import Visual_DVM_2021.Passes.PassCode; +import _VisualDVM.Passes.PassCode; import _VisualDVM.Global; import javax.swing.*;