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
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Common/Database/Database.java
View File

@@ -34,7 +34,7 @@ public abstract class Database {
// UI.Print(DebugPrintLevel.Database, "соединение с базой данных " + file.getAbsolutePath());
connect();
}
public void Activate() throws Exception{
public void Activate() throws Exception {
Connect();
CreateAllTables();
prepareTablesStatements();
@@ -310,7 +310,7 @@ public abstract class Database {
}
public abstract PassCode_ getSynchronizePassCode(); //если бд есть на сервере.
//--
public void ReplaceFileAndReconnect(File file_in) throws Exception{
public void ReplaceFileAndReconnect(File file_in) throws Exception {
Disconnect();
Utils_.forceDeleteWithCheck(getFile());
FileUtils.moveFile(file_in, getFile());
@@ -318,10 +318,10 @@ public abstract class Database {
prepareTablesStatements();
Synchronize();
}
public void DropUI(){
public void DropUI() {
SaveLastSelections();
}
public void ResetUI(){
public void ResetUI() {
RestoreLastSelections();
}
}

1
src/Common/Database/SQLITE/SQLiteDatabase.java
View File

@@ -255,5 +255,4 @@ public abstract class SQLiteDatabase extends Database {
}
//--
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
}

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

@@ -22,10 +22,6 @@ public class Pass<T> {
//--------------
public boolean ui_visible = true;
public Vector<PassControl> controls = new Vector<>();
public void addControl(PassControl control_in){
control_in.setVisible(ui_visible);
controls.add(control_in);
}
public TextLog Log; //внутренний журнал прохода.
protected boolean interrupt;
protected SwingWorker dispatcher = null;
@@ -34,6 +30,10 @@ public class Pass<T> {
private JButton button = null;
private JButton tabButton = null;
private Exception last_error; //последнее пойманное исключение выполнения.
public void addControl(PassControl control_in) {
control_in.setVisible(ui_visible);
controls.add(control_in);
}
//->>
public Throwable getCauseRec(Throwable ex) {
Throwable cause = ex.getCause();
@@ -79,7 +79,7 @@ public class Pass<T> {
control.setEnabled(flag);
}
public void setControlsVisible(boolean flag) {
ui_visible =flag;
ui_visible = flag;
for (PassControl control : controls)
control.setVisible(ui_visible);
}

16
src/Common/Properties.java
View File

@@ -11,6 +11,11 @@ import java.util.LinkedHashMap;
public class Properties {
protected LinkedHashMap<String, JMenuItem> controls = new LinkedHashMap<>();
private File file = null; //файл где хранятся настройки.
public Properties() {
}
public Properties(File file_in) {
setFile(file_in);
}
public File getFile() {
return file;
}
@@ -24,11 +29,6 @@ public class Properties {
e.printStackTrace();
}
}
public Properties() {
}
public Properties(File file_in) {
setFile(file_in);
}
public boolean updateField(String name, Object newValue) {
try {
Field field = getClass().getField(name);
@@ -50,7 +50,7 @@ public class Properties {
return "?";
}
public boolean controlAction(String fieldName, JMenuItem control
){
) {
return false;
}
public JMenuItem getMenuItem(String fieldName) {
@@ -86,8 +86,8 @@ public class Properties {
ex.printStackTrace();
}
}
public void setControlVisible(String settingName, boolean flag){
if (controls.containsKey(settingName)){
public void setControlVisible(String settingName, boolean flag) {
if (controls.containsKey(settingName)) {
controls.get(settingName).setVisible(flag);
}
}

2
src/Common/Utils/Loggable.java
View File

@@ -1,6 +1,6 @@
package Common.Utils;
import Common.Visual.UI;
import _VisualDVM.Visual.Windows.ReadOnlyMultilineTextForm;
import Common.Visual.Windows.ReadOnlyMultilineTextForm;
import java.io.File;
import java.io.FileWriter;

20
src/Common/Visual/DataSetControlForm.java
View File

@@ -2,7 +2,6 @@ package Common.Visual;
import Common.CommonConstants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.Grid.TableVisualData;
import Common.Database.Objects.riDBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
@@ -15,7 +14,6 @@ import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.*;
import Common.Visual.Tables.Grid.GridAnchestor;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import javax.swing.*;
import javax.swing.table.TableColumn;
@@ -42,8 +40,6 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
//--
Object savedCurrentKey = null;
Vector<Object> savedSelectedKeys = new Vector<>();
//--
public DataMenuBar getMenuBar() {return bar;}
public DataSetControlForm(DataSet<?, D> dataSource_in, JPanel mountPanel_in) {
super(DataTable.class, mountPanel_in);
dataSource = dataSource_in;
@@ -71,7 +67,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
//--
counter_ui = (count -> bar.countLabel.setText(String.valueOf(count)));
//--фильтры всегда в конец бара.
// bar.add(new JSeparator());
// bar.add(new JSeparator());
for (FilterFlag filter : getFilters(FilterFlag.class)) {
bar.add(filter.getControl());
}
@@ -84,6 +80,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
}
}
}
//--
public DataMenuBar getMenuBar() {
return bar;
}
protected boolean isPKVisible() {
return true;
}
@@ -575,12 +575,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
public PassCode_ getDeletePassCode() {
return null;
}
public Object getCurrentPK(Object nanValue){
return current==null? nanValue: current.getPK();
public Object getCurrentPK(Object nanValue) {
return current == null ? nanValue : current.getPK();
}
//todo временное решение ? ->>>
public boolean canModifyCurrent(TextLog Log){
return CheckCurrent(Log) && (
!(current instanceof riDBObject) || Global.mainModule.getAccount().CheckAuthorship(((riDBObject)current).sender_address,Log));
public boolean canModifyCurrent(TextLog Log) {
return CheckCurrent(Log);
}
}

14
src/_VisualDVM/Visual/Editor/BaseEditor.java → src/Common/Visual/Editor/BaseEditor.java
View File

@@ -1,12 +1,10 @@
package _VisualDVM.Visual.Editor;
import Common.MainModule_;
package Common.Visual.Editor;
import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.TextEditorMenu;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Visual.Syntax.SPFEditorTheme;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import javax.swing.event.HyperlinkEvent;
@@ -16,7 +14,7 @@ import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.net.URI;
public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogFields {
private final StyledPopupMenu menu;
protected final StyledPopupMenu menu;
// protected int changesCount = 0;
// protected int insertsCount = 0;
// protected int removesCount = 0;
@@ -128,14 +126,6 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
changeFont(getFont().getSize() - 1);
}
@Override
public void applyTheme() {
float font_size = (float) getFont().getSize();
((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size));
menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним.
}
@Override
public Component getContent() {
return this;
}

2
src/_VisualDVM/Visual/Editor/Viewer.java → src/Common/Visual/Editor/Viewer.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Editor;
package Common.Visual.Editor;
public class Viewer extends BaseEditor {
public Viewer() {
setLineWrap(true);

2
src/Common/Visual/Menus/DataMenuBar.java
View File

@@ -8,12 +8,12 @@ import java.awt.*;
import java.awt.event.ActionListener;
public class DataMenuBar extends VisualiserMenuBar {
public JLabel countLabel = null;
private DataSet dataSource = null;
//-
public ActionListener selectAllListener = null;
public ActionListener unselectAllListener = null;
JButton selectAllButton = null;
JButton unselectAllButton = null;
private DataSet dataSource = null;
//-
public DataMenuBar(String dataName, PassCode_... passes) {
add(new JLabel(dataName + " : "));

8
src/Common/Visual/Menus/TableMenu.java
View File

@@ -21,7 +21,7 @@ public class TableMenu extends StyledPopupMenu {
mcopy.addActionListener(e -> Utils_.CopyToClipboard(target.toString()));
add(mcopy);
//
add(value_scroll= new JScrollPane(value_view = new JTextArea()));
add(value_scroll = new JScrollPane(value_view = new JTextArea()));
value_view.setEditable(false);
//value_view.setLineWrap(true);
//value_view.setWrapStyleWord(true);
@@ -33,13 +33,13 @@ public class TableMenu extends StyledPopupMenu {
if ((row >= 0) && (column >= 0)) {
target = owner.getValueAt(row, column);
mcopy.setVisible(true);
Dimension d= new Dimension(Math.max(mcopy.getWidth(), 300),100);
Dimension d = new Dimension(Math.max(mcopy.getWidth(), 300), 100);
value_view.setVisible(true);
String res = target.toString();
if (target instanceof Vector){
if (target instanceof Vector) {
Vector<Object> v = (Vector<Object>) target;
Vector<String> res_ = new Vector<>();
for (Object o: v){
for (Object o : v) {
res_.add(o.toString());
}
res = String.join("\n", res_);

4
src/Common/Visual/Menus/VisualiserMenuBar.java
View File

@@ -21,8 +21,8 @@ public class VisualiserMenuBar extends JToolBar {
}
}
}
public void addPasses(Pass...passes){
for (Pass pass: passes)
public void addPasses(Pass... passes) {
for (Pass pass : passes)
add(pass.createButton());
}
public JMenuBar addMenus(JMenu... menus) {

14
src/Common/Visual/Tables/HeaderTextFilter.java
View File

@@ -18,26 +18,26 @@ public class HeaderTextFilter<D extends DBObject> implements DBObjectFilter_<D>
int columnIndex = CommonConstants.Nan; //номер столбца к которому привязан фильтр.
JTextField textField = null;
JPopupMenu popup = null;
boolean contains = true;
private String filterValue = "";
private int offset = 0;
boolean contains = true;
//при одиночном клике, показать поверх заголовка столбца выпавшее меню с полем фильтра.
public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in, boolean contains_in) {
dataSet = dataSet_in;
columnIndex = columnIndex_in;
offset = offset_in;
contains=contains_in;
contains = contains_in;
}
public HeaderTextFilter(DataSet dataSet_in, int columnIndex_in, int offset_in) {
this(dataSet_in,columnIndex_in,offset_in, true);
this(dataSet_in, columnIndex_in, offset_in, true);
}
@Override
public boolean Validate(D object) {
Object field = dataSet.getUI().getColumnInfo(columnIndex).getFieldAt(object);
if (field instanceof String){
String s = field.toString().toLowerCase();
return contains?s.contains(filterValue):
(filterValue.isEmpty()||s.equals(filterValue)) || (filterValue.trim().isEmpty()&&s.isEmpty());
if (field instanceof String) {
String s = field.toString().toLowerCase();
return contains ? s.contains(filterValue) :
(filterValue.isEmpty() || s.equals(filterValue)) || (filterValue.trim().isEmpty() && s.isEmpty());
}
return false;
}

5
src/Common/Visual/Tables/RendererMilliseconds.java
View File

@@ -1,11 +1,8 @@
package Common.Visual.Tables;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*;
import java.util.Date;
public class RendererMilliseconds extends RendererCell<Long>{
public class RendererMilliseconds extends RendererCell<Long> {
@Override
public Long Init(JTable table, Object value, int row, int column) {
return (Long) value;

4
src/Common/Visual/Themes/ThemeElement.java
View File

@@ -4,5 +4,7 @@ public interface ThemeElement {
}
default void FontDown() {
}
void applyTheme();
default void applyTheme() {
}
;
}

2
src/Common/Visual/Trees/TreeForm.java
View File

@@ -13,6 +13,6 @@ public class TreeForm<C extends StyledTree> extends ControlForm<C> {
}
@Override
protected void redrawControl() {
((DefaultTreeModel)getTree().getModel()).reload();
((DefaultTreeModel) getTree().getModel()).reload();
}
}

2
src/Common/Visual/Windows/Dialog/Dialog.java
View File

@@ -108,7 +108,7 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
}
getContentPane().add(buttonsPane, BorderLayout.SOUTH);
}
public void BlockButtons(){
public void BlockButtons() {
btnOK.setVisible(false);
btnCancel.setVisible(false);
}

4
src/_VisualDVM/Visual/Windows/MultilineTextForm.java → src/Common/Visual/Windows/MultilineTextForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.Visual.Windows;
package Common.Visual.Windows;
import Common.Visual.Editor.BaseEditor;
import Common.Visual.Windows.Dialog.Text.TextDialog;
import _VisualDVM.Visual.Editor.BaseEditor;
public class MultilineTextForm extends TextDialog<BaseEditor> {
public MultilineTextForm() {
super(BaseEditor.class);

2
src/_VisualDVM/Visual/Windows/ReadOnlyMultilineTextForm.java → src/Common/Visual/Windows/ReadOnlyMultilineTextForm.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Windows;
package Common.Visual.Windows;
public class ReadOnlyMultilineTextForm extends MultilineTextForm {
public ReadOnlyMultilineTextForm() {
}

2
src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
View File

@@ -155,12 +155,10 @@ public class BugReport extends rDBObject {
return project_version.isEmpty();
}
//--->
public void CheckRecipients() {
for (Recipient recipient : Global.componentsServer.db.recipients.Data.values())
recipient.Select(packedRecipientsJson.contains(recipient.email));
}
public void saveRecipientsAsJson(Vector<Recipient> recipients) {
packedRecipientsJson = Utils_.gson.toJson(new RecipientsJson(recipients));
}

4
src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java
View File

@@ -9,8 +9,8 @@ public class BugReportAdditionJson implements Serializable {
@Expose
public String fieldName = "";
@Expose
public String textAddition ="";
public BugReportAdditionJson(BugReport bugReport, String fieldName_in, String addition_in){
public String textAddition = "";
public BugReportAdditionJson(BugReport bugReport, String fieldName_in, String addition_in) {
id = bugReport.id;
fieldName = fieldName_in;
textAddition = addition_in;

2
src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
View File

@@ -4,7 +4,7 @@ public class RecipientJson {
@Expose
public String address;
public RecipientJson(String addres_in) {
address= addres_in;
address = addres_in;
}
public RecipientJson() {
}

2
src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
View File

@@ -5,6 +5,6 @@ public class VisualiserSettingJson {
public String name;
@Expose
public String value;
public VisualiserSettingJson(){
public VisualiserSettingJson() {
}
}

1
src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
View File

@@ -3,7 +3,6 @@ import Common.Database.SQLITE.SQLiteDatabase;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.Passes.PassCode;
import java.nio.file.Paths;

2
src/_VisualDVM/ComponentsServer/Component/Json/ComponentPublicationInfoJson.java
View File

@@ -25,7 +25,7 @@ public class ComponentPublicationInfoJson implements Serializable {
public boolean needsEmail = false;
@Expose
public boolean needsSendFile = false;
public ComponentPublicationInfoJson(Component component) throws Exception{
public ComponentPublicationInfoJson(Component component) throws Exception {
componentType = component.getComponentType();
fileName = component.getFileName();
packedFile = Utils_.fileToBytes(component.getFile());

4
src/_VisualDVM/ComponentsServer/Component/Json/ComponentVersionsInfoJson.java
View File

@@ -10,7 +10,7 @@ public class ComponentVersionsInfoJson implements Serializable {
public String minimal_version = "";
@Expose
public String actual_version = "";
public ComponentVersionsInfoJson(ComponentType componentType_in){
componentType=componentType_in;
public ComponentVersionsInfoJson(ComponentType componentType_in) {
componentType = componentType_in;
}
}

212
src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
View File

@@ -301,6 +301,112 @@ public abstract class Sapfor extends OSDComponent {
}
return res;
}
//--
public static int getFileMaxDim_C(File file) {
int fileMax = 0;
final String prefix = "#pragma dvm array distribute";
int n = 0;
try {
for (String line : FileUtils.readLines(file, Charset.defaultCharset())) {
// #pragma dvm array distribute[block][block], не важно
String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
if (packedLine.startsWith(prefix)) {
packedLine = packedLine.substring(prefix.length());
boolean bracketOpen = false;
int pragmaMax = 0;
String distr = "";
for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
char c = packedLine.charAt(i);
if (bracketOpen) {
if (c == ']') {
bracketOpen = false;
if (distr.equals("block"))
pragmaMax++;
distr = "";
} else {
distr += c;
}
} else {
if (c == '[') {
bracketOpen = true;
} else {
break;
}
}
}
fileMax = Math.max(fileMax, pragmaMax);
}
++n;
}
} catch (Exception ex) {
ex.printStackTrace();
}
return fileMax;
}
public static int getProjectMinMaxDim_C(db_project_info project) {
int res = 0;
for (DBProjectFile file : project.db.files.Data.values()) {
if (file.isActiveProgram())
res = Math.max(res, Sapfor.getFileMaxDim_C(file.file));
}
return res;
}
public static Pair<Integer, Integer> getProjectFolderMinMaxDim_F(File sapfor_drv, File projectPath) {
String flags = "-noLogo";
Pair<Integer, Integer> res = new Pair<>(0, 0);
try {
if (Sapfor.parse(sapfor_drv, projectPath, flags)
) {
Vector<String> outputLines = new Vector<>();
if (Sapfor.analysis(sapfor_drv, projectPath, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
//---
for (String line : outputLines) {
String prefix = "GET_MIN_MAX_BLOCK_DIST: ";
if (line.startsWith(prefix)) {
String s = line.substring(prefix.length());
String[] data = s.split(" ");
res = new Pair<>(Math.max(Integer.parseInt(data[0]), 0), Math.max(Integer.parseInt(data[1]), 0));
break;
}
}
}
}
} catch (Exception ex) {
ex.printStackTrace();
} finally {
try {
Utils.deleteFilesByExtensions(projectPath,
"proj", "dep", "jar"
);
File visualiser_data = new File(projectPath, Constants.data);
if (visualiser_data.exists())
FileUtils.forceDelete(visualiser_data);
} catch (Exception ex) {
ex.printStackTrace();
}
}
return res;
}
public static void getTestMinMaxDim_F(File sapfor_drv, Test test) {
Pair<Integer, Integer> res = getProjectFolderMinMaxDim_F(sapfor_drv, test.getServerPath());
test.min_dim = res.getKey();
test.max_dim = res.getValue();
}
public static void getTestMinMaxDime_C(Test test) {
File workspace = test.getServerPath();
Vector<File> files = new Vector<>();
TestFilesJson filesJson = Utils_.gson.fromJson(test.packedFilesJson, TestFilesJson.class);
for (TestFileJson fileJson : filesJson.values) {
files.add(new File(workspace, fileJson.name));
}
int min_dim = 0;
int max_dim = 0;
for (File file : files) {
max_dim = Math.max(max_dim, getFileMaxDim_C(file));
}
test.min_dim = min_dim;
test.max_dim = max_dim;
}
public void refreshPid() {
try {
// UI.Info("Calling SPF_GetCurrentPID...");
@@ -542,110 +648,4 @@ public abstract class Sapfor extends OSDComponent {
Global.mainModule.getUI().getVersionsWindow().BlockVariants();
}
//--
public static int getFileMaxDim_C(File file) {
int fileMax = 0;
final String prefix = "#pragma dvm array distribute";
int n = 0;
try {
for (String line : FileUtils.readLines(file, Charset.defaultCharset())) {
// #pragma dvm array distribute[block][block], не важно
String packedLine = Utils_.removeCharacters(Utils_.removeRedundantSpaces(line).toLowerCase(), "\n", "\r", "\t");
if (packedLine.startsWith(prefix)) {
packedLine = packedLine.substring(prefix.length());
boolean bracketOpen = false;
int pragmaMax = 0;
String distr = "";
for (int i = packedLine.indexOf('['); i < packedLine.length(); ++i) {
char c = packedLine.charAt(i);
if (bracketOpen) {
if (c == ']') {
bracketOpen = false;
if (distr.equals("block"))
pragmaMax++;
distr = "";
} else {
distr += c;
}
} else {
if (c == '[') {
bracketOpen = true;
} else {
break;
}
}
}
fileMax = Math.max(fileMax, pragmaMax);
}
++n;
}
} catch (Exception ex) {
ex.printStackTrace();
}
return fileMax;
}
public static int getProjectMinMaxDim_C(db_project_info project) {
int res = 0;
for (DBProjectFile file : project.db.files.Data.values()) {
if (file.isActiveProgram())
res = Math.max(res, Sapfor.getFileMaxDim_C(file.file));
}
return res;
}
public static Pair<Integer, Integer> getProjectFolderMinMaxDim_F(File sapfor_drv, File projectPath) {
String flags = "-noLogo";
Pair<Integer, Integer> res = new Pair<>(0, 0);
try {
if (Sapfor.parse(sapfor_drv, projectPath, flags)
) {
Vector<String> outputLines = new Vector<>();
if (Sapfor.analysis(sapfor_drv, projectPath, PassCode.SPF_GetMaxMinBlockDistribution, flags, outputLines)) {
//---
for (String line : outputLines) {
String prefix = "GET_MIN_MAX_BLOCK_DIST: ";
if (line.startsWith(prefix)) {
String s = line.substring(prefix.length());
String[] data = s.split(" ");
res = new Pair<>(Math.max(Integer.parseInt(data[0]), 0), Math.max(Integer.parseInt(data[1]), 0));
break;
}
}
}
}
} catch (Exception ex) {
ex.printStackTrace();
} finally {
try {
Utils.deleteFilesByExtensions(projectPath,
"proj", "dep", "jar"
);
File visualiser_data = new File(projectPath, Constants.data);
if (visualiser_data.exists())
FileUtils.forceDelete(visualiser_data);
} catch (Exception ex) {
ex.printStackTrace();
}
}
return res;
}
public static void getTestMinMaxDim_F(File sapfor_drv, Test test) {
Pair<Integer, Integer> res = getProjectFolderMinMaxDim_F(sapfor_drv, test.getServerPath());
test.min_dim = res.getKey();
test.max_dim = res.getValue();
}
public static void getTestMinMaxDime_C(Test test) {
File workspace = test.getServerPath();
Vector<File> files = new Vector<>();
TestFilesJson filesJson = Utils_.gson.fromJson(test.packedFilesJson,TestFilesJson.class);
for (TestFileJson fileJson : filesJson.values) {
files.add(new File(workspace, fileJson.name));
}
int min_dim = 0;
int max_dim = 0;
for (File file: files){
max_dim = Math.max(max_dim,getFileMaxDim_C(file));
}
test.min_dim = min_dim;
test.max_dim = max_dim;
}
//--
}

2
src/_VisualDVM/ComponentsServer/Component/UI/PublishFields.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.ComponentsServer.Component.UI;
import Common.Visual.Editor.BaseEditor;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Visual.Editor.BaseEditor;
import javax.swing.*;
import java.awt.*;

2
src/_VisualDVM/ComponentsServer/Component/Visualiser.java
View File

@@ -85,7 +85,7 @@ public class Visualiser extends Component {
}
return res;
}
public File getDownloadsDirectory(){
public File getDownloadsDirectory() {
File res = new File(getWorkspace(), Constants.DownloadsDirectoryName);
Utils_.CheckDirectory(res);
return res;

4
src/_VisualDVM/ComponentsServer/Component/Visualizer_2.java
View File

@@ -73,8 +73,8 @@ public class Visualizer_2 extends OSDComponent {
}
@Override
public String getAssemblyCommand() {
File src_home= Paths.get(Global.RepoDirectory.getAbsolutePath(),"SAPFOR/src/Server").toFile();
return "cd " +Utils_.DQuotes(src_home)+
File src_home = Paths.get(Global.RepoDirectory.getAbsolutePath(), "SAPFOR/src/Server").toFile();
return "cd " + Utils_.DQuotes(src_home) +
"\n" +
"g++ -O3 -std=c++17 checkUniq.cpp server.cpp -o Visualizer_2 -lpthread -lstdc++fs\n";
}

22
src/_VisualDVM/ComponentsServer/ComponentsServer.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.ComponentsServer;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.riDBObject;
import Common.Database.RepositoryRefuseException;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
@@ -12,13 +11,7 @@ import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Passes.All.ArchivesBackupPass;
import _VisualDVM.Passes.All.Email;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Passes.All.ZipFolderPass;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Repository.EmailMessage;
@@ -26,17 +19,14 @@ import _VisualDVM.Repository.Server.RepositoryServer;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.RandomStringUtils;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Vector;
public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
@@ -54,7 +44,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
}
@Override
protected void extraBackup(File todayBackUp) {
zip.Do("Bugs",new File (todayBackUp, "Bugs.zip").getAbsolutePath());
zip.Do("Bugs", new File(todayBackUp, "Bugs.zip").getAbsolutePath());
}
@Override
protected void beforePublishAction(DBObject object) throws Exception {
@@ -71,7 +61,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
if (object instanceof BugReport) {
BugReport bugReport = (BugReport) object;
if (!bugReport.project_version.isEmpty()) Utils_.forceDeleteWithCheck(bugReport.getArchiveFile());
}else if (object instanceof UserAccount){
} else if (object instanceof UserAccount) {
UserAccount account = (UserAccount) object;
Utils_.forceDeleteWithCheck(account.getServerKeyFile());
}
@@ -237,7 +227,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
bufferWriter_.close();
}
//-рассылка об изменениях.
if (info.needsEmail){
if (info.needsEmail) {
String version_mail_header = String.join(" ",
"Опубликована версия",
Utils_.DQuotes(info.versionNumber),
@@ -246,13 +236,13 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
//-
EmailMessage message =
new EmailMessage(version_mail_header,
info.changeRecord
info.changeRecord
);
if (info.needsSendFile)
message.addAttachement(componentFile);
//--
for (String address: credentials_db.userAccounts.getActiveMails()){
EmailMessagesQueue.add(new Pair<>(address,message));
for (String address : credentials_db.userAccounts.getActiveMails()) {
EmailMessagesQueue.add(new Pair<>(address, message));
}
}
}

7
src/_VisualDVM/ComponentsServer/CredentialsDatabase.java
View File

@@ -1,17 +1,11 @@
package _VisualDVM.ComponentsServer;
import Common.Database.Objects.DBObject;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Passes.PassCode_;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspaceDBTable;
import _VisualDVM.ComponentsServer.UserAccount.UserAccountsDBTable;
import _VisualDVM.Passes.PassCode;
import java.nio.file.Paths;
import java.util.LinkedHashMap;
public class CredentialsDatabase extends SQLiteDatabase {
public UserAccountsDBTable userAccounts;
public SubscriberWorkspaceDBTable workspaces;
@@ -38,5 +32,4 @@ public class CredentialsDatabase extends SQLiteDatabase {
userAccounts.ShowUI();
super.ResetUI();
}
}

2
src/_VisualDVM/ComponentsServer/Recipient/Json/UserAccountJson.java
View File

@@ -5,7 +5,7 @@ public class UserAccountJson {
public String email;
@Expose
public String name;
public UserAccountJson(String email_in, String name_in){
public UserAccountJson(String email_in, String name_in) {
email = email_in;
name = name_in;
}

12
src/_VisualDVM/ComponentsServer/Recipient/Recipient.java
View File

@@ -4,6 +4,12 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
public class Recipient extends DBObject {
public String email = "";
public String name = "";
public Recipient() {
}
public Recipient(UserAccountJson json) {
email = json.email;
name = json.name;
}
@Override
public Object getPK() {
return email;
@@ -15,10 +21,4 @@ public class Recipient extends DBObject {
email = src_.email;
name = src_.name;
}
public Recipient() {
}
public Recipient(UserAccountJson json) {
email = json.email;
name = json.name;
}
}

13
src/_VisualDVM/ComponentsServer/Recipient/RecipientsDataSet.java
View File

@@ -5,7 +5,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountJson;
import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
import _VisualDVM.ComponentsServer.Recipient.UI.RecipientsForm;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Constants;
import _VisualDVM.Global;
@@ -15,16 +14,16 @@ public class RecipientsDataSet extends DataSet<String, Recipient> {
public RecipientsDataSet() {
super(String.class, Recipient.class);
}
public void Unpack(String packed){
public void Unpack(String packed) {
clear();
UserAccountsJson jsons = Utils_.gson.fromJson(packed, UserAccountsJson.class);
for (UserAccountJson userAccountJson: jsons.values){
for (UserAccountJson userAccountJson : jsons.values) {
Global.componentsServer.db.recipients.put(userAccountJson.email, new Recipient(userAccountJson));
}
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new RecipientsForm(this,mountPanel);
return new RecipientsForm(this, mountPanel);
}
@Override
public String getPluralDescription() {
@@ -34,11 +33,11 @@ public class RecipientsDataSet extends DataSet<String, Recipient> {
public String getSingleDescription() {
return "адресат";
}
public Vector<String> getSelectedMails(){
public Vector<String> getSelectedMails() {
//баг текущий. значит адресаты уже активные и правильные. дополняем их админами и автором.
Vector<String> res = new Vector<>();
for (Recipient recipient:Data.values()){
if (recipient.isSelected()&& !res.contains(recipient.email))
for (Recipient recipient : Data.values()) {
if (recipient.isSelected() && !res.contains(recipient.email))
res.add(recipient.email);
}
//--

2
src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.java
View File

@@ -26,7 +26,7 @@ public class RecipientsForm extends DataSetControlForm<Recipient> {
}
@Override
protected DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor,PassCode.SaveBugReportRecipients);
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor, PassCode.SaveBugReportRecipients);
}
@Override
protected ColumnInfo<Recipient> createPKColumn() {

2
src/_VisualDVM/ComponentsServer/SubscriberWorkspace/UI/SubscriberWorkspacesForm.java
View File

@@ -1,13 +1,11 @@
package _VisualDVM.ComponentsServer.SubscriberWorkspace.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorkspace> {

2
src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountDialog.java
View File

@@ -2,9 +2,9 @@ package _VisualDVM.ComponentsServer.UserAccount.UI;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
public class UserAccountDialog extends DBObjectDialog<UserAccount, UserAccountFields> {
public UserAccountDialog() {
super(UserAccountFields.class);

2
src/_VisualDVM/ComponentsServer/UserAccount/UI/UserAccountFields.java
View File

@@ -6,11 +6,11 @@ import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import javax.swing.*;
import java.awt.*;
public class UserAccountFields implements DialogFields {
private JPanel content;
public JTextField tfName;
public JTextField tfAddress;
public JCheckBox cbMail;
public JComboBox cbRole;
private JPanel content;
private void createUIComponents() {
// TODO: place custom component creation code here
tfName = new StyledTextField();

27
src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java
View File

@@ -13,38 +13,37 @@ public class UserAccount extends iDBObject {
public String name = "";
public String email = "";
@Description("DEFAULT ''")
public String telegram_name="";
public String telegram_name = "";
@Description("DEFAULT 1")
public int subscribe_active = 1;
@Description("DEFAULT 'Undefined'")
public AccountRole role = AccountRole.Undefined; //права доступа
public UserAccount(){
public UserAccount() {
}
public UserAccount(UserAccount account_in) {
this.SynchronizeFields(account_in);
}
public UserAccount(String name_in, String email_in) {
name = name_in;
email = email_in;
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
UserAccount src_ = (UserAccount) src;
name = src_.name;
email = src_.email;
telegram_name=src_.telegram_name;
subscribe_active=src_.subscribe_active;
telegram_name = src_.telegram_name;
subscribe_active = src_.subscribe_active;
role = src_.role;
}
public UserAccount(String name_in, String email_in){
name = name_in;
email=email_in;
public File getClientKeyFile() {
return new File(Global.KeysDirectory, "key");
}
public File getClientKeyFile(){
return new File(Global.KeysDirectory,"key");
public File getServerKeyFile() {
return new File(Global.KeysDirectory, String.valueOf(id));
}
public File getServerKeyFile(){
return new File(Global.KeysDirectory,String.valueOf(id));
}
public String getKey() throws Exception{
public String getKey() throws Exception {
return FileUtils.readFileToString(getServerKeyFile());
}
public void generateKey() throws Exception {

24
src/_VisualDVM/ComponentsServer/UserAccount/UserAccountsDBTable.java
View File

@@ -11,7 +11,6 @@ import _VisualDVM.ComponentsServer.Recipient.Json.UserAccountsJson;
import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountsForm;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import javax.swing.*;
import java.util.LinkedHashMap;
@@ -20,15 +19,15 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
public UserAccountsDBTable() {
super(UserAccount.class);
}
public UserAccount getByKey(String key_in) throws Exception{
for (UserAccount userAccount: Data.values()){
public UserAccount getByKey(String key_in) throws Exception {
for (UserAccount userAccount : Data.values()) {
if (userAccount.getKey().equals(key_in))
return userAccount;
}
return null;
}
public UserAccount getByEmail(String email_in){
for (UserAccount userAccount: Data.values()){
public UserAccount getByEmail(String email_in) {
for (UserAccount userAccount : Data.values()) {
if (userAccount.email.equals(email_in))
return userAccount;
}
@@ -53,22 +52,21 @@ public class UserAccountsDBTable extends iDBTable<UserAccount> {
res.put(SubscriberWorkspace.class, new FKBehaviour(FKDataBehaviour.DELETE, FKCurrentObjectBehaviuor.ACTIVE));
return res;
}
public String getPackedActiveRecipients(){
UserAccountsJson res = new UserAccountsJson();
public String getPackedActiveRecipients() {
UserAccountsJson res = new UserAccountsJson();
Vector<String> active = new Vector<>();
for (UserAccount userAccount: Data.values()){
if ((userAccount.subscribe_active!=0) && !active.contains(userAccount.email)){
for (UserAccount userAccount : Data.values()) {
if ((userAccount.subscribe_active != 0) && !active.contains(userAccount.email)) {
active.add(userAccount.email);
res.values.add(new UserAccountJson(userAccount.email, userAccount.name));
}
}
return Utils_.gson.toJson(res);
}
public Vector<String> getActiveMails(){
public Vector<String> getActiveMails() {
Vector<String> res = new Vector<>();
for (UserAccount account: Data.values()){
if ((account.subscribe_active!=0)&& !res.contains(account.email))
for (UserAccount account : Data.values()) {
if ((account.subscribe_active != 0) && !res.contains(account.email))
res.add(account.email);
}
for (String admin_mail : Constants.admins_mails) {

8
src/_VisualDVM/ComponentsServerProperties.java
View File

@@ -2,17 +2,17 @@ package _VisualDVM;
import com.google.gson.annotations.Expose;
import java.io.File;
public class ComponentsServerProperties extends VisualDVMProperties{
public class ComponentsServerProperties extends VisualDVMProperties {
//---
@Expose
public int ComponentsBackUpsCount = 10;
@Expose
public String default_dvm_drv="";
public String default_dvm_drv = "";
//---
public ComponentsServerProperties(){
public ComponentsServerProperties() {
Mode = _VisualDVM.Mode.Server;
}
public ComponentsServerProperties(File file_in){
public ComponentsServerProperties(File file_in) {
super(_VisualDVM.Mode.Server, file_in);
}
}

2
src/_VisualDVM/Constants.java
View File

@@ -31,7 +31,7 @@ public class Constants {
public static final String DVM_REPOSITORY = "http://svn.dvm-system.org/svn/dvmhrepo/dvm";
//GIT
public static final String SAPFOR_REPOSITORY = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR.git";
public static final String SAPFOR_VERSION_URL= "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h";
public static final String SAPFOR_VERSION_URL = "http://dvmh-server.ddns.net:3000/Alexander_KS/SAPFOR/raw/branch/master/src/Utils/version.h";
//-вывод задач
public final static String parse_out_file = "parse_out.txt";
public final static String parse_err_file = "parse_err.txt";

1
src/_VisualDVM/Global.java
View File

@@ -17,7 +17,6 @@ import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
public class Global {
//todo свести большинство к содержимому mainModule

4
src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLine.java
View File

@@ -1,12 +1,10 @@
package _VisualDVM.GlobalData.CompilerEnvironment;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class EnvironmentsLine extends iDBObject {
public EnvironmentsJson json;
public EnvironmentsLine(EnvironmentsJson json_in){
public EnvironmentsLine(EnvironmentsJson json_in) {
json = json_in;
}
@Override

13
src/_VisualDVM/GlobalData/CompilerEnvironment/EnvironmentsLinesSet.java
View File

@@ -4,7 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.EnvironmentsLinesForm;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import javax.swing.*;
public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
@@ -14,8 +13,8 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
}
public EnvironmentsLinesSet(EnvironmentsSetJson json) {
super(Integer.class, EnvironmentsLine.class);
for (EnvironmentsJson environmentsJson: json.values) {
EnvironmentsLine environmentsLine =new EnvironmentsLine(environmentsJson);
for (EnvironmentsJson environmentsJson : json.values) {
EnvironmentsLine environmentsLine = new EnvironmentsLine(environmentsJson);
environmentsLine.id = maxId++;
put(environmentsLine.id, environmentsLine);
}
@@ -30,11 +29,11 @@ public class EnvironmentsLinesSet extends DataSet<Integer, EnvironmentsLine> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new EnvironmentsLinesForm(this,mountPanel);
return new EnvironmentsLinesForm(this, mountPanel);
}
public EnvironmentsSetJson toJson(){
EnvironmentsSetJson res= new EnvironmentsSetJson();
for (EnvironmentsLine environmentsLine: Data.values()){
public EnvironmentsSetJson toJson() {
EnvironmentsSetJson res = new EnvironmentsSetJson();
for (EnvironmentsLine environmentsLine : Data.values()) {
res.values.add(environmentsLine.json);
}
return res;

5
src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import com.google.gson.annotations.Expose;
public class EnvironmentJson {
@Expose
public String name; //в том числе и с разделителем если есть. поиск по startswith
@Expose
public String value; //значение без кавычек
public EnvironmentJson(CompilerEnvironment src){
name= src.name;
public EnvironmentJson(CompilerEnvironment src) {
name = src.name;
value = src.value;
}
}

7
src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsJson.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
import com.google.gson.annotations.Expose;
import java.util.List;
@@ -8,10 +7,10 @@ import java.util.Vector;
public class EnvironmentsJson {
@Expose
public List<EnvironmentJson> values = new Vector<>();
public String toLine(){
public String toLine() {
Vector<String> res = new Vector<>();
for (EnvironmentJson environmentJson: values){
res.add(environmentJson.name+"="+Utils_.DQuotes(environmentJson.value));
for (EnvironmentJson environmentJson : values) {
res.add(environmentJson.name + "=" + Utils_.DQuotes(environmentJson.value));
}
return String.join(" ", res);
}

1
src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentsSetJson.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.GlobalData.CompilerEnvironment.Json;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import com.google.gson.annotations.Expose;
import java.util.List;

15
src/_VisualDVM/GlobalData/CompilerEnvironment/RawCompilerEnvironmentsSet.java
View File

@@ -4,9 +4,6 @@ import Common.Visual.DataSetControlForm;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsForm;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionJson;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import javax.swing.*;
public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironment> {
@@ -25,23 +22,23 @@ public class RawCompilerEnvironmentsSet extends DataSet<String, CompilerEnvironm
public String getSingleDescription() {
return "переменная окружения";
}
public CompilerEnvironment findByJson(EnvironmentJson json){
for (CompilerEnvironment compilerEnvironment: Data.values()){
public CompilerEnvironment findByJson(EnvironmentJson json) {
for (CompilerEnvironment compilerEnvironment : Data.values()) {
if (json.name.equals(compilerEnvironment.name))
return compilerEnvironment;
}
return null;
}
public void Reset() {
for (CompilerEnvironment environment: Data.values()){
for (CompilerEnvironment environment : Data.values()) {
environment.select(false);
environment.value="";
environment.value = "";
}
}
public void Synchronize(EnvironmentsJson json) {
for (EnvironmentJson environmentJson: json.values){
for (EnvironmentJson environmentJson : json.values) {
CompilerEnvironment compilerEnvironment = findByJson(environmentJson);
if (compilerEnvironment!=null){
if (compilerEnvironment != null) {
compilerEnvironment.select(true);
compilerEnvironment.value = environmentJson.value;
}

19
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/EnvironmentsLinesForm.java
View File

@@ -8,9 +8,6 @@ import _VisualDVM.Global;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -18,7 +15,6 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
public EnvironmentsLinesForm(DataSet<?, EnvironmentsLine> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@Override
protected boolean hasCheckBox() {
return false;
@@ -40,7 +36,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
protected DataMenuBar createMenuBar() {
DataMenuBar res = super.createMenuBar();
res.addPasses(
new Pass<EnvironmentsLine>(){
new Pass<EnvironmentsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/RedAdd.png";
@@ -56,9 +52,9 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
@Override
protected boolean canStart(Object... args) throws Exception {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){
target= new EnvironmentsLine((EnvironmentsJson) pass.target);
target.id = ((EnvironmentsLinesSet)dataSource).maxId++;
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
target = new EnvironmentsLine((EnvironmentsJson) pass.target);
target.id = ((EnvironmentsLinesSet) dataSource).maxId++;
return true;
}
return false;
@@ -72,7 +68,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
dataSource.ShowUI(target.getPK());
}
},
new Pass<EnvironmentsLine>(){
new Pass<EnvironmentsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Edit.png";
@@ -90,7 +86,7 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent();
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
return true;
}
}
@@ -98,14 +94,13 @@ public class EnvironmentsLinesForm extends DataSetControlForm<EnvironmentsLine>
}
@Override
protected void body() throws Exception {
}
@Override
protected void showFinish() throws Exception {
dataSource.ShowUI(target.getPK());
}
},
new Pass<EnvironmentsLine>(){
new Pass<EnvironmentsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";

1
src/_VisualDVM/GlobalData/CompilerOption/CompilerOption.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.CompilerOption;
import Common.Database.Objects.DBObject;
import Common.Utils.Utils_;
import com.sun.org.glassfish.gmbal.Description;
import java.util.Arrays;
import java.util.Vector;

4
src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java
View File

@@ -6,8 +6,8 @@ public class OptionJson {
public String name; //в том числе и с разделителем если есть. поиск по startswith
@Expose
public String value; //значение без кавычек
public OptionJson(CompilerOption src){
name= src.name+src.parameterSeparator;
public OptionJson(CompilerOption src) {
name = src.name + src.parameterSeparator;
value = src.parameterValue;
}
}

9
src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java
View File

@@ -7,12 +7,11 @@ import java.util.Vector;
public class OptionsJson {
@Expose
public List<OptionJson> values = new Vector<>();
public String toLine(){
public String toLine() {
Vector<String> res = new Vector<>();
for (OptionJson optionJson: values){
res.add(optionJson.name+
(optionJson.value.contains(" ")? Utils_.DQuotes(optionJson.value): optionJson.value));
for (OptionJson optionJson : values) {
res.add(optionJson.name +
(optionJson.value.contains(" ") ? Utils_.DQuotes(optionJson.value) : optionJson.value));
}
return String.join(" ", res);
}

2
src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java
View File

@@ -6,6 +6,6 @@ import java.util.Vector;
public class OptionsSetJson {
@Expose
public List<OptionsJson> values = new Vector<>();
public OptionsSetJson(){
public OptionsSetJson() {
}
}

2
src/_VisualDVM/GlobalData/CompilerOption/OptionsLine.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
public class OptionsLine extends iDBObject {
public OptionsJson json;
public OptionsLine(OptionsJson json_in){
public OptionsLine(OptionsJson json_in) {
json = json_in;
}
@Override

14
src/_VisualDVM/GlobalData/CompilerOption/OptionsLinesSet.java
View File

@@ -11,10 +11,10 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
public OptionsLinesSet() {
super(Integer.class, OptionsLine.class);
}
public OptionsLinesSet(OptionsSetJson json){
public OptionsLinesSet(OptionsSetJson json) {
super(Integer.class, OptionsLine.class);
for (OptionsJson optionsJson: json.values) {
OptionsLine optionsLine =new OptionsLine(optionsJson);
for (OptionsJson optionsJson : json.values) {
OptionsLine optionsLine = new OptionsLine(optionsJson);
optionsLine.id = maxId++;
put(optionsLine.id, optionsLine);
}
@@ -29,11 +29,11 @@ public class OptionsLinesSet extends DataSet<Integer, OptionsLine> {
}
@Override
protected DataSetControlForm createUI(JPanel mountPanel) {
return new OptionsLinesForm(this,mountPanel);
return new OptionsLinesForm(this, mountPanel);
}
public OptionsSetJson toJson(){
OptionsSetJson res= new OptionsSetJson();
for (OptionsLine optionsLine: Data.values()){
public OptionsSetJson toJson() {
OptionsSetJson res = new OptionsSetJson();
for (OptionsLine optionsLine : Data.values()) {
res.values.add(optionsLine.json);
}
return res;

18
src/_VisualDVM/GlobalData/CompilerOption/RawCompilerOptionsSet.java
View File

@@ -23,24 +23,24 @@ public class RawCompilerOptionsSet extends DataSet<String, CompilerOption> {
public String getSingleDescription() {
return "опция компиляции";
}
public CompilerOption findByJson(OptionJson json){
for (CompilerOption compilerOption: Data.values()){
if (json.name.equals(compilerOption.name+compilerOption.parameterSeparator))
public CompilerOption findByJson(OptionJson json) {
for (CompilerOption compilerOption : Data.values()) {
if (json.name.equals(compilerOption.name + compilerOption.parameterSeparator))
return compilerOption;
}
return null;
}
public void Reset(){
for (CompilerOption option: Data.values()){
public void Reset() {
for (CompilerOption option : Data.values()) {
option.select(false);
option.parameterValue="";
option.parameterValue = "";
}
}
public void Synchronize(OptionsJson json){
for (OptionJson option_json: json.values){
public void Synchronize(OptionsJson json) {
for (OptionJson option_json : json.values) {
// найти опцию по началу
CompilerOption compilerOption = findByJson(option_json);
if (compilerOption!=null){
if (compilerOption != null) {
compilerOption.select(true);
compilerOption.parameterValue = option_json.value;
}

17
src/_VisualDVM/GlobalData/CompilerOption/UI/OptionsLinesForm.java
View File

@@ -1,7 +1,5 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -37,7 +35,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
protected DataMenuBar createMenuBar() {
DataMenuBar res = super.createMenuBar();
res.addPasses(
new Pass<OptionsLine>(){
new Pass<OptionsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/RedAdd.png";
@@ -53,9 +51,9 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
@Override
protected boolean canStart(Object... args) throws Exception {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())){
target= new OptionsLine((OptionsJson) pass.target);
target.id = ((OptionsLinesSet)dataSource).maxId++;
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent())) {
target = new OptionsLine((OptionsJson) pass.target);
target.id = ((OptionsLinesSet) dataSource).maxId++;
return true;
}
return false;
@@ -69,7 +67,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
dataSource.ShowUI(target.getPK());
}
},
new Pass<OptionsLine>(){
new Pass<OptionsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Edit.png";
@@ -87,7 +85,7 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
if (dataSource.getUI().CheckCurrent(Log)) {
target = dataSource.getUI().getCurrent();
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)){
if (pass.Do(Global.mainModule.getDb().compilers.getUI().getCurrent(), target.json)) {
return true;
}
}
@@ -95,14 +93,13 @@ public class OptionsLinesForm extends DataSetControlForm<OptionsLine> {
}
@Override
protected void body() throws Exception {
}
@Override
protected void showFinish() throws Exception {
dataSource.ShowUI(target.getPK());
}
},
new Pass<OptionsLine>(){
new Pass<OptionsLine>() {
@Override
public String getIconPath() {
return "/Common/icons/Delete.png";

8
src/_VisualDVM/GlobalData/GlobalDatabase.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.GlobalData;
import Common.CommonConstants;
import Common.Database.VisualiserDatabase;
import Common.MainModule_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilersDBTable;
@@ -98,7 +97,6 @@ public class GlobalDatabase extends VisualiserDatabase {
//--
//проверить, есть ли профиль с таким же набором настроек.
public SapforProfile checkProfileForCurrentSettings() {
LinkedHashMap<String, String> current_values = Global.mainModule.getProject().sapforProperties.toMap();
for (SapforProfile profile : sapforProfiles.Data.values()) {
//--получить все настройки профиля
@@ -152,9 +150,9 @@ public class GlobalDatabase extends VisualiserDatabase {
Insert(profile);
insertProfileSettings(profile);
}
public SapforProfile getDefaultSapforProfile(){
for (SapforProfile sapforProfile: sapforProfiles.Data.values()){
if (sapforProfile.isAuto!=0)
public SapforProfile getDefaultSapforProfile() {
for (SapforProfile sapforProfile : sapforProfiles.Data.values()) {
if (sapforProfile.isAuto != 0)
return sapforProfile;
}
return null;

4
src/_VisualDVM/GlobalData/Machine/UI/MachineFields.java
View File

@@ -33,8 +33,8 @@ public class MachineFields implements DialogFields {
//-
cbMachineType = new JComboBox<>();
cbMachineType.addItem(MachineType.Server);
// cbMachineType.addItem(MachineType.MVS_cluster);
// cbMachineType.addItem(MachineType.Local);
// cbMachineType.addItem(MachineType.MVS_cluster);
// cbMachineType.addItem(MachineType.Local);
}
@Override
public Component getContent() {

2
src/_VisualDVM/GlobalData/Machine/UI/MachinesForm.java
View File

@@ -24,7 +24,7 @@ public class MachinesForm extends DataSetControlForm<Machine> {
return object.name;
}
},
new ColumnInfo<Machine>("URL") {
new ColumnInfo<Machine>("URL") {
@Override
public Object getFieldAt(Machine object) {
return object.getURL();

2
src/_VisualDVM/GlobalData/Makefile/UI/MakefilePreviewForm.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Makefile.UI;
import Common.Visual.Editor.Viewer;
import Common.Visual.Windows.Dialog.Text.TextDialog;
import _VisualDVM.Visual.Editor.Viewer;
public class MakefilePreviewForm extends TextDialog<Viewer> {
public MakefilePreviewForm() {
super(Viewer.class);

4
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorFields.java
View File

@@ -42,7 +42,7 @@ public class ModuleAnchestorFields implements DialogFields {
public void actionPerformed(ActionEvent e) {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI.TrySelect(cbFlags, ((OptionsJson)pass.target).toLine());
UI.TrySelect(cbFlags, ((OptionsJson) pass.target).toLine());
}
}
});
@@ -60,7 +60,7 @@ public class ModuleAnchestorFields implements DialogFields {
((Module) target).language;
cbCompilers.addActionListener(e -> {
if (cbCompilers.getSelectedItem() instanceof Compiler) {
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
Compiler compiler = ((Compiler) cbCompilers.getSelectedItem());
UI.TrySelect(cbCommands,
linker ? compiler.getSpecialLinkCommand(languageName) : compiler.getSpecialCompilationCommand(languageName));
}

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Linux/LinuxLocalTaskSupervisor.java
View File

@@ -45,8 +45,8 @@ public abstract class LinuxLocalTaskSupervisor<T extends Task> extends LocalTask
@Override
public void WaitForTask() throws Exception {
if (isTaskActive()) {
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress();

2
src/_VisualDVM/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java
View File

@@ -18,7 +18,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
String env = String.join(" ", MainModule_.instance.getDb().getTable(RunConfiguration.class).getUI().getCurrent().getEnvList());
if (!env.isEmpty()) res = env + " " + res;
//--
// task.PID =
// task.PID =
pass.user.connection.startShellProcess(getRemoteProject(), "PID", res);
task.state = TaskState.Running;
}

4
src/_VisualDVM/GlobalData/Tasks/Supervisor/TaskSupervisor.java
View File

@@ -113,8 +113,8 @@ public abstract class TaskSupervisor<T extends Task, P extends Pass> {
}
public void WaitForTask() throws Exception {
if (isTaskActive()) {
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
// if (task.PID.isEmpty())
// throw new PassException("Ошибка при старте : идентификатор задачи не определен.");
task.StartDate = (new Date()).getTime();
pass.ShowMessage1("Задача активна");//, идентификатор " + Utils_.Brackets(task.PID));
RefreshProgress();

2
src/_VisualDVM/GlobalData/User/UI/UsersForm.java
View File

@@ -48,7 +48,7 @@ public class UsersForm extends DataSetControlForm<User> {
protected void ShowNoCurrentObject() throws Exception {
super.ShowNoCurrentObject();
Global.mainModule.getUI().mainMenuBar.ShowNoUser();
// Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
// Global.mainModule.getUI().getCredentialsMenuBar().ShowNoUser();
}
@Override
public PassCode_ getDeletePassCode() {

2
src/_VisualDVM/Passes/All/AddBugReport.java
View File

@@ -6,8 +6,8 @@ import Common.Visual.UI;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportState;
import _VisualDVM.ComponentsServer.Component.ComponentType;
import _VisualDVM.Global;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.io.File;

2
src/_VisualDVM/Passes/All/AppendBugReportComment.java
View File

@@ -13,6 +13,6 @@ public class AppendBugReportComment extends AppendBugReportField {
}
@Override
protected boolean canUpdate() {
return target.canAppend(Global.mainModule.getAccount(),Log);
return target.canAppend(Global.mainModule.getAccount(), Log);
}
}

5
src/_VisualDVM/Passes/All/ArchivesBackupPass.java
View File

@@ -1,6 +1,4 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
@@ -8,7 +6,6 @@ import _VisualDVM.Passes.SSH.ConnectionPass;
import com.jcraft.jsch.ChannelSftp;
import java.io.File;
import java.nio.file.Paths;
import java.util.Comparator;
import java.util.Vector;
public class ArchivesBackupPass extends ConnectionPass<File> {
@@ -26,7 +23,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
}
@Override
protected void ServerAction() throws Exception {
RemoteFile workspace = new RemoteFile(user.connection.sftpChannel.getHome(), "_sapfor_x64_backups", true);
RemoteFile workspace = new RemoteFile(user.connection.sftpChannel.getHome(), "_sapfor_x64_backups", true);
user.connection.MKDIR(workspace);
RemoteFile dst = new RemoteFile(workspace.full_name, src.getName());
user.connection.putSingleFile(src, dst);

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

@@ -31,9 +31,9 @@ public class BuildComponent extends ProcessPass<Component> {
@Override
protected void body() throws Exception {
ShowMessage1("Сборка " + target.getComponentType().getDescription());
if (target.getComponentType().equals(ComponentType.Sapfor_F)){
if (target.getComponentType().equals(ComponentType.Sapfor_F)) {
File RepoSapfor = new File(Global.RepoDirectory, "SAPFOR");
File installationDirectory = new File(RepoSapfor,"install");
File installationDirectory = new File(RepoSapfor, "install");
Utils_.CheckAndCleanDirectory(installationDirectory);
}
PerformScript(target.getAssemblyCommand());

21
src/_VisualDVM/Passes/All/CheckAccount.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.Server.ServerCode;
@@ -11,6 +11,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
public class CheckAccount extends ComponentsServerPass {
File keyFile;
@Override
public String getIconPath() {
return "/icons/Registry.png";
@@ -19,12 +20,12 @@ public class CheckAccount extends ComponentsServerPass {
protected boolean isSafe() {
return false;
}
File keyFile;
void confirmEmail() throws Exception{
ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);;
void confirmEmail() throws Exception {
ConfirmEmail confirmEmailPass = (ConfirmEmail) Global.mainModule.getPass(PassCode.ConfirmEmail);
;
if (confirmEmailPass.Do(Global.mainModule.getAccount())) {
//подтвердили почту. теперь проверяем ее роль на сервере. если на сервере нет акка будет создан
if (SendRequest(ServerCode.GetUserAccountByEmail, "",Global.mainModule.getAccount())){
if (SendRequest(ServerCode.GetUserAccountByEmail, "", Global.mainModule.getAccount())) {
Global.mainModule.setAccount((UserAccount) request.server_response.object);
FileUtils.writeStringToFile(keyFile, request.server_response.arg);
}
@@ -39,19 +40,19 @@ public class CheckAccount extends ComponentsServerPass {
//1. Ищем ключ.
if (keyFile.exists()) {
//ключ есть. проверить его актуальность.
String key = FileUtils.readFileToString(keyFile);
if (SendRequest(ServerCode.GetUserAccountByKey,key)){
if (request.server_response.object!=null){
String key = FileUtils.readFileToString(keyFile);
if (SendRequest(ServerCode.GetUserAccountByKey, key)) {
if (request.server_response.object != null) {
//ключ актуальный.
Global.mainModule.setAccount((UserAccount) request.server_response.object);
}else {
} else {
//ключ неактуальный. регистрируемся по новой.
UI.Error("Текущий ключ неверен. Он будет удален.");
Utils_.forceDeleteWithCheck(keyFile);
confirmEmail();
}
}
}else {
} else {
confirmEmail();
}
return !Global.mainModule.getAccount().role.equals(AccountRole.Undefined);

5
src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java
View File

@@ -10,7 +10,7 @@ public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspa
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
if (Global.mainModule.getAccount().CheckRegistered(Log)){
if (Global.mainModule.getAccount().CheckRegistered(Log)) {
String email = Global.mainModule.getAccount().email;
String machineURL = MainModule_.instance.getDb().getTable(Machine.class).getUI().getCurrent().getURL();
String login = MainModule_.instance.getDb().getTable(User.class).getUI().getCurrent().login;
@@ -18,7 +18,8 @@ public class CheckRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspa
target = (SubscriberWorkspace) request.server_response.object;
return true;
}
};
}
;
return false;
}
}

2
src/_VisualDVM/Passes/All/ComponentsServerBackUp.java
View File

@@ -9,6 +9,6 @@ public class ComponentsServerBackUp extends ComponentsServerPass {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.mainModule.getAccount().isAdmin()&&SendRequest(ServerCode.CreateBackUp,"", true);
return Global.mainModule.getAccount().isAdmin() && SendRequest(ServerCode.CreateBackUp, "", true);
}
}

3
src/_VisualDVM/Passes/All/ConfirmEmail.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.ComponentsServer.UserAccount.UI.UserAccountDialog;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
@@ -32,7 +31,7 @@ public class ConfirmEmail extends ComponentsServerPass<UserAccount> {
return false;
}
password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
return SendRequest(ServerCode.Email,
return SendRequest(ServerCode.Email,
target.email,
new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(target.name), password));
}

2
src/_VisualDVM/Passes/All/ConvertCorrectnessTests.java
View File

@@ -18,7 +18,7 @@ public class ConvertCorrectnessTests extends TestingServerPass<File> {
Log.Writeln_("Вы не являетесь администратором");
return false;
}
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.")&&
return UI.Warning("Загрузить полный пакет DVM тестов на корректность и производительность.") &&
SendRequest(ServerCode.RefreshDVMTests, "", null);
}
@Override

2
src/_VisualDVM/Passes/All/CreateTestFromDirectory.java
View File

@@ -168,7 +168,7 @@ public class CreateTestFromDirectory extends Pass<Test> {
filesNames.add(projectFile.file.getName());
filesJson.values.add(new TestFileJson(projectFile));
}
target.packedFilesJson=Utils_.gson.toJson(filesJson);
target.packedFilesJson = Utils_.gson.toJson(filesJson);
return true;
}
public boolean isNotExcluded(ProjectFile projectFile) {

3
src/_VisualDVM/Passes/All/CreateTestFromProject.java
View File

@@ -24,8 +24,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory {
return true;
}
}
}
else {
} else {
project = (db_project_info) args[0];
group = (Group) args[1];
//если проект не текущий, освежить его бд.

2
src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java
View File

@@ -47,7 +47,7 @@ public class CreateTestsGroupFromSelectedVersions extends PublishTests {
}
//---
return UI.Question("В группу " + Utils_.Brackets(group.description) +
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить")&&
"\nбудет добавлено " + target.size() + " тестов.\nПродолжить") &&
SendRequest(ServerCode.PublishObjects, null, target);
}
}

2
src/_VisualDVM/Passes/All/DVMConvertProject.java
View File

@@ -72,7 +72,7 @@ public class DVMConvertProject extends ComponentsServerPass<db_project_info> {
unit_args.add(target.languageName.toString());
unit_args.add(target.sapforProperties.DVMConvertationOptions);
unit_args.addAll(programsNames);
return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args),Utils_.fileToBytes(archive));
return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args), Utils_.fileToBytes(archive));
//--
}
return false;

2
src/_VisualDVM/Passes/All/DeleteBugReport.java
View File

@@ -10,7 +10,7 @@ public class DeleteBugReport extends DeleteObjectPass<BugReport> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
return super.canStart(args) && target.canModify(Global.mainModule.getAccount(),Log);
return super.canStart(args) && target.canModify(Global.mainModule.getAccount(), Log);
}
@Override
protected void performDone() throws Exception {

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

@@ -8,7 +8,7 @@ public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
@Override
protected boolean canStart(Object... args) {
target = (BugReport) args[0];
return !target.state.equals(BugReportState.draft)&&
SendRequest(ServerCode.DeleteObjectByPK, "",new Pair<>(BugReport.class, target.getPK()));
return !target.state.equals(BugReportState.draft) &&
SendRequest(ServerCode.DeleteObjectByPK, "", new Pair<>(BugReport.class, target.getPK()));
}
}

1
src/_VisualDVM/Passes/All/DeleteUserAccount.java
View File

@@ -6,7 +6,6 @@ import _VisualDVM.Global;
import _VisualDVM.Passes.Server.DeleteServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import javafx.util.Pair;
public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, UserAccount> {
public DeleteUserAccount() {

2
src/_VisualDVM/Passes/All/DownloadBugReport.java
View File

@@ -8,7 +8,7 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
@Override
protected boolean canStart(Object... args) {
target = (BugReport) args[0];
return !target.getArchiveFile().exists()&&SendRequest(ServerCode.ReceiveBugReport, target.id);
return !target.getArchiveFile().exists() && SendRequest(ServerCode.ReceiveBugReport, target.id);
}
@Override
protected void performPreparation() throws Exception {

1
src/_VisualDVM/Passes/All/DownloadDvmRepository.java
View File

@@ -13,7 +13,6 @@ public class DownloadDvmRepository extends ProcessPass {
git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm /home/testuser/Repo/DVM/
git clone https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm-auto-test /home/testuser/Repo/DVM_AUTO_TEST/
*/
File dvmHome;
@Override
protected boolean canStart(Object... args) throws Exception {

2
src/_VisualDVM/Passes/All/DownloadSapforPackage.java
View File

@@ -23,7 +23,7 @@ public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
}
int id = target.id;
loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id);
return !loaded.exists() && SendRequest(ServerCode.DownloadSapforPackage, "", id);
}
@Override
protected void body() throws Exception {

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

@@ -12,8 +12,8 @@ public class DownloadTaskTest extends DownloadTest {
target = null;
if (Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
if (!Global.testingServer.db.tests.containsKey(task.test_id)){
Log.Writeln_("Теста с ключом "+task.test_id+" не существует!");
if (!Global.testingServer.db.tests.containsKey(task.test_id)) {
Log.Writeln_("Теста с ключом " + task.test_id + " не существует!");
return false;
}
target = Global.testingServer.db.tests.get(task.test_id);

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

@@ -17,7 +17,7 @@ public class DownloadTest extends TestingServerPass<Test> {
}
@Override
protected boolean canStart(Object... args) throws Exception {
testArchive= null;
testArchive = null;
if (Global.mainModule.getAccount().CheckRegistered(Log) &&
Global.testingServer.db.tests.getUI().CheckCurrent(Log)
) {
@@ -34,7 +34,7 @@ public class DownloadTest extends TestingServerPass<Test> {
}
@Override
protected void body() throws Exception {
testArchive= new File(Global.TempDirectory, Utils_.getDateName(String.valueOf(target.id)));
testArchive = new File(Global.TempDirectory, Utils_.getDateName(String.valueOf(target.id)));
request.server_response.Unpack(testArchive);
}
@Override

5
src/_VisualDVM/Passes/All/EditUserAccount.java
View File

@@ -1,15 +1,12 @@
package _VisualDVM.Passes.All;
import Common.Database.Database;
import Common.Passes.Pass;
import _VisualDVM.ComponentsServer.ComponentsServer;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
public class EditUserAccount extends EditServerObject<ComponentsServer,UserAccount> {
public class EditUserAccount extends EditServerObject<ComponentsServer, UserAccount> {
public EditUserAccount() {
super(Global.componentsServer, UserAccount.class);
}

11
src/_VisualDVM/Passes/All/Email.java
View File

@@ -17,17 +17,16 @@ public class Email extends ComponentsServerPass<EmailMessage> {
@Override
protected boolean canStart(Object... args) throws Exception {
recipients = null;
if (args.length<=1) {
if (args.length <= 1) {
return false;
}
target = (EmailMessage) args[0];
if (args[1]instanceof Vector) {
if (args[1] instanceof Vector) {
recipients = (Vector<String>) args[1];
return true;
}
else if (args[1] instanceof String){
recipients= new Vector<>();
for (int i=1; i< args.length; ++i){
} else if (args[1] instanceof String) {
recipients = new Vector<>();
for (int i = 1; i < args.length; ++i) {
recipients.add((String) args[i]);
}
return true;

2
src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java
View File

@@ -13,7 +13,7 @@ public class GetComponentsBackupsFromServer extends ComponentsServerPass<Vector<
@Override
protected boolean canStart(Object... args) throws Exception {
target = new Vector<>();
return Global.components.getUI().CheckCurrent(Log)&&
return Global.components.getUI().CheckCurrent(Log) &&
SendRequest(ServerCode.GetComponentsBackups,
Global.components.getUI().getCurrent().getComponentType().toString());
}

2
src/_VisualDVM/Passes/All/GetDVMPackageCredetials.java
View File

@@ -7,7 +7,7 @@ public class GetDVMPackageCredetials extends TestingServerPass<DVMPackageCredent
@Override
protected boolean canStart(Object... args) throws Exception {
target = null;
return SendRequest(ServerCode.GetDVMPackageCredentials, "", ((DVMPackage)args[0]).id);
return SendRequest(ServerCode.GetDVMPackageCredentials, "", ((DVMPackage) args[0]).id);
}
@Override
protected void performDone() throws Exception {

10
src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
View File

@@ -7,22 +7,22 @@ import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
Group group;
SapforPackage sapforPackage;
@Override
public String getIconPath() {
return "/Common/icons/Publish.png";
}
Group group;
SapforPackage sapforPackage;
@Override
protected boolean canStart(Object... args) throws Exception {
if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)) {
group = Global.testingServer.db.groups.getUI().getCurrent();
sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
if (!sapforPackage.state.equals(TasksPackageState.Done)&&!sapforPackage.state.equals(TasksPackageState.DoneWithErrors)){
if (!sapforPackage.state.equals(TasksPackageState.Done) && !sapforPackage.state.equals(TasksPackageState.DoneWithErrors)) {
Log.Writeln_("Пакет не завершен!");
return false;
}
return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id+"\n"+sapforPackage.id, null);
return SendRequest(ServerCode.JoinSapforVersionsToGroup, group.id + "\n" + sapforPackage.id, null);
}
return false;
}

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

@@ -24,8 +24,6 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
(target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
if (!target.project_version.isEmpty()) {
root = new File(Global.visualiser.getDownloadsDirectory(), target.id);
project = new File(root,
Utils_.isWindows() ? Utils_.toW(target.project_version) : Utils_.toU(target.project_version)
);
@@ -64,7 +62,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
}
@Override
protected void performDone() throws Exception {
if (Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project)&&target.visualiser_version<1134)
if (Global.mainModule.getPass(PassCode.OpenCurrentProject).Do(project) && target.visualiser_version < 1134)
Global.mainModule.getPass(PassCode.ApplyBugReportSettings).Do();
}
}

7
src/_VisualDVM/Passes/All/PickCompilerEnvironmentsForTesting.java
View File

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -9,11 +8,9 @@ import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.UI.CompilerEnvironmentsFields;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.util.Vector;
public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
Compiler compiler = null;
//-
@@ -32,7 +29,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false;
compiler.environments.Reset();
if (args.length>1){
if (args.length > 1) {
target = (EnvironmentsJson) args[1];
compiler.environments.Synchronize(target);
}
@@ -61,7 +58,7 @@ public class PickCompilerEnvironmentsForTesting extends Pass<EnvironmentsJson> {
protected void body() throws Exception {
target.values.clear();
for (CompilerEnvironment compilerEnv : compiler.environments.Data.values()) {
if (compilerEnv.isSelected()){
if (compilerEnv.isSelected()) {
target.values.add(new EnvironmentJson(compilerEnv));
}
}

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

@@ -29,8 +29,8 @@ public class PickCompilerOptions extends Pass<OptionsJson> {
if (!(compiler.helpLoaded || Global.mainModule.getPass(PassCode.ShowCompilerHelp).Do(compiler, false)))
return false;
compiler.options.Reset();
if (args.length>1){
target =(OptionsJson) args[1];
if (args.length > 1) {
target = (OptionsJson) args[1];
compiler.options.Synchronize(target);
}
Dialog<String, CompilerOptionsFields> dialog = new Dialog<String, CompilerOptionsFields>(CompilerOptionsFields.class) {

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

@@ -42,8 +42,8 @@ public class PublishBugReport extends Pass<BugReport> {
}
@Override
protected void body() throws Exception {
// target.targets = BugReport.getPackedTargets();
// target.saveRecipientsAsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems());
// target.targets = BugReport.getPackedTargets();
// target.saveRecipientsAsJson(Global.componentsServer.db.subscribers.getUI().getSelectedItems());
target.change_date = new Date().getTime();
Global.componentsServer.db.Update(target);
target.state = BugReportState.active;

11
src/_VisualDVM/Passes/All/PublishComponent.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.Component.Component;
import _VisualDVM.ComponentsServer.Component.ComponentType;
@@ -10,11 +9,9 @@ import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode;
import java.util.Date;
import java.util.Vector;
public class PublishComponent extends ComponentsServerPass<Component> {
String version_mail_header = "";
String version_text = "";
@@ -64,13 +61,13 @@ public class PublishComponent extends ComponentsServerPass<Component> {
Constants.separator, ""
);
//--
ComponentPublicationInfoJson info=new ComponentPublicationInfoJson(target);
ComponentPublicationInfoJson info = new ComponentPublicationInfoJson(target);
info.changeRecord = change_record;
info.needsUpdateMinimalVersion = f.fields.cbUpdateMinimalVersion.isSelected();
info.needsUpdateMinimalVersion = f.fields.cbUpdateMinimalVersion.isSelected();
info.needsEmail = f.fields.cbNeedsBroadcast.isSelected();
info.needsSendFile =f.fields.cbForceMail.isSelected();
info.needsSendFile = f.fields.cbForceMail.isSelected();
//--
return SendRequest(ServerCode.UpdateComponent, "",info);
return SendRequest(ServerCode.UpdateComponent, "", info);
}
}
return false;

2
src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
View File

@@ -112,7 +112,7 @@ public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
}
@Override
protected void performDone() throws Exception {
SendRequest(ServerCode.ReplaceDVMPackageResults,"",
SendRequest(ServerCode.ReplaceDVMPackageResults, "",
new Pair<>(
target,
Utils_.fileToBytes(target.getJsonFile())

2
src/_VisualDVM/Passes/All/ReplaceTestProject.java
View File

@@ -13,7 +13,7 @@ public class ReplaceTestProject extends CreateTestFromProject {
}
@Override
protected void performDone() throws Exception {
new TestingServerPass(){
new TestingServerPass() {
@Override
public String getDescription() {
return "";

Some files were not shown because too many files have changed in this diff Show More