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-07 22:04:09 +03:00
parent 7fac84740d
commit 17c0bf7eb3
103 changed files with 560 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common_old/Utils/Validators/PathValidator.java
View File

@@ -1,7 +1,7 @@
package Common_old.Utils.Validators;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Utils.TextLog;
import Common_old.Utils.Utils;
import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
public class PathValidator extends Validator {
PathValidatorState state;
@@ -39,7 +39,7 @@ public class PathValidator extends Validator {
name.append(c);
break;
default:
if (Utils.isForbidden(c))
if (CommonUtils.isForbiddenCharacter(c))
state = PathValidatorState.Forbidden;
else name.append(c);
break;
@@ -54,7 +54,7 @@ public class PathValidator extends Validator {
Log.Writeln(string_name + ": имя файла или каталога в пути имеет неверный формат");
break;
case Forbidden:
Log.Writeln(string_name + ": Составляющие путь имена содержат запрещённые символы \n" + Constants.all_forbidden_characters_string);
Log.Writeln(string_name + ": Составляющие путь имена содержат запрещённые символы \n" + CommonUtils.printAllForbiddenCharacters());
break;
case Name:
if (spaces_count > 0)

11
src/Common_old/Utils/Validators/ShellParser.java
View File

@@ -1,7 +1,6 @@
package Common_old.Utils.Validators;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import _VisualDVM.Global;
import java.io.InputStreamReader;
import java.util.Vector;
@@ -167,7 +166,7 @@ public class ShellParser {
userName = userName_in;
}
public static void printChar() {
if (c != Constants.boop) {
if (c != CommonConstants.boop) {
int code = c;
if ((!return_active) || (c == '\n')) {
System.out.print(c == '\r' ? ("\\r") :
@@ -211,7 +210,7 @@ public class ShellParser {
} else
state = ShellParserState.End;
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
state = ShellParserState.End;
}
} while (!state.equals(ShellParserState.End));
@@ -237,7 +236,7 @@ public class ShellParser {
} else
state = ShellParserState.End;
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
state = ShellParserState.End;
}
} while (!state.equals(ShellParserState.End));
@@ -262,7 +261,7 @@ public class ShellParser {
} else
return;
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
return;
}
} while (!res.toString().contains(command));