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-14 01:31:33 +03:00
parent b37d52496e
commit 9669eb61d2
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@@ -7,19 +7,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/VisualiserDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/Pass.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Passes/SortPassesByStats.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStatsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DropFastAccess.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/CallbackForm.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

5
src/Common/Passes/ObjectPass.java
View File

@@ -3,17 +3,18 @@ import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable; import Common.Database.Tables.DBTable;
import Common.Database.Database; import Common.Database.Database;
import Common.Passes.Pass; import Common.Passes.Pass;
import MainModule_.MainModule_;
import _VisualDVM.Global; import _VisualDVM.Global;
public abstract class ObjectPass<D extends DBObject> extends Pass<D> { public abstract class ObjectPass<D extends DBObject> extends Pass<D> {
protected Class<D> d; //класс объектов. protected Class<D> d; //класс объектов.
public ObjectPass(Class<D> d_in) { public ObjectPass(Class<D> d_in) {
d = d_in; d = d_in;
} }
protected Database getDb(){ return Global.mainModule.getDb();}; //источник данных protected Database getDb(){ return MainModule_.object.getDb();}; //источник данных
public DBTable getTable() { public DBTable getTable() {
return getDb().tables.get(d); return getDb().tables.get(d);
} //таблица в источнике данных } //таблица в источнике данных
@Override @Override//sorted
public String getButtonText() { public String getButtonText() {
return ""; return "";
} }

6
src/Common/Passes/Pass.java
View File

@@ -98,17 +98,17 @@ public class Pass<T> {
} catch (Exception ex) { } catch (Exception ex) {
Utils_.MainLog.PrintException(ex); Utils_.MainLog.PrintException(ex);
} }
UI.fastAccessMenuBar.Refresh(); UI.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
} }
} }
public PassCode code() { public PassCode code() {
return PassCode.valueOf(getClass().getSimpleName()); return PassCode.valueOf(getClass().getSimpleName());
} }
public boolean isDone() { public boolean isDone() {
return state == PassState.Done; return state.equals(PassState.Done);
} }
public void setDone() { public void setDone() {
state = PassState.Done; state.equals(PassState.Done);
} }
public String getDescription() { public String getDescription() {
return code().getDescription(); return code().getDescription();

9
src/MainModule_/MainModule_.java
View File

@@ -5,17 +5,15 @@ import Common.Database.VisualiserDatabase;
import Common.Passes.Pass; import Common.Passes.Pass;
import Common.Passes.PassCode_; import Common.Passes.PassCode_;
import Common.Utils.TextLog; import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Utils.Vector_;
import Visual_DVM_2021.PassStats.PassStats; import Visual_DVM_2021.PassStats.PassStats;
import Visual_DVM_2021.Passes.PassCode;
import _VisualDVM.Global;
import java.util.Comparator; import java.util.Comparator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Vector; import java.util.Vector;
//Основной объект визуализатора. //Основной объект визуализатора.
public abstract class MainModule_<D extends VisualiserDatabase> { public abstract class MainModule_<D extends VisualiserDatabase> {
public static MainModule_ object =null;
//--
D db; D db;
Class<D> db_class; Class<D> db_class;
//-- //--
@@ -51,6 +49,8 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
ex.printStackTrace(); ex.printStackTrace();
} }
//--- //---
object = this;
System.out.println("main module created");
} }
public abstract Class getPassCodesEnum(); public abstract Class getPassCodesEnum();
public void ActivateDB() throws Exception { public void ActivateDB() throws Exception {
@@ -90,7 +90,6 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
} }
public Vector<Pass> getFirstAccessPasses(){ public Vector<Pass> getFirstAccessPasses(){
Vector<PassStats> sortedStats = new Vector<>(getDb().passStats.Data.values()); Vector<PassStats> sortedStats = new Vector<>(getDb().passStats.Data.values());
System.out.println("sorted passes size= "+sortedStats.size());
sortedStats.sort(new Comparator<PassStats>() { sortedStats.sort(new Comparator<PassStats>() {
@Override @Override
public int compare(PassStats o1, PassStats o2) { public int compare(PassStats o1, PassStats o2) {