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-16 16:21:21 +03:00
parent 0f7b65f467
commit 6d7f885926
3 changed files with 12 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/_VisualDVM/Passes/All/DVMConvertProject.java
View File

@@ -151,4 +151,8 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
menuItem = new PassMenuItem(this);
return menuItem;
}
@Override
protected void FocusResult() {
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusVersions();
}
}

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

@@ -148,7 +148,10 @@ public class db_project_info extends DBObject {
public SapforProperties sapforProperties=null;
public void SynchronizeSapforProperties() {
System.out.println("Syncronize Sapfor Properties...");
sapforProperties = Utils_.SynschronizeProperties(new File(getDataDirectory(), "properties"), SapforProperties.class);
sapforProperties = Utils_.SynschronizeProperties(getPropertiesFile(), SapforProperties.class);
}
public File getPropertiesFile(){
return new File(getDataDirectory(), "properties");
}
public db_project_info() {
}
@@ -161,10 +164,7 @@ public class db_project_info extends DBObject {
parent = parent_in;
name = parent.GenerateVersionName(letter_in);
languageName = parent.languageName;
// style = ((Global.mainModule.getDb()).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed);
style = (parent_in.sapforProperties.FREE_FORM ? LanguageStyle.free : LanguageStyle.fixed);
style = (parent_in.sapforProperties.FREE_FORM ? LanguageStyle.free : LanguageStyle.fixed);
description = description_in;
original = original_in;
Home = Paths.get(parent_in.Home.getAbsolutePath(), name).toFile();
@@ -175,9 +175,7 @@ public class db_project_info extends DBObject {
parent.AddVersion(this);
//если это делать раньше, папка версии учтется как подпапка.
parent.CopySubdirectories(Home);
//-- наследование настроек от предка.
this.sapforProperties=new SapforProperties(parent.sapforProperties);
SynchronizeSapforProperties();
FileUtils.copyFile(parent.getPropertiesFile(), getPropertiesFile());
}
//------------------------------
//обычное открытие.
@@ -901,7 +899,6 @@ public class db_project_info extends DBObject {
}
}
public void createEmptyVersion(String versionLetter, String versionDescription) throws Exception {
//boolean needsM = (Global.mainModule.getDb()).settings.get(SettingName.SaveModifications).toBoolean();
if (sapforProperties.SaveModifications)
createModification();
last_version = new db_project_info(
@@ -919,11 +916,9 @@ 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 = Utils_.getDateNumber(); //----------------------------------------------------------------------------->>>
last_version.creationDate = Utils_.getDateNumber();
last_version.CreateVisualiserData();
//наследование от предка
last_version.sapforProperties =new SapforProperties(last_version.parent.sapforProperties);
last_version.SynchronizeSapforProperties();
FileUtils.copyFile(getPropertiesFile(), last_version.getPropertiesFile());
this.AddVersion(last_version);
}
//не является ли текущая версия последней модификацией