no message

This commit is contained in:
2024-10-07 14:22:52 +03:00
parent 6b1576461d
commit 61fc37b574
173 changed files with 960 additions and 1526 deletions

View File

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

View File

@@ -1,7 +1,7 @@
package ProjectData.Files;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import Common_old.Utils.Utils;
import ProjectData.LanguageName;
import javax.swing.*;
@@ -48,7 +48,7 @@ public class ProjectFile extends DBObject {
}
}
//-
switch (Utils.getExtensionByName(name_in)) {
switch (CommonUtils.getExtensionFromName(name_in)) {
case "f":
case "fdv":
case "for":
@@ -87,7 +87,7 @@ public class ProjectFile extends DBObject {
fileType = FileType.forbidden;
break;
case "":
if (Utils.isDigit(name_in)) {
if (CommonUtils.isDigit(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 Utils.toU(file.getName());
return CommonUtils.toU(file.getName());
}
@Override
public String toString() {
return file.getName();
}
public String getQSourceName() {
return Utils.DQuotes(getUnixName());
return CommonUtils.DQuotes(getUnixName());
}
public String getStyleOptions() {
if (languageName == LanguageName.fortran) {

View File

@@ -1,6 +1,6 @@
package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common.Utils.CommonUtils;
import Common_old.UI.Editor.CaretInfo;
import Common_old.Utils.Utils;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import org.fife.ui.autocomplete.BasicCompletion;
@@ -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))
&& !Utils.isBracketsBalanced(getCaretInfo().before);
&& !CommonUtils.isRBracketsBalanced(getCaretInfo().before);
}
//итоговая функция, определяющая наличие директивы в автозаполнении
public boolean Check() {