рефакторинг. переносил текущие объекты в другое место
This commit is contained in:
@@ -435,8 +435,8 @@ public class db_project_info extends DBObject {
|
||||
db.ResetAI(MessageWarning.class);
|
||||
db.ResetAI(MessageRecommendation.class);
|
||||
//-
|
||||
Current_.set(Current.Function, null);
|
||||
Current_.set(Current.SelectedFunction, null);
|
||||
Global.mainModule.set(Current.Function, null);
|
||||
Global.mainModule.set(Current.SelectedFunction, null);
|
||||
}
|
||||
public void CleanVersions() throws Exception {
|
||||
node.removeAllChildren();
|
||||
@@ -660,7 +660,7 @@ public class db_project_info extends DBObject {
|
||||
}
|
||||
public Vector<DBProjectFile> getFilesForComparsion() {
|
||||
Vector<DBProjectFile> res = new Vector<>();
|
||||
if (Current.HasProject() && this.Home.equals(Current.getProject().Home)) {
|
||||
if (Global.mainModule.HasProject() && this.Home.equals(Global.mainModule.getProject().Home)) {
|
||||
//
|
||||
res = db.files.Data.values().stream().filter(file -> !file.state.equals(FileState.Excluded)).collect(Collectors.toCollection(Vector::new));
|
||||
} else {
|
||||
@@ -1069,7 +1069,7 @@ public class db_project_info extends DBObject {
|
||||
target.Close();
|
||||
}
|
||||
public void undoLastTransformation() throws Exception {
|
||||
Current_.set(Current.Version, null);
|
||||
Global.mainModule.set(Current.Version, null);
|
||||
//---
|
||||
UI.getVersionsWindow().getVersionsForm().getTree().RemoveNode(last_version.node);
|
||||
Utils.forceDeleteWithCheck(last_version.Home);
|
||||
@@ -1498,8 +1498,8 @@ public class db_project_info extends DBObject {
|
||||
}
|
||||
public String getLocalName() {
|
||||
//требует отображения рута. без него работать не будет.
|
||||
if (Current.HasRoot())
|
||||
return Home.getAbsolutePath().substring(Current.getRoot().Home.getParentFile().getAbsolutePath().length() + 1);
|
||||
if (Global.mainModule.HasRoot())
|
||||
return Home.getAbsolutePath().substring(Global.mainModule.getRoot().Home.getParentFile().getAbsolutePath().length() + 1);
|
||||
else return Home.getName();
|
||||
}
|
||||
public void SelectAllFiles(boolean b) {
|
||||
|
||||
Reference in New Issue
Block a user