/ - Diff - Application: gvSIG desktop - gvSIG

Revision 45695

     import javax.swing.JTable;
     import javax.swing.table.AbstractTableModel;
     import javax.swing.table.DefaultTableCellRenderer;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.fmap.dal.complements.Search;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
-...
         public boolean isCellEditable(int rowIndex, int columnIndex) {
             return false;
+        }
         public FeatureAttributeDescriptor getFeatureDescriptor(int columnIndex) {
             String attrName = this.columnNames.get(columnIndex);
             if (this.featureType == null) {
                 return null;
+            }
             for (FeatureAttributeDescriptor attr : this.featureType.getAllAttributeDescriptors()) {
                 if (StringUtils.equals(attrName,attr.getName())) {
                     return attr;
+                }
+            }
             return null;
+        }
         @Override
         public Feature get(int position) {

     import java.awt.Cursor;
     import java.awt.Dimension;
     import java.awt.FlowLayout;
     import java.awt.Toolkit;
     import java.awt.datatransfer.Clipboard;
     import java.awt.datatransfer.StringSelection;
     import java.awt.datatransfer.Transferable;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.awt.event.ComponentAdapter;
-...
     import javax.swing.JMenuItem;
     import javax.swing.JOptionPane;
     import javax.swing.JPopupMenu;
     import javax.swing.JTable;
     import javax.swing.ListSelectionModel;
     import javax.swing.SwingUtilities;
     import javax.swing.TransferHandler;
     import javax.swing.event.ChangeEvent;
     import javax.swing.event.ChangeListener;
     import javax.swing.event.ListSelectionEvent;
-...
                 panel.doOrderBy();
+            }
+        }
         private class TablePopupMenu extends JPopupMenu {
                 public final JTable table;
                 public TablePopupMenu(JTable inputTable) {
                     this.table = inputTable;
                     JMenuItem copyRowsActionMenu = new JMenuItem("_Copy_rows");
                     copyRowsActionMenu.addActionListener(new ActionListener() {
                         @Override
                         public void actionPerformed(ActionEvent e) {
                             doCopyRows(table);
+                        }
                     });
                     this.add(copyRowsActionMenu);
+                }
+            }
         private class ActionButtons {
             private final DALActionFactory factory;
-...
                         doShowCellInDialog();
+                    }
+                }
             });
             });
             this.tblResults.setComponentPopupMenu(new TablePopupMenu(this.tblResults));
             this.tblSearchPostProcessResults.setComponentPopupMenu(new TablePopupMenu(this.tblSearchPostProcessResults));
             //this.tblResults.add
             if (this.bookmarks.hasBookmark(this.store.getName())) {
                 Bookmark<DefaultSearchParameters> initBookmark = this.bookmarks.get(this.store.getName());
                 DefaultSearchParameters initSearchParams = initBookmark.getValue().getCopy();
-...
             });
             dialog.show(WindowManager.MODE.DIALOG);
+        }
         private void doCopyRows(JTable table) {
             SimpleFeaturesTableModel model = null;
             if (table.getModel() instanceof SimpleFeaturesTableModel) {
                 model = (SimpleFeaturesTableModel) table.getModel();
+            }
             String LINE_BREAK = System.lineSeparator();
             String CELL_BREAK = "\t";
             char DELIMITER = '"';
             Clipboard CLIPBOARD = Toolkit.getDefaultToolkit().getSystemClipboard();
             int[] selection = table.getSelectedRows();
             for (int i = 0; i < selection.length; i++) {
               selection[i] = table.convertRowIndexToModel(selection[i]);
+            }
             int numCols = table.getColumnCount();
             StringBuilder excelStr = new StringBuilder();
             boolean valueIsNumeric;
             for (int j = 0; j < numCols; j++) {
                 excelStr.append(DELIMITER);
                 excelStr.append(escape(table.getColumnName(j), LINE_BREAK, CELL_BREAK));
                 excelStr.append(DELIMITER);
                 if (j < numCols - 1) {
                     excelStr.append(CELL_BREAK);
+                }
+            }
             excelStr.append(LINE_BREAK);
             for (int i : selection) {
                 for (int j = 0; j < numCols; j++) {
                     valueIsNumeric = false;
                     if (model != null) {
                         FeatureAttributeDescriptor descriptor = model.getFeatureDescriptor(j);
                         if (descriptor.getDataType().isNumeric()) {
                             if (!descriptor.hasAvailableValues()) {
                                 valueIsNumeric = true;
+                            }
+                        }
+                    }
                     if (!valueIsNumeric) {
                         excelStr.append(DELIMITER);
+                    }
                     excelStr.append(escape(table.getValueAt(i, j), LINE_BREAK, CELL_BREAK));
                     if (!valueIsNumeric) {
                         excelStr.append(DELIMITER);
+                    }
                     if (j < numCols - 1) {
                         excelStr.append(CELL_BREAK);
+                    }
+                }
                 excelStr.append(LINE_BREAK);
+            }
             StringSelection sel = new StringSelection(excelStr.toString());
             CLIPBOARD.setContents(sel, sel);
+        }
         private String escape(Object cell,String LINE_BREAK, String CELL_BREAK) {
             return (cell == null ? "" : cell.toString()
                     .replace(CELL_BREAK, " ")
                     );
+        }
         @Override
         public ImageIcon loadImage(String imageName) {
             String name = FilenameUtils.getBaseName(imageName);
-...
+        }
+    }

     import javax.swing.JTable;
     import javax.swing.table.TableModel;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.tools.dispose.Disposable;
     import org.gvsig.tools.util.UnmodifiableBasicList;
-...
         public void setCellRenderers(JTable table);
         public FeatureAttributeDescriptor getFeatureDescriptor(int columnIndex);
+    }

Also available in: Unified diff