Changeset 13959 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
- Timestamp:
- 2018-06-19T19:44:45+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r13956 r13959 178 178 private final transient DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this); 179 179 private final HelpAction helpAction = new HelpAction(tagTable, editHelper::getDataKey, editHelper::getDataValues, 180 membershipTable, x -> ( Relation) membershipData.getValueAt(x, 0));180 membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0)); 181 181 private final TaginfoAction taginfoAction = new TaginfoAction(tagTable, editHelper::getDataKey, editHelper::getDataValues, 182 membershipTable, x -> ( Relation) membershipData.getValueAt(x, 0));182 membershipTable, x -> (IRelation<?>) membershipData.getValueAt(x, 0)); 183 183 private final PasteValueAction pasteValueAction = new PasteValueAction(); 184 184 private final CopyValueAction copyValueAction = new CopyValueAction( … … 378 378 protected int checkTableSelection(JTable table, Point p) { 379 379 int row = super.checkTableSelection(table, p); 380 List< Relation> rels = new ArrayList<>();380 List<IRelation<?>> rels = new ArrayList<>(); 381 381 for (int i: table.getSelectedRows()) { 382 rels.add(( Relation) table.getValueAt(i, 0));382 rels.add((IRelation<?>) table.getValueAt(i, 0)); 383 383 } 384 384 membershipMenuHandler.setPrimitives(rels); … … 569 569 Collection<? extends IPrimitive> newSel = Main.main.getInProgressISelection(); 570 570 String selectedTag; 571 RelationselectedRelation = null;571 IRelation<?> selectedRelation = null; 572 572 selectedTag = editHelper.getChangedKey(); // select last added or last edited key by default 573 573 if (selectedTag == null && tagTable.getSelectedRowCount() == 1) { … … 575 575 } 576 576 if (membershipTable.getSelectedRowCount() == 1) { 577 selectedRelation = ( Relation) membershipData.getValueAt(membershipTable.getSelectedRow(), 0);577 selectedRelation = (IRelation<?>) membershipData.getValueAt(membershipTable.getSelectedRow(), 0); 578 578 } 579 579 … … 775 775 if (c instanceof JLabel) { 776 776 JLabel label = (JLabel) c; 777 Relation r = (Relation) value;777 IRelation<?> r = (IRelation<?>) value; 778 778 label.setText(r.getDisplayName(DefaultNameFormatter.getInstance())); 779 779 if (r.isDisabledAndHidden()) { … … 792 792 return this; 793 793 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column); 794 boolean isDisabledAndHidden = (( Relation) table.getValueAt(row, 0)).isDisabledAndHidden();794 boolean isDisabledAndHidden = ((IRelation<?>) table.getValueAt(row, 0)).isDisabledAndHidden(); 795 795 if (c instanceof JLabel) { 796 796 JLabel label = (JLabel) c; … … 809 809 boolean isSelected, boolean hasFocus, int row, int column) { 810 810 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column); 811 boolean isDisabledAndHidden = (( Relation) table.getValueAt(row, 0)).isDisabledAndHidden();811 boolean isDisabledAndHidden = ((IRelation<?>) table.getValueAt(row, 0)).isDisabledAndHidden(); 812 812 if (c instanceof JLabel) { 813 813 JLabel label = (JLabel) c;
Note:
See TracChangeset
for help on using the changeset viewer.