no message
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -8,9 +8,8 @@
|
|||||||
<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$/.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/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.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/Utils/Utils_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils_.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/MainModule_/MainModule_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/MainModule_.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/MainModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/MainModule.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import Common.Passes.Pass;
|
|||||||
import Common.Passes.PassCode_;
|
import Common.Passes.PassCode_;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
import Common.Database.Objects.PassStats.PassStats;
|
import Common.Database.Objects.PassStats.PassStats;
|
||||||
|
import Common.Visual.Windows.PassForm;
|
||||||
|
import _VisualDVM.Current;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@@ -22,7 +24,7 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
|
|||||||
public D getDb() {
|
public D getDb() {
|
||||||
return db;
|
return db;
|
||||||
}
|
}
|
||||||
|
//---
|
||||||
private void createPasses(){
|
private void createPasses(){
|
||||||
passes= new LinkedHashMap<>();
|
passes= new LinkedHashMap<>();
|
||||||
for (Object code: getPassCodesEnum().getEnumConstants()){
|
for (Object code: getPassCodesEnum().getEnumConstants()){
|
||||||
@@ -39,6 +41,19 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
|
|||||||
for (PassCode_ code_in : codes_in)
|
for (PassCode_ code_in : codes_in)
|
||||||
getPass(code_in).setControlsVisible(flag);
|
getPass(code_in).setControlsVisible(flag);
|
||||||
}
|
}
|
||||||
|
public boolean HasPassForm() {
|
||||||
|
return get(Current.PassForm) != null;
|
||||||
|
}
|
||||||
|
public PassForm getPassForm() {
|
||||||
|
return (PassForm) get(Current.PassForm);
|
||||||
|
}
|
||||||
|
public Pass getPass(PassCode_ code){
|
||||||
|
return passes.get(code);
|
||||||
|
}
|
||||||
|
public String getPassDescription(String passName){
|
||||||
|
return ((PassCode_)Enum.valueOf(MainModule_.object.getPassCodesEnum(), passName)).getDescription();
|
||||||
|
}
|
||||||
|
//---
|
||||||
public MainModule_(Class<D> db_class_in) {
|
public MainModule_(Class<D> db_class_in) {
|
||||||
objects = new LinkedHashMap<>();
|
objects = new LinkedHashMap<>();
|
||||||
createPasses();
|
createPasses();
|
||||||
@@ -85,12 +100,7 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
|
|||||||
public boolean matchCurrentID(Current_ name, int id) {
|
public boolean matchCurrentID(Current_ name, int id) {
|
||||||
return (get(name) != null) && (((iDBObject) get(name)).id == id);
|
return (get(name) != null) && (((iDBObject) get(name)).id == id);
|
||||||
}
|
}
|
||||||
public Pass getPass(PassCode_ code){
|
|
||||||
return passes.get(code);
|
|
||||||
}
|
|
||||||
public String getPassDescription(String passName){
|
|
||||||
return ((PassCode_)Enum.valueOf(MainModule_.object.getPassCodesEnum(), passName)).getDescription();
|
|
||||||
}
|
|
||||||
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());
|
||||||
sortedStats.sort(new Comparator<PassStats>() {
|
sortedStats.sort(new Comparator<PassStats>() {
|
||||||
|
|||||||
@@ -41,9 +41,6 @@ public class Utils_ {
|
|||||||
public static Semaphore date_semaphore = new Semaphore(1);
|
public static Semaphore date_semaphore = new Semaphore(1);
|
||||||
public static long last_ticks = CommonConstants.Nan;
|
public static long last_ticks = CommonConstants.Nan;
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
//главная база данных
|
|
||||||
// public static VisualiserDatabase db = null;
|
|
||||||
//------------------------------------------------------------------------
|
|
||||||
public static Object requireNonNullElse(Object value, Object default_value) {
|
public static Object requireNonNullElse(Object value, Object default_value) {
|
||||||
return (value != null) ? value : default_value;
|
return (value != null) ? value : default_value;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,9 +89,6 @@ public class MainModule extends MainModule_<GlobalDatabase> {
|
|||||||
public boolean HasRunTask() {
|
public boolean HasRunTask() {
|
||||||
return get(Current.RunTask) != null;
|
return get(Current.RunTask) != null;
|
||||||
}
|
}
|
||||||
public boolean HasPassForm() {
|
|
||||||
return get(Current.PassForm) != null;
|
|
||||||
}
|
|
||||||
public boolean HasProjectView() {
|
public boolean HasProjectView() {
|
||||||
return get(Current.ProjectView) != null;
|
return get(Current.ProjectView) != null;
|
||||||
}
|
}
|
||||||
@@ -210,9 +207,6 @@ public class MainModule extends MainModule_<GlobalDatabase> {
|
|||||||
public boolean HasBugReport() {
|
public boolean HasBugReport() {
|
||||||
return get(Current.BugReport) != null;
|
return get(Current.BugReport) != null;
|
||||||
}
|
}
|
||||||
public PassForm getPassForm() {
|
|
||||||
return (PassForm) get(Current.PassForm);
|
|
||||||
}
|
|
||||||
public ParallelRegion getParallelRegion() {
|
public ParallelRegion getParallelRegion() {
|
||||||
return (ParallelRegion) get(Current.ParallelRegion);
|
return (ParallelRegion) get(Current.ParallelRegion);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package _VisualDVM.Repository.Component.Sapfor;
|
package _VisualDVM.Repository.Component.Sapfor;
|
||||||
|
import Common.MainModule_;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import _VisualDVM.Current;
|
import _VisualDVM.Current;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
@@ -29,8 +30,8 @@ public class MessagesServer {
|
|||||||
InputStreamReader(client.getInputStream()));
|
InputStreamReader(client.getInputStream()));
|
||||||
String line;
|
String line;
|
||||||
while ((line = in.readLine()) != null) {
|
while ((line = in.readLine()) != null) {
|
||||||
if (Global.mainModule.HasPassForm())
|
if (MainModule_.object.HasPassForm())
|
||||||
Global.mainModule.getPassForm().Result.ShowSapforMessage(line);
|
MainModule_.object.getPassForm().Result.ShowSapforMessage(line);
|
||||||
}
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
// UI.Print(DebugPrintLevel.MessagesServer, "соединение сброшено!");
|
// UI.Print(DebugPrintLevel.MessagesServer, "соединение сброшено!");
|
||||||
|
|||||||
Reference in New Issue
Block a user