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

рефакторинг

Browse Source
This commit is contained in:
02090095
2023-09-29 21:46:08 +03:00
parent 12898b07bb
commit 760707e6fb
41 changed files with 510 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
package Repository.Component;
import Common.Constants.Constants;
import Common.Database.DBObject;
import Common.Global;
import Common.Utils.Files.VFileChooser;
@@ -13,9 +14,9 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
public abstract class Component extends DBObject implements Loggable {
public String date_text = Global.dateNaN;
public long version = Utils.Nan;
public long actual_version = Utils.Nan;
public long minimal_version = Utils.Nan;
public long version = Constants.Nan;
public long actual_version = Constants.Nan;
public long minimal_version = Constants.Nan;
//--
public String code = "";
public String actual_code = "";
@@ -33,7 +34,7 @@ public abstract class Component extends DBObject implements Loggable {
return String.valueOf(version);
}
public void CheckIfNeedsUpdateOrPublish() {
if (actual_version != Utils.Nan) {
if (actual_version != Constants.Nan) {
if (version < minimal_version) setState(ComponentState.Old_version);
else {
ComponentState new_state =
@@ -47,7 +48,7 @@ public abstract class Component extends DBObject implements Loggable {
setState(ComponentState.Undefined);
if (getFile().exists()) {
GetVersionInfo();
if (version == Utils.Nan)
if (version == Constants.Nan)
setState(ComponentState.Unknown_version);
} else setState(ComponentState.Not_found);
}
@@ -85,7 +86,7 @@ public abstract class Component extends DBObject implements Loggable {
return getComponentType();
}
public boolean isValidVersion(TextLog Log, String desc) {
if (version == Utils.Nan) {
if (version == Constants.Nan) {
Log.Writeln_("Не определена версия " + desc + " компонента " + Utils.Brackets(getComponentType().getDescription()));
return false;
}

3
src/Repository/Component/Sapfor/Sapfor.java
View File

@@ -1,4 +1,5 @@
package Repository.Component.Sapfor;
import Common.Constants.Constants;
import Common.Current;
import Common.Global;
import Common.UI.UI;
@@ -365,7 +366,7 @@ public abstract class Sapfor extends OSDComponent {
//временный (?) проход, по тихому получить размерность теста, предварительно выполнив тихий парс.
//тут все одноразовое. считаем что таблицы бд уже заполнены как надо.
public int getTextMaxDim(File testFile, db_project_info target) {
int res = Utils.Nan;
int res = Constants.Nan;
LinkedHashMap<String, DBProjectFile> files = null;
if (testFile != null) {
DBProjectFile dbProjectFile = new DBProjectFile(testFile, target);