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

упраздение лишних енумов в оформлении таблиц и деревьев.

Browse Source
This commit is contained in:
02090095
2024-10-15 15:13:57 +03:00
parent b7b82e54c6
commit 5e2a9848da
146 changed files with 565 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Common/Visual/Tables/ColumnInfo.java
View File

@@ -4,29 +4,22 @@ public class ColumnInfo {
private String Name = "?";
private boolean visible = true;
private boolean editable = false;
private TableRenderers renderer = TableRenderers.RendererDefault;
private TableEditors editor = TableEditors.EditorDefault;
private Class rendererClass = null;
private Class editorClass = null;
private int maxWidth = CommonConstants.Nan;
private int minWidth = CommonConstants.Nan;
//private int lastWidth = Utils.Nan;
// public void setLastWidth(int width_in) {
// lastWidth = width_in;
// }
// public int getLastWidth() {
// return lastWidth;
// }
public ColumnInfo(String name_in) {
setName(name_in);
}
public ColumnInfo(String name_in, TableRenderers renderer_in, TableEditors editor_in) {
public ColumnInfo(String name_in, Class renderer_in, Class editor_in) {
setName(name_in);
setRenderer(renderer_in);
setRendererClass(renderer_in);
setEditable(true);
setEditor(editor_in);
setEditorClass(editor_in);
}
public ColumnInfo(String name_in, TableRenderers renderer_in) {
public ColumnInfo(String name_in, Class renderer_in) {
setName(name_in);
setRenderer(renderer_in);
setRendererClass(renderer_in);
}
public String getName() {
return Name;
@@ -46,24 +39,24 @@ public class ColumnInfo {
public void setEditable(boolean editable_in) {
this.editable = editable_in;
}
public TableRenderers getRenderer() {
return renderer;
public Class getRendererClass() {
return rendererClass;
}
public void setRenderer(TableRenderers renderer_in) {
this.renderer = renderer_in;
public void setRendererClass(Class renderer_in) {
this.rendererClass = renderer_in;
}
public TableEditors getEditor() {
return editor;
public Class getEditorClass() {
return editorClass;
}
public void setEditor(TableEditors editor_in) {
this.editor = editor_in;
setEditable(editor != TableEditors.EditorDefault);
public void setEditorClass(Class editor_in) {
this.editorClass = editor_in;
setEditable(editorClass != null);
}
public boolean hasRenderer() {
return getRenderer() != TableRenderers.RendererDefault;
return getRendererClass() != null;
}
public boolean hasEditor() {
return getEditor() != TableEditors.EditorDefault;
return getEditorClass() != null;
}
public int getMaxWidth() {
return maxWidth;
@@ -84,11 +77,4 @@ public class ColumnInfo {
public boolean hasMinWidth() {
return minWidth != CommonConstants.Nan;
}
/*
public boolean hasLastWidth() {
return lastWidth != Utils.Nan;
}
*/
//-
}

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

@@ -1,10 +0,0 @@
package Common.Visual.Tables;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
public class ConfigurationAutoRenderer extends DBObjectRenderer {
@Override
public void Display() {
if (value != null) {
setIcon(((Configuration) value).GetAutoIcon());
}
}
}

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

@@ -1,38 +0,0 @@
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;
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) {
@Override
protected boolean canStart(Object... args) throws Exception {
target = (Configuration) args[0];
return true;
}
@Override
public String getDescription() {
return "Обновить флаг автоматического тестирования";
}
@Override
protected void showDone() throws Exception {
VisualCaches.RefreshCache(target);
if (target instanceof SapforConfiguration)
Global.testingServer.db.sapforConfigurations.ShowUI(target.id);
}
};
pass.Do(value);
}
@Override
public Object getCellEditorValue() {
return value;
}
}

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

@@ -1,5 +1,5 @@
package Common.Visual.Tables;
public class DBObjectSelectionRenderer extends DBObjectRenderer {
public class DBObjectSelectionRenderer extends RendererDBObject {
/*
@Override
public Dimension getMinimumSize() {

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

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import Common.Database.Objects.DBObject;
public class DBObjectSelector<T extends DBObject> extends DBObjectEditor<T> {
public class DBObjectSelector<T extends DBObject> extends EditorDBObject<T> {
@Override
public void Action() {
value.SwitchSelection();

2
src/Common/Visual/Tables/DBObjectEditor.java → src/Common/Visual/Tables/EditorDBObject.java
View File

@@ -9,7 +9,7 @@ import javax.swing.table.TableCellEditor;
import java.awt.*;
import java.util.EventObject;
import java.util.Objects;
public abstract class DBObjectEditor<T extends DBObject> extends EditorCell implements TableCellEditor {
public abstract class EditorDBObject<T extends DBObject> extends EditorCell implements TableCellEditor {
//задается при редактировании клетки.
public T value = null;
protected transient ChangeEvent changeEvent;

15
src/Common/Visual/Tables/HyperlinksRenderer.java
View File

@@ -1,15 +0,0 @@
package Common.Visual.Tables;
import Common.Visual.Controls.HyperlinksStyledList;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.util.Vector;
public class HyperlinksRenderer extends HyperlinksStyledList implements TableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
setListData((Vector) value);
return this;
}
}

4
src/Common/Visual/Tables/EditableHeaderRenderer.java → src/Common/Visual/Tables/RendereEditableHeader.java
View File

@@ -5,11 +5,11 @@ import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
public class EditableHeaderRenderer implements TableCellRenderer {
public class RendereEditableHeader implements TableCellRenderer {
private JTable table = null;
private MouseEventReposter reporter = null;
private JComponent editor;
public EditableHeaderRenderer(JComponent editor) {
public RendereEditableHeader(JComponent editor) {
this.editor = editor;
this.editor.setBorder(UIManager.getBorder("TableHeader.cellBorder"));
}

2
src/Common/Visual/Tables/DBObjectRenderer.java → src/Common/Visual/Tables/RendererDBObject.java
View File

@@ -3,7 +3,7 @@ import Common.Database.Objects.DBObject;
import Common.Visual.DataControl;
import javax.swing.*;
public abstract class DBObjectRenderer extends RendererCell<DBObject> {
public abstract class RendererDBObject extends RendererCell<DBObject> {
@Override
public DBObject Init(JTable table, Object value, int row, int column) {
return ((DataControl) table).getRowObject(row);

2
src/Common/Visual/Tables/DateRenderer_.java → src/Common/Visual/Tables/RendererDate.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Utils_;
import javax.swing.*;
import java.util.Date;
//название пересекается с встроенным классом поэтому подчеркивание.
public class DateRenderer_ extends RendererCell<Date> {
public class RendererDate extends RendererCell<Date> {
private static final Date zero = new Date(0);
@Override
public Date Init(JTable table, Object value, int row, int column) {

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

@@ -4,7 +4,7 @@ import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*;
import java.util.Vector;
public class HiddenListRenderer extends RendererCell<Vector<String>> {
public class RendererHiddenList extends RendererCell<Vector<String>> {
@Override
public Vector<String> Init(JTable table, Object value, int row, int column) {
return (Vector<String>) value;

2
src/Common/Visual/Tables/MaskedIntegerValueRenderer.java → src/Common/Visual/Tables/RendererMaskedNanInteger.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import javax.swing.*;
public class MaskedIntegerValueRenderer extends RendererCell<Long> {
public class RendererMaskedNanInteger extends RendererCell<Long> {
@Override
public Long Init(JTable table, Object value, int row, int column) {
return (Long) value;

2
src/Common/Visual/Tables/MultilineRenderer.java → src/Common/Visual/Tables/RendererMultiline.java
View File

@@ -5,7 +5,7 @@ import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.util.Vector;
public class MultilineRenderer extends StyledList implements TableCellRenderer {
public class RendererMultiline extends StyledList implements TableCellRenderer {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

2
src/Common/Visual/Tables/ProgressBarRenderer.java → src/Common/Visual/Tables/RendererProgressBar.java
View File

@@ -3,7 +3,7 @@ import Common.Visual.Controls.StyledProgressBar;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;
public class ProgressBarRenderer extends StyledProgressBar implements TableCellRenderer {
public class RendererProgressBar extends StyledProgressBar implements TableCellRenderer {
@Override
public java.awt.Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());

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

@@ -3,7 +3,7 @@ import Common.MainModule_;
import Common.Visual.StatusEnum;
import javax.swing.*;
public class StatusEnumRenderer extends RendererCell<StatusEnum> {
public class RendererStatusEnum extends RendererCell<StatusEnum> {
@Override
public StatusEnum Init(JTable table, Object value, int row, int column) {
return (StatusEnum) value;

2
src/Common/Visual/Tables/TopLeftRenderer.java → src/Common/Visual/Tables/RendererTopLeft.java
View File

@@ -1,6 +1,6 @@
package Common.Visual.Tables;
import javax.swing.*;
public class TopLeftRenderer extends RendererCell {
public class RendererTopLeft extends RendererCell {
@Override
public Object Init(JTable table, Object value, int row, int column) {
return value;

4
src/Common/Visual/Tables/WrapTextRenderer.java → src/Common/Visual/Tables/RendererWrapText.java
View File

@@ -5,8 +5,8 @@ import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
public class WrapTextRenderer extends JTextArea implements TableCellRenderer {
public WrapTextRenderer() {
public class RendererWrapText extends JTextArea implements TableCellRenderer {
public RendererWrapText() {
setLineWrap(true);
setWrapStyleWord(true);
// setOpaque(false);

10
src/Common/Visual/Tables/TableEditors.java
View File

@@ -1,10 +0,0 @@
package Common.Visual.Tables;
public enum TableEditors {
EditorDefault,
EditorSelect,
EditorHyperlinks,
EditorDimension,
EditorCompilerEnvironmentValue,
EditorCompilerOptionParameterValue,
EditorAutoConfiguration
}

20
src/Common/Visual/Tables/TableRenderers.java
View File

@@ -1,20 +0,0 @@
package Common.Visual.Tables;
public enum TableRenderers {
RendererDefault,
RendererDate,
RendererProgress,
RendererSelect,
RendererDimension,
RendererMultiline,
RendererHyperlinks,
RendererTopLeft,
RendererMaskedInt,
RendererVariantRank,
RendererHiddenList,
RendererWrapText,
RendererCompilerOptionParameterValue,
RendererCompilerEnvironmentValue,
RendererCompilerOptionParameterName,
RendererStatusEnum,
RendererAutoConfiguration
}

89
src/Common/Visual/Tables/VectorEditor.java
View File

@@ -1,89 +0,0 @@
package Common.Visual.Tables;
import _VisualDVM.ProjectData.Files.UI.FilesHyperlinksPanel;
import javax.swing.*;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.table.TableCellEditor;
import java.awt.*;
import java.util.EventObject;
import java.util.Objects;
import java.util.Vector;
public class VectorEditor extends FilesHyperlinksPanel implements TableCellEditor {
protected transient ChangeEvent changeEvent;
@Override
public Component getTableCellEditorComponent(
JTable table, Object value, boolean isSelected, int row, int column) {
if (value instanceof Vector) {
UpdateByCell((Vector) value);
this.Hyperlinks.setBackground(table.getSelectionBackground());
Hyperlinks.setSelectionBackground(table.getSelectionBackground());
Hyperlinks.setSelectionForeground(table.getSelectionForeground());
}
return this;
}
@Override
public Object getCellEditorValue() {
return links;
}
//Copied from AbstractCellEditor
//protected EventListenerList listenerList = new EventListenerList();
@Override
public boolean isCellEditable(EventObject e) {
return true;
}
@Override
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
@Override
public boolean stopCellEditing() {
fireEditingStopped();
return true;
}
@Override
public void cancelCellEditing() {
fireEditingCanceled();
}
@Override
public void addCellEditorListener(CellEditorListener l) {
listenerList.add(CellEditorListener.class, l);
}
@Override
public void removeCellEditorListener(CellEditorListener l) {
listenerList.remove(CellEditorListener.class, l);
}
public CellEditorListener[] getCellEditorListeners() {
return listenerList.getListeners(CellEditorListener.class);
}
protected void fireEditingStopped() {
// Guaranteed to return a non-null array
Object[] listeners = listenerList.getListenerList();
// Process the listeners last to first, notifying
// those that are interested in this event
for (int i = listeners.length - 2; i >= 0; i -= 2) {
if (listeners[i] == CellEditorListener.class) {
// Lazily create the event:
if (Objects.isNull(changeEvent)) {
changeEvent = new ChangeEvent(this);
}
((CellEditorListener) listeners[i + 1]).editingStopped(changeEvent);
}
}
}
protected void fireEditingCanceled() {
// Guaranteed to return a non-null array
Object[] listeners = listenerList.getListenerList();
// Process the listeners last to first, notifying
// those that are interested in this event
for (int i = listeners.length - 2; i >= 0; i -= 2) {
if (listeners[i] == CellEditorListener.class) {
// Lazily create the event:
if (Objects.isNull(changeEvent)) {
changeEvent = new ChangeEvent(this);
}
((CellEditorListener) listeners[i + 1]).editingCanceled(changeEvent);
}
}
}
}