From 58312b9c3d6e157de3da64ceff8a87f2c04af9d7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 23 Jan 2025 19:52:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B2=D0=B5=D1=80=D0=BD=D1=8B=D0=BC=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D1=80=D0=B8=D1=82=D0=B5=D1=82=D0=BE=D0=BC=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D1=8F=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?=
 =?UTF-8?q?.=20v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 properties                                    |  4 +--
 .../ProjectData/Project/db_project_info.java  | 34 ++++++++++++++-----
 .../Repository/Component/Visualiser.java      |  2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/properties b/properties
index 0f0da0da..9069739e 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "C:\\Users\\misha\\Documents\\visual_sapfor_2023\\Downloads\\JAC_1737641430\\JAC\\v1\\v1\\v1",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
@@ -38,7 +38,7 @@
   "SmallScreen": false,
   "BugReportsAgeLimit": 1,
   "FastAccessPassesCount": 10,
-  "LastOpenedProjectsCount": 10,
+  "LastOpenedProjectsCount": 25,
   "Mode": "Normal",
   "ComponentsServerPort": 7995,
   "TestingServerPort": 7998,
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 3a84b406..bc9eb06f 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -6,6 +6,7 @@ import Common.Passes.PassException;
 import Common.Utils.Index;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
+import Common.Utils.Vector_;
 import Common.Visual.UI;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
@@ -381,17 +382,32 @@ public class db_project_info extends DBObject {
         return null;
     }
     public DBProjectFile getLastOpenedFile() {
-        long max = 0;
-        DBProjectFile res = null;
-        for (DBProjectFile f : db.files.Data.values()) {
-            if (!f.state.equals(FileState.Excluded)) {
-                if (f.file.lastModified() > max) {
-                    res = f;
-                    max = f.file.lastModified();
-                }
+        Vector<DBProjectFile> sorted_= new Vector<>();
+        for (DBProjectFile f: db.files.Data.values()){
+            if (!f.state.equals(FileState.Excluded) && !f.fileType.equals(FileType.forbidden)) {
+                sorted_.add(f);
             }
         }
-        return res;
+        sorted_.sort(new Comparator<DBProjectFile>() {
+            @Override
+            public int compare(DBProjectFile o1, DBProjectFile o2) {
+                return Long.compare(o1.file.lastModified(), o2.file.lastModified());
+            }
+        }.reversed());
+        LinkedHashMap<FileType, DBProjectFile> matches = new LinkedHashMap<>();
+        DBProjectFile sorceFile= null;
+        DBProjectFile headerFile = null;
+        for (DBProjectFile f: sorted_){
+            if (!matches.containsKey(f.fileType)){
+                matches.put(f.fileType, f);
+            }
+        }
+        Vector<FileType> priority = new Vector_<>(FileType.program, FileType.header, FileType.data, FileType.none);
+        for (FileType type: priority){
+            if (matches.containsKey(type))
+                    return matches.get(type);
+        }
+        return null;
     }
     public void CreateParserOptionsDirs() throws Exception {
         Utils_.forceDeleteWithCheck(getOptionsDirectory());
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index b9ff74bc..5f35f9c1 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -60,7 +60,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1138;
+        version = 1139;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());