M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Current_.java
View File

@@ -1,10 +1,6 @@
package Common;
import Common.Database.Objects.iDBObject;
import Common.Utils.TextLog;
import java.util.LinkedHashMap;
public interface Current_ {
default String getDescription(){
default String getDescription() {
return "?";
}
}

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

@@ -1,12 +1,12 @@
package Common.Database;
import Common.CommonConstants;
import Common.Utils.Utils_;
import Common.Database.Tables.DBTable;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Repository.RepositoryRefuseException;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.RepositoryRefuseException;
import java.io.File;
import java.util.LinkedHashMap;

15
src/Common/Database/Objects/DBObject.java
View File

@@ -1,7 +1,7 @@
package Common.Database.Objects;
import Common.Utils.Index;
import Common.Utils.Utils_;
import Common.Visual.Selectable;
import Common.Utils.Index;
import com.sun.org.glassfish.gmbal.Description;
import java.io.Serializable;
@@ -10,6 +10,12 @@ public abstract class DBObject implements Selectable, Serializable {
//<editor-fold desc="Selectable">
@Description("IGNORE")
private boolean selected = false;
//------
public DBObject() {
}
public DBObject(DBObject src) {
this.SynchronizeFields(src);
}
@Override
public boolean isSelected() {
return selected;
@@ -50,13 +56,8 @@ public abstract class DBObject implements Selectable, Serializable {
return getBDialogName();
}
//---
public void SynchronizeFields(DBObject src){
public void SynchronizeFields(DBObject src) {
selected = src.selected;
}
//------
public DBObject(){}
public DBObject(DBObject src){
this.SynchronizeFields(src);
}
//---------
}

1
src/Common/Database/Objects/PassStats/PassStatsDBTable.java
View File

@@ -20,5 +20,4 @@ public class PassStatsDBTable extends DBTable<String, PassStats> {
getDb().Insert(passStats);
}
}
}

11
src/Common/Database/Objects/iDBObject.java
View File

@@ -7,6 +7,11 @@ public class iDBObject extends DBObject {
@Expose
@Description("PRIMARY KEY,AUTOINCREMENT")
public int id;
public iDBObject() {
}
public iDBObject(iDBObject src) {
this.SynchronizeFields(src);
}
@Override
public Object getPK() {
return id;
@@ -19,10 +24,6 @@ public class iDBObject extends DBObject {
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
id = ((iDBObject)src).id;
}
public iDBObject(){}
public iDBObject(iDBObject src){
this.SynchronizeFields(src);
id = ((iDBObject) src).id;
}
}

11
src/Common/Database/Objects/nDBObject.java
View File

@@ -4,6 +4,11 @@ import com.sun.org.glassfish.gmbal.Description;
public abstract class nDBObject extends DBObject {
@Description("PRIMARY KEY, UNIQUE")
public String id = "";
public nDBObject(nDBObject src) {
this.SynchronizeFields(src);
}
public nDBObject() {
}
@Override
public Object getPK() {
return id;
@@ -19,10 +24,6 @@ public abstract class nDBObject extends DBObject {
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
id = ((nDBObject)src).id;
id = ((nDBObject) src).id;
}
public nDBObject(nDBObject src){
this.SynchronizeFields(src);
}
public nDBObject(){}
}

10
src/Common/Database/Objects/rDBObject.java
View File

@@ -8,6 +8,11 @@ public class rDBObject extends nDBObject {
//-
public long date = 0;
public long change_date;
public rDBObject(rDBObject src) {
this.SynchronizeFields(src);
}
public rDBObject() {
}
public Date getDate() {
return new Date(date);
}
@@ -24,9 +29,4 @@ public class rDBObject extends nDBObject {
date = r.date;
change_date = r.change_date;
}
public rDBObject(rDBObject src) {
this.SynchronizeFields(src);
}
public rDBObject() {
}
}

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

@@ -1,11 +1,11 @@
package Common.Database.SQLITE;
import Common.Database.Database;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DBTableColumn;
import Common.Database.Database;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Passes.PassException;
import javafx.util.Pair;
import java.io.File;
@@ -15,12 +15,12 @@ import java.util.Vector;
import static Common.Utils.Utils_.requireNonNullElse;
public abstract class SQLiteDatabase extends Database {
protected Connection conn = null;
protected Statement statement = null;
protected ResultSet resSet = null;
public LinkedHashMap<Class<? extends DBObject>, PreparedStatement> insertStatements = new LinkedHashMap<>();
public LinkedHashMap<Class<? extends DBObject>, PreparedStatement> updateStatements = new LinkedHashMap<>();
public LinkedHashMap<Class<? extends DBObject>, PreparedStatement> deleteStatements = new LinkedHashMap<>();
protected Connection conn = null;
protected Statement statement = null;
protected ResultSet resSet = null;
//->>
public SQLiteDatabase(File file_in) {
super(file_in);
@@ -255,5 +255,4 @@ public abstract class SQLiteDatabase extends Database {
}
//--
//https://stackoverflow.com/questions/8558099/sqlite-query-with-byte-where-clause
}

26
src/Common/Database/Tables/DataSet.java
View File

@@ -1,15 +1,15 @@
package Common.Database.Tables;
import Common.Current_;
import Common.Visual.DataSetFilter;
import Common.Database.Objects.DBObject;
import Common.Utils.TextLog;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import Common.Visual.FilterInterface;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnFilter;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Utils.TextLog;
import Common.Database.Objects.DBObject;
import Common.Visual.UI_;
import Common.Visual.FilterInterface;
import _VisualDVM.Global;
import javax.swing.*;
@@ -28,29 +28,29 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
public LinkedHashMap<K, D> Data = new LinkedHashMap<>(); //наполнение
//-
public DataSetControlForm ui_;
protected FilterInterface f_ui; // отображение количества объектов
//-
public LinkedHashMap<Integer, ColumnFilter> columnsFilters = new LinkedHashMap<>(); //текстовые фильтры столбцов
protected FilterInterface f_ui; // отображение количества объектов
//--
protected Vector<DataSetFilter<D>> filters = new Vector<>();
protected void createFilters() {
}
//--
public DataSet(Class<K> k_in, Class<D> d_in) {
k = k_in;
d = d_in;
Name = d.getSimpleName();
}
protected void createFilters() {
}
public void mountUI(JPanel content_in) {
UI_.Clear(content_in);
//-->
ui_ = createUI();
ui_.setContent(content_in);
//-->
if ( UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = UI_.menuBars.get(getClass());
if (UI_.menuBars.containsKey(getClass())) {
DataMenuBar bar = UI_.menuBars.get(getClass());
content_in.add(bar, BorderLayout.NORTH);
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
setFilterUI(count -> UI_.menuBars.get(getClass()).countLabel.setText(String.valueOf(count)));
if (ui_.hasCheckBox())
bar.createSelectionButtons(this);
}
@@ -58,7 +58,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
//----
createFilters();
if (!filters.isEmpty()) {
DataMenuBar menuBar = UI_.menuBars.get(getClass());
DataMenuBar menuBar = UI_.menuBars.get(getClass());
for (DataSetFilter<D> filter : filters)
menuBar.addMenus(filter.menu);
}
@@ -264,7 +264,7 @@ public class DataSet<K, D extends DBObject> extends DataSetAnchestor {
if (getCheckedCount() > 0)
res = getCheckedItems();
else {
if (CurrentName()!=null) {
if (CurrentName() != null) {
if (getCurrent() != null) {
res.add(getCurrent());
}

2
src/Common/Database/VisualiserDatabase.java
View File

@@ -1,7 +1,7 @@
package Common.Database;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Database.Objects.DBForm.FormsDBTable;
import Common.Database.Objects.PassStats.PassStatsDBTable;
import Common.Database.SQLITE.SQLiteDatabase;
import _VisualDVM.GlobalData.Grid.TablesVisualDatasDBTable;
import _VisualDVM.GlobalData.Splitter.SplittersDBTable;
import _VisualDVM.Passes.PassCode;

11
src/Common/MainModule_.java
View File

@@ -6,7 +6,7 @@ import Common.Passes.Pass;
import Common.Passes.PassCode_;
import Common.Utils.TextLog;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Current;
import _VisualDVM.Visual.Menus.FastAccessMenuBar.FastAccessMenuBar;
import java.util.Comparator;
import java.util.LinkedHashMap;
@@ -15,6 +15,9 @@ import java.util.Vector;
public abstract class MainModule_<D extends VisualiserDatabase> {
public static MainModule_ object = null; //текущий экземпляр. всегда один.
//--
public FastAccessMenuBar fastAccessMenuBar = null;
public PassForm passForm = null;
//--
D db;
Class<D> db_class;
LinkedHashMap<Current_, Object> objects; //Current
@@ -86,12 +89,6 @@ public abstract class MainModule_<D extends VisualiserDatabase> {
for (PassCode_ code_in : codes_in)
getPass(code_in).setControlsVisible(flag);
}
public boolean HasPassForm() {
return get(Current.PassForm) != null;
}
public PassForm getPassForm() {
return (PassForm) get(Current.PassForm);
}
public Pass getPass(PassCode_ code) {
return passes.get(code);
}

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

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

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

@@ -1,17 +1,14 @@
package Common.Passes;
import Common.Utils.Utils_;
import Common.MainModule_;
import Common.Utils.Stopwatch;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.Controls.PassButton;
import Common.Visual.Controls.PassControl;
import Common.Visual.Controls.StablePassMenuItem;
import Common.Visual.UI_;
import Common.MainModule_;
import _VisualDVM.Passes.PassCode;
import Common.Visual.Windows.PassForm;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.Controls.PassButton;
import _VisualDVM.Visual.Controls.PassControl;
import _VisualDVM.Visual.Menus.StablePassMenuItem;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -28,8 +25,8 @@ public class Pass<T> {
public TextLog Log; //внутренний журнал прохода.
protected boolean interrupt;
protected SwingWorker dispatcher = null;
private PassForm form = null;
protected JMenuItem menuItem = null;
private PassForm form = null;
private JButton button = null;
private JButton tabButton = null;
private Exception last_error; //последнее пойманное исключение выполнения.
@@ -97,16 +94,18 @@ public class Pass<T> {
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
UI.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
MainModule_.object.fastAccessMenuBar.Refresh(); //todo все бары в мейн модуль. или уи.мейн модуль
}
}
public boolean isDone() {
return state.equals(PassState.Done);
}
public void setDone() {
state=PassState.Done;
state = PassState.Done;
}
public String getName() {
return getClass().getSimpleName();
}
public String getName(){return getClass().getSimpleName();}
public String getDescription() {
return MainModule_.object.getPassDescription(getName());
}
@@ -178,7 +177,7 @@ public class Pass<T> {
showFail();
}
//------
protected PassCode necessary() {
protected PassCode_ necessary() {
return null;
}
protected boolean resetsNecessary() {
@@ -267,10 +266,10 @@ public class Pass<T> {
animation_sem.acquire();
//---
form = null;
MainModule_.object.set(Current.PassForm, null);
MainModule_.object.passForm = null;
System.gc();
//--
MainModule_.object.set(Current.PassForm, form = new PassForm(this));
MainModule_.object.passForm = form = new PassForm(this);
dispatcher = new SwingWorker() {
@Override
protected Object doInBackground() {

2
src/Common/Passes/PassCode_.java
View File

@@ -1,6 +1,6 @@
package Common.Passes;
public interface PassCode_ {
default String getDescription(){
default String getDescription() {
return "?";
}
}

4
src/Common/Utils/InterruptThread.java
View File

@@ -4,9 +4,9 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.concurrent.Callable;
public class InterruptThread extends Thread{
public class InterruptThread extends Thread {
//------------
public InterruptThread(int sleep_ms, Callable action){
public InterruptThread(int sleep_ms, Callable action) {
super(() -> {
File interruptFile = new File(Constants.INTERRUPT);
try {

37
src/Common/Utils/Utils_.java
View File

@@ -22,28 +22,10 @@ import java.util.concurrent.Semaphore;
import java.util.regex.Matcher;
import java.util.stream.Collectors;
public class Utils_ {
static String HomePath = System.getProperty("user.dir");
public static void setHomePath(String path_in){
HomePath = path_in;
}
//Текущая оперционная система
public static boolean isWindows() {
return System.getProperty("os.name").startsWith("Windows");
}
public static String getHomePath(){
return HomePath;
}
public static File getHomeDirectory(){
return new File(getHomePath());
};
//ГЛОБАЛЬНЫЙ ЖУРНАЛ
public static Loggable MainLog;
public static Semaphore date_semaphore = new Semaphore(1);
public static long last_ticks = CommonConstants.Nan;
//--------------------------------------------------
public static Object requireNonNullElse(Object value, Object default_value) {
return (value != null) ? value : default_value;
}
//--
//JSON
//--
@@ -55,6 +37,25 @@ public class Utils_ {
// }
//--
public static Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().create();
static String HomePath = System.getProperty("user.dir");
;
//Текущая оперционная система
public static boolean isWindows() {
return System.getProperty("os.name").startsWith("Windows");
}
public static String getHomePath() {
return HomePath;
}
public static void setHomePath(String path_in) {
HomePath = path_in;
}
public static File getHomeDirectory() {
return new File(getHomePath());
}
//--------------------------------------------------
public static Object requireNonNullElse(Object value, Object default_value) {
return (value != null) ? value : default_value;
}
//------------------------------------------------------------------
//-
public static <T> T jsonFromFile(File file, Class<T> json_class) throws Exception {

4
src/Common/Utils/Vector_.java
View File

@@ -1,8 +1,8 @@
package Common.Utils;
import java.util.Vector;
public class Vector_<T> extends Vector<T> {
public Vector_(T... data){
for (T object: data)
public Vector_(T... data) {
for (T object : data)
this.add(object);
}
}

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

@@ -6,9 +6,9 @@ import java.awt.*;
//класс, представляющий собой прокручиваемую панель, на которой лежит нечто.
public class ControlForm<C extends Component> {
public C control = null;
public JScrollPane scroll = null;
protected Class<C> control_class;
protected JPanel content; //задник.
public JScrollPane scroll = null;
public ControlForm(Class<C> class_in) {
control_class = class_in;
setContent(new JPanel(new BorderLayout()));
@@ -18,7 +18,6 @@ public class ControlForm<C extends Component> {
return content;
}
public void setContent(JPanel content_in) {
content = content_in;
}
//-

2
src/Common/Visual/Controls/HyperlinksStyledList.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Controls;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
public class HyperlinksStyledList extends StyledList {
@Override
public void applyTheme() {

4
src/Common/Visual/Controls/MenuBarButton.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Controls;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;
@@ -29,7 +29,7 @@ public class MenuBarButton extends JButton {
public void setIcon(String icon_path) {
setIcon(Utils_.getIcon(icon_path));
}
public void setFont(VisualiserFonts font_in){
public void setFont(VisualiserFonts font_in) {
setFont(UI_.getTheme().Fonts.get(font_in));
}
}

14
src/_VisualDVM/Visual/Controls/PassButton.java → src/Common/Visual/Controls/PassButton.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Visual.Controls;
import Common.Visual.Controls.MenuBarButton;
package Common.Visual.Controls;
import Common.Passes.Pass;
import java.awt.*;
@@ -10,12 +9,11 @@ public class PassButton extends MenuBarButton implements PassControl {
if (pass.getIconPath() != null) {
if (tab) {
setIcon(pass.getTabIcon());
setPreferredSize(new Dimension(18,18));
setMaximumSize(new Dimension(18,18));
setMinimumSize(new Dimension(18,18));
}
else
setIcon(pass.getIconPath());
setPreferredSize(new Dimension(18, 18));
setMaximumSize(new Dimension(18, 18));
setMinimumSize(new Dimension(18, 18));
} else
setIcon(pass.getIconPath());
}
addActionListener(pass.getControlAction());
pass.controls.add(this);

2
src/_VisualDVM/Visual/Controls/PassControl.java → src/Common/Visual/Controls/PassControl.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Controls;
package Common.Visual.Controls;
public interface PassControl {
void setIcon(String icon_path);
void setEnabled(boolean flag);

13
src/_VisualDVM/Visual/Menus/PassMenuItem.java → src/Common/Visual/Controls/PassMenuItem.java
View File

@@ -1,13 +1,8 @@
package _VisualDVM.Visual.Menus;
package Common.Visual.Controls;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(Utils_.getIcon(icon_path));
}
public PassMenuItem(Pass pass) {
setText(pass.getDescription());
setToolTipText(pass.getDescription());
@@ -15,4 +10,8 @@ public class PassMenuItem extends VisualiserMenuItem implements PassControl {
addActionListener(pass.getControlAction());
pass.controls.add(this);
}
@Override
public void setIcon(String icon_path) {
setIcon(Utils_.getIcon(icon_path));
}
}

2
src/_VisualDVM/Visual/Controls/ShortLabel.java → src/Common/Visual/Controls/ShortLabel.java
View File

@@ -1,4 +1,4 @@
package _VisualDVM.Visual.Controls;
package Common.Visual.Controls;
import javax.swing.*;
public class ShortLabel extends JLabel {
int max = 0;

4
src/_VisualDVM/Visual/Menus/StableMenuItem.java → src/Common/Visual/Controls/StableMenuItem.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.Visual.Menus;
package Common.Visual.Controls;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Menus.VisualiserMenuItem;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;

13
src/_VisualDVM/Visual/Menus/StablePassMenuItem.java → src/Common/Visual/Controls/StablePassMenuItem.java
View File

@@ -1,12 +1,7 @@
package _VisualDVM.Visual.Menus;
import Common.Utils.Utils_;
package Common.Visual.Controls;
import Common.Passes.Pass;
import _VisualDVM.Visual.Controls.PassControl;
import Common.Utils.Utils_;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(Utils_.getIcon(icon_path));
}
public StablePassMenuItem(Pass pass) {
setText(pass.getDescription());
setToolTipText(pass.getDescription());
@@ -14,4 +9,8 @@ public class StablePassMenuItem extends StableMenuItem implements PassControl {
addActionListener(pass.getControlAction());
pass.controls.add(this);
}
@Override
public void setIcon(String icon_path) {
setIcon(Utils_.getIcon(icon_path));
}
}

4
src/Common/Visual/Controls/StyledList.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Controls;
import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
public class StyledList extends JList implements ThemeElement {

2
src/Common/Visual/Controls/StyledProgressBar.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Controls;
import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
public class StyledProgressBar extends JProgressBar implements ThemeElement {

38
src/Common/Visual/DBObjectFilter.java
View File

@@ -1,8 +1,8 @@
package Common.Visual;
import Common.Utils.Utils_;
import _VisualDVM.Visual.Menus.StableMenuItem;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet;
import Common.Utils.Utils_;
import Common.Visual.Controls.StableMenuItem;
import javax.swing.*;
//одиночный фильтр, пункт фильтрационного меню.
@@ -12,6 +12,19 @@ public abstract class DBObjectFilter<D extends DBObject> {
String description;
boolean active = true; //включен ли фильтр
int count = 0;
public DBObjectFilter(DataSet dataSet, String description_in, boolean active_in) {
menuItem = new StableMenuItem((description = description_in) + " (0)");
active = active_in;
menuItem.addActionListener(e -> {
active = !active;
Mark();
dataSet.ShowUI();
});
Mark();
}
public DBObjectFilter(DataSet dataSet, String description_in) {
this(dataSet, description_in, true);
}
//--
static String getNotActiveIconPath() {
return "/Common/icons/NotPick.png";
@@ -29,23 +42,6 @@ public abstract class DBObjectFilter<D extends DBObject> {
count++;
return valid & active;
}
public DBObjectFilter(DataSet dataSet, String description_in, boolean active_in) {
menuItem = new StableMenuItem((description = description_in) + " (0)");
active = active_in;
menuItem.addActionListener(e -> {
active = !active;
Mark();
dataSet.ShowUI();
});
Mark();
}
public DBObjectFilter(DataSet dataSet, String description_in) {
this(dataSet, description_in, true);
}
public void setActive(boolean flag) {
active = flag;
Mark();
}
//--
protected abstract boolean validate(D object);
//--
@@ -58,5 +54,9 @@ public abstract class DBObjectFilter<D extends DBObject> {
public boolean isActive() {
return active;
}
public void setActive(boolean flag) {
active = flag;
Mark();
}
//--
}

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

@@ -1,18 +1,18 @@
package Common.Visual;
import Common.CommonConstants;
import Common.Current_;
import Common.Utils.Utils_;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DBTable;
import Common.Database.Tables.DataSet;
import Common.Database.Tables.FKBehaviour;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Utils.Utils_;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.DataTable;
import Common.Visual.Tables.Grid.GridAnchestor;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Grid.TableVisualData;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import javax.swing.table.TableColumn;
@@ -29,9 +29,6 @@ import static Common.Visual.Tables.TableRenderers.RendererSelect;
public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
protected JPanel dataPanel;
protected DataSet dataSource;
public JPanel getDataPanel() {
return dataPanel;
}
protected int current_row_i;
protected boolean events_on = true;
protected String colNamesAndSizes = "";
@@ -46,6 +43,9 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
dataPanel = new JPanel(new BorderLayout());
content.add(dataPanel, BorderLayout.CENTER);
}
public JPanel getDataPanel() {
return dataPanel;
}
@Override
public void Show() {
super.Show();
@@ -68,7 +68,7 @@ public class DataSetControlForm extends ControlWithCurrentForm<DataTable> {
if (Global.mainModule.getDb() != null) {
try {
if ((CurrentName() != null)) {
String tableName= CurrentName().toString();
String tableName = CurrentName().toString();
Vector<String> widths = IntStream.range(0, columns.size()).mapToObj(i -> String.valueOf(control.getColumnModel().getColumn(i).getWidth())).collect(Collectors.toCollection(Vector::new));
String packed = String.join("|", widths);
TableVisualData tableVisualData;

4
src/Common/Visual/DataSetFilter.java
View File

@@ -1,8 +1,8 @@
package Common.Visual;
import _VisualDVM.Visual.Menus.StableMenuItem;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.DataSet;
import Common.Visual.Controls.StableMenuItem;
import _VisualDVM.Visual.Menus.VisualiserMenu;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

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

@@ -1,19 +1,19 @@
package Common.Visual.Menus;
import Common.Database.Tables.DataSet;
import Common.Visual.Controls.MenuBarButton;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionListener;
public class DataMenuBar extends VisualiserMenuBar {
public JLabel countLabel = null;
JButton selectAllButton = null;
JButton unselectAllButton = null;
//-
public ActionListener selectAllListener = null;
public ActionListener unselectAllListener = null;
JButton selectAllButton = null;
JButton unselectAllButton = null;
//-
public DataMenuBar(String dataName, PassCode... passes) {
// Font font = Current.getTheme().Fonts.get(VisualiserFonts.TreeBoldItalic).deriveFont(12.0F);
@@ -46,7 +46,8 @@ public class DataMenuBar extends VisualiserMenuBar {
}, 1);
}
if (selectAllListener != null) {
selectAllButton.removeActionListener(selectAllListener); }
selectAllButton.removeActionListener(selectAllListener);
}
selectAllButton.addActionListener(selectAllListener = e -> dataSet.CheckAll(true));
if (unselectAllListener != null) {
unselectAllButton.removeActionListener(unselectAllListener);

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

@@ -1,6 +1,6 @@
package Common.Visual.Menus;
import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.event.PopupMenuEvent;

12
src/Common/Visual/Menus/TextEditorMenu.java
View File

@@ -8,12 +8,12 @@ import java.util.Vector;
public class TextEditorMenu extends StyledPopupMenu {
protected JTextComponent editor;
protected String selectedText = null;
protected JMenuItem m_strike;
protected JMenuItem m_unstrike;
//-------------------------------------------------
JMenuItem m_cut;
JMenuItem m_copy;
JMenuItem m_paste;
protected JMenuItem m_strike;
protected JMenuItem m_unstrike;
//-------------------------------------------------
public TextEditorMenu(JTextComponent editor_in) {
editor = editor_in;
@@ -44,28 +44,28 @@ public class TextEditorMenu extends StyledPopupMenu {
});
add(m_paste);
//--
m_strike = new VisualiserMenuItem("Вычеркнуть","/icons/Editor/Strikethrough.png");
m_strike = new VisualiserMenuItem("Вычеркнуть", "/icons/Editor/Strikethrough.png");
m_strike.addActionListener(
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
String[] data = selectedText.split("\n");
Vector<String> new_data = new Vector<>();
for (String line: data){
for (String line : data) {
new_data.add(Utils_.strikeThrough(line));
}
editor.replaceSelection(String.join("\n", new_data));
}
});
add(m_strike);
m_unstrike = new VisualiserMenuItem("Отменить вычёркивание","/icons/Editor/NoStrike.png");
m_unstrike = new VisualiserMenuItem("Отменить вычёркивание", "/icons/Editor/NoStrike.png");
m_unstrike.addActionListener(
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
String[] data = selectedText.split("\n");
Vector<String> new_data = new Vector<>();
for (String line: data){
for (String line : data) {
new_data.add(Utils_.noStrikeThrough(line));
}
editor.replaceSelection(String.join("\n", new_data));

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

@@ -1,7 +1,7 @@
package Common.Visual.Menus;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem {
@@ -15,7 +15,7 @@ public class VisualiserMenuItem extends JMenuItem {
if (icon_path != null)
setIcon(Utils_.getIcon(icon_path));
}
public VisualiserMenuItem(){
public VisualiserMenuItem() {
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
}
}

4
src/Common/Visual/StatusEnum.java
View File

@@ -4,5 +4,7 @@ public interface StatusEnum {
default String getDescription() {
return toString();
}
default VisualiserFonts getFont() {return VisualiserFonts.UnknownState;}
default VisualiserFonts getFont() {
return VisualiserFonts.UnknownState;
}
}

4
src/Common/Visual/Tables/ColumnFilter.java
View File

@@ -52,7 +52,7 @@ public class ColumnFilter {
setBackground(dataSet.getUi().control.getTableHeader().getBackground());
setFont(dataSet.getUi().control.getTableHeader().getFont());
setBorder(new MatteBorder(0, 0, 1, 1, Color.DARK_GRAY));
setText("текст : "+dataSet.getColumnFilterValue(columnIndex));
setText("текст : " + dataSet.getColumnFilterValue(columnIndex));
}
});
//--
@@ -63,7 +63,7 @@ public class ColumnFilter {
int columnIndex = dataSet.getUi().control.getTableHeader().columnAtPoint(event.getPoint());
if (dataSet.columnsFilters.containsKey(columnIndex)) {
Rectangle columnRectangle = dataSet.getUi().control.getTableHeader().getHeaderRect(columnIndex);
Dimension d = new Dimension(columnRectangle.width - 72, columnRectangle.height - 1);
Dimension d = new Dimension(columnRectangle.width - 72, columnRectangle.height - 1);
popup.setPreferredSize(d);
popup.setMaximumSize(d);
popup.show(dataSet.getUi().control.getTableHeader(), columnRectangle.x + 72, 0);

2
src/Common/Visual/Tables/ConfigurationAutoRenderer.java
View File

@@ -4,7 +4,7 @@ public class ConfigurationAutoRenderer extends DBObjectRenderer {
@Override
public void Display() {
if (value != null) {
setIcon(((Configuration)value).GetAutoIcon());
setIcon(((Configuration) value).GetAutoIcon());
}
}
}

6
src/Common/Visual/Tables/ConfigurationAutoSwitcher.java
View File

@@ -1,18 +1,18 @@
package Common.Visual.Tables;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.EditServerObject;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import _VisualDVM.TestingSystem.Common.TestingServer;
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import Common.Passes.Pass;
import _VisualDVM.Passes.Server.EditServerObject;
public class ConfigurationAutoSwitcher extends DBObjectEditor<Configuration> {
@Override
public void Action() {
value.SwitchAuto();
setIcon(value.GetAutoIcon());
///-
Pass pass = new EditServerObject<TestingServer,Configuration> (Global.testingServer, Configuration.class){
Pass pass = new EditServerObject<TestingServer, Configuration>(Global.testingServer, Configuration.class) {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (Configuration) args[0];

4
src/Common/Visual/Tables/DataTable.java
View File

@@ -10,8 +10,8 @@ public abstract class DataTable extends StyledTable implements DataControl {
@Override
public void SelectRowByPK(Object pk) {
for (int i = 0; i < getRowCount(); ++i) {
DBObject o = getRowObject(i);
if (o!=null) {
DBObject o = getRowObject(i);
if (o != null) {
if (o.getPK()
.equals(pk)) {
SelectRow(i);

2
src/Common/Visual/Tables/HiddenListRenderer.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.util.Vector;

2
src/Common/Visual/Tables/StatusEnumRenderer.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import Common.Visual.UI_;
import Common.Visual.StatusEnum;
import Common.Visual.UI_;
import javax.swing.*;
public class StatusEnumRenderer extends RendererCell<StatusEnum> {

4
src/Common/Visual/Tables/StyledCellLabel.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Tables;
import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
//наиболее распространенный случай. переотображение текста и/или изображения в ячейке таблицы.

4
src/Common/Visual/Tables/StyledTable.java
View File

@@ -1,8 +1,8 @@
package Common.Visual.Tables;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Menus.TableMenu;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.table.*;

2
src/Common/Visual/Tables/WrapTextRenderer.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;

2
src/Common/Visual/Themes/DefaultTheme.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Themes;
import java.awt.*;
public class DefaultTheme extends VisualiserTheme{
public class DefaultTheme extends VisualiserTheme {
@Override
protected String getForegroundHex() {
return "#000000";

41
src/Common/Visual/Themes/VisualiserTheme.java
View File

@@ -18,6 +18,24 @@ public abstract class VisualiserTheme {
public Color bar_background;
public Color table_background;
//--
public LinkedHashMap<VisualiserFonts, Font> Fonts = new LinkedHashMap<>();
public LinkedHashMap<VisualiserColor, Color> Colors = new LinkedHashMap<>();
public VisualiserTheme() {
try {
//-----------------------------------------------
foreground = Color.decode(getForegroundHex());
background = Color.decode(getBackgroundHex());
selection_background = Color.decode(getSelectionBackgroundHex());
trees_background = Color.decode(getTreeBackgroundHex());
bar_foreground = Color.decode(getBarForegroundHex());
bar_background = Color.decode(getBarBackgroundHex());
table_background = Color.decode(getTableBackgroundHex());
createFonts();
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
}
//--
protected abstract String getForegroundHex();
protected abstract String getBackgroundHex();
protected abstract String getSelectionBackgroundHex();
@@ -32,10 +50,7 @@ public abstract class VisualiserTheme {
protected abstract Color getFatalFontColor();
protected abstract Color getUnknownFontColor();
protected abstract Color getHyperlinkFontColor();
//--
public LinkedHashMap<VisualiserFonts, Font> Fonts = new LinkedHashMap<>();
public LinkedHashMap<VisualiserColor, Color> Colors = new LinkedHashMap<>();
protected void createFonts(){
protected void createFonts() {
Fonts.put(VisualiserFonts.GoodState,
new Font(
new HashMap<TextAttribute, Object>() {
@@ -142,7 +157,7 @@ public abstract class VisualiserTheme {
Fonts.put(VisualiserFonts.TreePlain, new Font("Times New Roman", Font.PLAIN, 16));
Fonts.put(VisualiserFonts.TreeItalic, new Font("Times New Roman", Font.ITALIC, 16));
Fonts.put(VisualiserFonts.TreeBold, new Font("Times New Roman", Font.BOLD, 16));
Fonts.put(VisualiserFonts.TreeBoldItalic, new Font("Times New Roman", Font.BOLD|Font.ITALIC, 16));
Fonts.put(VisualiserFonts.TreeBoldItalic, new Font("Times New Roman", Font.BOLD | Font.ITALIC, 16));
Fonts.put(VisualiserFonts.Menu, new Font("Times New Roman", Font.ITALIC, 16));
Fonts.put(VisualiserFonts.NewVersion, new Font(
new HashMap<TextAttribute, Object>() {
@@ -153,22 +168,6 @@ public abstract class VisualiserTheme {
put(TextAttribute.SIZE, 16);
}
}
));
}
public VisualiserTheme() {
try {
//-----------------------------------------------
foreground = Color.decode(getForegroundHex());
background = Color.decode(getBackgroundHex());
selection_background = Color.decode(getSelectionBackgroundHex());
trees_background = Color.decode(getTreeBackgroundHex());
bar_foreground = Color.decode(getBarForegroundHex());
bar_background = Color.decode(getBarBackgroundHex());
table_background = Color.decode(getTableBackgroundHex());
createFonts();
} catch (Exception ex) {
Utils_.MainLog.PrintException(ex);
}
}
}

1
src/Common/Visual/Trees/DataTree.java
View File

@@ -1,5 +1,4 @@
package Common.Visual.Trees;
import Common.Current_;
import Common.Utils.Utils_;
import Common.Visual.DataControl_OLD;
import _VisualDVM.Global;

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

@@ -1,7 +1,7 @@
package Common.Visual.Trees;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import javax.swing.*;

1
src/Common/Visual/Trees/SelectableTree.java
View File

@@ -1,5 +1,4 @@
package Common.Visual.Trees;
import Common.Current_;
import Common.Visual.Selectable;
import _VisualDVM.Global;

4
src/Common/Visual/Trees/SelectionTreeCellRenderer.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Trees;
import Common.Visual.UI_;
import Common.Visual.Selectable;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Selectable;
import Common.Visual.UI_;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;

14
src/Common/Visual/Trees/StyledTree.java
View File

@@ -1,8 +1,8 @@
package Common.Visual.Trees;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import _VisualDVM.Visual.Menus.GraphMenu;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts;
import _VisualDVM.Visual.UI;
import javax.swing.*;
@@ -144,8 +144,8 @@ public class StyledTree extends JTree implements ThemeElement {
public void SelectNode(DefaultMutableTreeNode node) {
setSelectionPath(new TreePath(((DefaultTreeModel) getModel()).getPathToRoot(node)));
}
//https://stackoverflow.com/questions/7928839/adding-and-removing-nodes-from-a-jtree !!!
public void AddNode(DefaultMutableTreeNode parent, DefaultMutableTreeNode node){
//https://stackoverflow.com/questions/7928839/adding-and-removing-nodes-from-a-jtree !!!
public void AddNode(DefaultMutableTreeNode parent, DefaultMutableTreeNode node) {
parent.add(node);
DefaultTreeModel model = (DefaultTreeModel) getModel();
model.reload(parent);
@@ -154,13 +154,13 @@ public class StyledTree extends JTree implements ThemeElement {
setSelectionPath(path);
//scrollPathToVisible(path);
}
public void RemoveNode(DefaultMutableTreeNode node){
if (node.getParent()!=null) {
public void RemoveNode(DefaultMutableTreeNode node) {
if (node.getParent() != null) {
DefaultTreeModel model = (DefaultTreeModel) getModel();
model.removeNodeFromParent(node);
}
}
public void RefreshNode(DefaultMutableTreeNode node){
public void RefreshNode(DefaultMutableTreeNode node) {
DefaultTreeModel model = (DefaultTreeModel) getModel();
model.reload(node);
}

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

@@ -1,6 +1,6 @@
package Common.Visual.Trees;
import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.tree.DefaultTreeCellRenderer;
public class StyledTreeCellRenderer extends DefaultTreeCellRenderer implements ThemeElement {

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

@@ -1,6 +1,6 @@
package Common.Visual.Trees;
import Common.Visual.UI_;
import Common.Visual.ControlForm;
import Common.Visual.UI_;
import java.awt.*;
public class TreeForm<C extends StyledTree> extends ControlForm<C> {

15
src/Common/Visual/UI_.java
View File

@@ -12,27 +12,26 @@ import java.awt.*;
import java.util.LinkedHashMap;
import java.util.Stack;
public class UI_ {
public static boolean active=false; //есть ли интерфейс. в консольных версиях не нужен.
public static boolean active = false; //есть ли интерфейс. в консольных версиях не нужен.
public static MenuElement[] last_menu_path; //для меню
public static boolean isActive() {
return active;
}
//---
public static LinkedHashMap<Class<? extends DataSet>, DataMenuBar> menuBars = new LinkedHashMap<>();
public static Stack<Component> windowsStack = new Stack<>();
static VisualiserTheme theme = new DefaultTheme();
public static boolean isActive() {
return active;
}
public static VisualiserTheme getTheme() {
return theme;
}
public static void setTheme(VisualiserTheme theme_in){
theme= theme_in;
public static void setTheme(VisualiserTheme theme_in) {
theme = theme_in;
}
public static Component getFrontWindow() {
Component res = null;
try {
res = windowsStack.peek();
} catch (Exception ignored){
} catch (Exception ignored) {
}
return res;
}

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

@@ -18,7 +18,7 @@ public abstract class DBObjectDialog<T extends DBObject, F extends DialogFields>
public void fillFields() {
//отобразить объект
}
public void SetReadonly(){
public void SetReadonly() {
//заблокировать окно для редактирования
}
}

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

@@ -1,9 +1,9 @@
package Common.Visual.Windows.Dialog;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Themes.ThemeElement;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;
@@ -25,9 +25,6 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
protected JButton btnOK = null;
protected JButton btnCancel = null;
protected JCheckBox showNoMore = null;
public String getIconPath() {
return "";
}
protected Component content;
//--------------------------------------
public Dialog(Class<F> f_in) {
@@ -60,6 +57,9 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
setLocationRelativeTo(null);
LoadSize();
}
public String getIconPath() {
return "";
}
public void CreateContent() {
try {
content = (fields = f.newInstance()).getContent();
@@ -69,7 +69,6 @@ public class Dialog<T, F extends DialogFields> extends JDialog implements ThemeE
}
}
public void onClose() {
}
public void LoadSize() {
setMinimumSize(new Dimension(getDefaultWidth(), getDefaultHeight()));

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

@@ -1,6 +1,6 @@
package Common.Visual.Windows.Dialog;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;

4
src/Common/Visual/Windows/Dialog/DialogWrapText.java
View File

@@ -1,11 +1,11 @@
package Common.Visual.Windows.Dialog;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
import javax.swing.*;
import java.awt.*;
public class DialogWrapText extends JTextPane implements DialogFields {
public DialogWrapText(){
public DialogWrapText() {
setOpaque(true);
setBackground(Color.WHITE);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeBold));

6
src/Common/Visual/Windows/Dialog/VFileChooser_.java
View File

@@ -14,14 +14,14 @@ public class VFileChooser_ {
return res;
}
};
public File getCurrentDirectory(){
return fileChooser.getCurrentDirectory();
}
public VFileChooser_(String title, FileFilter filter) {
fileChooser.setDialogTitle(title);
fileChooser.setAcceptAllFileFilterUsed(false);
fileChooser.setFileFilter(filter);
}
public File getCurrentDirectory() {
return fileChooser.getCurrentDirectory();
}
public void setTitle(String title_in) {
fileChooser.setDialogTitle(title_in);
}

8
src/Common/Visual/Windows/Form.java
View File

@@ -1,7 +1,7 @@
package Common.Visual.Windows;
import Common.Database.Objects.DBForm.DBForm;
import Common.Utils.Utils_;
import Common.Visual.Themes.ThemeElement;
import Common.Database.Objects.DBForm.DBForm;
import _VisualDVM.Global;
import javax.swing.*;
@@ -11,7 +11,7 @@ import java.awt.event.WindowEvent;
public abstract class Form extends JFrame implements ThemeElement {
private DBForm dbInfo = null;
public Form() {
if (getIconPath()!=null) setIconImage(Utils_.getIcon(getIconPath()).getImage());
if (getIconPath() != null) setIconImage(Utils_.getIcon(getIconPath()).getImage());
SetListener();
this.setTitle(Utils_.isWindows() ? getWTitleText() : getUTitleText());
pack();
@@ -73,7 +73,7 @@ public abstract class Form extends JFrame implements ThemeElement {
public void AfterClose() {
}
public void LoadWindowParameters() throws Exception {
if (getFormKey()!=null)
if (getFormKey() != null)
if (Global.mainModule.getDb().forms.Data.containsKey(getFormKey())) {
dbInfo = Global.mainModule.getDb().forms.Data.get(getFormKey());
dbInfo.Apply(this);
@@ -83,7 +83,7 @@ public abstract class Form extends JFrame implements ThemeElement {
setLocationRelativeTo(getRelative());
}
public void SaveWindowParameters() throws Exception {
if (getFormKey()!=null) {
if (getFormKey() != null) {
if (dbInfo != null) {
dbInfo.Init(this);
Global.mainModule.getDb().Update(dbInfo);

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

@@ -1,7 +1,7 @@
package Common.Visual.Windows;
import Common.Passes.Pass;
import Common.Utils.Utils_;
import Common.Visual.Windows.Dialog.Dialog;
import Common.Passes.Pass;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;

6
src/_VisualDVM/Constants.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
import java.util.Vector;
public class Constants {
public static final int planner_version = 3;
public static final int testingMaxKernels= 64; //вообще говоря, это параметр машины.
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
//--
public static final String ComponentsDirectoryName = "Components";
public static final String DataDirectoryName = "Data";
@@ -106,7 +106,6 @@ public class Constants {
"Text.h",
"Utils.h",
"version.h"
};
//пробный коммит. изменение комментария.++
//кронтаб и перезагрузка
@@ -456,8 +455,7 @@ public class Constants {
//</editor-fold>
};
public static Vector<String> admins_mails = new Vector_<>(
"vmk-post@yandex.ru"
// "79854210702@ya.ru"
// "79854210702@ya.ru"
);
}

1
src/_VisualDVM/Current.java
View File

@@ -40,7 +40,6 @@ public enum Current implements Current_ {
SelectedFile,
//текущий выбранный удаленный файл
RemoteFile,
PassForm, //текущее окно анимации. нужно для сообщений сапфора по сокету.
RunStsRecord,
//только для того, чтобы закодировать таблицу.
Array,

4
src/_VisualDVM/Global.java
View File

@@ -4,11 +4,11 @@ import Common.Mode;
import Common.Utils.Loggable;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Account.AccountRole;
import _VisualDVM.GlobalData.Settings.DBSetting;
import _VisualDVM.GlobalData.Settings.SettingName;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ProjectData.ProjectView;
import _VisualDVM.Repository.Component.*;
import _VisualDVM.Repository.Component.PerformanceAnalyzer.PerformanceAnalyzer;
@@ -226,7 +226,7 @@ public class Global {
//-------------------------------->>
UI_.active = true;
UI_.setTheme(new LightSPFEditorTheme());
mainModule= new MainModule();
mainModule = new MainModule();
CheckVisualiserDirectories();
CreateLogAtComponentsPath();
//-

6
src/_VisualDVM/GlobalData/Account/Account.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Account;
import Common.Database.Objects.DBObject;
import _VisualDVM.Visual.UI;
import Common.Utils.TextLog;
import _VisualDVM.Repository.BugReport.BugReport;
import _VisualDVM.Visual.UI;
import com.sun.org.glassfish.gmbal.Description;
public class Account extends DBObject {
@Description("PRIMARY KEY,NOT NULL")
@@ -55,8 +55,8 @@ public class Account extends DBObject {
public boolean isAdmin() {
return role.equals(AccountRole.Admin);
}
public boolean CheckAdmin(TextLog log){
if (!isAdmin()){
public boolean CheckAdmin(TextLog log) {
if (!isAdmin()) {
log.Writeln_("Вы не являетесь администратором!");
return false;
}

12
src/_VisualDVM/GlobalData/Compiler/Compiler.java
View File

@@ -1,14 +1,14 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import _VisualDVM.Validators.DVMHelpParser;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironmentsSet;
import _VisualDVM.GlobalData.CompilerOption.CompilerOptionsSet;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Validators.DVMHelpParser;
import com.sun.org.glassfish.gmbal.Description;
public class Compiler extends iDBObject {
public int machine_id = -1;
@@ -72,8 +72,8 @@ public class Compiler extends iDBObject {
public void ParseVersion() {
switch (type) {
case dvm:
String [] lines = versionText.split("\n");
if (lines.length>=3) {
String[] lines = versionText.split("\n");
if (lines.length >= 3) {
String[] data = lines[2].split(" ");
if (data.length >= 4)
version = data[3].replace(",", "");
@@ -188,7 +188,7 @@ public class Compiler extends iDBObject {
public String getVersionCommand() {
return Utils_.DQuotes(call_command) + " " + version_command;
}
public String getVersionInfo(){
return "v="+version+" r="+revision;
public String getVersionInfo() {
return "v=" + version + " r=" + revision;
}
}

22
src/_VisualDVM/GlobalData/Compiler/CompilersDBTable.java
View File

@@ -1,22 +1,22 @@
package _VisualDVM.GlobalData.Compiler;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.UI.CompilerFields;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.Utils;
import _VisualDVM.Validators.PathValidator;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class CompilersDBTable extends iDBTable<Compiler> {
@@ -79,7 +79,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
//самое опасное место. теоретически тут можно ввести любую команду ОС, в том числе rm -rf
if (call_command.contains(" "))
Log.Writeln("Прямая команда вызова не может содержать пробелы");
if (!call_command.contains("+")&& Utils_.ContainsForbiddenName(call_command))
if (!call_command.contains("+") && Utils_.ContainsForbiddenName(call_command))
Log.Writeln("Прямая команда вызова содержит запрещённые символы");
else {
if (Utils.isLinuxSystemCommand(call_command))
@@ -118,7 +118,7 @@ public class CompilersDBTable extends iDBTable<Compiler> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);

4
src/_VisualDVM/GlobalData/Compiler/UI/CompilerFields.java
View File

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Compiler.UI;
import Common.Visual.UI_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields;
import Common.Visual.Windows.Dialog.VDirectoryChooser;
import _VisualDVM.Global;
@@ -35,7 +35,7 @@ public class CompilerFields implements DialogFields {
if (file != null)
dst = file.getAbsolutePath();
} else {
if ( Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true))
if (Global.mainModule.getPass(PassCode.SelectRemoteFile).Do(true))
dst = Global.mainModule.getRemoteFile().full_name;
}
if (dst != null)

4
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueEditor.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueEditor extends DBObjectEditor<CompilerEnvironment> {

4
src/_VisualDVM/GlobalData/CompilerEnvironment/UI/CompilerEnvironmentValueRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerEnvironment.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerEnvironment.CompilerEnvironment;
public class CompilerEnvironmentValueRenderer extends DBObjectRenderer {
@Override

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterNameRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterNameRenderer extends DBObjectRenderer {
@Override

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueEditor.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectEditor;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueEditor extends DBObjectEditor<CompilerOption> {

4
src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionParameterValueRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.CompilerOption.UI;
import Common.Visual.UI_;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Tables.DBObjectRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
public class CompilerOptionParameterValueRenderer extends DBObjectRenderer {
@Override

12
src/_VisualDVM/GlobalData/DVMParameter/DVMParameterDBTable.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.DVMParameter;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.DVMParameter.UI.DVMParameterFields;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Utils;
public class DVMParameterDBTable extends iDBTable<DVMParameter> {
public DVMParameterDBTable() {
super(DVMParameter.class);
@@ -41,12 +40,11 @@ public class DVMParameterDBTable extends iDBTable<DVMParameter> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

2
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValue.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.EnvironmentValue;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
public class EnvironmentValue extends iDBObject {
public String name = "";

12
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesDBTable.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.EnvironmentValue;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Utils.Utils_;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.EnvironmentValue.UI.EnvironmentValueFields;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.Utils;
public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
public EnvironmentValuesDBTable() {
super(EnvironmentValue.class);
@@ -66,12 +65,11 @@ public class EnvironmentValuesDBTable extends iDBTable<EnvironmentValue> {
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

4
src/_VisualDVM/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java
View File

@@ -3,10 +3,10 @@ import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
public class EnvironmentValuesMenuBar extends DataMenuBar {
public EnvironmentValuesMenuBar() {
super("переменные окружения", PassCode.AddEnvironmentValue,
super("переменные окружения", PassCode.AddEnvironmentValue,
PassCode.EditEnvironmentValue,
PassCode.DeleteEnvironmentValue,
PassCode.PickCompilerEnvironments
);
);
}
}

2
src/_VisualDVM/GlobalData/FileObject/DirInfo.java
View File

@@ -17,7 +17,7 @@ public class DirInfo extends DBObject {
public Date getDate() {
return new Date(mdate);
}
public File getFile(){
public File getFile() {
return dir;
}
}

8
src/_VisualDVM/GlobalData/FileObject/DirInfosDataSet.java
View File

@@ -2,22 +2,22 @@ package _VisualDVM.GlobalData.FileObject;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetControlForm;
import static Common.Visual.Tables.TableRenderers.*;
import static Common.Visual.Tables.TableRenderers.RendererDate;
public class DirInfosDataSet extends DataSet<String, DirInfo> {
public DirInfosDataSet() {
super(String.class, DirInfo.class);
}
@Override
protected DataSetControlForm createUI() {
return new DataSetControlForm(this){
return new DataSetControlForm(this) {
@Override
protected void AdditionalInitColumns() {
columns.get(1).setRenderer(RendererDate);
columns.get(1).setRenderer(RendererDate);
}
};
}
@Override
public String[] getUIColumnNames(){
public String[] getUIColumnNames() {
return new String[]{
"дата изменения"};
}

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

@@ -25,8 +25,8 @@ import _VisualDVM.GlobalData.Settings.SettingsDBTable;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTasksDBTable;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTasksDBTable;
import _VisualDVM.GlobalData.User.UsersDBTable;
import _VisualDVM.Repository.Component.ComponentType;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.ComponentType;
import java.nio.file.Paths;
import java.util.Date;
@@ -94,7 +94,7 @@ public class GlobalDatabase extends VisualiserDatabase {
public PassCode getSynchronizePassCode() {
return null;
}
public void SaveCredentials(){
public void SaveCredentials() {
try {
Credentials credentials = Global.mainModule.getCredentials();
if (Global.mainModule.HasMachine())
@@ -108,8 +108,7 @@ public class GlobalDatabase extends VisualiserDatabase {
if (Global.mainModule.HasRunConfiguration())
credentials.runconfiguration_id = Global.mainModule.getRunConfiguration().id;
Update(credentials);
}
catch (Exception ex){
} catch (Exception ex) {
ex.printStackTrace();
}
}

1
src/_VisualDVM/GlobalData/Grid/TableVisualData.java
View File

@@ -8,7 +8,6 @@ import java.util.stream.Collectors;
public class TableVisualData extends DBObject {
@Description("PRIMARY KEY, UNIQUE") //имя таблицы
public String name = null;
//todo запаковать в json (?)
@Description("DEFAULT ''")
public String sizes = ""; //ширины столбцов запакованные через |. вводить объекты ради них нецелесообразно.

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

@@ -24,7 +24,7 @@ public class Machine extends iDBObject {
}
public String getFullDescription() {
return //this.equals(Constants.repository_machine) ? "Репозиторий визуализатора" :
"Машина по адресу " + Utils_.Brackets(getURL());
"Машина по адресу " + Utils_.Brackets(getURL());
}
public LinkedHashMap<Integer, Compiler> getCompilers() {
return Global.mainModule.getDb().getMapByFKi(this, Compiler.class);

11
src/_VisualDVM/GlobalData/Machine/MachinesDBTable.java
View File

@@ -1,14 +1,13 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
@@ -19,6 +18,7 @@ import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.Visual.UI;
import java.util.LinkedHashMap;
public class MachinesDBTable extends iDBTable<Machine> {
@@ -63,7 +63,6 @@ public class MachinesDBTable extends iDBTable<Machine> {
public void SetEditLimits() {
fields.cbMachineType.setEnabled(false);
}
};
}
@Override

2
src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.Machine;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

4
src/_VisualDVM/GlobalData/Makefile/Makefile.java
View File

@@ -1,9 +1,8 @@
package _VisualDVM.GlobalData.Makefile;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Utils.TextLog;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.Machine.Machine;
@@ -12,6 +11,7 @@ import _VisualDVM.GlobalData.Module.ModuleAnchestor;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Utils;
import java.util.LinkedHashMap;
import java.util.Vector;

7
src/_VisualDVM/GlobalData/Makefile/MakefilesDBTable.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.GlobalData.Makefile;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorFields;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
@@ -43,7 +43,6 @@ public class MakefilesDBTable extends iDBTable<Makefile> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

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

@@ -1,6 +1,6 @@
package _VisualDVM.GlobalData.Makefile.UI;
import _VisualDVM.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);

2
src/_VisualDVM/GlobalData/Module/ModuleAnchestor.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.Module;
import Common.CommonConstants;
import Common.Utils.Utils_;
import Common.Database.Objects.iDBObject;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
public class ModuleAnchestor extends iDBObject {

2
src/_VisualDVM/GlobalData/Module/ModulesDBTable.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.GlobalData.Module;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Module.UI.ModuleAnchestorForm;
public class ModulesDBTable extends iDBTable<Module> {
public ModulesDBTable() {

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

@@ -1,15 +1,15 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.Visual.UI_;
import Common.Passes.Pass;
import Common.Visual.Controls.StyledTextComboBox;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Makefile.Makefile;
import _VisualDVM.GlobalData.Module.Module;
import _VisualDVM.GlobalData.Module.ModuleAnchestor;
import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.ProjectData.LanguageName;
import javax.swing.*;
import java.awt.*;
@@ -37,7 +37,7 @@ public class ModuleAnchestorFields implements DialogFields {
BPickOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
Pass<String> pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(compiler)) {
UI_.TrySelect(cbFlags, pass.target);
}

3
src/_VisualDVM/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.GlobalData.Module.UI;
import Common.CommonConstants;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
@@ -38,7 +37,7 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
if (Result instanceof Makefile) {
//могут быть только flink/clink
if (!command.equals("flink") && !command.equals("clink")
&&
&&
!command.equals("f") && !command.equals("c")
) {
Log.Writeln("При линковке DVM системой допустимы\n" +

2
src/_VisualDVM/GlobalData/RemoteFile/RemoteFile.java
View File

@@ -20,7 +20,7 @@ public class RemoteFile implements Serializable {
name = name_in;
isDirectory = isDirectory_in;
}
public RemoteFile(RemoteFile parent_in, String name_in){
public RemoteFile(RemoteFile parent_in, String name_in) {
this(parent_in.full_name, name_in);
}
public RemoteFile(String parent_in, String name_in) {

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooser.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.Windows.Dialog.Dialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.SSH.ConnectionPass;

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileChooserFields.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.Trees.TreeForm;
import _VisualDVM.Visual.UI;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Visual.UI;
import javax.swing.*;
import java.awt.*;

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFileRenderer.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import Common.Visual.UI_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.Trees.StyledTreeCellRenderer;
import Common.Visual.UI_;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import javax.swing.*;

2
src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.GlobalData.RemoteFile.UI;
import _VisualDVM.Current;
import Common.Visual.Trees.DataTree;
import Common.Visual.Trees.TreeRenderers;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Visual.UI;
public class RemoteFilesTree extends DataTree {

6
src/_VisualDVM/GlobalData/RunConfiguration/RunConfiguration.java
View File

@@ -1,9 +1,10 @@
package _VisualDVM.GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import Common.Passes.PassException;
import Common.Utils.TextLog;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import Common.Database.Objects.iDBObject;
import Common.Utils.TextLog;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
@@ -12,7 +13,6 @@ import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.PassException;
import com.sun.org.glassfish.gmbal.Description;
import java.util.LinkedHashMap;

11
src/_VisualDVM/GlobalData/RunConfiguration/RunConfigurationsDBTable.java
View File

@@ -1,21 +1,19 @@
package _VisualDVM.GlobalData.RunConfiguration;
import Common.CommonConstants;
import Common.Utils.Utils_;
import Common.Visual.UI_;
import _VisualDVM.Current;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.FKBehaviour;
import Common.Database.Tables.FKCurrentObjectBehaviuor;
import Common.Database.Tables.FKDataBehaviour;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.UI_;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Compiler.CompilerType;
import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
import _VisualDVM.GlobalData.GlobalDatabase;
import _VisualDVM.GlobalData.RunConfiguration.UI.MatrixBar;
import _VisualDVM.GlobalData.RunConfiguration.UI.RunConfigurationFields;
import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
@@ -123,7 +121,6 @@ public class RunConfigurationsDBTable extends iDBTable<RunConfiguration> {
protected void AdditionalInitColumns() {
columns.get(0).setVisible(false);
}
};
}
@Override

2
src/_VisualDVM/GlobalData/SapforProfile/SapforProfile.java
View File

@@ -5,5 +5,5 @@ public class SapforProfile extends iDBObject {
@Description("DEFAULT ''")
public String description = "";
@Description("DEFAULT 0")
public long creationDate= 0;
public long creationDate = 0;
}

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