/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 25842

     import java.awt.Color;
     import javax.swing.JTable;
     import javax.swing.event.TableModelEvent;
     import javax.swing.table.TableColumnModel;
     import javax.swing.table.TableModel;
-...
+        }
         @Override
         public void tableChanged(TableModelEvent e) {
             super.tableChanged(e);
             headerCellRenderer.deselectAll();
+        }
         @Override
         protected void initializeLocalVars() {
             super.initializeLocalVars();
             // Add a cell renderer for Geometries and Features

          * @throws DataException
          *             if there is an error loading the data
          */
         public void setFeatureType(FeatureType featureType) throws DataException {
         public void setFeatureType(FeatureType featureType) {
             getFeatureQuery().setFeatureType(featureType);
             getHelper().reload();
             reloadFeatures();
             fireTableStructureChanged();
+        }
-...
                     && notification instanceof FeatureStoreNotification) {
                 FeatureStoreNotification fsNotification = (FeatureStoreNotification) notification;
                 String type = fsNotification.getType();
                 try {
                     // Is any data is changed in the FeatureStore, notify the model
                     // listeners. Ignore the case where the updated feature is
                     // changed through us.
                     if (editableFeature == null
                             || !editableFeature.equals(fsNotification.getFeature())) {
                         // Notify only about new, updated or deleted features
                         if (FeatureStoreNotification.AFTER_DELETE.equals(type)
                                 | FeatureStoreNotification.AFTER_INSERT
                                         .equals(type)
                                 | FeatureStoreNotification.AFTER_UPDATE
                                         .equals(type)) {
                             getHelper().reload();
                             fireTableDataChanged();
+                        }
+                    }
                 } catch (DataException ex) {
                     throw new FeaturesDataReloadException(ex);
                 // If there are new, updated or deleted features
                 // reload the table data
                 if (FeatureStoreNotification.AFTER_DELETE.equals(type)
                         || FeatureStoreNotification.AFTER_INSERT.equals(type)
                         || FeatureStoreNotification.AFTER_UPDATE.equals(type)) {
                     reloadIfFeatureChanged(fsNotification.getFeature());
                 } else if (FeatureStoreNotification.AFTER_UPDATE_TYPE.equals(type)) {
                     reloadIfTypeChanged(fsNotification.getFeatureType());
                 } else if (FeatureStoreNotification.TRANSFORM_CHANGE.equals(type)) {
                     reloadIfTypeTransformed(fsNotification.getFeatureType());
+                }
+            }
+        }
-...
         private FeatureType getFeatureType() {
             return getFeatureQuery().getFeatureType();
+        }
         /**
          * Reloads the table data if a feature has been changed, not through the
          * table.
          */
         private void reloadIfFeatureChanged(Feature feature) {
             // Is any data is changed in the FeatureStore, notify the model
             // listeners. Ignore the case where the updated feature is
             // changed through us.
             if (editableFeature == null || !editableFeature.equals(feature)) {
                 reloadFeatures();
                 fireTableDataChanged();
+            }
+        }
         /**
          * Reloads data and structure if the {@link FeatureType} of the features
          * being shown has changed.
          */
         private void reloadIfTypeChanged(FeatureType updatedType) {
             // If the updated featured type is the one currently being
             // shown, reload the table.
             if (updatedType != null && updatedType.equals(getFeatureType())) {
                 setFeatureType(updatedType);
+            }
+        }
         /**
          * Reloads data and structure if the {@link FeatureType} of the features
          * being shown has been transformed.
          */
         private void reloadIfTypeTransformed(FeatureType transformedType) {
             // TODO: verify this is correct, at least we should check the
             // transformed type is the one we are showing
             setFeatureType(transformedType);
+        }
         /**
          * Reloads the features shown on the table.
          */
         private void reloadFeatures() {
             try {
                 getHelper().reload();
             } catch (DataException ex) {
                 throw new FeaturesDataReloadException(ex);
+            }
+        }
+    }

         // Component to render on each header cell
         private JToggleButton button;
         private FeatureTable table;
         /**
          * Create a new JToggleButtonCellRenderer for a JTable.
          */
         public JToggleButtonHeaderCellRenderer(JTable table) {
         public JToggleButtonHeaderCellRenderer(FeatureTable table) {
             this.table = table;
             JTableHeader header = table.getTableHeader();
             header.addMouseListener(this);
             button = new JToggleButton();
-...
             return button;
+        }
         public void deselectAll() {
             selectedColumns.clear();
             notifyObservers(new ColumnHeaderSelectionChangeNotification(table));
+        }
         public void mouseClicked(MouseEvent event) {
             // Look for the clicked column
             JTable table = ((JTableHeader) event.getSource()).getTable();
             int columnViewIndex = table.columnAtPoint(event.getPoint());
             int columnModelIndex = table.convertColumnIndexToModel(columnViewIndex);
             JTable jtable = ((JTableHeader) event.getSource()).getTable();
             if (jtable.equals(table)) {
                 int columnViewIndex = table.columnAtPoint(event.getPoint());
                 int columnModelIndex = table
                         .convertColumnIndexToModel(columnViewIndex);
             // Set or add the selected column, depending on the CTRL key being
             // pressed or not
             if (ctrlKeyPressed(event)) {
                 reverseSelection((FeatureTable) table, columnModelIndex);
             } else {
                 setSelection((FeatureTable) table, columnModelIndex);
                 // Set or add the selected column, depending on the CTRL key being
                 // pressed or not
                 if (ctrlKeyPressed(event)) {
                     reverseSelection(columnModelIndex);
                 } else {
                     setSelection(columnModelIndex);
+                }
+            }
+        }
-...
         /**
          * Sets the selection to only the given column.
          */
         private void setSelection(FeatureTable table, int column) {
         private void setSelection(int column) {
             selectedColumns.clear();
             selectedColumns.set(column);
-...
         /**
          * Reverses the selection of a column.
          */
         private void reverseSelection(FeatureTable table, int column) {
         private void reverseSelection(int column) {
             selectedColumns.flip(column);
             notifyObservers(new ColumnHeaderSelectionChangeNotification(table));

Also available in: Unified diff