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

no message

Browse Source
This commit is contained in:
02090095
2025-01-18 01:36:02 +03:00
parent 69151dd7a8
commit 18b4d58682
47 changed files with 724 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/Passes/All/ArchivesBackupPass.java
View File

@@ -26,7 +26,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
}
@Override
protected void ServerAction() throws Exception {
String workspace_path = Utils_.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString());
String workspace_path = Utils_.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.componentsServerProperties.BackupWorkspace).toString());
RemoteFile workspace = new RemoteFile(workspace_path, true);
user.connection.MKDIR(workspace);
RemoteFile dst = new RemoteFile(workspace.full_name, src.getName());

4
src/_VisualDVM/Passes/All/DeleteDownloadedBugReports.java
View File

@@ -21,7 +21,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
target = (DirInfosDataSet) Global.mainModule.getPass(PassCode.GetOldBugReports).target;
if (target.Data.isEmpty()) {
Log.Writeln_("Не найдено отчетов, не использовавшихся " +
Global.properties.BugReportsAgeLimit +
Global.normalProperties.BugReportsAgeLimit +
" месяцев и более!");
return false;
}
@@ -45,7 +45,7 @@ public class DeleteDownloadedBugReports extends Pass<DirInfosDataSet> {
}
};
if (dialog.ShowDialog("Найдено " + target.size() + " отчетов, не использовавшихся " +
Global.properties.BugReportsAgeLimit +
Global.normalProperties.BugReportsAgeLimit +
" месяцев и более. Удалить?")) {
return true;
}

2
src/_VisualDVM/Passes/All/GetOldBugReports.java
View File

@@ -28,7 +28,7 @@ public class GetOldBugReports extends Pass<DirInfosDataSet> {
//---
Calendar c = new GregorianCalendar();
c.setTimeInMillis(System.currentTimeMillis());
c.add(Calendar.MONTH, -Global.properties.BugReportsAgeLimit);
c.add(Calendar.MONTH, -Global.normalProperties.BugReportsAgeLimit);
Date date = c.getTime();
System.out.println(date);
long border = date.getTime();

8
src/_VisualDVM/Passes/All/InstallComponentFromFolder.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.NormalProperties;
import _VisualDVM.Passes.CurrentComponentPass;
import java.io.File;
@@ -22,15 +22,15 @@ public class InstallComponentFromFolder extends CurrentComponentPass {
if (super.canStart(args)) {
VFileChooser fileChooser = target.getFileChooser();
String propertyName = target.getComponentType() + "Path";
String lastDirectory = (String) GlobalProperties.class.getField(propertyName).get(Global.properties);
String lastDirectory = (String) NormalProperties.class.getField(propertyName).get(Global.normalProperties);
if (!lastDirectory.isEmpty()) {
//настройка выставлена не впервые, устанавливаем ее как папку
fileChooser.SetCurrentDirectory(lastDirectory);
}
boolean res = (file = fileChooser.ShowDialog()) != null;
File newDirectory = fileChooser.getCurrentDirectory();
GlobalProperties.class.getField(propertyName).set(Global.properties, newDirectory.getAbsolutePath());
Global.properties.Update();
NormalProperties.class.getField(propertyName).set(Global.normalProperties, newDirectory.getAbsolutePath());
Global.normalProperties.Update();
return res;
}
return false;

6
src/_VisualDVM/Passes/All/Precompilation.java
View File

@@ -93,7 +93,7 @@ public class Precompilation extends Pass<db_project_info> {
target = Global.mainModule.getProject();
if (Utils_.isWindows()) {
//--
makepath = Global.properties.LocalMakePathWindows;
makepath = Global.normalProperties.LocalMakePathWindows;
if (makepath.isEmpty()) {
Log.Writeln_("Не задан путь к make.exe.\n " +
"Укажите его в меню глобальных настроек." +
@@ -184,10 +184,10 @@ public class Precompilation extends Pass<db_project_info> {
protected void body() throws Exception {
if (Utils_.isWindows()) {
name_to_kill = "make.exe";
StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + Global.properties.Kernels,
StartProcess(Utils_.DQuotes(Global.normalProperties.LocalMakePathWindows) + " -j " + Global.normalProperties.Kernels,
target.compilation_maxtime);
} else
StartProcess("make -j " + Global.properties.Kernels, target.compilation_maxtime);
StartProcess("make -j " + Global.normalProperties.Kernels, target.compilation_maxtime);
}
protected void StartProcess(String command, int TA) throws Exception {
killed = false;

2
src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java
View File

@@ -62,7 +62,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
user,
compiler,
configurations,
Global.properties.EmailOnTestingProgress ? 1 : 0
Global.normalProperties.EmailOnTestingProgress ? 1 : 0
);
//----
if (target.tasksCount == 0) {

2
src/_VisualDVM/Passes/All/StartSelectedSAPFORConfigurations.java
View File

@@ -41,7 +41,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
target = new SapforPackage(Global.mainModule.getAccount(),
Global.testingServer.db.serverSapfors.getUI().getCurrent(),
configurations,
Global.properties.EmailOnTestingProgress ? 1 : 0,
Global.normalProperties.EmailOnTestingProgress ? 1 : 0,
Log);
if (target.tasksCount == 0) {
Log.Writeln_("Не сформировано ни одной новой задачи.");

19
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -6,7 +6,7 @@ import Common.Visual.Windows.Dialog.SpinnerNumberForm;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.NormalProperties;
import _VisualDVM.Utils;
import javax.swing.*;
@@ -20,9 +20,9 @@ public class UpdateProperty extends Pass<Object> {
@Override
protected boolean canStart(Object... args) throws Exception {
name = (String) args[0];
String description = Global.properties.getFieldDescription(name);
field = GlobalProperties.class.getField(name);
oldValue = field.get(Global.properties);
String description = Global.normalProperties.getFieldDescription(name);
field = NormalProperties.class.getField(name);
oldValue = field.get(Global.normalProperties);
newValue = null;
SliderNumberForm sliderNumberForm = new SliderNumberForm();
VDirectoryChooser directoryChooser = new VDirectoryChooser("");
@@ -69,7 +69,8 @@ public class UpdateProperty extends Pass<Object> {
case "Workspace":
directoryChooser.setTitle(description);
directoryChooser.SetCurrentDirectory(
Global.properties.Workspace.isEmpty() ? Global.ProjectsDirectory : new File(Global.properties.Workspace));
Global.normalProperties.Workspace.isEmpty() ? Global.ProjectsDirectory :
new File(Global.normalProperties.Workspace));
File dir = directoryChooser.ShowDialog();
if (dir != null)
newValue = dir.getAbsolutePath();
@@ -82,8 +83,8 @@ public class UpdateProperty extends Pass<Object> {
}
@Override
protected void body() throws Exception {
field.set(Global.properties, newValue);
Global.properties.Update();
field.set(Global.normalProperties, newValue);
Global.normalProperties.Update();
}
@Override
protected void showDone() throws Exception {
@@ -128,8 +129,8 @@ public class UpdateProperty extends Pass<Object> {
case "SmallScreen":
if (Global.mainModule.HasProject())
Global.mainModule.getUI().getMainWindow().getProjectWindow().SwitchScreen(
Global.properties.SmallScreen);
Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen( Global.properties.SmallScreen);
Global.normalProperties.SmallScreen);
Global.mainModule.getUI().getMainWindow().getCallbackWindow().SwitchScreen( Global.normalProperties.SmallScreen);
break;
}
}

4
src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java
View File

@@ -28,8 +28,8 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
userHome = null;
serverHome = null;
//--
machine = new Machine("alex", Global.properties.ServerAddress, Global.properties.ServerUserSHHPort, MachineType.Server);
user = new User(Global.properties.ServerUserName, "mprit_2011");
machine = new Machine("alex", Global.normalProperties.ServerAddress, Global.normalProperties.ServerUserSHHPort, MachineType.Server);
user = new User(Global.normalProperties.ServerUserName, "mprit_2011");
super.Connect();
//--
userHome = new RemoteFile(user.connection.sftpChannel.getHome(), true);