Changeset 100 for java/main/src/main/java/com/framsticks/gui/table/TableModel.java

Timestamp:

07/12/13 23:41:06 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add <include/> to configuration
• add side notes to tree
  • used to store arbitrary information alongside the tree structure
• migrate to log4j2
  • supports lazy string evaluation of passed arguments
• improve GUI tree
  • it stays in synchronization with actual state (even in high load test scenario)
• improve panel management in GUI
• make loading objects in GUI more lazy
• offload parsing to connection receiver thread
  • info parsing
  • first step of objects parsing
• fix connection parsing bug (eof in long values)
• support zero-arguments procedure in table view

CHANGELOG:
Implement procedure calls from table view.

Refactorization around procedures in tables.

Add table editor for buttons.

Render buttons in the the list view.

Further improve Columns.

Add Column class for TableModel?.

Accept also non-arguments ProcedureParams? in tableView.

Increase maximal TextAreaControl? size.

Add tooltip to ProcedureControl?.

Fix bug of interpreting eofs in long values by connection reader.

Further rework connection parsing.

Simplify client connection processing.

Test ListChange? modification.

Test ListChange? events with java server.

Add TestChild?.

Fix bug with fast deregistering when connecting to running server.

Another minor refactorization in TreeOperations?.

Fix bug in SimpleAbstractAccess? loading routine.

Another minor improvement.

Minor change.

Make reading of List objects two-phase.

Another minor change.

Dispatch parsing into receiver thread.

Another step.

Enclose passing value in ObjectParam? case in closure.

Minor step.

Minor change on way to offload parsing.

Temporarily comment out single ValueParam? get.

It will be generalized to multi ValueParam?.

Process info in receiver thread.

Add DispatchingExceptionHandler?.

Make waits in browser test longer.

Use FETCHED_MARK.

It is honored in GUI, where it used to decide whether to get values

after user action.

It is set in standard algorithm for processing fetched values.

Add remove operation to side notes.

Make loading more lazy.

Improve loading policy.

On node choose load itself, on node expansion, load children.

Minor improvement.

Fix bug with panel interleaving.

Minor improvements.

Improve panel management.

More cleaning around panels.

Reorganize panels.

Further improve tree.

Fix bug in TreeModel?.

Remove children from TreeNode?.

Implement TreeNode? hashCode and equals.

Make TreeNode? delegate equals and hashcode to internal reference.

Move listeners from TreeNode? to side notes.

Store path.textual as a side note.

Side note params instead of accesses for objects.

More refactorizations.

In TreeNode? bindAccess based on side notes.

Minor step.

Hide createAccess.

Rename AccessInterface? to Access.

Minor changes.

Several improvements in high load scenarios.

Change semantics of ArrayListAccess?.set(index, null);

It now removes the element, making list shorter
(it was set to null before).

Add path remove handler.

Handle exceptions in Connection.

Update .gitignore

Configure logging to file.

Move registration to TreeModel?.

Further refactorization.

Minor refactorization.

Minor improvements.

Use specialized event also for Modify action of ListChange?.

Use remove events.

Use the insertion events for tree.

Further improve tree refreshing.

Further improve reacting on events in GUI.

Fix problem with not adding objects on addition list change.

Migrate to log4j lazy String construction interface.

Migrate imports to log4j2.

Drop dependency on adapter to version 1.2.

Switch log4j implementation to log4j2.

Add dirty mark to the NodeAtFrame?.

Make selecting in AccessInterfaces? type safe.

Ignore containers size settings in Model and Genotype.

Use tree side notes to remember local changes and panels.

Add sideNotes to tree.

They will be used to store various accompanying information
right in the tree.

Use ReferenceIdentityMap? from apache in TreeNode?.

It suits the need perfectly (weak semantics on both key and value).

Make ArrayListParam? do not react size changes.

Guard in TableModel? before not yet loaded objects.

Add <include/> clause and AutoInjector?.

Extract common columns configuration to separate xml,
that can be included by other configurations.

File:

• java/main/src/main/java/com/framsticks/gui/table/TableModel.java (modified) (6 diffs)

java/main/src/main/java/com/framsticks/gui/table/TableModel.java

@@ -6 +6 @@
 import java.util.List;
 
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JTable;
+import javax.swing.UIManager;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
-import com.framsticks.params.AccessInterface;
+import com.framsticks.params.Access;
 import com.framsticks.params.ListAccess;
+import com.framsticks.params.Param;
 import com.framsticks.params.PrimitiveParam;
-import com.framsticks.util.UnsupportedOperationException;
+import com.framsticks.params.types.ProcedureParam;
 import com.framsticks.util.lang.Casting;
 
 public class TableModel implements javax.swing.table.TableModel {
-        private static final Logger log =
-                Logger.getLogger(TableModel.class);
 
+        private static final Logger log = LogManager.getLogger(TableModel.class);
 
         protected List<TableModelListener> listeners = new LinkedList<>();
         protected ListAccess access;
-        protected AccessInterface elementAccess;
-        protected final List<PrimitiveParam<?>> columnParams = new ArrayList<>();
+        protected Access elementAccess;
+        protected final List<Column> columns = new ArrayList<>();
+        protected final ListPanel listPanel;
+        protected JTable table;
+
+        /**
+         * @param listPanel
+         */
+        public TableModel(ListPanel listPanel) {
+                this.listPanel = listPanel;
+        }
+
+        /**
+         * @return the listPanel
+         */
+        public ListPanel getListPanel() {
+                return listPanel;
+        }
+
+        public JTable getTable() {
+                return listPanel.getTable();
+        }
 
         protected void refreshAll() {
@@ -31 +56 @@
                         l.tableChanged(new TableModelEvent(this));
                 }
+        }
 
+        /**
+         * @param table the table to set
+         */
+        public void setupTable() {
+                getTable().setDefaultRenderer(ProcedureParam.class, new ProcedureRenderer());
+                getTable().setDefaultEditor(ProcedureParam.class, new ProcedureEditor(new JCheckBox()));
         }
 
@@ -38 +70 @@
 
                 this.elementAccess = this.access.getElementAccess().cloneAccess();
-                log.debug("attached " + access);
+                log.debug("attached {}", access);
                 refreshAll();
         }
@@ -49 +81 @@
         @Override
         public Class<?> getColumnClass(int columnIndex) {
-                // log.debug("returning column type " + columnParams.get(columnIndex).getStorageType());
-                return columnParams.get(columnIndex).getStorageType();
+                // log.debug("returning column type {}", columnParams.get(columnIndex).getStorageType());
+                return columns.get(columnIndex).getColumnClass();
         }
 
         @Override
         public int getColumnCount() {
-                // log.debug("returning column count " + columnParams.size());
-                return columnParams.size();
+                // log.debug("returning column count {}", columnParams.size());
+                return columns.size();
         }
 
         @Override
         public String getColumnName(int columnIndex) {
-                return columnParams.get(columnIndex).getName();
+                return columns.get(columnIndex).getParam().getName();
         }
 
         @Override
         public int getRowCount() {
-                // log.debug("returning row count " + access.getParamCount());
-                return access.getParamCount();
+                // log.debug("returning row count {}", access.getParamCount());
+                return access == null ? 0 : access.getParamCount();
         }
 
         @Override
         public Object getValueAt(int rowIndex, int columnIndex) {
-                assert (rowIndex < access.getParamCount() && columnIndex < columnParams.size());
+                assert (rowIndex < access.getParamCount() && columnIndex < columns.size());
 
-                return elementAccess.select(access.get(rowIndex, Object.class)).get(columnParams.get(columnIndex), Object.class);
+                return columns.get(columnIndex).getValueAt(rowIndex);
         }
 
         @Override
         public boolean isCellEditable(int rowIndex, int columnIndex) {
-                return false;
+                return columns.get(columnIndex).isEditable();
         }
 
@@ -87 +119 @@
         }
 
+
         @Override
         public void setValueAt(Object value, int rowIndex, int columnIndex) {
-                throw new UnsupportedOperationException().msg("setting value in table");
-
+                assert (rowIndex < access.getParamCount() && columnIndex < columns.size());
+                // Object object = getObjectAt(rowIndex, columnIndex);
+                // if (object == null) {
+                //      return;
+                // }
+                columns.get(columnIndex).setValueAt(rowIndex, value);
         }
 
-        public void addColumn(PrimitiveParam<?> columnParam) {
-                log.debug("added " + columnParam);
-                columnParams.add(columnParam);
+        public void addColumn(Column column) {
+                log.debug("added {}", column);
+                columns.add(column);
+        }
+
+        /**
+         * @return the access
+         */
+        public ListAccess getAccess() {
+                return access;
+        }
+
+        /**
+         * @return the elementAccess
+         */
+        public Access getElementAccess() {
+                return elementAccess;
         }
 
@@ -101 +152 @@
          * @return the columnParams
          */
-        public List<PrimitiveParam<?>> getColumnParams() {
-                return Collections.unmodifiableList(columnParams);
+        public List<Column> getColumns() {
+                return Collections.unmodifiableList(columns);
+        }
+
+
+        public boolean addColumnIfSupported(Param param) {
+                if (param instanceof PrimitiveParam) {
+                        addColumn(new PrimitiveColumn((PrimitiveParam<?>) param, this));
+                        return true;
+                }
+                if (param instanceof ProcedureParam) {
+                        if (((ProcedureParam) param).getArgumentsType().size() == 0) {
+                                addColumn(new ProcedureColumn((ProcedureParam) param, this));
+                                return true;
+                        }
+                        return false;
+                }
+                return false;
+        }
+
+        public static void transferCellAppeariance(JTable table, JComponent component, boolean isSelected) {
+                if (isSelected) {
+                        component.setForeground(table.getSelectionForeground());
+                        component.setBackground(table.getSelectionBackground());
+                } else {
+                        component.setForeground(table.getForeground());
+                        component.setBackground(UIManager.getColor("Button.background"));
+                }
+
         }