Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
nicol authored and nicol committed Jan 24, 2025
1 parent 03f65dc commit f67c049
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 44 deletions.
6 changes: 0 additions & 6 deletions src/main/java/org/magic/gui/abstracts/GenericTableModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ public GenericTableModel(String...columnName) {
changed=false;
}

public String getId()
{
return String.valueOf(ArrayUtils.toString(columns).toString().hashCode());

}

public void setDefaultHiddenComlumns(int... nums)
{
this.hiddenColumns =nums;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import javax.swing.SwingConstants;
import javax.swing.border.LineBorder;

import org.jdesktop.swingx.JXTable;
import org.magic.api.interfaces.MTGServer;
import org.magic.gui.models.conf.LogTableModel;
import org.magic.services.MTGConstants;
Expand Down Expand Up @@ -92,13 +91,11 @@ private void init(boolean b, MTGServer s) {
if(b)
{
model = new LogTableModel();
JXTable table = UITools.createNewTable(model,false);
var table = UITools.createNewTable(model,false);

for(int i: new int[] {0,1,2,3})
table.getColumnExt(model.getColumnName(i)).setVisible(false);



table.setRowFilter(RowFilter.regexFilter(server.getClass().getName(), 3));
table.setTableHeader(null);

Expand Down
36 changes: 2 additions & 34 deletions src/main/java/org/magic/services/tools/UITools.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Desktop;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
Expand Down Expand Up @@ -145,28 +144,6 @@ public static final int getComponentIndex(Component component) {
return -1;
}

public static List<JComponent> getComponentsFrom(Container root)
{
var list = new ArrayList<JComponent>();

for(var c : root.getComponents())
{
if(c instanceof JComponent comp)
{
list.add(comp);
list.addAll(getComponentsFrom(comp));
}
}




return list;
}




public static String humanReadableSize(long bytes) {
var absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
if (absB < 1024) {
Expand Down Expand Up @@ -308,22 +285,13 @@ public static JXTable createNewTable(TableModel mod, boolean enableFilter)
if(enableFilter)
initTableFilter(table);



if(mod instanceof GenericTableModel gtm)
{
table.setName(gtm.getId());
}


//TODO dev for columns state records
table.getColumnModel().addColumnModelListener(new TableColumnModelExtListenerAdapter() {
@Override
public void columnPropertyChange(PropertyChangeEvent event) {
if(event.getPropertyName().equals("visible") && MTGControler.getInstance().isLoaded())
{
if(event.getPropertyName().equals("visible") && MTGControler.getInstance().isLoaded()){
var tce = (TableColumnExt)event.getSource();
logger.trace("{} {} {} {}",table.getName(),tce.getModelIndex(),tce.getIdentifier(),Boolean.valueOf(event.getNewValue().toString()));
logger.trace("{} {} {} {}",table.getModel().getClass(),tce.getModelIndex(),tce.getIdentifier(),Boolean.valueOf(event.getNewValue().toString()));
}
}
});
Expand Down

0 comments on commit f67c049

Please sign in to comment.