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

++

Browse Source 
решение проблемы совместимости с java 1.8._4xx
This commit is contained in:
02090095
2025-04-21 15:27:20 +03:00
parent e8c748eb7e
commit b37e20e4a4
71 changed files with 361 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Pair;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import javafx.util.Pair;
public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
@Override
protected boolean canStart(Object... args) {

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

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Pair;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import javafx.util.Pair;
public class DeleteRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
@Override
public String getIconPath() {

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

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;

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

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import javafx.util.Pair;
import java.io.File;
public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {

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

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.All;
import Common.CommonConstants;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
import javafx.util.Pair;
import java.io.File;
public class RefreshSapforPackageResults extends TestingServerPass<SapforPackage> {

22
src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java
View File

@@ -23,6 +23,25 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
}
@Override
protected void unpack(String packed) throws Exception {
//----------------------------------------
String[] data_ = packed.split("@");
DBProjectFile file_ = null;
for (int i = 0; i < data_.length; ++i) {
String s = data_[i];
if (i % 2 == 0) {
file_ = target.db.files.Data.get(Utils_.toW(s));
} else {
String[] local = s.split("_");
int num = Integer.parseInt(local[0]);
target.numSPF += Integer.parseInt(local[1]);
target.numDVM += Integer.parseInt(local[2]);
if (file_ != null)
file_.lines_count = num;
target.numLines += num;
}
}
/*
MetricsJson metricsJson = Utils_.gson.fromJson(packed, MetricsJson.class);
for (FileMetrics fileMetrics : metricsJson.allMetrics) {
fileMetrics.file = Utils_.toW(fileMetrics.file);
@@ -30,7 +49,7 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
DBProjectFile file = target.db.files.Data.get(fileMetrics.file);
file.lines_count = fileMetrics.linesCount;
//--
target.numLines+= fileMetrics.linesCount;
target.numLines += fileMetrics.linesCount;
target.numSPF += fileMetrics.numSPF;
target.numDVM += fileMetrics.numDVM;
//--
@@ -38,6 +57,7 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
target.UpdateDVMCount();
target.UpdateSPFCount();
target.UpdateLinesCount();
*/
}
@Override
protected void showDone() throws Exception {

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

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -9,7 +10,6 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.ProjectData.SapforData.Functions.Json.FunctionGraphPositionJson;
import _VisualDVM.ProjectData.SapforData.Functions.Json.FunctionsGraphPositionsJson;
import javafx.util.Pair;
import java.util.Vector;
public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
@@ -213,7 +213,7 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
*/
protected void unpack(String packed) throws Exception {
FunctionsGraphPositionsJson positionsJson = Utils_.gson.fromJson(packed, FunctionsGraphPositionsJson.class);
for (FunctionGraphPositionJson positionJson: positionsJson.allPositions) {
for (FunctionGraphPositionJson positionJson : positionsJson.allPositions) {
target.functionsGraph.addVertex(positionJson.functionName);
target.functionsGraph.vertexCoordinates.put(positionJson.functionName, new Pair<>(positionJson.x, positionJson.y));
}

7
src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -55,7 +54,7 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
DBProjectFile projectFile = target.db.files.get(fileFunctionsJson.file);
projectFile.saveFunctions(fileFunctionsJson.functions);
//--
for (FuncInfo funcInfo: projectFile.function_decls.values()){
for (FuncInfo funcInfo : projectFile.function_decls.values()) {
if (!declarated_functions.containsKey(funcInfo.funcName))
declarated_functions.put(funcInfo.funcName, funcInfo);
}
@@ -115,8 +114,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
Global.mainModule.getFile().form.ShowFunctions();
Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
//--
DBProjectFile main=target.getMainProgramUnit();
if (main!=null)
DBProjectFile main = target.getMainProgramUnit();
if (main != null)
Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(main.node);
}
}

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

@@ -4,8 +4,8 @@ import Common.Visual.Selectable;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Includes.Include;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.ProjectData.SapforData.Includes.Include;
import java.util.Vector;
import java.util.stream.Collectors;

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

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Pair;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
@@ -8,7 +9,6 @@ import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Utils;
import javafx.util.Pair;
import java.io.Serializable;
import java.util.Date;

2
src/_VisualDVM/Passes/Server/CloneServerObject.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.riDBObject;
import Common.Utils.Pair;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import javafx.util.Pair;
public abstract class CloneServerObject<S extends RepositoryServer, D extends riDBObject> extends PublishServerObject<S, D> {
public D src;
public CloneServerObject(S server_in, Class<D> d_in) {

2
src/_VisualDVM/Passes/Server/DeleteServerObject.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.Server;
import Common.Database.Objects.DBObject;
import Common.Utils.Pair;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javafx.util.Pair;
public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
public DeleteServerObject(S server_in, Class<D> d_in) {
super(server_in, d_in);

2
src/_VisualDVM/Passes/Server/DeleteServerObjects.java
View File

@@ -3,12 +3,12 @@ import Common.Database.Database;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.Tables.DBTable;
import Common.Utils.Pair;
import _VisualDVM.Global;
import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javafx.util.Pair;
import java.util.Vector;
public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject> extends RepositoryPass<S, Vector<Object>> {

2
src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.Passes.Testing;
import Common.Database.Tables.iDBTable;
import Common.Utils.Pair;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
import javafx.util.Pair;
import java.util.Vector;
public abstract class ActualizeTestingPackages<P extends TestingPackage> extends TestingServerPass<Vector<Pair<Integer, Long>>> {