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
2024-10-11 00:00:30 +03:00
parent a11b7711f7
commit f317ab1aa1
341 changed files with 1866 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/_VisualDVM/ProjectData/Files/DBProjectFile.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.Utils;
@@ -85,7 +85,7 @@ public class DBProjectFile extends ProjectFile {
if (data.length > 1) {
String[] data1 = data[1].split(":");
if (data1.length > 0) {
file = CommonUtils.toW(data1[0]);//.substring(1));
file = Utils_.toW(data1[0]);//.substring(1));
//первый символ тут всегда пробел. слеши всегда виндовые.
}
}
@@ -97,7 +97,7 @@ public class DBProjectFile extends ProjectFile {
lastLine = line_in;
father.db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
}
@@ -156,7 +156,7 @@ public class DBProjectFile extends ProjectFile {
String default_options = "";
switch (languageName) {
case fortran:
default_options += " -spf -noProject -o " + CommonUtils.DQuotes(getDepFile().getAbsolutePath());
default_options += " -spf -noProject -o " + Utils_.DQuotes(getDepFile().getAbsolutePath());
switch (style) {
case free:
default_options += " -f90";
@@ -292,7 +292,7 @@ public class DBProjectFile extends ProjectFile {
father.db.Update(this);
return true;
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
return false;
@@ -304,7 +304,7 @@ public class DBProjectFile extends ProjectFile {
father.db.Update(this);
return true;
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
return false;
@@ -316,7 +316,7 @@ public class DBProjectFile extends ProjectFile {
father.db.Update(this);
return true;
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
return false;
@@ -390,10 +390,10 @@ public class DBProjectFile extends ProjectFile {
father.db.Update(this);
}
public String getUnixName() {
return CommonUtils.toU(name);
return Utils_.toU(name);
}
public String getQObjectName() {
return CommonUtils.DQuotes(getUnixName() + ".o");
return Utils_.DQuotes(getUnixName() + ".o");
}
@Override
@@ -401,7 +401,7 @@ public class DBProjectFile extends ProjectFile {
return name;
}
public String getProjectNameWithoutExtension() {
String extension = CommonUtils.getExtension(file);
String extension = Utils_.getExtension(file);
return name.substring(0, name.length() - (extension.length() + 1));
}
public void importSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {

10
src/_VisualDVM/ProjectData/Files/ProjectFile.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import Common.Database.Objects.DBObject;
import _VisualDVM.ProjectData.LanguageName;
@@ -48,7 +48,7 @@ public class ProjectFile extends DBObject {
}
}
//-
switch (CommonUtils.getExtensionFromName(name_in)) {
switch (Utils_.getExtensionFromName(name_in)) {
case "f":
case "fdv":
case "for":
@@ -87,7 +87,7 @@ public class ProjectFile extends DBObject {
fileType = FileType.forbidden;
break;
case "":
if (CommonUtils.isIntegerValue(name_in)) {
if (Utils_.isIntegerValue(name_in)) {
fileType = FileType.forbidden;
} else {
state = FileState.Excluded;
@@ -130,14 +130,14 @@ public class ProjectFile extends DBObject {
return new ImageIcon(imageUrl);
}
public String getUnixName() {
return CommonUtils.toU(file.getName());
return Utils_.toU(file.getName());
}
@Override
public String toString() {
return file.getName();
}
public String getQSourceName() {
return CommonUtils.DQuotes(getUnixName());
return Utils_.DQuotes(getUnixName());
}
public String getStyleOptions() {
if (languageName == LanguageName.fortran) {

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

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Editor.CaretInfo;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
@@ -18,7 +18,7 @@ public class BaseDirective extends BasicCompletion {
getCaretInfo().suffix_word.isEmpty() &&
name.getText().startsWith(getCaretInfo().prefix_word)
&& (!name.getText().equals(getCaretInfo().prefix_word))
&& !CommonUtils.isRBracketsBalanced(getCaretInfo().before);
&& !Utils_.isRBracketsBalanced(getCaretInfo().before);
}
//итоговая функция, определяющая наличие директивы в автозаполнении
public boolean Check() {

6
src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
public class IntervalDirective extends BaseDirective {
protected String prefix;
@@ -19,9 +19,9 @@ public class IntervalDirective extends BaseDirective {
}
@Override
public String getReplacementText() {
prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
prefix = Utils_.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
word = name.getText();
suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
suffix = Utils_.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
String pp = prefix.replace(" ", "");
String ps = suffix.replace(" ", "");
if ((!ps.isEmpty()) && (ps.charAt(0) != ','))

6
src/_VisualDVM/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
//промежуточный тип. относится ко всем директивам со скобками и требующим запятых.
public class SpecDirective extends BaseDirective {
@@ -16,9 +16,9 @@ public class SpecDirective extends BaseDirective {
}
@Override
public String getReplacementText() {
prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
prefix = Utils_.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
word = get_word();
suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
suffix = Utils_.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
String pp = prefix.replace(" ", "");
String ps = suffix.replace(" ", "");
if (!pp.isEmpty() && (pp.charAt(pp.length() - 1) != ',') && (pp.charAt(pp.length() - 1) != '('))

8
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI.Editor;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Global;
@@ -46,7 +46,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
highlighter = (RSyntaxTextAreaHighlighter) getHighlighter();
autoComplete = new SapforAutoComplete(this);
//-------------------------
float font_size = (float) ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.EditorFontSize).toInt32();
float font_size = (float) ((GlobalDatabase) Utils_.db).settings.get(SettingName.EditorFontSize).toInt32();
setFont(getFont().deriveFont(font_size));
//-------------------------
setText(Utils.ReadAllText(file.file).replace("\r", " "));
@@ -151,7 +151,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
painter
));
} catch (BadLocationException ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
}
@@ -167,7 +167,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
Pair<Long, Integer> p = file.gcov_info.line_info.get(lineNum);
Color color = never;
if (p.getKey() > 0) {
color = (p.getValue() >= ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.GCOVLimit).toInt32()) ?
color = (p.getValue() >= ((GlobalDatabase) Utils_.db).settings.get(SettingName.GCOVLimit).toInt32()) ?
new Color(255, 255, (100 - p.getValue()), 90) : null;
}
if (color != null) {

4
src/_VisualDVM/ProjectData/Files/UI/FilesHyperlinksPanel.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Visual.UI;
@@ -41,7 +41,7 @@ public class FilesHyperlinksPanel extends JPanel {
}
});
Hyperlinks.setLayoutOrientation(JList.VERTICAL);
Hyperlinks.setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
Hyperlinks.setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
add(Hyperlinks, BorderLayout.CENTER);
}
}

8
src/_VisualDVM/ProjectData/Files/UI/FilesTreeCellRenderer.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Files.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Global;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
@@ -23,7 +23,7 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
File dir = (File) o;
setIcon(new ImageIcon(getClass().getResource("/icons/Folder.png")));
setText(dir.getName());
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
} else if (o instanceof DBProjectFile) {
DBProjectFile file = (DBProjectFile) o;
if (Global.files_multiselection) {
@@ -32,8 +32,8 @@ public class FilesTreeCellRenderer extends StyledTreeCellRenderer {
setIcon(file.GetIcon());
}
setText(file.file.getName());
if (file.IsMain()) setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeBold));
else setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.IsMain()) setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));
else setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreePlain));
if (file.state.equals(FileState.Excluded)) {
Map attributes = getFont().getAttributes();
attributes.put(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON);

8
src/_VisualDVM/ProjectData/Messages/Message.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.Messages;
import Common.Current_;
import Common.Mode;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.GlobalDatabase;
@@ -31,7 +31,7 @@ public class Message extends FileObject {
(Global.mode != Mode.Normal)) {
value = value_in;
} else {
value = !((GlobalDatabase)CommonUtils.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
value = !((GlobalDatabase) Utils_.db).settings.get(SettingName.TRANSLATE_MESSAGES).toBoolean() ? value_in : decodeRussianMessage(value_in);
}
}
// last code - 183
@@ -397,9 +397,9 @@ public class Message extends FileObject {
}
} while (idx != -1);
if (sum != splited.length && !message.equals("")) {
CommonUtils.CopyToClipboard(message);
Utils_.CopyToClipboard(message);
throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
"message=" + CommonUtils.Brackets(message));
"message=" + Utils_.Brackets(message));
}
idx = 0;
String result = "";

10
src/_VisualDVM/ProjectData/Messages/Recommendations/MessageRecommendation.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.Messages.Recommendations;
import Common.Database.Objects.iDBObject;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode;
import com.sun.org.glassfish.gmbal.Description;
@@ -19,18 +19,18 @@ public class MessageRecommendation extends iDBObject {
public MessageRecommendation(PassCode passCode_in) {
type = RecommendationType.Transformation;
argName = passCode_in.toString();
text = "Выполните преобразование " + CommonUtils.Quotes(passCode_in.getDescription());
text = "Выполните преобразование " + Utils_.Quotes(passCode_in.getDescription());
}
public MessageRecommendation(SettingName settingName_in, String settingValue_in) {
type = RecommendationType.Setting;
argName = settingName_in.toString();
argValue = settingValue_in;
if (argValue.equals("1"))
text = "Включите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
text = "Включите настройку SAPFOR " + Utils_.Quotes(settingName_in.getDescription());
else if (argValue.equals("0"))
text = "Отключите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
text = "Отключите настройку SAPFOR " + Utils_.Quotes(settingName_in.getDescription());
else
text = "Задайте значение " + CommonUtils.DQuotes(argValue) + " для настройки SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
text = "Задайте значение " + Utils_.DQuotes(argValue) + " для настройки SAPFOR " + Utils_.Quotes(settingName_in.getDescription());
}
public MessageRecommendation(String text_in) {
type = RecommendationType.Text;

4
src/_VisualDVM/ProjectData/Project/UI/VersionsTreeCellRenderer.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.Project.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import Common.Visual.Selectable;
@@ -42,7 +42,7 @@ public class VersionsTreeCellRenderer extends StyledTreeCellRenderer {
}
}
setForeground(tree.getForeground());
setFont(CommonUI.getTheme().Fonts.get(
setFont(UI_.getTheme().Fonts.get(
version.isNew ? VisualiserFonts.NewVersion : VisualiserFonts.TreePlain));
setText(version.getTitle());
return this;

70
src/_VisualDVM/ProjectData/Project/db_project_info.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.ProjectData.Project;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Constants;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
@@ -172,13 +172,13 @@ public class db_project_info extends DBObject {
parent = parent_in;
name = parent.GenerateVersionName(letter_in);
languageName = parent.languageName;
style = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
style = ((GlobalDatabase) Utils_.db).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
description = description_in;
original = original_in;
Home = Paths.get(parent_in.Home.getAbsolutePath(), name).toFile();
parent.SaveVersionToBuild(name);
if (!Home.mkdir()) throw new PassException("Не удалось создать папку для версии");
creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
CreateVisualiserData();
parent.AddVersion(this);
//если это делать раньше, папка версии учтется как подпапка.
@@ -191,7 +191,7 @@ public class db_project_info extends DBObject {
name = Home.getName();
description = description_;
if (create_data) {
creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
CreateVisualiserData();
}
}
@@ -208,7 +208,7 @@ public class db_project_info extends DBObject {
if (stored_info == null) {
name = Home.getName();
description = "";
creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
db.Insert(this);
} else
ExtractStoredInfo(stored_info);
@@ -252,7 +252,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public void UpdatefgResistance(int resistance_in) {
@@ -260,7 +260,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public void UpdatefgScreen(double screen_in) {
@@ -268,7 +268,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public void UpdateCompilationMaxtime(int ct_in) {
@@ -276,7 +276,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public void UpdateRunMaxtime(int rt_in) {
@@ -284,7 +284,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
//</editor-fold>
@@ -301,7 +301,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public void SwitchFilterMultiplied() {
@@ -309,15 +309,15 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public boolean IsMCopy() {
String lname = name.toLowerCase();
return (lname.startsWith("m") && CommonUtils.isIntegerValue(lname.substring(1)));
return (lname.startsWith("m") && Utils_.isIntegerValue(lname.substring(1)));
}
public String getTitle() {
return name + " " + CommonUtils.DQuotes(description);
return name + " " + Utils_.DQuotes(description);
}
public File getProjFile() {
return Paths.get(Home.getAbsolutePath(), Constants.data, Constants.spf).toFile();
@@ -452,7 +452,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
public boolean UpdateLanguage(LanguageName lang_in) {
@@ -543,7 +543,7 @@ public class db_project_info extends DBObject {
db.Update(this);
return true;
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
return false;
}
@@ -551,14 +551,14 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public void UpdateDVMCount() {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
}
public boolean UpdateAddictedCount() {
@@ -566,7 +566,7 @@ public class db_project_info extends DBObject {
db.Update(this);
return true;
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
return false;
}
@@ -678,8 +678,8 @@ public class db_project_info extends DBObject {
public boolean FolderNotExists(File new_directory, File subdir, TextLog passLog) {
for (File pf : getSubdirectoriesSimple(subdir)) {
if (pf.getName().equals(new_directory.getName())) {
passLog.Writeln("В папке " + CommonUtils.Brackets(subdir.getAbsolutePath()) + "\n" +
"уже существует папка с именем " + CommonUtils.Brackets(new_directory.getName()));
passLog.Writeln("В папке " + Utils_.Brackets(subdir.getAbsolutePath()) + "\n" +
"уже существует папка с именем " + Utils_.Brackets(new_directory.getName()));
return false;
}
}
@@ -700,7 +700,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception ex) {
CommonUtils.MainLog.PrintException(ex);
Utils_.MainLog.PrintException(ex);
}
}
public mxGraphComponent DrawFunctionsGraph() {
@@ -718,8 +718,8 @@ public class db_project_info extends DBObject {
}
public boolean CheckAttachmentFile(File f, TextLog Log) {
Utils.validateFileShortNewName(f.getName(), Log);
if (CommonUtils.getFileSizeMegaBytes(f) > 2)
Log.Writeln_("Размер вложения " + CommonUtils.Brackets(f.getName()) + " превышает 2 Мb");
if (Utils_.getFileSizeMegaBytes(f) > 2)
Log.Writeln_("Размер вложения " + Utils_.Brackets(f.getName()) + " превышает 2 Мb");
return Log.isEmpty();
}
public boolean CheckAllAttachments(TextLog Log) {
@@ -848,7 +848,7 @@ public class db_project_info extends DBObject {
for (String key_ : versions.keySet()) {
String[] data_ = key_.split(letter);
String last = data_[data_.length - 1];
if (CommonUtils.isIntegerValue(last)) {
if (Utils_.isIntegerValue(last)) {
int vn = Integer.parseInt(last);
if (vn > max_vn)
max_vn = vn;
@@ -866,7 +866,7 @@ public class db_project_info extends DBObject {
for (DBProjectFile file : parent.db.files.Data.values()) {
Files.copy(file.file.toPath(),
Paths.get(Home.getAbsolutePath(),
CommonUtils.isWindows() ? file.name :
Utils_.isWindows() ? file.name :
file.name.replace('\\', '/')));
}
}
@@ -906,7 +906,7 @@ public class db_project_info extends DBObject {
}
}
public void createEmptyVersion(String versionLetter, String versionDescription) throws Exception {
boolean needsM = ((GlobalDatabase)CommonUtils.db).settings.get(SettingName.SaveModifications).toBoolean();
boolean needsM = ((GlobalDatabase) Utils_.db).settings.get(SettingName.SaveModifications).toBoolean();
if (needsM)
createModification();
last_version = new db_project_info(
@@ -924,7 +924,7 @@ public class db_project_info extends DBObject {
last_version.description = description_in;
last_version.original = last_modification.name;
last_version.Home = versionDirectory;
last_version.creationDate = CommonUtils.getDateNumber(); //----------------------------------------------------------------------------->>>
last_version.creationDate = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
last_version.CreateVisualiserData();
this.AddVersion(last_version);
}
@@ -1090,7 +1090,7 @@ public class db_project_info extends DBObject {
for (DBProjectFile file : db.files.Data.values()) {
File src_file = file.file;
File dst_file = Paths.get(dst.getAbsolutePath(),
CommonUtils.isWindows() ? file.name :
Utils_.isWindows() ? file.name :
file.name.replace('\\', '/')).toFile();
Files.copy(src_file.toPath(), dst_file.toPath());
}
@@ -1128,7 +1128,7 @@ public class db_project_info extends DBObject {
String[] splited = packed_messages.split("\\|");
int numberOfFiles = Integer.parseInt(splited[idx++]);
for (int i = 0; i < numberOfFiles; ++i) {
String message_file = CommonUtils.toW(splited[idx++]); //для ключа.
String message_file = Utils_.toW(splited[idx++]); //для ключа.
int numberOfMessages = Integer.parseInt(splited[idx++]);
if (!db.files.Data.containsKey(message_file)) {
throw new PassException("Ошибка при распаковке сообщений: файл: [" +
@@ -1162,7 +1162,7 @@ public class db_project_info extends DBObject {
String[] localSplit = splited[idx++].split(" ");
int m_type = Integer.parseInt(localSplit[0]);
if (m_type == 1) {
CommonUI.Info(packed_messages);
UI_.Info(packed_messages);
return true;
}
}
@@ -1235,7 +1235,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
for (ParallelRegion parallelRegion : parallelRegions.Data.values())
parallelRegion.UpdateLoopsCount();
@@ -1244,7 +1244,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
for (ParallelRegion parallelRegion : parallelRegions.Data.values())
parallelRegion.UpdateFunctionsCount();
@@ -1254,7 +1254,7 @@ public class db_project_info extends DBObject {
try {
db.Update(this);
} catch (Exception e) {
CommonUtils.MainLog.PrintException(e);
Utils_.MainLog.PrintException(e);
}
for (ParallelRegion parallelRegion : parallelRegions.Data.values())
parallelRegion.UpdateArraysCount();

4
src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
// это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray
@@ -13,6 +13,6 @@ public class ArrayDecl extends FileObjectWithMessages {
}
@Override
public String Description() {
return array_loc.getDescription() + " массив " + CommonUtils.Brackets(array_name);
return array_loc.getDescription() + " массив " + Utils_.Brackets(array_name);
}
}

4
src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysSet.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
@@ -39,7 +39,7 @@ public class ArraysSet extends DataSet<Long, ProjectArray> {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
if (((GlobalDatabase)CommonUtils.db).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
if (((GlobalDatabase) Utils_.db).settings.get(SettingName.ShowFullArraysDeclarations).toBoolean()) {
columns.get(4).setRenderer(RendererHyperlinks);
columns.get(4).setEditor(EditorHyperlinks);
} else {

8
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
@@ -103,7 +103,7 @@ public class ProjectArray extends DBObject {
int numDeclPlaces = Integer.parseInt(localSplited[2]);
int idxPl = 3;
for (int i = 0; i < numDeclPlaces; ++i, idxPl += 2) {
String declFile = CommonUtils.toW(localSplited[idxPl]);
String declFile = Utils_.toW(localSplited[idxPl]);
DBProjectFile file = Current.getProject().db.files.Data.get(declFile);
int declLine = Integer.parseInt(localSplited[idxPl + 1]);
//declPlaces.add(new Pair<>(declFile, declLine));
@@ -318,7 +318,7 @@ public class ProjectArray extends DBObject {
default:
break;
}
res += CommonUtils.ending(i == binary.length() - 1);
res += Utils_.ending(i == binary.length() - 1);
}
}
return res;
@@ -358,7 +358,7 @@ public class ProjectArray extends DBObject {
}
@Override
public ImageIcon GetDisabledIcon() {
return CommonUtils.getIcon("/icons/Arrays/" + State.toString() + ".png");
return Utils_.getIcon("/icons/Arrays/" + State.toString() + ".png");
}
@Override
public void select(boolean flag) {

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionRenderer.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import Common.Visual.Tables.RendererCell;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimension;
@@ -14,7 +14,7 @@ public class DimensionRenderer extends RendererCell<TemplateDimension> {
public void Display() {
if (value != null) {
setText(value.state.getMaskDescription());
setFont(value.isBlocked() ? CommonUI.getTheme().Fonts.get(VisualiserFonts.Disabled) : CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setFont(value.isBlocked() ? UI_.getTheme().Fonts.get(VisualiserFonts.Disabled) : UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
}
}
}

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionStateChanger.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Visual.UI;
@@ -17,7 +17,7 @@ public class DimensionStateChanger extends DBObjectEditor<TemplateDimension> {
}
@Override
public void Action() {
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Hyperlink));
value.SwitchState();
setText(value.state.getMaskDescription());
UI.getVersionsWindow().getVariantsWindow().ShowFilteredVariantsCount();

4
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/DimensionsTableForm.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.ControlForm;
import Common.Visual.Tables.Grid.GridAnchestor;
@@ -26,7 +26,7 @@ public class DimensionsTableForm extends ControlForm<StyledTable> {
@Override
public void Clear() {
super.Clear();
CommonUI.Clear(content);
UI_.Clear(content);
}
@Override
public void CreateControl() {

6
src/_VisualDVM/ProjectData/SapforData/Arrays/UI/RulesTreeCellRenderer.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Arrays.UI;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -14,9 +14,9 @@ public class RulesTreeCellRenderer extends StyledTreeCellRenderer {
super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof String) {
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Distribution));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Distribution));
} else if (o instanceof ParallelRegion)
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setForeground(tree.getForeground());
return this;
}

4
src/_VisualDVM/ProjectData/SapforData/FileObject.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Visual.UI;
@@ -18,7 +18,7 @@ public abstract class FileObject extends iDBObject {
}
@Override
public String getSelectionText() {
return "файл " + CommonUtils.Brackets(file) + " строка: " + line;
return "файл " + Utils_.Brackets(file) + " строка: " + line;
}
public DBProjectFile getFather() {
return Current.getProject().db.files.Data.get(file);

8
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassCode;
@@ -25,14 +25,14 @@ public class FuncCall extends FileObjectWithMessages {
}
@Override
public String Description() {
return "вызов " + CommonUtils.Brackets(funcName);
return "вызов " + Utils_.Brackets(funcName);
}
@Override
public void Select(boolean flag) {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

8
src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Visual_DVM_2021.Passes.PassCode;
import Common.Passes.Pass;
@@ -29,7 +29,7 @@ public class FuncCallH extends FuncCall {
}
@Override
public String getSelectionText() {
return "вызов " + CommonUtils.Brackets(funcName) + " в строке " + line;
return "вызов " + Utils_.Brackets(funcName) + " в строке " + line;
}
@Override
public void SelectAllChildren(boolean select) {
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
if (Pass.passes.get(PassCode.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
CommonUI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
UI_.Info("Для подстановки функций требуется выполнить проход " + Utils_.DQuotes(PassCode.SPF_GetGraphFunctions.getDescription()));
}
}
}

8
src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import Common.Utils.Index;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
@@ -52,7 +52,7 @@ public class FuncInfo extends FileObjectWithMessages {
//--
@Override
public String getSelectionText() {
return type.getDescription() + " " + CommonUtils.Brackets(funcName);
return type.getDescription() + " " + Utils_.Brackets(funcName);
}
public boolean isMain() {
return type.equals(FunctionType.Main);
@@ -64,7 +64,7 @@ public class FuncInfo extends FileObjectWithMessages {
}
@Override
public ImageIcon GetDisabledIcon() {
return CommonUtils.getIcon("/icons/Function.png");
return Utils_.getIcon("/icons/Function.png");
}
@Override
public void SelectAllChildren(boolean select) {
@@ -77,6 +77,6 @@ public class FuncInfo extends FileObjectWithMessages {
}
@Override
public String Description() {
return type.getDescription() + " " + CommonUtils.Brackets(funcName);
return type.getDescription() + " " + Utils_.Brackets(funcName);
}
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphForm.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Visual.CommonUI;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.ControlForm;
import com.mxgraph.swing.mxGraphComponent;
@@ -22,6 +22,6 @@ public class FunctionsGraphForm extends ControlForm<mxGraphComponent> {
@Override
public void Clear() {
super.Clear();
CommonUI.Clear(content);
UI_.Clear(content);
}
}

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.Menus.StyledPopupMenu;
@@ -33,7 +33,7 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
@Override
public void CheckElementsVisibility() {
if (Current.HasSelectedFunction()) {
changeCurrent.setText("Назначить процедуру " + CommonUtils.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
changeCurrent.setText("Назначить процедуру " + Utils_.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
changeCurrent.setEnabled(true);
} else {
changeCurrent.setText("Невозможно назначить текущую процедуру: узел графа не выбран");

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

@@ -1,7 +1,7 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Current_;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCoordinates;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
@@ -244,7 +244,7 @@ public class FunctionsGraphUI extends mxGraph {
break;
case Standard:
case NotFound:
CommonUI.Info("процедура " + CommonUtils.Brackets(func_name) + " " + fi.type.getDescription());
UI_.Info("процедура " + Utils_.Brackets(func_name) + " " + fi.type.getDescription());
break;
}
break;

4
src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import com.mxgraph.swing.mxGraphComponent;
import javafx.util.Pair;
@@ -44,7 +44,7 @@ public class GraphInfo {
Vector<String> edges = new Vector<>();
for (String name : vertexMap.keySet()) {
for (String neighbor : vertexMap.get(name)) {
edges.add(CommonUtils.Brackets(name + "," + neighbor));
edges.add(Utils_.Brackets(name + "," + neighbor));
}
}
}

4
src/_VisualDVM/ProjectData/SapforData/Includes/DependencyInfo.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Includes;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.SapforData.FileObject;
public class DependencyInfo extends FileObject {
public DependencyInfo(String file_in) {
@@ -7,7 +7,7 @@ public class DependencyInfo extends FileObject {
}
@Override
public String getSelectionText() {
return "включение: " + CommonUtils.Brackets(file);
return "включение: " + Utils_.Brackets(file);
}
//мб на будущее расширить, в какой строке находится команда икнлудить файл.
// но это уже к Сапфору

4
src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Includes;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.ProjectData.SapforData.FileObject;
import javax.swing.*;
@@ -19,7 +19,7 @@ public class FileInfo extends FileObject {
}
@Override
public ImageIcon GetDisabledIcon() {
return CommonUtils.getIcon("/icons/File.png");
return Utils_.getIcon("/icons/File.png");
}
@Override
public void SelectAllChildren(boolean select) {

4
src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -1,5 +1,5 @@
package _VisualDVM.ProjectData.SapforData.Regions;
import Common.Utils.CommonUtils;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
@@ -39,7 +39,7 @@ public class ParallelRegion extends DBObject {
//распаковка Lines -----------------------------------------------
//---------------------------------------------------------------
for (int i = 0; i < lines_size; ++i) {
String line_file = CommonUtils.toW(localSplited[1]);
String line_file = Utils_.toW(localSplited[1]);
int line_list_size = Integer.parseInt(localSplited[2]);
Vector<Pair<Integer, Integer>> current_lines = new Vector<>(line_list_size);
for (int k = 0; k < line_list_size; ++k) {