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

удаление отладочной печати сравнения и не только

Browse Source
This commit is contained in:
02090095
2024-07-22 00:57:05 +03:00
parent 3374c9783b
commit 53ad5e637f
76 changed files with 78 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
.idea/workspace.xml generated
View File

@@ -8,8 +8,81 @@
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackageDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/DataSetControlForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Themes/ProvidedTokenMaker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Themes/ProvidedTokenMaker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Dialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Windows/Dialog/Dialog.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Windows/SearchReplaceForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/StringTemplate.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/DVMHelpParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/DVMHelpParser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/ShellParser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Validators/Validator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Validators/Validator.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/TaskSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/UI/FilesTree.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Message.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/MachineProcess/MachineProcess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/LocalDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/LocalDVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingTestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Precompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/ProcessPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/RepositoryPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/FileForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ProjectForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/Common/Database/SQLITE/SQLiteDatabase.java
View File

@@ -184,9 +184,7 @@ public abstract class SQLiteDatabase extends Database {
try {
field_value = Enum.valueOf(enum_class, string);
} catch (Exception ignore) {
System.out.println(Utils.Brackets(string) + "not found");
field_value = enum_constants[0];
System.out.println(field_value);
}
} else field_value = enum_constants[0];
} else

1
src/Common/Global.java
View File

@@ -265,7 +265,6 @@ public class Global {
if (files != null) {
for (File file : files) {
if (file.getName().contains(Constants.old_tests_db_name)) {
System.out.println("found " + Utils.Brackets(file.getAbsolutePath()));
try {
Utils.forceDeleteWithCheck(file);
} catch (Exception ex) {

4
src/Common/UI/DataSetControlForm.java
View File

@@ -195,13 +195,11 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
//обновление в БД при ручном изменении размера столбиков.--------->>
getTableHeader().addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent arg0) {
System.out.println("Header mouse released");
String new_colNamesAndSizes = getColumnsProfile();
// check if changed, if yes, persist...
if (!colNamesAndSizes.equals(new_colNamesAndSizes)) {
colNamesAndSizes = new_colNamesAndSizes;
SaveColumns();
System.out.println("columns updated");
}
}
});
@@ -216,7 +214,6 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
if ((row >= 0)) {
if (row != current_row_i) {
current_row_i = row;
// System.out.println("current row_i="+current_row_i);
getDataSource().setCurrent(control.getRowObject(row));
if (events_on) {
try {
@@ -228,7 +225,6 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
}
} else {
current_row_i = Constants.Nan;
// System.out.println("no current row_i="+current_row_i);
getDataSource().dropCurrent();
if (events_on) {
try {

2
src/Common/UI/Themes/ProvidedTokenMaker.java
View File

@@ -29,12 +29,10 @@ public abstract class ProvidedTokenMaker extends AbstractTokenMaker {
public abstract void Body(TokenProvider provider);
public abstract void performFinish(TokenProvider provider);
public Token getTokenList(Segment text, int startTokenType, int startOffset) {
// System.out.println(Utils.Brackets(text.toString()));
resetTokenList();
//структура для хранения индексов смещений, текущего состояния и т д.
TokenProvider provider = new TokenProvider(text, startTokenType, startOffset);
// provider.checkFortranWrap();
// System.out.println(this.);
while (provider.canRead()) {
provider.readNext();
Body(provider);

6
src/Common/UI/UI.java
View File

@@ -356,10 +356,8 @@ public class UI {
}
}
public static void refreshTheme_r(Accessible accessible) {
// System.out.println(accessible.getClass().getSimpleName() + ": children_count: ");
AccessibleContext context = accessible.getAccessibleContext();
if (accessible instanceof ThemeElement) {
// System.out.println(accessible.getClass().getSimpleName() + ": refresh theme");
((ThemeElement) accessible).applyTheme();
} else {
if ((accessible instanceof JPanel) ||
@@ -390,8 +388,8 @@ public class UI {
Component res = null;
try {
res = windowsStack.peek();
} catch (Exception ex) {
System.out.println("NO FRONT WINDOW FOUND");
} catch (Exception ignored){
}
return res;
}

2
src/Common/UI/Windows/Dialog/Dialog.java
View File

@@ -54,7 +54,6 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
UI.windowsStack.pop();
System.out.println("Previous Front Window");
onCancel();
onClose();
}
@@ -121,7 +120,6 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
ShowTitle();
setAlwaysOnTop(isOnTop());
UI.windowsStack.push(this);
System.out.println("New Front Window");
setVisible(true);
return OK;
}

4
src/Common/UI/Windows/SearchReplaceForm.java
View File

@@ -62,7 +62,6 @@ public class SearchReplaceForm extends Form {
}
public void setMode(boolean replace) {
replace_mode = replace;
System.out.println("MODE CHANGED");
tfReplace.setEnabled(replace_mode);
String prefix = replace_mode ? "Заменить" : "Найти";
bNext.setText(prefix + " далее");
@@ -103,9 +102,6 @@ public class SearchReplaceForm extends Form {
public void applyParams() {
String toFind = Utils.hideRegularMetasymbols(tfFind.getText());
String toReplace = Utils.hideRegularMetasymbols(tfReplace.getText());
System.out.println("toFind=" + toFind);
System.out.println("toReplace" + toReplace);
System.out.println("============");
context.setSearchFor(toFind);
context.setMatchCase(registerOn.isSelected());
context.setWholeWord(wholeWordOn.isSelected());

11
src/Common/Utils/StringTemplate.java
View File

@@ -13,8 +13,6 @@ public class StringTemplate {
public StringTemplate(String p, String s) {
prefix = Utils.pack(p);
suffix = Utils.pack(s);
// System.out.println(Utils.Brackets(prefix));
// System.out.println(Utils.Brackets(suffix));
String[] prefix_words = prefix.split(" ");
String[] suffix_words = suffix.split(" ");
//настраиваем регулярное выражение----------
@@ -37,25 +35,16 @@ public class StringTemplate {
return text_in.substring(m.start(), m.end());
}
public boolean check(String text_in) {
// System.out.println("sentense = " + Utils.Brackets(text_in));
// System.out.println("pattern = " + Utils.Brackets(pattern));
return Pattern.compile(pattern, Pattern.CASE_INSENSITIVE | Pattern.MULTILINE).matcher(text_in).find();
}
public String check_and_get_param(String text_in) {
Pattern regex = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
Matcher matcher = regex.matcher(text_in);
// System.out.println("sentense = " + Utils.Brackets(text_in));
// System.out.println("pattern = " + Utils.Brackets(pattern));
if (matcher.find()) {
// System.out.println("match found " + matcher.start() + " " + matcher.end());
String sentence = text_in.substring(matcher.start(), matcher.end());
// System.out.println("sentence=" + Utils.Brackets(sentence));
String prefix_ = getFirstMatch(prefix, sentence);
// System.out.println("prefix_ = " + Utils.Brackets(prefix_));
String suffix_ = getFirstMatch(suffix, sentence);
// System.out.println("suffix_ = " + Utils.Brackets(suffix_));
String param = sentence.substring(prefix_.length(), sentence.length() - suffix_.length());
// System.out.println("param = " + Utils.Brackets(param));
return param;
}
return null;

30
src/Common/Utils/Utils.java
View File

@@ -124,7 +124,6 @@ public class Utils {
.anyMatch(b -> b.equals(Character.UnicodeBlock.CYRILLIC));
}
public static void CheckDirectory(File dir) {
// System.out.println("check: "+dir);
if (!dir.exists()) {
try {
FileUtils.forceMkdir(dir);
@@ -134,7 +133,6 @@ public class Utils {
}
}
public static void CheckAndCleanDirectory(File dir) {
// System.out.println("check and clean: "+dir);
if (dir.exists()) {
File[] files = dir.listFiles();
if (files != null)
@@ -174,7 +172,6 @@ public class Utils {
}
public static double getFileSizeMegaBytes(File file) {
double res = file.length() / (1024 * 1024);
System.out.println(res);
return res;
}
public static void CleanDirectory(File dir) {
@@ -534,7 +531,6 @@ public class Utils {
public static ImageIcon getIcon(String path) {
URL imageUrl = Utils.class.getResource(path);
if (imageUrl == null) {
System.out.println("image: " + Brackets(path) + "not found");
return null;
}
return new ImageIcon(imageUrl);
@@ -542,7 +538,6 @@ public class Utils {
public static ImageIcon getTabIcon(String path) {
URL imageUrl = Utils.class.getResource(path);
if (imageUrl == null) {
System.out.println("image: " + Brackets(path) + "not found");
return null;
}
ImageIcon icon = new ImageIcon(imageUrl);
@@ -646,18 +641,13 @@ public class Utils {
throw new PassException("Не удалось удалить файл " + Brackets(file.getAbsolutePath()) + " за " + attempts + " попыток");
}
public static byte[] packFile(File src) throws Exception {
System.out.println("pack begins: " + src.getAbsolutePath());
byte[] dst = Files.readAllBytes(src.toPath());
System.out.println("pack done: bytes:" + dst.length);
return dst;
}
public static void unpackFile(byte[] bytes, File dst) throws Exception {
FileOutputStream os = new FileOutputStream(dst);
System.out.println(dst.getAbsolutePath());
System.out.println("unpack begins: bytes:" + bytes.length);
os.write(bytes);
os.close();
System.out.println("unpack done to " + dst.getAbsolutePath());
}
public static Socket createClientSocket(InetAddress address, int port, int timeout) throws Exception {
Socket socket = new Socket();
@@ -692,8 +682,6 @@ public class Utils {
for (String ext : extensions) {
if (file_extension.equalsIgnoreCase(ext)) {
res.add(file);
// System.out.println(file.getAbsolutePath() + ":" + Utils.Brackets(file_extension));
// System.out.println("MATCH");
}
}
}
@@ -742,7 +730,6 @@ public class Utils {
InputStreamReader isrStdout = new InputStreamReader(stdout);
BufferedReader brStdout = new BufferedReader(isrStdout);
String line = brStdout.readLine();
System.out.println(line);
return line;
}
public static Vector<String> readAllLines(Process process) throws Exception {
@@ -752,7 +739,6 @@ public class Utils {
BufferedReader brStdout = new BufferedReader(isrStdout);
String line;
while ((line = brStdout.readLine()) != null) {
System.out.println(line);
output.add(line);
}
return output;
@@ -830,18 +816,15 @@ public class Utils {
// #pragma dvm array distribute[block][block], не важно
String packedLine = remove(pack(line).toLowerCase(), "\n", "\r", "\t");
if (packedLine.startsWith(prefix)) {
// System.out.println(n + ": " + packedLine);
packedLine = packedLine.substring(prefix.length());
boolean bracketOpen = false;
int pragmaMax = 0;
String distr = "";
for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
char c = packedLine.charAt(i);
// System.out.print(c);
if (bracketOpen) {
if (c == ']') {
bracketOpen = false;
// System.out.println("<DISTR>="+Utils.DQuotes(distr));
if (distr.equals("block"))
pragmaMax++;
distr = "";
@@ -856,7 +839,6 @@ public class Utils {
}
}
}
// System.out.println("< - " + pragmaMax);
fileMax = Math.max(fileMax, pragmaMax);
}
++n;
@@ -914,7 +896,6 @@ public class Utils {
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(text);
while (matcher.find()) res++;
System.out.println("matches=" + res);
} catch (Exception e) {
e.printStackTrace();
}
@@ -974,9 +955,7 @@ public class Utils {
Vector<File> sources = new Vector<>();
if (files != null) {
for (File file : files) {
// System.out.println(file.getAbsolutePath());
if (isSource(file)) {
// System.out.println(file.getAbsolutePath() + " is source!");
sources.add(file);
}
}
@@ -1030,7 +1009,6 @@ public class Utils {
old.sort((o1, o2) -> Long.compare(o2.lastModified(), o1.lastModified()));
for (int i = count - 1; i < old.size(); ++i) {
File file = old.get(i);
System.out.println(file.getName() + ":" + file.lastModified());
FileUtils.forceDelete(file);
}
}
@@ -1149,7 +1127,6 @@ public class Utils {
}
public static boolean checkFileCreation(File file) {
for (int i = 1; i <= 10; ++i) {
System.out.println("Проверка " + i + " существования файла " + Utils.Brackets(file.getAbsolutePath()));
if (file.exists()) return true;
else sleep(1000);
}
@@ -1192,32 +1169,25 @@ public class Utils {
boolean hasWrap = false;
int wi;
//------
//System.out.println("checking wrap...");
//с нуля потому что и уже увеличено.
for (int j = 0; (j < 6) && ((wi = i + j) < chars.length); ++j) {
char s = chars[wi];
// System.out.print(s);
if ((j == 0) && ((s == 'c') || (s == 'C') || (s == '!'))) {
// System.out.println("next line is FL comment");
break;
}
if ((j > 0) && (j < 5) && (s == '!')) {
// System.out.println("next line is comment");
break;
}
if ((j == 5) && (s != ' ')) {
hasWrap = true;
i = wi + 1;
// System.out.println("next line is WRAP");
break;
}
}
// System.out.println();
//-----
if (hasWrap)
break;
}
// System.out.println();
//добавление строки в результат.
if ((line.length() > 0) || Global.db.settings.get(SettingName.EmptyLinesOn).toBoolean()
// Global.db.settings.get(SettingName.SpacesOn).toBoolean()

7
src/Common/Utils/Validators/DVMHelpParser.java
View File

@@ -82,12 +82,10 @@ public class DVMHelpParser {
case "Output and debugging options:":
case "Convertation options:":
case "Optimization options:":
System.out.println(t_line + " Options chapter started!");
state = HelpParserState.OptionsChapter;
ResetOption();
break;
case "Environment variables":
System.out.println(t_line + " Environments chapter started!");
state = HelpParserState.EnvironmentsChapterHeader;
break;
}
@@ -99,7 +97,6 @@ public class DVMHelpParser {
case OptionsChapter:
if (t_line.isEmpty()) {
TryConfirmOption();
System.out.println("Chapter ended");
state = HelpParserState.Search;
} else {
char[] symbols = t_line.toCharArray();
@@ -107,9 +104,6 @@ public class DVMHelpParser {
optionState = OptionState.SearchName;
//-
for (char c : symbols) {
//-
// System.out.print(c);
//-
switch (optionState) {
case SearchName:
switch (c) {
@@ -176,7 +170,6 @@ public class DVMHelpParser {
case EnvironmentsChapter:
if (t_line.isEmpty()) {
TryConfirmEnvironment();
System.out.println("Chapter ended");
state = HelpParserState.Search;
} else {
char[] symbols = line.toCharArray();

3
src/Common/Utils/Validators/ShellParser.java
View File

@@ -208,8 +208,6 @@ public class ShellParser {
break;
}
}
// System.out.println(Utils.Brackets(state));
// }
} else
state = ShellParserState.End;
} catch (Exception ex) {
@@ -279,7 +277,6 @@ public class ShellParser {
if (lines.size() > 0) {
last_line = lines.lastElement();
if (no_extra_read = last_line.endsWith(invitationBuilder.toString())) {
System.out.println("needs trim");
lines.remove(lines.size() - 1);
//больше ничего не читаем. но. обрезаем ее конец.
last_line = last_line.substring(0, last_line.length() - invitationBuilder.length());

2
src/Common/Utils/Validators/Validator.java
View File

@@ -27,10 +27,8 @@ public class Validator {
public void Validate() {
for (i = getStartIndex(); i < chars.length && continueCondition(); ++i) {
c = chars[i];
System.out.print(c);
Body();
}
System.out.println();
PerformFinish();
}
}

12
src/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -111,12 +111,6 @@ public class RunConfiguration extends iDBObject {
ms.add(String.valueOf(i));
res.add(String.join(" ", ms));
}
System.out.println("=======================");
System.out.println(res.size());
for (String ms : res) {
System.out.println(Utils.Brackets(ms));
}
System.out.println("=======================");
} else
res.add("");
if (res.isEmpty())
@@ -235,12 +229,6 @@ public class RunConfiguration extends iDBObject {
ms.add(String.valueOf(i));
res.add(String.join(" ", ms));
}
System.out.println("=======================");
System.out.println(res.size());
for (String ms : res) {
System.out.println(Utils.Brackets(ms));
}
System.out.println("=======================");
} else
res.add("");
if (res.isEmpty())

1
src/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalRunSupervisor.java
View File

@@ -28,7 +28,6 @@ public class WindowsLocalRunSupervisor extends WindowsLocalTaskSupervisor<RunTas
return Current.getRunConfiguration().getEnvMap();
}
void kill_mpi() throws Exception {
System.out.println("KILLING MPI");
}
@Override
protected void AbortTask() throws Exception {

1
src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java
View File

@@ -30,7 +30,6 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
@Override
protected void StartTask() throws Exception {
task.PID = pass.user.connection.startShellProcess(getRemoteProject(), "PID",getStartCommand());
System.out.println("PID="+Utils.Brackets(task.PID));
task.state = TaskState.Running;
}
@Override

1
src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java
View File

@@ -83,7 +83,6 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
Utils.DQuotes(getCoupDeGrace()),
task.getFullCommand()
);
System.out.println(res);
return res;
}
}

1
src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
View File

@@ -19,7 +19,6 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
//--
task.PID = pass.user.connection.startShellProcess(getRemoteProject(),"PID",
"ulimit -s unlimited", res);
System.out.println("PID="+Utils.Brackets(task.PID));
task.state = TaskState.Running;
}
@Override

1
src/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -76,7 +76,6 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass_2021> {
pass.ShowProgressTextOnly(task.progressAll, task.progressStep, "задача");
//сброс
performanceTime = 0;
System.out.println(performanceTime);
task.Reset();
ShowTaskState();
pass.ShowMessage1("Подготовка рабочего пространства задачи..");

2
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
View File

@@ -25,8 +25,6 @@ public class BaseDirective extends BasicCompletion {
return visible = isMatch();
}
protected CaretInfo getCaretInfo() {
// System.out.println(getOwner());
// System.out.println(getOwner().getEditor());
return getOwner().getEditor().getCaretInfo();
}
protected SapforAutoComplete getOwner() {

1
src/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -163,7 +163,6 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
ClearGOCVHighlights();
for (int lineNum : file.gcov_info.line_info.keySet()) {
Pair<Long, Integer> p = file.gcov_info.line_info.get(lineNum);
//System.out.println((lineNum + 1) + ": " + p.getKey() + " " + p.getValue() + "%");
Color color = never;
if (p.getKey() > 0) {
color = (p.getValue() >= Global.db.settings.get(SettingName.GCOVLimit).toInt32()) ?

2
src/ProjectData/Files/UI/FilesTree.java
View File

@@ -65,7 +65,6 @@ public class FilesTree extends StyledTree {
}
@Override
public void SelectionAction(TreePath e) {
System.out.println("Select");
DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
Current.set(Current.ProjectNode, node);
Object o = node.getUserObject();
@@ -97,7 +96,6 @@ public class FilesTree extends StyledTree {
public void LeftMouseAction1() {
if (Global.files_multiselection && Current.getSelectedFile() != null) {
Current.getSelectedFile().SwitchSelection();
System.out.println("LMC "+Current.getSelectedFile().name+" : "+Current.getSelectedFile().isSelected());
updateUI();
}
}

1
src/ProjectData/Messages/Message.java
View File

@@ -392,7 +392,6 @@ public class Message extends FileObject {
}
} while (idx != -1);
if (sum != splited.length && !message.equals("")) {
System.out.println("message="+ Utils.Brackets(message));
Utils.CopyToClipboard(message);
throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
"message=" + Utils.Brackets(message));

13
src/ProjectData/Project/db_project_info.java
View File

@@ -1082,14 +1082,11 @@ public class db_project_info extends DBObject {
public void Clone(File dst, boolean cloneData) throws Exception {
CopySubdirectories(dst);
//->
System.out.println("---->>>>>CLONE >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
for (DBProjectFile file : db.files.Data.values()) {
File src_file = file.file;
File dst_file = Paths.get(dst.getAbsolutePath(),
Global.isWindows ? file.name :
file.name.replace('\\', '/')).toFile();
System.out.println("src=" + src_file);
System.out.println("dst=" + dst_file);
Files.copy(src_file.toPath(), dst_file.toPath());
}
//теперь копируем инфу по файлам.
@@ -1263,7 +1260,6 @@ public class db_project_info extends DBObject {
LinkedHashMap<String, Long> res = new LinkedHashMap<>();
for (DBProjectFile file : db.files.Data.values()) {
if (!file.state.equals(FileState.Excluded)) {
System.out.println(file.file.getAbsolutePath());
long matches_count = Utils.findInFile(keyword_in, registerOn, wholeWord, file.file);
if (matches_count > 0) {
res.put(file.name, matches_count);
@@ -1273,14 +1269,8 @@ public class db_project_info extends DBObject {
return res;
}
public db_project_info CreateVersionsTree() throws Exception {
// System.out.println("CREATE VERSIONS TREE");
File anchestor_file = find_anchestor();
// System.out.println("anchestor = " + anchestor_file);
// System.out.println("---------------");
db_project_info root_ = createVersionsTree_r(anchestor_file);
// System.out.println("print versions r--------");
// root_.PrintVersions_r();
// System.out.println("----------------");
return root_;
}
public static int extractVersionNumber(db_project_info version) {
@@ -1387,7 +1377,6 @@ public class db_project_info extends DBObject {
ProjectArray mainTemplate = sortedSizeTemplates.get(0);
for (long mVarId : mainTemplate.get_varIDs(false)) {
String main_binary = mainTemplate.get_binary(mVarId);
// System.out.println("main_binary = " + main_binary);
boolean variantEnabled = true;
for (int i = 1; i < sortedSizeTemplates.size(); ++i) {
ProjectArray template = sortedSizeTemplates.get(i);
@@ -1419,7 +1408,6 @@ public class db_project_info extends DBObject {
for (Vector<BigInteger> triple : main_template_triples) {
//двоичное представление максимального шаблона. 1111
String main_binary = mainTemplate.get_binary(triple.get(1).longValueExact());
// System.out.println("main_binary = " + main_binary);
boolean variantEnabled = true;
Vector<BigInteger> variantVector = new Vector<>(triple);
//перебор остальных шаблонов
@@ -1428,7 +1416,6 @@ public class db_project_info extends DBObject {
String template_binary = (mainTemplate.dimSize > template.dimSize) ?
main_binary.substring(0, template.dimSize) :
main_binary;
// System.out.println("template_binary: " + template_binary);
//сконвертировать из двоичной в long, чтобы получить varId
long varID = Long.parseLong(template_binary, 2);
//-- проверить на пригодность этот самый varID

1
src/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -335,7 +335,6 @@ public class ProjectArray extends DBObject {
char s = distributed ? '1' : '0';
String filterMask = getFilterMask();
String variant = binary_in.isEmpty() ? get_binary(varID) : binary_in;
// System.out.println(shortName+"|mask="+filterMask+"|varId="+variant+"|"+s);
for (int i = 0; i < variant.length(); ++i) {
if ((filterMask.toCharArray()[i] == s) && (variant.toCharArray()[i] != s)) return false;
}

11
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -34,9 +34,7 @@ public class FunctionsGraphUI extends mxGraph {
public final static Timer ffTimer = new Timer(1000, new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
System.out.println("Time to Redraw Functions Graph");
Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctionPositions).Do();
System.out.println("DONE");
}
});
//---
@@ -221,21 +219,12 @@ public class FunctionsGraphUI extends mxGraph {
}
}
}
/*
System.out.println("------");
for (String key: mxEventObject.getProperties().keySet()){
System.out.println(key+" : "+ mxEventObject.getProperties().get(key));
}
System.out.println("------");
*/
});
graphComponent.getGraphControl().setComponentPopupMenu(new FunctionsGraphMenu());
//обработка клика мышом.
graphComponent.getGraphControl().addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent e) {
System.out.println("Released");
Object cell = graphComponent.getCellAt(e.getX(), e.getY());
if (cell != null) {
mxCell mx_cell = (mxCell) cell;

11
src/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java
View File

@@ -41,15 +41,12 @@ public class ArrayAlignmentBar extends JToolBar {
ChangeListener changeListener = e -> {
//инфа о связях. из списка всех объявленных массивов.
ProjectArray d_array = Current.getProject().declaratedArrays.get(array.id);
System.out.println("current region = " + Current.getParallelRegion().regionId);
System.out.println(array.id + " links count= " + d_array.links.size() + ":" + d_array.printLinks());
//опять же, берем инфу из объявлений!
for (ProjectArray d_link : d_array.links.values()) {
//это массивы из объявлений. прежде чем их трогать проверим а есть ли они в текущей области.
// по адресам принадлежность смотреть нельзя.
// на момент поиска массивов у них их еще нет. а вот ид совпадают.
if (Current.getParallelRegion().ArrayBelongsToRegion(d_link.id)) {
System.out.println(d_link.id + " belongs to current region, apply link!");
//инфа о массиве уже из области. имеющая адрес и бар.
ProjectArray r_link = Current.getParallelRegion().getArrayById(d_link.id);
Pair<JSpinner, JSpinner> pair = r_link.bar.dimensions.get(dim);
@@ -65,17 +62,9 @@ public class ArrayAlignmentBar extends JToolBar {
}
}
public void apply_changes() {
System.out.println(array);
for (int dim : dimensions.keySet()) {
array.ac_new.get(dim).K = (int) dimensions.get(dim).getKey().getValue();
array.ac_new.get(dim).B = (int) dimensions.get(dim).getValue().getValue();
//-
System.out.println("dim=" + dim +
" k=" + array.ac_new.get(dim).K +
" b=" + array.ac_new.get(dim).B
);
//- }
System.out.println("-----");
}
}
}

2
src/Repository/Component/Component.java
View File

@@ -65,12 +65,10 @@ public abstract class Component extends DBObject implements Loggable {
}
public void ReplaceOldFile() throws Exception {
Utils.delete_with_check(getFile());
System.out.println("old file removed");
//-скопировать файл
Files.move(getNewFile().toPath(), getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
//удалить новый файл.
Utils.delete_with_check(getNewFile());
System.out.println("new file removed");
}
public void Update() throws Exception {
if (!getNewFile().setExecutable(true)) throw new PassException("Не удалось разрешить файл\n" +

16
src/Repository/Component/PerformanceAnalyzer/PerformanceAnalyzer.java
View File

@@ -64,8 +64,6 @@ public class PerformanceAnalyzer extends Component {
}
public void ReadMessageIn() throws Exception {
message_in = (MessageJtoJ) in.readObject();
System.out.println("message = " + Utils.DQuotes(message_in.getMessage()));
System.out.println("command = " + Utils.DQuotes(message_in.getCommand()));
}
public void SendMessageOut(MessageJtoJ messageJtoJ) throws Exception {
message_out = messageJtoJ;
@@ -73,8 +71,6 @@ public class PerformanceAnalyzer extends Component {
}
public void ConvertStatistic() throws Exception {
message_in = (MessageJtoJ) in.readObject();
System.out.println("message = " + Utils.DQuotes(message_in.getMessage()));
System.out.println("command = " + Utils.DQuotes(message_in.getCommand()));
String message = Current.getSapfor().readStatForAnalyzer(message_in.getMessage());
message_out = new MessageJtoJ(message, message_in.getCommand());
out.writeObject(message_out);
@@ -85,7 +81,6 @@ public class PerformanceAnalyzer extends Component {
server_thread = new Thread(() -> {
try {
client = serverSocket.accept();
System.out.println("Основной цикл анализатора статистик начат..");
out = new ObjectOutputStream(client.getOutputStream());
in = new ObjectInputStream(client.getInputStream());
//------------------------------------------------------->>;
@@ -95,26 +90,17 @@ public class PerformanceAnalyzer extends Component {
}
});
server_thread.start();
System.out.println("Нить сервера запущена");
}
@Override
public void GetVersionInfo() {
try {
StartServer(() -> {
System.out.println("Запрос версии анализатора..");
ReadMessageIn(); //на версию.
version = (long) Double.parseDouble(message_in.getMessage());
ReadMessageIn(); //на дату.
date_text = message_in.getMessage();
System.out.println("Завершено");
return null;
});
//--
/*
Utils.performProcess("java", "-jar",
"-Dprism.order=sw",
Utils.DQuotes(Global.performanceAnalyzer.getFile()), "--port", String.valueOf(getPort()), "--version");
*/
Utils.startScript(Global.TempDirectory, Global.ComponentsDirectory, "analyzer",
"java -jar -Dprism.order=sw "+ Utils.DQuotes(Global.performanceAnalyzer.getFile()) + " --port "+ getPort()+ " --version" );
//-
@@ -123,7 +109,6 @@ public class PerformanceAnalyzer extends Component {
ex.printStackTrace();
} finally {
Shutdown();
System.out.println("FINALIZE");
}
}
public void ServerBody() {
@@ -153,7 +138,6 @@ public class PerformanceAnalyzer extends Component {
ex.printStackTrace();
} finally {
Shutdown();
System.out.println("FINALIZE");
isActive = false;
}
}

6
src/Repository/RepositoryServer.java
View File

@@ -67,7 +67,6 @@ public abstract class RepositoryServer<D extends Database> {
}
protected Thread interruptThread = new InterruptThread(10000,
() -> {
System.out.println("INTERRUPT FILE FOUND");
System.exit(0);
return null;
});
@@ -77,7 +76,6 @@ public abstract class RepositoryServer<D extends Database> {
Log = new FileWriter("Log.txt", true);
String dmessage = Utils.Brackets("SESSION -> ") + new Date() +
" " + message;
System.out.println(dmessage);
Log.write(dmessage + "\n");
Log.close();
} catch (Exception ex) {
@@ -90,7 +88,6 @@ public abstract class RepositoryServer<D extends Database> {
public void Email(EmailMessage message_in, File... directAttachements) throws Exception {
checkTargets(message_in);
Thread thread = new Thread(() -> {
System.out.println("EMAIL THREAD STARTED");
try {
Properties props = new Properties();
props.put("mail.smtp.host", Global.properties.SMTPHost);
@@ -122,7 +119,6 @@ public abstract class RepositoryServer<D extends Database> {
}
});
for (String target : targets_) {
System.out.println("target=" + target);
boolean done = false;
int attempts = 5;
while (!done && (attempts > 0)) {
@@ -153,7 +149,6 @@ public abstract class RepositoryServer<D extends Database> {
}
message.setContent(multipart);
Transport.send(message);
System.out.println("message sent");
done = true;
} catch (Exception ex) {
System.out.println("Исключение во время отправки сообщения абоненту " + Utils.Brackets(target));
@@ -168,7 +163,6 @@ public abstract class RepositoryServer<D extends Database> {
System.out.println("Исключение во время выполнения рассылки.");
ex.printStackTrace();
}
System.out.println("EMAIL THREAD ENDED");
});
thread.start();
}

9
src/Repository/Server/ComponentsServer.java
View File

@@ -68,7 +68,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
targets
);
Email(message);
System.out.println("EMAIL ON START DONE");
}
}
@Override
@@ -252,8 +251,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
Utils.ReadAllText(vFile),
"\n", "\r"
);
System.out.println(vFile.getAbsolutePath());
System.out.println(Utils.DQuotes(v_string));
response_actual_versions_.put(componentType, v_string);
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
@@ -270,8 +267,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
Utils.ReadAllText(vFile),
"\n", "\r"
);
System.out.println(vFile.getAbsolutePath());
System.out.println(Utils.DQuotes(mv_string));
response_minimal_versions_.put(componentType, mv_string);
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
@@ -311,7 +306,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
String output = "";
for (String fileName : filesNames) {
File program = Paths.get(project.getAbsolutePath(), fileName).toFile();
System.out.println(program.getAbsolutePath());
//--
File convertedProgram = Paths.get(program.getParent(),
Utils.getFileNameWithoutExtension(program) + ".DVMH." +
@@ -322,7 +316,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
projectLanguage.getDVMCompile() + "dv " +
options + " "
+ Utils.DQuotes(program.getName());
System.out.println(command);
//--
File fileWorkspace = program.getParentFile();
Process process = Utils.startScript(workspace, fileWorkspace, Utils.getDateName("convert_script"), command);
@@ -350,7 +343,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
//--
} else
throw new RepositoryRefuseException("Внутренняя ошибка. Не удалось распаковать проект");
// File archive = Paths.get(workspace.getAbsolutePath());
break;
}
} else
@@ -397,7 +389,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
File bugsArchives = Paths.get(todayBackUp.getAbsolutePath(), "Bugs.zip").toFile();
//-
// Чистка старых бекапов на самом сервере.
System.out.println(todayBackUp.getAbsolutePath());
Utils.keepNewFiles(todayBackUp.getParentFile(), 2);
if (!todayBackUpArchive.exists()) {
FileUtils.forceMkdir(todayBackUp);

2
src/TestingSystem/Common/MachineProcess/MachineProcess.java
View File

@@ -82,8 +82,6 @@ public class MachineProcess extends DBObject {
try {
InetAddress address = InetAddress.getByName(machineAddress);
InetAddress localAddress = InetAddress.getByName(Global.properties.ServerAddress);
System.out.println("machine ip=" + Utils.Brackets(address.getHostAddress()));
System.out.println("server ip=" + Utils.Brackets(localAddress.getHostAddress()));
local = localAddress.getHostAddress().equals(address.getHostAddress());
} catch (Exception ex) {
Global.Log.PrintException(ex);

1
src/TestingSystem/Common/TestingPlanner.java
View File

@@ -194,7 +194,6 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
//--
Global.Home = testingSystemRoot;
Global.CheckTestingSystemDirectories();
System.out.println(Global.TestsDirectory.getAbsolutePath());
//---
machine = new Machine(machineAddress, machineAddress, machinePort, MachineType.Server);
user = new User(userName, userPassword, userWorkspace);

3
src/TestingSystem/Common/TestingServer.java
View File

@@ -148,14 +148,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//------>>>
public static Timer checkTimer = null;
public static void TimerOn() {
System.out.println("timer on");
checkTimer = new Timer(Global.properties.CheckTestingIntervalSeconds * 1000, e -> {
Pass_2021.passes.get(PassCode_2021.ActualizePackages).Do();
});
checkTimer.start();
}
public static void TimerOff() {
System.out.println("timer off");
if (checkTimer != null)
checkTimer.stop();
}
@@ -332,7 +330,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
}
groups.sort(Comparator.comparing(o -> o.getKey().description));
//-теперь создать тесты.
System.out.println("найдено " + groups.size() + " групп");
//--
for (Pair<Group, Vector<File>> p : groups)
db.RefreshGroup(account, sapfor, p);

5
src/TestingSystem/Common/TestsDatabase.java
View File

@@ -199,7 +199,6 @@ public class TestsDatabase extends SQLiteDatabase {
}
//---
public void CreateTestFromSingleFile(Account account, ServerSapfor sapfor, Group group, File file, String testDescription) throws Exception {
System.out.println("Создание теста " + file.getName());
Test test = new Test();
test.description = testDescription;
test.sender_name = account.name;
@@ -216,11 +215,9 @@ public class TestsDatabase extends SQLiteDatabase {
//--
Group oldGroup = groups.getGroupByDescription(group.language, group.description);
if (oldGroup == null) {
System.out.println("group " + Utils.Brackets(group.description) + " not found. create.");
Insert(group);
for (File file : files) {
String testDescription = Utils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
System.out.println("test " + Utils.Brackets(testDescription) + " create"); //добавить тест.
CreateTestFromSingleFile(account, sapfor, group, file, testDescription);
}
} else {
@@ -228,10 +225,8 @@ public class TestsDatabase extends SQLiteDatabase {
String testDescription = Utils.getNameWithoutExtension(file.getName()) + "_" + group.language.getDVMCompile();
Test oldTest = tests.getTestByDescription(oldGroup.id, testDescription);
if (oldTest == null) {
System.out.println("test " + Utils.Brackets(testDescription) + " not found. create"); //добавить тест.
CreateTestFromSingleFile(account, sapfor, oldGroup, file, testDescription);
} else {
System.out.println(Utils.Brackets(testDescription) + " found. rewrite"); //добавить тест.
SaveTestFromSingleFile(sapfor, group, oldTest, file);
}
}

2
src/TestingSystem/DVM/Configuration/Configuration.java
View File

@@ -63,11 +63,9 @@ public class Configuration extends riDBObject {
Vector<Integer> from = RunConfiguration.getBounds(String.join(" ", min_border));
Vector<Integer> to = RunConfiguration.getBounds(String.join(" ", max_border));
if (from.size() != to.size()) {
System.out.println("Верхняя и нижняя границы матриц конфигурации имеют разные размерности");
return res;
}
if (from.size() != testDim) {
System.out.println("Границы матриц не совпадают с размерностью конфигурации");
return res;
}
//1 стадия. заполнение.

2
src/TestingSystem/DVM/LocalDVMTestingPlanner.java
View File

@@ -28,13 +28,11 @@ public class LocalDVMTestingPlanner extends DVMTestingPlanner {
if (version.exists()) {
try {
current_version = Integer.parseInt(FileUtils.readFileToString(version));
System.out.println("current version ="+current_version);
} catch (Exception ex) {
ex.printStackTrace();
}
}
else {
System.out.println("version not exists");
}
if (current_version < actual_version) {
Print("Закачка кода модулей...");

9
src/TestingSystem/DVM/UserConnection.java
View File

@@ -249,7 +249,6 @@ public class UserConnection {
String getAvailibleCPPStandard(RemoteFile scriptDirectory) throws Exception {
String res = "";
String command = "g++ -v --help 2> /dev/null | sed -n '/^ *-std=\\([^<][^ ]\\+\\).*/ {s//\\1/p}' | grep c++";
System.out.println(command);
Pair<RemoteFile, RemoteFile> oe = performScript(scriptDirectory, command);
RemoteFile outFile = oe.getKey();
String out = readFromFile(outFile);
@@ -494,7 +493,6 @@ public class UserConnection {
public void CheckUserInitialization(String email) throws Exception {
RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
if (!Exists(userWorkspace)) {
System.out.println("создание папки пользователя");
sftpChannel.mkdir(userWorkspace.full_name);
//--
RemoteFile modulesDirectory = new RemoteFile(userWorkspace, "modules");
@@ -505,17 +503,13 @@ public class UserConnection {
subdirectories.add(modulesDirectory);
subdirectories.add(projectsDirectory);
subdirectories.add(testsDirectory);
System.out.println("создание рабочих подпапок");
for (RemoteFile remoteFile : subdirectories)
sftpChannel.mkdir(remoteFile.full_name);
//--
System.out.println("закачка кода модулей");
for (String resource_name : Constants.resourses_names) {
System.out.println(resource_name);
putResource(modulesDirectory, resource_name);
}
//-
System.out.println("Сборка модулей...");
String modules_log = compileModules(modulesDirectory);
if (!modules_log.isEmpty())
throw new PassException(modules_log);
@@ -538,13 +532,10 @@ public class UserConnection {
}
}
if (current_version < actual_version) {
System.out.println("Закачка кода модулей...");
for (String resource_name : Constants.resourses_names) {
System.out.println(resource_name);
putResource(modulesDirectory, resource_name);
}
//--
System.out.println("Сборка модулей...");
return compileModules(modulesDirectory);
}
return "";

7
src/TestingSystem/SAPFOR/Json/SapforVersion_json.java
View File

@@ -98,16 +98,13 @@ public class SapforVersion_json implements Serializable {
}
public boolean isMatch(SapforVersion_json version_json) {
if (!description.equals(version_json.description)) {
System.out.println("не совпадение описания версии");
return false;
}
if (files.size() != version_json.files.size()) {
System.out.println("не совпадение количества файлов");
return false;
}
for (String name1 : files.keySet()) {
if (!version_json.files.containsKey(name1)) {
System.out.println("Файл " + Utils.Brackets(name1) + " не найден в версии " + version_json.Home);
return false;
}
}
@@ -128,7 +125,6 @@ public class SapforVersion_json implements Serializable {
ex.printStackTrace();
}
if (!Utils.compareFortranTexts(text1, text2)) {
System.out.println("различие текста файла " + Utils.Brackets(file1.file.getName()));
return false;
}
}
@@ -140,14 +136,11 @@ public class SapforVersion_json implements Serializable {
res.line = Constants.Nan;
res.value = "";
String line = line_in.substring(9);
//System.out.println(line);
int i = 0;
int s = 0;
String lexeme = "";
//#1020: red43.fdv: line 988]: Active DVM directives are not supported (turn on DVM-directive support option)
for (char c : line.toCharArray()) {
// System.out.print("<s=" + s + ">");
// System.out.println(c);
switch (s) {
case 0:
//поиск groups_s

3
src/TestingSystem/SAPFOR/SapforTask/SapforTask.java
View File

@@ -132,7 +132,6 @@ public class SapforTask extends DBObject {
LinkedHashMap<String, SapforVersion_json> versions2 = task2.getSortedVersions();
//---
for (String name1 : versions1.keySet()) {
System.out.println("current version="+Utils.Brackets(name1));
if (versions2.containsKey(name1)) {
SapforVersion_json version1 = versions1.get(name1);
SapforVersion_json version2 = versions2.get(name1);
@@ -143,12 +142,10 @@ public class SapforTask extends DBObject {
version1.comparisonState = VersionComparisonState.NotMatch;
version2.comparisonState = VersionComparisonState.NotMatch;
//-
// System.out.println(version1.comparisonState);
}else {
version1.comparisonState = VersionComparisonState.Match;
version2.comparisonState = VersionComparisonState.Match;
//-
// System.out.println(version1.comparisonState);
}
} else {
comparisonState = ComparisonState.NotMatch;

7
src/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -184,15 +184,11 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
}
}
void SyncronizeRepository() throws Exception {
System.out.println("Синхронизация репозитория...");
UpdateSapforState(ServerSapforState.DVMRepositorySynchronization);
System.out.println("Синхронизация ветви DVM...");
Utils.startScript(repo, repo, "dvm_checkout",
"svn checkout " +
Constants.REPOSITORY_AUTHENTICATION +
" " + Constants.DVM_REPOSITORY + " 1>dvm_out.txt 2>dvm_err.txt\n").waitFor();
System.out.println("Синхронизация ветви SAPFOR...");
UpdateSapforState(ServerSapforState.SAPFORRepositorySynchronization);
Utils.startScript(repo, repo, "spf_checkout",
"svn checkout " +
@@ -200,7 +196,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
" " + Constants.SAPFOR_REPOSITORY + " 1>spf_out.txt 2>spf_err.txt\n").waitFor();
}
void CompileSapfor() throws Exception {
System.out.println("Сборка SAPFOR...");
UpdateSapforState(ServerSapforState.Compilation);
//-
if (repo_bin.exists())
@@ -234,7 +229,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
max_version = (int) ServerCommand(ServerCode.GetMaxSapforVersion);
current_version = Sapfor.readVersionFromCode(Paths.get(repo.getAbsolutePath(), "/sapfor/experts/Sapfor_2017/_src/Utils/version.h").toFile());
if (current_version==max_version){
System.out.println("Версия SAPFOR " + max_version + " уже собрана!");
ServerCommand(ServerCode.DeleteObjectByPK, new Pair(ServerSapfor.class,sapfor.id));
return;
}
@@ -256,7 +250,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
if (repo_err.exists())
FileUtils.copyFile(repo_err, sapforErr);
if (repo_bin.exists()) {
System.out.println("Сборка SAPFOR успешно выполнена");
FileUtils.copyFile(repo_bin, sapforBin);
sapforBin.setExecutable(true, false);
//--

1
src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java
View File

@@ -39,7 +39,6 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
//сортируем по времени обновления. по убыванию.
files.sort((o1, o2) -> (int) (o2.updateTime - o1.updateTime));
for (int i = 2; i < files.size(); ++i) {
System.out.println(files.get(i).full_name + ":" + files.get(i).updateTime);
user.connection.sftpChannel.rm(files.get(i).full_name);
}
//--------------

4
src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java
View File

@@ -207,10 +207,6 @@ public class CloneDVMPackage extends AddObjectPass<DVMPackage> {
target.tasksCount++;
}
}
//--
for (String test_id : inexistingTests) {
System.out.println("Тест " + test_id + " не найден!");
}
return inexistingTests.isEmpty() || UI.Question(inexistingTests.size() + " тестов отсутствует. Продолжить");
}
@Override

12
src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java
View File

@@ -36,7 +36,6 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
//--
for (SapforTest_json src_TestJson : src.tests) {
if (Global.testingServer.db.tests.containsKey(src_TestJson.id)) {
System.out.println("test=" + src_TestJson.id);
Test test = Global.testingServer.db.tests.get(src_TestJson.id);
SapforTest_json testJson = new SapforTest_json();
//--
@@ -53,7 +52,6 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
//--
for (SapforConfiguration_json src_configuration : src.configurations) {
if (Global.testingServer.db.sapforConfigurations.containsKey(src_configuration.id)) {
System.out.println("configuration=" + src_configuration.id);
SapforConfiguration configuration = Global.testingServer.db.sapforConfigurations.get(src_configuration.id);
SapforConfiguration_json configurationJson = new SapforConfiguration_json();
//--
@@ -170,13 +168,6 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
target.testsNames = String.join(";", target.package_json.getTestsNames());
target.configurationsNames = String.join(";", target.package_json.getConfigurationsNames());
//--
for (String test_id : inexistingTests) {
System.out.println("Тест " + test_id + " не найден!");
}
for (String configiration_id : inexistingConfigurations) {
System.out.println("Конфигурация " + configiration_id + " не найдена!");
}
//--
return inexistingTests.isEmpty() && inexistingConfigurations.isEmpty() ||
UI.Question(
(inexistingTests.isEmpty() ? "" : (inexistingTests.size() + " тестов отсутствует;")) +
@@ -187,8 +178,5 @@ public class CloneSapforPackage extends AddObjectPass<SapforPackage> {
@Override
protected void body() throws Exception {
Global.testingServer.db.sapforPackages.Data.put(target.id, target);
//--
// Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
// target.saveJson();
}
}

1
src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
View File

@@ -178,7 +178,6 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
FileUtils.forceMkdir(tempProject);
//--
for (ProjectFile projectFile : project_files) {
System.out.println(projectFile.file.getAbsolutePath());
File dst = new File(tempProject, projectFile.file.getName());
FileUtils.copyFile(projectFile.file, dst);
}

1
src/Visual_DVM_2021/Passes/All/DeleteLonelyM.java
View File

@@ -17,7 +17,6 @@ public class DeleteLonelyM extends Pass_2021<db_project_info> {
@Override
protected void body() throws Exception {
Vector<db_project_info> targets = target.getLonelyM();
System.out.println(targets.size());
for (db_project_info m : targets) {
passes.get(PassCode_2021.DeleteVersion).Do(m);
}

1
src/Visual_DVM_2021/Passes/All/DownloadProject.java
View File

@@ -21,7 +21,6 @@ public class DownloadProject extends CurrentConnectionPass {
dialogOK = (UI.getRemoteFileChooser().ShowDialog(getDescription(), this, true));
if (dialogOK) {
src = Current.getRemoteFile();
System.out.println(Current.getRemoteFile());
remote_archive = new RemoteFile(src.full_name, src.name + ".zip", false);
local_archive = Utils.getTempFileName(remote_archive.name);
if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) {

1
src/Visual_DVM_2021/Passes/All/EditAccount.java
View File

@@ -46,7 +46,6 @@ public class EditAccount extends Email {
"Подтверждение адреса почты",
JOptionPane.INFORMATION_MESSAGE);
if (attempt != null) {
System.out.println("Введенный код: " + Utils.Brackets(attempt));
if (attempt.equals(password)) {
UI.Info("Почта успешно подтверждена!");
return true;

3
src/Visual_DVM_2021/Passes/All/InstallComponentFromFolder.java
View File

@@ -23,16 +23,13 @@ public class InstallComponentFromFolder extends CurrentComponentPass {
if (super.canStart(args)){
VFileChooser fileChooser = target.getFileChooser();
String propertyName = target.getComponentType()+"Path";
System.out.println(propertyName);
String lastDirectory = (String) GlobalProperties.class.getField(propertyName).get(Global.properties);
System.out.println("last directory = "+ Utils.Brackets(lastDirectory));
if (!lastDirectory.isEmpty()){
//настройка выставлена не впервые, устанавливаем ее как папку
fileChooser.SetCurrentDirectory(lastDirectory);
}
boolean res = (file = fileChooser.ShowDialog()) != null;
File newDirectory = fileChooser.getCurrentDirectory();
System.out.println("new directory = "+newDirectory.getAbsolutePath());
GlobalProperties.class.getField(propertyName).set(Global.properties, newDirectory.getAbsolutePath());
Global.properties.Update();
return res;

1
src/Visual_DVM_2021/Passes/All/OpenCurrentFile.java
View File

@@ -17,7 +17,6 @@ public class OpenCurrentFile extends Pass_2021<DBProjectFile> {
}
@Override
protected void body() throws Exception {
System.out.println(getDescription() + " " + target.file.getAbsolutePath());
}
@Override
protected void performDone() throws Exception {

1
src/Visual_DVM_2021/Passes/All/PingComponentsServer.java
View File

@@ -29,7 +29,6 @@ public class PingComponentsServer extends ComponentsRepositoryPass {
Throwable cause = getCauseRec(ex);
if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
//так как это пинг, игнорируем.
System.out.println("Server inactive");
return;
}
}

1
src/Visual_DVM_2021/Passes/All/PingTestingServer.java
View File

@@ -28,7 +28,6 @@ public class PingTestingServer extends TestingSystemPass {
Throwable cause = getCauseRec(ex);
if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
//так как это пинг, игнорируем.
System.out.println("Server inactive");
return;
}
}

3
src/Visual_DVM_2021/Passes/All/Precompilation.java
View File

@@ -216,7 +216,6 @@ public class Precompilation extends Pass_2021<db_project_info> {
}
@Override
protected void performDone() throws Exception {
System.out.println("DONE");
}
@Override
protected void performFinish() throws Exception {
@@ -248,10 +247,8 @@ public class Precompilation extends Pass_2021<db_project_info> {
if (Global.isWindows) {
if (!name_to_kill.isEmpty()) {
killed = true;
System.out.println("time to kill...");
Process killer = Runtime.getRuntime().exec("taskkill /FI \"IMAGENAME eq " + name_to_kill + "\" /F /T");
killer.waitFor();
System.out.println("DEAD");
}
} else {
UI.Info("Прерывание процессов под Linux не реализовано");

3
src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java
View File

@@ -36,10 +36,7 @@ public class PublishComponentsServer extends RepositoryServerSSHPass {
user.connection.tryRM(dst);
user.connection.putSingleFile(src, dst);
//-
StartServer();
System.out.println("userHome=" + Utils.Brackets(userHome.full_name));
System.out.println("testingHome=" + Utils.Brackets(serverHome.full_name));
}
@Override
protected boolean validate() {

2
src/Visual_DVM_2021/Passes/All/PublishTestingServer.java
View File

@@ -39,8 +39,6 @@ public class PublishTestingServer extends RepositoryServerSSHPass {
//-
StartServer();
System.out.println("userHome=" + Utils.Brackets(userHome.full_name));
System.out.println("testingHome=" + Utils.Brackets(serverHome.full_name));
}
@Override
protected boolean validate() {

2
src/Visual_DVM_2021/Passes/All/ResurrectComponentFromServer.java
View File

@@ -94,10 +94,8 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
}
@Override
protected void ServerAction() throws Exception {
System.out.println(remoteFile.full_name);
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, remoteFile.full_name));
localFile = Utils.getTempFileName(remoteFile.name);
System.out.println(response.object);
response.Unpack(localFile);
}
};

15
src/Visual_DVM_2021/Passes/All/SPF_GetArrayLinks.java
View File

@@ -18,12 +18,10 @@ public class SPF_GetArrayLinks extends SilentSapforPass {
id_1|number_1|link_id1|link_id2|link_id3|id_2|number_2|link_id1|link_id2|link_id3
*/
//эту инфу суем в список объявленных массивов, чтобы не плодить лишних таблиц.
System.out.println(packed);
String[] data = packed.split("\\|");
long current_id;
int links_size = 0;
ProjectArray current_array = null;
System.out.println("parsing..");
int j = 0;
for (int i = 0; i < data.length; ++i) {
switch (j) {
@@ -32,38 +30,25 @@ public class SPF_GetArrayLinks extends SilentSapforPass {
current_array =
target.declaratedArrays.get(current_id);
current_array.links.clear();
System.out.print(current_array.id + "[");
j++;
break;
case 1:
links_size = Integer.parseInt(data[i]);
System.out.print(links_size + "]-> {");
j++;
break;
default:
if (links_size > 0) {
long link_id = Long.parseLong(data[i]);
System.out.print(link_id + ",");
current_array.links.put(link_id, target.declaratedArrays.get(link_id));
links_size--;
}
if (links_size == 0) {
j = 0;
current_array = null;
System.out.println("}");
}
break;
}
}
System.out.println("DONE");
/*
for (long id: target.arraysLinks.keySet()){
System.out.print(id+"|");
System.out.print(target.arraysLinks.get(id).size()+"|");
for (long link_id: target.arraysLinks.get(id))
System.out.print(link_id+"|");
}
*/
}
@Override
protected void performDone() throws Exception {

1
src/Visual_DVM_2021/Passes/All/SPF_GetGCovInfo.java
View File

@@ -52,7 +52,6 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
unpack(sapfor.getResult());
}
protected void unpack(String packed) throws Exception {
System.out.println("PACKED GCOV INFO ="+Utils.Brackets(packed));
String[] byFiles = packed.split("@");
for (int z = 0; z < byFiles.length; ++z) {
DBProjectFile cur = target.db.files.get((byFiles[z++]).replace("/", "\\"));

5
src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctionPositions.java
View File

@@ -236,11 +236,6 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
break;
}
}
/*
System.out.println("Got "+target.functionsGraph.vertexMap.keySet().size()+" functions to draw");
System.out.println(String.join("\n", target.functionsGraph.vertexMap.keySet()));
System.out.println("===============================================");
*/
//теперь добавить ребер.
for (String funcName : target.functionsGraph.vertexMap.keySet()) {
FuncInfo fi = target.allFunctions.get(funcName);

2
src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
View File

@@ -43,9 +43,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
return false;
}
Options = Utils.toU(String.join("|", Result));
System.out.println(Utils.Brackets(Options));
Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
// Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.PARSE_FOR_INLINE, "1");
SPF_ParseFilesWithOrder.silent = true;
return passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do(false);
}

1
src/Visual_DVM_2021/Passes/All/SPF_InlineProceduresH.java
View File

@@ -73,7 +73,6 @@ public class SPF_InlineProceduresH extends SapforTransformation {
}
}
Options = Utils.toU(String.join("|", Result));
System.out.println(Utils.Brackets(Options));
Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
SPF_ParseFilesWithOrder.silent = true;
return passes.get(PassCode_2021.SPF_ParseFilesWithOrder).Do();

1
src/Visual_DVM_2021/Passes/All/SPF_InsertIncludesPass.java
View File

@@ -36,7 +36,6 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
return false;
}
Options = Utils.toU(String.join("|", Result));
System.out.println(Utils.Brackets(Options));
return true;
}
return false;

3
src/Visual_DVM_2021/Passes/All/SPF_ModifyArrayDistribution.java
View File

@@ -81,8 +81,7 @@ public class SPF_ModifyArrayDistribution extends SapforModification {
}
coeffs.insertElementAt(String.valueOf(coeffs.size() + 1), 0);
addOpt2 = String.join("|", coeffs);
System.out.println("addOpt1=" + Utils.Brackets(addOpt1));
System.out.println("addOpt2=" + Utils.Brackets(addOpt2));
addOpt2 = String.join("|", coeffs);
return true;
}
Log.Writeln("Коефициенты выравнивания актуальны");

33
src/Visual_DVM_2021/Passes/All/TestPass.java
View File

@@ -7,37 +7,4 @@ public class TestPass extends TestingSystemPass {
protected void ServerAction() throws Exception {
// Command(new ServerExchangeUnit_2021(ServerCode.GetSapforActualVersion));
}
/*
@Override
protected void body() throws Exception {
/*
File workspace = new File("E:\\Workspace");
Utils.CheckAndCleanDirectory(workspace);
//копирование визуализатора
File supervisor = new File(workspace, "VisualSapfor.jar");
//
FileUtils.copyFile(Global.visualiser.getFile(), supervisor);
//создание настроек
GlobalProperties properties = new GlobalProperties();
properties.Mode = Current.Mode.DVMPackage;
Utils.jsonToFile(properties, new File(workspace, "properties"));
Vector<String> args = new Vector<>();
args.add(Utils.DQuotes("dvm.keldysh.ru"));
args.add(Utils.DQuotes("2222"));
args.add(Utils.DQuotes("dvmuser1"));
args.add(Utils.DQuotes("nkat_2023"));
args.add(Utils.DQuotes("/home/dvmuser1/visual_sapfor_workspace_1711108722"));
args.add("777");
args.add(String.valueOf(TasksPackageState.TestsSynchronize));
//подготовка пакетного режима. Запустит его уже очередь.
Utils.createScript(workspace, workspace,
"start",
"java -jar VisualSapfor.jar "+ String.join(" ", args));
byte[] localIp = InetAddress.getLocalHost().getAddress();
InetAddress address = InetAddress.getByName("alex-freenas.ddns.net");
System.out.println(address);
//java определить по адресу сервера совпадает ли он с локальным
}
*/
}

2
src/Visual_DVM_2021/Passes/All/UnzipFolderPass.java
View File

@@ -21,8 +21,6 @@ public class UnzipFolderPass<T> extends Pass_2021<T> {
protected boolean canStart(Object... args) {
src = (String) args[0];
dst = (String) args[1];
System.out.println("src=" + src);
System.out.println("dst=" + dst);
clean_dst = args.length > 2 && (boolean) args[2];
return true;
}

2
src/Visual_DVM_2021/Passes/ProcessPass.java
View File

@@ -37,7 +37,6 @@ public abstract class ProcessPass<T> extends Pass_2021<T> {
//ожидать завершения читая весь его поток в процессе выполнения.
public void WaitForProcess() throws Exception {
exit_code = process.waitFor();
System.out.println("завершено с кодом " + exit_code);
process = null;
if (exit_code != 0)
throw new PassException("Процесс завершился с кодом " + exit_code);
@@ -49,7 +48,6 @@ public abstract class ProcessPass<T> extends Pass_2021<T> {
BufferedReader brStdout = new BufferedReader(isrStdout);
String line;
while ((line = brStdout.readLine()) != null) {
System.out.println(line);
output.add(line);
}
} catch (Exception ex) {

1
src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java
View File

@@ -10,7 +10,6 @@ public class ConnectionPass<T> extends Pass_2021<T> {
protected void Connect() throws Exception{
user.connection = null;
user.connection = new UserConnection(machine, user);
System.out.println("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
}
void Disconnect(){
if (user.connection!=null){

3
src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java
View File

@@ -36,8 +36,6 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
userHome = new RemoteFile(user.connection.sftpChannel.getHome(), true);
serverHome = new RemoteFile(userHome, getServerHomeName());
//-
System.out.println("userHome=" + Utils.Brackets(userHome.full_name));
System.out.println("testingHome=" + Utils.Brackets(serverHome.full_name));
}
//--
protected void StartServer() throws Exception {
@@ -82,6 +80,5 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
new Date().toString()
);
user.connection.sftpChannel.rename(ABORTED.full_name, AbortLog.full_name);
System.out.println("Done");
}
}

1
src/Visual_DVM_2021/Passes/SapforAnalysis.java
View File

@@ -79,7 +79,6 @@ public class SapforAnalysis extends SapforPass {
@Override
protected void performDone() throws Exception {
if (!sapfor.getResult().isEmpty()) {
System.out.println("UNPACK");
unpack(sapfor.getResult());
}
if (!isAtomic() && !asDonePhase) {

2
src/Visual_DVM_2021/Passes/Server/RepositoryPass.java
View File

@@ -45,7 +45,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
in = new ObjectInputStream(clientSocket.getInputStream());
}
protected void disconnect() throws Exception {
//System.out.println("разрыв соединения...");
if (clientSocket != null)
clientSocket.close();
if (in != null)
@@ -56,7 +55,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
clientSocket = null;
in = null;
out = null;
// System.out.println("done");
}
protected abstract void ServerAction() throws Exception;
protected void Command(ServerExchangeUnit_2021 request_in) throws Exception {

1
src/Visual_DVM_2021/UI/Main/CallbackForm.java
View File

@@ -340,7 +340,6 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
currentBugReportTabs.setSelectedIndex(2);
}
public void SwitchListeners(boolean on) {
//System.out.println("switching listeners " + on);
if (on) {
BugReportDescriptionAddition.getDocument().addDocumentListener(descriptionAdditionListener);
BugReportCommentAddition.getDocument().addDocumentListener(commentAdditionListener);

2
src/Visual_DVM_2021/UI/Main/FileForm.java
View File

@@ -310,14 +310,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
//если выделяем строку из графа, то тоже надо отключиьт события.
//чтобы по ней не начался поиск.
if (events_on && line_changed) {
// System.out.println("Search in graphs by line...");
if (loopsForm.getTree() != null)
loopsForm.getTree().SelectNodeByCriteria(current_file_line);
if (functionsForm.getTree() != null)
functionsForm.getTree().SelectNodeByCriteria(current_file_line);
if (arraysForm.getTree() != null)
arraysForm.getTree().SelectNodeByCriteria(current_file_line);
// System.out.println("DONE");
}
}
@Override

1
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -236,7 +236,6 @@ public class MainForm extends Form implements MainWindow {
if (getTestingWindow() != null)
getTestingWindow().ShowAll();
UI.windowsStack.push(this);
System.out.println("New Front Window");
super.Show();
}
@Override

3
src/Visual_DVM_2021/UI/Main/ProjectForm.java
View File

@@ -112,15 +112,12 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
@Override
public void ShowSelectedDirectory() {
System.out.println(Current.getSelectedDirectory().getAbsolutePath());
}
@Override
public void ShowSelectedFile() {
System.out.println(Current.getSelectedFile().file.getAbsolutePath());
}
@Override
public void ShowNoSelectedFile() {
System.out.println("?");
}
@Override
public void ShowProjectSapforLog() {

4
src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
View File

@@ -248,10 +248,6 @@ public class SapforPackagesComparisonForm {
//--
for (SapforTask task1 : package1.package_json.tasks) {
SapforTask task2 = package2.package_json.getTaskByKey(task1.getUniqueKey());
//---
for (SapforVersion_json version : task1.versions) {
System.out.println(version + ":" + version.comparisonState);
}
}
//---
package1.package_json.buildComparisonTree(package1);

2
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -80,7 +80,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
if (events_on) {
events_on=false;
SC66.setDividerLocation(SC65.getDividerLocation());
System.out.println("Left");
events_on=true;
}
}
@@ -91,7 +90,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
if (events_on) {
events_on=false;
SC65.setDividerLocation(SC66.getDividerLocation());
System.out.println("Right");
events_on=true;
}
}