продолжение рефакторинга. создал предка для класса current
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.CommonConstants;
|
||||
import Common.CurrentAnchestor;
|
||||
import Common.Utils.CommonUtils;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
@@ -74,8 +75,8 @@ public abstract class ComparisonForm<T> {
|
||||
public void ApplyObject() {
|
||||
RemoveObject();
|
||||
TextLog log = new TextLog();
|
||||
if (Current.Check(log, getCurrentObjectName())) {
|
||||
object = (T) Current.get(getCurrentObjectName());
|
||||
if (CurrentAnchestor.Check(log, getCurrentObjectName())) {
|
||||
object = (T) CurrentAnchestor.get(getCurrentObjectName());
|
||||
applyObject();
|
||||
showObject();
|
||||
} else
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.CurrentAnchestor;
|
||||
import Common.Visual.CommonUI;
|
||||
import Common_old.Current;
|
||||
import Common.Database.Objects.DBObject;
|
||||
@@ -68,7 +69,7 @@ public class SapforPackagesComparisonForm {
|
||||
RemoveObject();
|
||||
//---
|
||||
TextLog log = new TextLog();
|
||||
if (Current.Check(log, Current.SapforPackage)) {
|
||||
if (CurrentAnchestor.Check(log, Current.SapforPackage)) {
|
||||
object = Current.getSapforPackage();
|
||||
if (object.isLoaded() || (Pass_2021.passes.get(PassCode_2021.DownloadSapforPackage).Do(object))) {
|
||||
showObject();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package Visual_DVM_2021.UI.Main;
|
||||
import Common.CommonConstants;
|
||||
import Common.CurrentAnchestor;
|
||||
import Common.Visual.CommonUI;
|
||||
import Common_old.Current;
|
||||
import _VisualDVM.Global;
|
||||
@@ -268,7 +269,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
|
||||
testingTabs.setSelectedIndex(3);
|
||||
}
|
||||
public void RestoreLastCredentials() {
|
||||
Credentials credentials = (Credentials) Current.get(Current.Credentials);
|
||||
Credentials credentials = (Credentials) CurrentAnchestor.get(Current.Credentials);
|
||||
if (credentials.machine_id != CommonConstants.Nan) {
|
||||
if (Global.db.machines.containsKey(credentials.machine_id)) {
|
||||
Global.db.machines.ShowUI(credentials.machine_id);
|
||||
|
||||
Reference in New Issue
Block a user