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-15 15:30:26 +03:00
parent 5e2a9848da
commit f44ccf7893
11 changed files with 31 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,8 @@ public class Pass<T> {
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
if (UI.isActive())
MainModule_.instance.getUI().getFastAccessMenuBar().Refresh(((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32()));
}
}
public boolean isDone() {

3
src/Common/Visual/UI.java
View File

@@ -7,9 +7,8 @@ import javax.swing.event.ChangeListener;
import javax.swing.text.DefaultFormatter;
import java.awt.*;
public class UI {
public static boolean active = false;
public static boolean isActive() {
return active;
return (MainModule_.instance!=null)&&MainModule_.instance.hasUI();
}
//---
public static void Clear(Container container) {

8
src/_VisualDVM/Global.java
View File

@@ -13,7 +13,6 @@ import _VisualDVM.Repository.Component.*;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
import _VisualDVM.Repository.Component.Sapfor.MessagesServer;
import _VisualDVM.Repository.Component.Sapfor.Sapfor_F;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Repository.Server.ComponentsServer;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.DVM.LocalDVMTestingPlanner;
@@ -31,14 +30,9 @@ public class Global {
public static Mode mode = Mode.Undefined;
//--------------------------------------------------
public static GlobalProperties properties = new GlobalProperties();
//</editor-fold>
//------------------------------------------------------
public static boolean enable_text_changed = false;
//---
public static boolean files_multiselection = false;
public static boolean versions_multiselection = false;
//---
public static TransformationPermission transformationPermission = TransformationPermission.None;
//??
public static DataSet<ComponentType, Component> Components = null;
public static MessagesServer messagesServer = null;
@@ -221,7 +215,6 @@ public class Global {
//--
public static void NormalMode(int port) throws Exception {
//-------------------------------->>
UI.active = true;
mainModule = new MainModule();
mainModule.Init();
//--
@@ -309,7 +302,6 @@ public class Global {
CreateLogAtComponentsPath();
testingServer = new TestingServer();
testingServer.ActivateDB();
// testingServer.PATCH();
testingServer.Start();
System.exit(0);
}

4
src/_VisualDVM/Passes/All/CombineFiles.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.Transformation;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.CombineFilesDialog;
@@ -24,7 +24,7 @@ public class CombineFiles extends Transformation {
}
@Override
protected boolean canStart(Object... args) throws Exception {
switch (Global.transformationPermission) {
switch (Sapfor.transformationPermission) {
case All:
return super.canStart(args) && target.CheckSameStyle(Log) &&
(fd = new CombineFilesDialog()).ShowDialog("Выберите имя итогового файла", target.files_order);

4
src/_VisualDVM/Passes/All/PrepareForModulesAssembly.java
View File

@@ -1,10 +1,10 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.Transformation;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileType;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import org.apache.commons.io.FileUtils;
@@ -19,7 +19,7 @@ public class PrepareForModulesAssembly extends Transformation {
}
@Override
protected boolean canStart(Object... args) throws Exception {
switch (Global.transformationPermission) {
switch (Sapfor.transformationPermission) {
case All:
return super.canStart(args) && target.CheckSameStyle(Log);
case VariantsOnly:

4
src/_VisualDVM/Passes/All/SPF_CreateParallelVariant.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariant;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
public class SPF_CreateParallelVariant extends SapforTransformation {
ParallelVariant variant = null;
@@ -63,7 +63,7 @@ public class SPF_CreateParallelVariant extends SapforTransformation {
}
@Override
protected void performDone() throws Exception {
Global.transformationPermission = TransformationPermission.VariantsOnly;
Sapfor.transformationPermission = TransformationPermission.VariantsOnly;
target.migrateFilesSettings(target.last_version, true, true);
if (UI.isActive())
variant.UpdateStats(sapfor.getPredictorStats(), target.last_version.name);

8
src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -7,6 +7,8 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.FileState;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import org.apache.commons.io.FileUtils;
@@ -119,7 +121,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
sapfor.GetIntrinsics();
//--------------------------
projLines.clear();
Global.transformationPermission = TransformationPermission.None;
Sapfor.transformationPermission = TransformationPermission.None;
target.CreateParserOptionsDirs();
//---------------------------
for (DBProjectFile f : target.db.files.Data.values()) {
@@ -159,8 +161,8 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
target.updateLog(sapfor.getOutput());
}
*/
Global.transformationPermission = TransformationPermission.All;
Global.enable_text_changed = true;
Sapfor.transformationPermission = TransformationPermission.All;
SPFEditor.enable_text_changed = true;
}
/*
@Override

3
src/_VisualDVM/Passes/Sapfor/SapforTransformation.java
View File

@@ -5,6 +5,7 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.Sapfor.Sapfor;
import _VisualDVM.Repository.Component.Sapfor.TransformationPermission;
import javax.swing.*;
@@ -81,7 +82,7 @@ public class SapforTransformation extends SapforPass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
switch (Global.transformationPermission) {
switch (Sapfor.transformationPermission) {
case All:
return super.canStart(args);
case VariantsOnly:

5
src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java
View File

@@ -30,6 +30,9 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
//--
public static final Highlighter.HighlightPainter GreenTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
public static final Highlighter.HighlightPainter RedTextPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
//</editor-fold>
//------------------------------------------------------
public static boolean enable_text_changed = false;
public DBProjectFile file = null; //файл связанный с редактором
//----
public RSyntaxTextAreaHighlighter highlighter = null;
@@ -63,7 +66,7 @@ public class SPFEditor extends BaseEditor implements SPFEditorInterface {
public void changedUpdate(DocumentEvent arg0) {
if (!switching_language) {
file.NeedsSave = true;
if (Global.enable_text_changed && file.state != FileState.Excluded) {
if (enable_text_changed && file.state != FileState.Excluded) {
Global.mainModule.getSapfor().ResetAllAnalyses();
//текст изменился, значит M ка более не актуальна.
file.father.dropLastModification();

7
src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java
View File

@@ -10,6 +10,7 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
import _VisualDVM.Repository.Component.OSDComponent;
import _VisualDVM.Repository.Component.Visualizer_2;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -27,6 +28,8 @@ public abstract class Sapfor extends OSDComponent {
public static final int canceled_code = -99;
public static final int invalid_proj_code = -2;
public static File temp_copy = null;
//---
public static TransformationPermission transformationPermission = TransformationPermission.None;
public Vector<String> Intrinsics = new Vector<>();
public LinkedHashMap<String, String> ModifiedFiles = new LinkedHashMap<>();
public LinkedHashMap<String, String> OldFiles = new LinkedHashMap<>();
@@ -558,8 +561,8 @@ public abstract class Sapfor extends OSDComponent {
Global.mainModule.getPass(PassCode.Precompilation).Reset();
Global.mainModule.getPass(PassCode.SPF_GetGCovInfo).Reset();
}
Global.enable_text_changed = false;
Global.transformationPermission = TransformationPermission.None;
SPFEditor.enable_text_changed = false;
transformationPermission = TransformationPermission.None;
if ((UI.isActive()) && (Global.mainModule.getUI().hasMainWindow()) && (Global.mainModule.getUI().getVersionsWindow() != null))
Global.mainModule.getUI().getVersionsWindow().BlockVariants();
}