/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 27382

+    					}
     					projectTable.setStore(fs);
     					FeatureTableDocumentPanel t = new FeatureTableDocumentPanel(projectTable);
     					if (fs.isEditing()) {
     						// FIXME ???
     //						fs.addObserver(t);
+    					}
     					fs.addObserver(t);
     					t.getModel().setModified(true);
     					PluginServices.getMDIManager().addWindow(t);
+    				}

     import javax.swing.JButton;
     import javax.swing.JLabel;
     import javax.swing.JPanel;
     import javax.swing.event.ListSelectionEvent;
     import javax.swing.event.ListSelectionListener;
     import javax.swing.event.TableModelEvent;
     import javax.swing.event.TableModelListener;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureStoreNotification;
     import org.gvsig.fmap.data.feature.swing.FeatureTypesTablePanel;
     import org.gvsig.fmap.data.feature.swing.table.notification.ColumnHeaderSelectionChangeNotification;
     import org.gvsig.project.document.table.FeatureTableDocument;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
-...
      * @author <a href="mailto:cordin@disid.com">C?sar Ordi?ana</a>
      */
     public class FeatureTableDocumentPanel extends FeatureTypesTablePanel implements
             SingletonWindow, IWindowTransform, Observer {
             SingletonWindow, IWindowTransform, Observer, ListSelectionListener,
     		TableModelListener {
         private boolean showTypes=false;
         private static final long serialVersionUID = -1003263265311764630L;
-...
     	private JLabel jLabel;
     	private JButton bShowFeatureTypes = null;
     	private JPanel jPanel1 = null;
     	public FeatureTableDocumentPanel(FeatureTableDocument document)
     			throws DataException {
-...
+    	}
     	public void update(Observable arg0, Object arg1) {
     		if (this.model.getStore().equals(arg0)) {
     			FeatureStoreNotification event = (FeatureStoreNotification) arg1;
     			if (event.getType() == FeatureStoreNotification.TRANSFORM_CHANGE
     					|| event.getType() == FeatureStoreNotification.RESOURCE_CHANGED) {
     				//FIXME!!! que hacemos
     				return;
+    			}
     			updateSelection();
     			repaint();
     		if (arg1 instanceof ColumnHeaderSelectionChangeNotification) {
     			PluginServices.getMainFrame().enableControls();
+    		}
     		PluginServices.getMainFrame().enableControls();
+    	}
     	public void updateSelection() {
-...
+    		}
     		return jPanel;
+    	}
     	private void initialize(){
     	private void initialize() throws DataException {
     		add(getJPanel(),BorderLayout.SOUTH);
     		try {
     			getTablePanel().getTable().addObserver(this);
     		} catch (DataException e) {
     			e.printStackTrace();
+    		}
     		getTablePanel().getTable().addObserver(this);
     		getTablePanel().getTable().getSelectionModel()
     				.addListSelectionListener(this);
     		getTableModel().addTableModelListener(this);
+    	}
     	/**
-...
     		return WindowInfo.EDITOR_PROFILE;
+    	}
     //	/**
     //	 * This method initializes jPanel1
     //	 *
     //	 * @return javax.swing.JPanel
     //	 */
     //	private JPanel getJPanel1() {
     //		if (jPanel1 == null) {
     //			jPanel1 = new JPanel();
     //			jPanel1.setLayout(new GridBagLayout());
     //			jPanel1.add(getBShowFeatureTypes(), null);
     //		}
     //		return jPanel1;
     //	}
     	public void valueChanged(ListSelectionEvent e) {
     		this.updateSelection();
     		this.updateUI();
+    	}
     	public void tableChanged(TableModelEvent e) {
     		this.updateSelection();
     		this.updateUI();
+    	}
+    }

                 FeatureStoreNotification fsNotification = (FeatureStoreNotification) notification;
                 String type = fsNotification.getType();
                 System.out.println("FeatureTableModel.update(): " + type);
                 // If there are new, updated or deleted features
                 // reload the table data
                 if (FeatureStoreNotification.AFTER_DELETE.equals(type)
-...
                 } else if (FeatureStoreNotification.TRANSFORM_CHANGE.equals(type)) {
                     reloadIfTypeTransformed();
                 } else if (FeatureStoreNotification.AFTER_FINISHEDITING.equals(type)) {
                 	reloadFeatures();
                 } else if (FeatureStoreNotification.AFTER_FINISHEDITING
     					.equals(type)
     					|| FeatureStoreNotification.AFTER_CANCELEDITING
     							.equals(type)) {
                 	reloadIfTypeTransformed();
+                }
+            }
-...
          */
         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();
+            }
     		// listeners. Ignore the case where the updated feature is
     		// changed through us.
     		if (editableFeature == null || !editableFeature.equals(feature)) {
     			reloadFeatures();
     			fireTableDataChanged();
+    		}
+        }
         /**

     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureStoreNotification;
     import org.gvsig.fmap.data.feature.swing.table.FeatureTableModel;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
     /**
      * ListSelectionModel implementation based on the FeatureSelection of a
-...
+     *
      * @author <a href="mailto:cordin@disid.com">C?sar Ordi?ana</a>
      */
     public class FeatureSelectionModel extends DefaultListSelectionModel {
     public class FeatureSelectionModel extends DefaultListSelectionModel implements
     		Observer {
         private static final long serialVersionUID = 7643472991526133823L;
         private final FeatureSelection selection;
         private final FeatureTableModel featureTableModel;
         /**
-...
         public FeatureSelectionModel(FeatureTableModel featureTableModel)
                 throws DataException {
             this.featureTableModel = featureTableModel;
             FeatureStore store = getFeatureStore();
             this.selection = store.getFeatureSelection();
             this.featureTableModel.getFeatureStore().addObserver(this);
+        }
         @Override
-...
         		return false;
+        	}
             Feature feature = featureTableModel.getFeatureAt(index);
             return selection.isSelected(feature);
             return getSelection().isSelected(feature);
             // }
+        }
-...
         public void setSelectionInterval(int index0, int index1) {
             // if (!getValueIsAdjusting()) {
             try {
                 selection.deselectAll();
             	getSelection().deselectAll();
             } catch (DataException ex) {
                 throw new SelectionChangeException(ex);
+            }
-...
         private void selectFeatureInterval(int index0, int index1, boolean select) {
             // If only single selection is allowed, the valid value is index1
             if (getSelectionMode() == SINGLE_SELECTION) {
                 selectFeatureAt(index1, select);
                 selectFeatureAt(index1, select, getSelection());
             } else {
                 // index0 < index1 is not guaranteed
                 int first = index0 <= index1 ? index0 : index1;
-...
                 if (first == 0 && last == featureTableModel.getRowCount() - 1) {
                     try {
                         if (select) {
                             selection.selectAll();
                         	getSelection().selectAll();
                         } else {
                             selection.deselectAll();
                         	getSelection().deselectAll();
+                        }
                     } catch (DataException ex) {
                         throw new SelectionChangeException(ex);
+                    }
                 } else {
                     for (int i = first; i <= last; i++) {
                         selectFeatureAt(i, select);
                 	FeatureSelection selection;
     				try {
     					selection = this.getFeatureStore().createFeatureSelection();
     				} catch (DataException e) {
     					throw new SelectionChangeException(e);
+    				}
     				for (int i = first; i <= last; i++) {
     					selectFeatureAt(i, select, selection);
+                    }
     				try {
     					this.getFeatureStore().setSelection(selection);
     				} catch (DataException e) {
     					throw new SelectionChangeException(e);
+    				}
+                }
+            }
+        }
         /**
          * Selects a feature at a row position.
+         *
          * @param index
          *            the Feature row index
          * @param select
          *            if to select or deselect
          */
         private void selectFeatureAt(int index, boolean select) {
     	/**
     	 * Selects a feature at a row position.
+    	 *
     	 * @param index
     	 *            the Feature row index
     	 * @param select
     	 *            if to select or deselect
     	 * @param selection
     	 *            selection instance to use
     	 */
         private void selectFeatureAt(int index, boolean select,
     			FeatureSelection selection) {
             Feature feature = getFeature(index);
             if (select) {
                 selection.select(feature);
             } else {
                 selection.deselect(feature);
             	selection.deselect(feature);
+            }
+        }
-...
         private FeatureStore getFeatureStore() {
             return featureTableModel.getFeatureStore();
+        }
         /**
     	 * Returns the FeatureStore.
     	 */
     	private FeatureSelection getSelection() {
             try {
     			return (FeatureSelection) getFeatureStore().getSelection();
     		} catch (DataException ex) {
     			throw new SelectionChangeException(ex);
+    		}
+    	}
     	public void update(Observable observable, Object notification) {
     		if (notification instanceof FeatureStoreNotification) {
     			FeatureStoreNotification fnotification = (FeatureStoreNotification) notification;
     			if (!fnotification.getSource().equals(getFeatureStore())) {
     				return;
+    			}
     			if (FeatureStoreNotification.SELECTION_CHANGE.equals(fnotification
     					.getType())) {
     				this.fireValueChanged(-1, -1, false);
+    			}
+    		}
+    	}
+    }

Also available in: Unified diff