no message
This commit is contained in:
9
.idea/workspace.xml
generated
9
.idea/workspace.xml
generated
@@ -7,9 +7,16 @@
|
|||||||
</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$/src/Common/Passes/ObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Passes/ObjectPass.java" 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/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/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/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/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_StatisticAnalyzer.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforAnalysis.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Transformation.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" />
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import Common.Utils.Utils_;
|
|||||||
import Common.Utils.Stopwatch;
|
import Common.Utils.Stopwatch;
|
||||||
import Common.Utils.TextLog;
|
import Common.Utils.TextLog;
|
||||||
import Common.Visual.UI_;
|
import Common.Visual.UI_;
|
||||||
|
import MainModule_.MainModule_;
|
||||||
import Visual_DVM_2021.PassStats.PassStats;
|
import Visual_DVM_2021.PassStats.PassStats;
|
||||||
import Visual_DVM_2021.Passes.PassCode;
|
import Visual_DVM_2021.Passes.PassCode;
|
||||||
import Visual_DVM_2021.Passes.UI.PassForm;
|
import Visual_DVM_2021.Passes.UI.PassForm;
|
||||||
@@ -94,24 +95,22 @@ public class Pass<T> {
|
|||||||
public void UpdateStatsIfNeed() {
|
public void UpdateStatsIfNeed() {
|
||||||
if (hasStats()) {
|
if (hasStats()) {
|
||||||
try {
|
try {
|
||||||
Global.mainModule.getDb().passStats.IncPassStat(code());
|
MainModule_.object.getDb().passStats.IncPassStat(getName());
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Utils_.MainLog.PrintException(ex);
|
Utils_.MainLog.PrintException(ex);
|
||||||
}
|
}
|
||||||
UI.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
|
UI.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public PassCode code() {
|
|
||||||
return PassCode.valueOf(getClass().getSimpleName());
|
|
||||||
}
|
|
||||||
public boolean isDone() {
|
public boolean isDone() {
|
||||||
return state.equals(PassState.Done);
|
return state.equals(PassState.Done);
|
||||||
}
|
}
|
||||||
public void setDone() {
|
public void setDone() {
|
||||||
state.equals(PassState.Done);
|
state.equals(PassState.Done);
|
||||||
}
|
}
|
||||||
|
public String getName(){return getClass().getSimpleName();}
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return code().getDescription();
|
return Global.mainModule.getPassDescription(getName());
|
||||||
}
|
}
|
||||||
public String getStartDescription() {
|
public String getStartDescription() {
|
||||||
return getDescription();
|
return getDescription();
|
||||||
|
|||||||
@@ -88,6 +88,9 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
|
|||||||
public Pass getPass(PassCode_ code){
|
public Pass getPass(PassCode_ code){
|
||||||
return passes.get(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>() {
|
||||||
|
|||||||
@@ -11,15 +11,14 @@ public class PassStatsDBTable extends DBTable<String, PassStats> {
|
|||||||
public String getSingleDescription() {
|
public String getSingleDescription() {
|
||||||
return "статистика выполнения прохода";
|
return "статистика выполнения прохода";
|
||||||
}
|
}
|
||||||
public void IncPassStat(PassCode_ code) throws Exception {
|
public void IncPassStat(String passName) throws Exception {
|
||||||
String code_s = code.toString();
|
|
||||||
PassStats passStats = null;
|
PassStats passStats = null;
|
||||||
if (Data.containsKey(code_s)) {
|
if (Data.containsKey(passName)) {
|
||||||
passStats = Data.get(code_s);
|
passStats = Data.get(passName);
|
||||||
passStats.Inc();
|
passStats.Inc();
|
||||||
getDb().Update(passStats);
|
getDb().Update(passStats);
|
||||||
} else {
|
} else {
|
||||||
passStats = new PassStats(code_s);
|
passStats = new PassStats(passName);
|
||||||
passStats.Inc();
|
passStats.Inc();
|
||||||
getDb().Insert(passStats);
|
getDb().Insert(passStats);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info>
|
|||||||
//-
|
//-
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
return "/icons/Transformations/" + code().toString() + ".png";
|
return "/icons/Transformations/" + getName() + ".png";
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public boolean hasStats() {
|
public boolean hasStats() {
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
|
|||||||
f.fields.cbAssemblyOnServer.setVisible(false);
|
f.fields.cbAssemblyOnServer.setVisible(false);
|
||||||
f.fields.cbAssemblyOnServer.setSelected(false);
|
f.fields.cbAssemblyOnServer.setSelected(false);
|
||||||
}
|
}
|
||||||
if (f.ShowDialog(code().getDescription())) {
|
if (f.ShowDialog(getDescription())) {
|
||||||
target.needs_update_minimal_version = f.fields.cbUpdateMinimalVersion.isSelected();
|
target.needs_update_minimal_version = f.fields.cbUpdateMinimalVersion.isSelected();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
|
import Common.Passes.PassCode_;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
import Common.Visual.UI_;
|
import Common.Visual.UI_;
|
||||||
|
import MainModule_.MainModule_;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Visual.UI;
|
import _VisualDVM.Visual.UI;
|
||||||
import _VisualDVM.GlobalData.GlobalDatabase;
|
import _VisualDVM.GlobalData.GlobalDatabase;
|
||||||
@@ -41,6 +43,6 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return code().getDescription();
|
return Global.mainModule.getPassDescription(getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
|
import Common.Utils.Vector_;
|
||||||
import _VisualDVM.Global;
|
import _VisualDVM.Global;
|
||||||
import _VisualDVM.Visual.Controls.PassControl;
|
import _VisualDVM.Visual.Controls.PassControl;
|
||||||
import _VisualDVM.Visual.UI;
|
import _VisualDVM.Visual.UI;
|
||||||
@@ -15,8 +16,8 @@ import java.util.Comparator;
|
|||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
|
public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
|
||||||
@Override
|
@Override
|
||||||
protected Vector<PassCode> getForbiddenPhases() {
|
protected Vector<String> getForbiddenPhases() {
|
||||||
return new Vector<>(Collections.singletonList(PassCode.SPF_GetArrayDistributionOnlyRegions));
|
return new Vector_<>("SPF_GetArrayDistributionOnlyRegions");
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String phase() {
|
public String phase() {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public class SPF_StatisticAnalyzer extends SilentSapforPass {
|
|||||||
@Override
|
@Override
|
||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
sapfor.RunAnalysis(
|
sapfor.RunAnalysis(
|
||||||
code().toString(),
|
getName(),
|
||||||
-Global.messagesServer.getPort(),
|
-Global.messagesServer.getPort(),
|
||||||
Global.packSapforSettings(),
|
Global.packSapforSettings(),
|
||||||
Utils_.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
|
Utils_.DQuotes(task.getLocalStsFile().getAbsolutePath()) +
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import java.awt.event.ActionEvent;
|
|||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
public class SapforAnalysis extends SapforPass {
|
public class SapforAnalysis extends SapforPass {
|
||||||
boolean asDonePhase = false;
|
boolean asDonePhase = false;
|
||||||
protected Vector<PassCode> getForbiddenPhases() {
|
protected Vector<String> getForbiddenPhases() {
|
||||||
return new Vector<>();
|
return new Vector<>();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
@@ -106,8 +106,8 @@ public class SapforAnalysis extends SapforPass {
|
|||||||
if (!p.isEmpty() && !phase().equals(p)) {
|
if (!p.isEmpty() && !phase().equals(p)) {
|
||||||
SapforAnalysis analysis =
|
SapforAnalysis analysis =
|
||||||
sapfor.getAnalysisByPhase(p);
|
sapfor.getAnalysisByPhase(p);
|
||||||
if ((analysis != null) && (analysis.code() != code()) && (analysis.alwaysCheck() || !analysis.isDone())) {
|
if ((analysis != null) && (!analysis.getName().equals(getName())) && (analysis.alwaysCheck() || !analysis.isDone())) {
|
||||||
if (getForbiddenPhases().contains(analysis.code())) {
|
if (getForbiddenPhases().contains(analysis.getName())) {
|
||||||
analysis.setDone();
|
analysis.setDone();
|
||||||
analysis.MarkAsDone();
|
analysis.MarkAsDone();
|
||||||
} else
|
} else
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class SapforTransformation extends SapforPass {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
return "/icons/Transformations/" + code().toString() + ".png";
|
return "/icons/Transformations/" + getName() + ".png";
|
||||||
}
|
}
|
||||||
protected String getVersionLetter() {
|
protected String getVersionLetter() {
|
||||||
return "v";
|
return "v";
|
||||||
@@ -46,7 +46,7 @@ public class SapforTransformation extends SapforPass {
|
|||||||
@Override
|
@Override
|
||||||
protected void body() throws Exception {
|
protected void body() throws Exception {
|
||||||
sapfor.RunTransformation(
|
sapfor.RunTransformation(
|
||||||
code().toString(),
|
getName(),
|
||||||
-Global.messagesServer.getPort(),
|
-Global.messagesServer.getPort(),
|
||||||
Global.packSapforSettings(),
|
Global.packSapforSettings(),
|
||||||
target.getProjFile().getAbsolutePath(),
|
target.getProjFile().getAbsolutePath(),
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public class SilentSapforPass extends CurrentProjectPass {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
protected String getSapforPassName() {
|
protected String getSapforPassName() {
|
||||||
return code().toString();
|
return getName();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class Transformation extends CurrentProjectPass {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
return "/icons/Transformations/" + code().toString() + ".png";
|
return "/icons/Transformations/" + getName() + ".png";
|
||||||
}
|
}
|
||||||
protected String getVersionLetter() {
|
protected String getVersionLetter() {
|
||||||
return "v";
|
return "v";
|
||||||
|
|||||||
Reference in New Issue
Block a user