Changeset 23830 in osm for applications


Ignore:
Timestamp:
2010-10-25T22:41:03+02:00 (14 years ago)
Author:
oliverw
Message:

Added table models for incomplete and unresolved addresses.

Location:
applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java

    r23829 r23830  
    175175        }
    176176       
     177        public List<AddressNode> getUnresolvedAddresses() {
     178                return unresolvedAddresses;
     179        }
     180
     181        public List<AddressNode> getIncompleteAddresses() {
     182                return incompleteAddresses;
     183        }
     184
    177185        public List<StreetNode> getStreetList() {
    178186               

  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

    r23829 r23830  
    6262        private static final long serialVersionUID = 6251676464816335631L;
    6363        private AddressEditContainer model;
    64         private JTree unresolvedTree;
    65         private JTree incompleteTree;
     64        private JTable unresolvedTable;
     65        private JTable incompleteTable;
    6666        private JTable streetList;
    67         private DefaultMutableTreeNode selStreet;
    68         private DefaultMutableTreeNode selUnrAddr;
    69         private DefaultMutableTreeNode selIncAddr;
    7067       
    7168        private AssignAddressToStreetAction resolveAction = new AssignAddressToStreetAction();
    … …  
    9188                if (addressEditContainer != null) {
    9289                        JPanel streetPanel = new JPanel(new BorderLayout());
    93                         /*
    94                         streetsTree = new JTree(new DefaultTreeModel(addressEditContainer.getStreetsTree()));
    95                         streetsTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
    96                         streetsTree.addTreeSelectionListener(this);
    97                         streetsTree.setCellRenderer(new StreetTreeCellRenderer());
    98                         */
    9990                        streetList = new JTable(new StreetTableModel(model));
    10091                        streetList.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     92                        streetList.getSelectionModel().addListSelectionListener(this);
    10193                       
    10294                        JScrollPane scroll1 = new JScrollPane(streetList);
    … …  
    10698                       
    10799                        JPanel unresolvedPanel = new JPanel(new BorderLayout());               
    108                         unresolvedTree = new JTree(new DefaultTreeModel(new DefaultMutableTreeNode()));
    109                         unresolvedTree.addTreeSelectionListener(this);
     100                        unresolvedTable = new JTable(new UnresolvedAddressesTableModel(model));
     101                        unresolvedTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     102                        unresolvedTable.getSelectionModel().addListSelectionListener(this);
    110103                       
    111                         JScrollPane scroll2 = new JScrollPane(unresolvedTree);
     104                        JScrollPane scroll2 = new JScrollPane(unresolvedTable);
    112105                        unresolvedPanel.add(scroll2, BorderLayout.CENTER);
    113106                        unresolvedPanel.add(new JLabel("Unresolved Addresses"), BorderLayout.NORTH);
    … …  
    120113                       
    121114                        JPanel incompletePanel = new JPanel(new BorderLayout());
    122                         incompleteTree = new JTree(new DefaultTreeModel(new DefaultMutableTreeNode()));
    123                         incompleteTree.addTreeSelectionListener(this);
    124                         JScrollPane scroll3 = new JScrollPane(incompleteTree);
     115                       
     116                        incompleteTable = new JTable(new IncompleteAddressesTableModel(model));
     117                        incompleteTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     118                        incompleteTable.getSelectionModel().addListSelectionListener(this);
     119                        JScrollPane scroll3 = new JScrollPane(incompleteTable);
     120                       
    125121                        incompletePanel.add(scroll3, BorderLayout.CENTER);
    126122                        incompletePanel.add(new JLabel("Incomplete Addresses"), BorderLayout.NORTH);

  • applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/StreetTableModel.java

    r23829 r23830  
    2323        private static final int NUMBER_OF_COLUMNS = 4;
    2424        private static final String[] COLUMN_NAMES = new String[]{tr("Type"), tr("Name"), tr("Segments"), tr("Addresses")};
     25        private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, String.class, Integer.class, Integer.class};
    2526       
    2627        /**
    … …  
    3940        }
    4041
     42        /* (non-Javadoc)
     43         * @see javax.swing.table.DefaultTableModel#getColumnCount()
     44         */
    4145        @Override
    4246        public int getColumnCount() {
    … …  
    4549        }
    4650
     51        /* (non-Javadoc)
     52         * @see javax.swing.table.DefaultTableModel#getColumnName(int)
     53         */
    4754        @Override
    4855        public String getColumnName(int column) {
    4956                return COLUMN_NAMES[column];
    5057        }
     58       
     59        /* (non-Javadoc)
     60         * @see javax.swing.table.AbstractTableModel#getColumnClass(int)
     61         */
     62        @Override
     63        public Class<?> getColumnClass(int columnIndex) {
     64                return COLUMN_CLASSES[columnIndex];
     65        }
    5166
     67        /* (non-Javadoc)
     68         * @see javax.swing.table.DefaultTableModel#getRowCount()
     69         */
    5270        @Override
    5371        public int getRowCount() {
    … …  
    5876        }
    5977
     78        /* (non-Javadoc)
     79         * @see javax.swing.table.DefaultTableModel#getValueAt(int, int)
     80         */
    6081        @Override
    6182        public Object getValueAt(int row, int column) {
    … …  
    88109                return false;
    89110        }
    90        
    91        
    92        
    93111}
Note: See TracChangeset for help on using the changeset viewer.