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

no message

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

14
src/_VisualDVM/Utils.java
View File

@@ -598,7 +598,7 @@ public class Utils {
return res;
}
public static void RestoreSelectedDirectory(VFileChooser_ directoryChooser) {
String last_dir_home = Global.properties.ProjectsSearchDirectory;
String last_dir_home = Global.normalProperties.ProjectsSearchDirectory;
if (!last_dir_home.isEmpty())
directoryChooser.SetCurrentDirectory(last_dir_home);
}
@@ -646,11 +646,11 @@ public class Utils {
break;
case ' ':
case '\t':
if (Global.properties.SpacesOn) line.append(c);
if (Global.normalProperties.SpacesOn) line.append(c);
v_line.append(c);
break;
case '\n': //конец строки
if (Global.properties.FortranWrapsOn) {
if (Global.normalProperties.FortranWrapsOn) {
//оракул. лезем в начало следующей строки
//и анализируем первые 5 символов
boolean hasWrap = false;
@@ -676,7 +676,7 @@ public class Utils {
break;
}
//добавление строки в результат.
if ((line.length() > 0) || Global.properties.EmptyLinesOn
if ((line.length() > 0) || Global.normalProperties.EmptyLinesOn
// Global.db.settings.get(SettingName.SpacesOn).toBoolean()
) {
lines.add(line.toString());
@@ -695,7 +695,7 @@ public class Utils {
if ((i > 0) && (c != '\n')) {
//строка оборвалась на EOF
//добавление строки в результат.
if ((line.length() > 0) || Global.properties.EmptyLinesOn
if ((line.length() > 0) || Global.normalProperties.EmptyLinesOn
// && Global.db.settings.get(SettingName.SpacesOn).toBoolean()
) {
lines.add(line.toString());
@@ -707,11 +707,11 @@ public class Utils {
public static boolean CompareLines(String line1_raw, String line2_raw) {
String line1 = line1_raw;
String line2 = line2_raw;
if (!Global.properties.RegisterOn) {
if (!Global.normalProperties.RegisterOn) {
line1 = line1.toUpperCase();
line2 = line2.toUpperCase();
}
if (!Global.properties.SpacesOn) {
if (!Global.normalProperties.SpacesOn) {
line1 = Utils_.removeCharacters(line1, " ", "\t");
line2 = Utils_.removeCharacters(line2, " ", "\t");
}