Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
r8384 r8510 29 29 30 30 /** background color used when the coordinates are different */ 31 public static final Color BGCOLOR_DIFFERENCE = new Color(255, 197,197);31 public static final Color BGCOLOR_DIFFERENCE = new Color(255, 197, 197); 32 32 33 33 /** the model */ … … 55 55 gc.weightx = 0.5; 56 56 gc.weighty = 0.0; 57 gc.insets = new Insets(5, 5,5,0);57 gc.insets = new Insets(5, 5, 5, 0); 58 58 gc.fill = GridBagConstraints.HORIZONTAL; 59 59 gc.anchor = GridBagConstraints.FIRST_LINE_START; 60 60 referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME); 61 add(referenceInfoPanel, gc);61 add(referenceInfoPanel, gc); 62 62 63 63 gc.gridx = 1; … … 68 68 gc.anchor = GridBagConstraints.FIRST_LINE_START; 69 69 currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME); 70 add(currentInfoPanel, gc);70 add(currentInfoPanel, gc); 71 71 72 72 // --------------------------- … … 199 199 gc.fill = GridBagConstraints.NONE; 200 200 gc.weightx = 0.0; 201 gc.insets = new Insets(5, 5,5,5);201 gc.insets = new Insets(5, 5, 5, 5); 202 202 gc.anchor = GridBagConstraints.NORTHWEST; 203 203 add(new JLabel(tr("Latitude: ")), gc); … … 211 211 lblLat.setBackground(Color.WHITE); 212 212 lblLat.setOpaque(true); 213 lblLat.setBorder(BorderFactory.createEmptyBorder(2, 2,2,2));213 lblLat.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); 214 214 215 215 // -------- … … 229 229 lblLon.setBackground(Color.WHITE); 230 230 lblLon.setOpaque(true); 231 lblLon.setBorder(BorderFactory.createEmptyBorder(2, 2,2,2));231 lblLon.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); 232 232 233 233 // fill the remaining space … … 257 257 if (!(p instanceof HistoryNode)) return false; 258 258 if (!(opposite instanceof HistoryNode)) return false; 259 HistoryNode node = (HistoryNode) p;259 HistoryNode node = (HistoryNode) p; 260 260 HistoryNode oppositeNode = (HistoryNode) opposite; 261 261 … … 312 312 gc.fill = GridBagConstraints.NONE; 313 313 gc.weightx = 0.0; 314 gc.insets = new Insets(5, 5,5,5);314 gc.insets = new Insets(5, 5, 5, 5); 315 315 gc.anchor = GridBagConstraints.NORTHWEST; 316 316 add(new JLabel(tr("Distance: ")), gc); … … 324 324 lblDistance.setBackground(Color.WHITE); 325 325 lblDistance.setOpaque(true); 326 lblDistance.setBorder(BorderFactory.createEmptyBorder(2, 2,2,2));326 lblDistance.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); 327 327 } 328 328 -
trunk/src/org/openstreetmap/josm/gui/history/DiffTableModel.java
r8308 r8510 22 22 fireTableDataChanged(); 23 23 } 24 24 25 @Override 25 26 public int getRowCount() { … … 42 43 43 44 public int getFirstChange() { 44 for (int i =0; i<rows.size(); i++) {45 for (int i = 0; i < rows.size(); i++) { 45 46 if (rows.get(i).state != DiffItemType.SAME) 46 47 return i; -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
r8470 r8510 153 153 } 154 154 155 156 155 class CloseAction extends AbstractAction { 157 156 public CloseAction() { -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
r8465 r8510 154 154 @Override 155 155 public void activeLayerChange(Layer oldLayer, Layer newLayer) {} 156 156 157 @Override 157 158 public void layerAdded(Layer newLayer) {} -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r8509 r8510 138 138 return false; 139 139 } 140 140 141 protected boolean canShowAsLatest(OsmPrimitive primitive) { 141 142 if (primitive == null) return false; … … 224 225 */ 225 226 protected void initNodeListTableModels() { 226 if (current.getType() != OsmPrimitiveType.WAY || reference.getType() != OsmPrimitiveType.WAY)227 if (current.getType() != OsmPrimitiveType.WAY || reference.getType() != OsmPrimitiveType.WAY) 227 228 return; 228 229 TwoColumnDiff diff = new TwoColumnDiff( 229 ((HistoryWay) reference).getNodes().toArray(),230 ((HistoryWay) current).getNodes().toArray());230 ((HistoryWay) reference).getNodes().toArray(), 231 ((HistoryWay) current).getNodes().toArray()); 231 232 referenceNodeListTableModel.setRows(diff.referenceDiff, diff.referenceReversed); 232 233 currentNodeListTableModel.setRows(diff.currentDiff, false); … … 234 235 235 236 protected void initMemberListTableModels() { 236 if (current.getType() != OsmPrimitiveType.RELATION || reference.getType() != OsmPrimitiveType.RELATION)237 if (current.getType() != OsmPrimitiveType.RELATION || reference.getType() != OsmPrimitiveType.RELATION) 237 238 return; 238 239 TwoColumnDiff diff = new TwoColumnDiff( 239 ((HistoryRelation) reference).getMembers().toArray(),240 ((HistoryRelation) current).getMembers().toArray());240 ((HistoryRelation) reference).getMembers().toArray(), 241 ((HistoryRelation) current).getMembers().toArray()); 241 242 referenceRelationMemberTableModel.setRows(diff.referenceDiff, diff.referenceReversed); 242 243 currentRelationMemberTableModel.setRows(diff.currentDiff, false); … … 735 736 public void activeLayerChange(Layer oldLayer, Layer newLayer) { 736 737 if (oldLayer instanceof OsmDataLayer) { 737 OsmDataLayer l = (OsmDataLayer) oldLayer;738 OsmDataLayer l = (OsmDataLayer) oldLayer; 738 739 l.data.removeDataSetListener(this); 739 740 } … … 743 744 return; 744 745 } 745 OsmDataLayer l = (OsmDataLayer) newLayer;746 OsmDataLayer l = (OsmDataLayer) newLayer; 746 747 l.data.addDataSetListener(this); 747 748 OsmPrimitive primitive = l.data.getPrimitiveById(history.getId(), history.getType()); … … 758 759 @Override 759 760 public void layerAdded(Layer newLayer) {} 761 760 762 @Override 761 763 public void layerRemoved(Layer oldLayer) {} … … 778 780 clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), getCurrentUser(), 0, null, false); 779 781 clone.setTags(r.getKeys()); 780 HistoryRelation hr = (HistoryRelation) clone;782 HistoryRelation hr = (HistoryRelation) clone; 781 783 for (RelationMember rm : r.getMembers()) { 782 784 hr.addMember(new RelationMemberData(rm.getRole(), rm.getType(), rm.getUniqueId())); … … 789 791 clone.setTags(w.getKeys()); 790 792 for (Node n: w.getNodes()) { 791 ((HistoryWay) clone).addNode(n.getUniqueId());793 ((HistoryWay) clone).addNode(n.getUniqueId()); 792 794 } 793 795 } -
trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
r8291 r8510 190 190 try { 191 191 progressMonitor.setTicksCount(toLoad.size()); 192 for (PrimitiveId pid: toLoad) {192 for (PrimitiveId pid: toLoad) { 193 193 if (canceled) { 194 194 break; … … 212 212 ds.putChangeset(i); 213 213 } 214 } catch (OsmTransferException e) {214 } catch (OsmTransferException e) { 215 215 if (canceled) 216 216 return; … … 219 219 loadedData.mergeInto(ds); 220 220 } 221 } catch (OsmTransferException e) {221 } catch (OsmTransferException e) { 222 222 lastException = e; 223 223 return; -
trunk/src/org/openstreetmap/josm/gui/history/HistoryViewerPanel.java
r8308 r8510 82 82 gc.weightx = 0.5; 83 83 gc.weighty = 0.0; 84 gc.insets = new Insets(5, 5,5,0);84 gc.insets = new Insets(5, 5, 5, 0); 85 85 gc.fill = GridBagConstraints.HORIZONTAL; 86 86 gc.anchor = GridBagConstraints.FIRST_LINE_START; 87 87 referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME); 88 add(referenceInfoPanel, gc);88 add(referenceInfoPanel, gc); 89 89 90 90 gc.gridx = 1; … … 97 97 gc.anchor = GridBagConstraints.FIRST_LINE_START; 98 98 currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME); 99 add(currentInfoPanel, gc);99 add(currentInfoPanel, gc); 100 100 101 101 adjustmentSynchronizer = new AdjustmentSynchronizer(); … … 111 111 gc.fill = GridBagConstraints.BOTH; 112 112 gc.anchor = GridBagConstraints.NORTHWEST; 113 add(embedInScrollPane(buildReferenceTable()), gc);113 add(embedInScrollPane(buildReferenceTable()), gc); 114 114 115 115 gc.gridx = 1; … … 121 121 gc.fill = GridBagConstraints.BOTH; 122 122 gc.anchor = GridBagConstraints.NORTHWEST; 123 add(embedInScrollPane(buildCurrentTable()), gc);123 add(embedInScrollPane(buildCurrentTable()), gc); 124 124 } 125 125 } -
trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
r6986 r8510 17 17 public class NodeListTableCellRenderer extends JLabel implements TableCellRenderer { 18 18 19 public static final Color BGCOLOR_SELECTED = new Color(143, 170,255);19 public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255); 20 20 21 21 private ImageIcon nodeIcon; … … 24 24 * Constructs a new {@code NodeListTableCellRenderer}. 25 25 */ 26 public NodeListTableCellRenderer() {26 public NodeListTableCellRenderer() { 27 27 setOpaque(true); 28 28 nodeIcon = ImageProvider.get("data", "node"); … … 54 54 int row, int column) { 55 55 56 renderNode((TwoColumnDiff.Item) value, isSelected);56 renderNode((TwoColumnDiff.Item) value, isSelected); 57 57 return this; 58 58 } -
trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
r8308 r8510 118 118 gc.weightx = 0.5; 119 119 gc.weighty = 0.0; 120 gc.insets = new Insets(5, 5,5,0);120 gc.insets = new Insets(5, 5, 5, 0); 121 121 gc.fill = GridBagConstraints.HORIZONTAL; 122 122 gc.anchor = GridBagConstraints.FIRST_LINE_START; 123 123 referenceInfoPanel = new VersionInfoPanel(model, PointInTimeType.REFERENCE_POINT_IN_TIME); 124 add(referenceInfoPanel, gc);124 add(referenceInfoPanel, gc); 125 125 126 126 gc.gridx = 1; … … 133 133 gc.anchor = GridBagConstraints.FIRST_LINE_START; 134 134 currentInfoPanel = new VersionInfoPanel(model, PointInTimeType.CURRENT_POINT_IN_TIME); 135 add(currentInfoPanel, gc);135 add(currentInfoPanel, gc); 136 136 137 137 adjustmentSynchronizer = new AdjustmentSynchronizer(); … … 149 149 gc.fill = GridBagConstraints.BOTH; 150 150 gc.anchor = GridBagConstraints.NORTHWEST; 151 add(embeddInScrollPane(buildReferenceNodeListTable()), gc);151 add(embeddInScrollPane(buildReferenceNodeListTable()), gc); 152 152 153 153 gc.gridx = 1; … … 159 159 gc.fill = GridBagConstraints.BOTH; 160 160 gc.anchor = GridBagConstraints.NORTHWEST; 161 add(embeddInScrollPane(buildCurrentNodeListTable()), gc);161 add(embeddInScrollPane(buildCurrentNodeListTable()), gc); 162 162 } 163 163 … … 175 175 } 176 176 } 177 177 178 protected void registerAsObserver(HistoryBrowserModel model) { 178 179 if (currentInfoPanel != null) { … … 205 206 } 206 207 207 public void prepare(PrimitiveId pid) {208 public void prepare(PrimitiveId pid) { 208 209 zoomToNodeAction.setPrimitiveId(pid); 209 210 zoomToNodeAction.updateEnabledState(); … … 310 311 private static PrimitiveId primitiveIdAtRow(TableModel model, int row) { 311 312 DiffTableModel castedModel = (DiffTableModel) model; 312 Long id = (Long) castedModel.getValueAt(row, 0).value;313 if (id == null) return null;313 Long id = (Long) castedModel.getValueAt(row, 0).value; 314 if (id == null) return null; 314 315 return new SimplePrimitiveId(id, OsmPrimitiveType.NODE); 315 316 } … … 340 341 if (e.getClickCount() < 2) return; 341 342 int row = table.rowAtPoint(e.getPoint()); 342 if (row <= 0) return;343 if (row <= 0) return; 343 344 PrimitiveId pid = primitiveIdAtRow(table.getModel(), row); 344 345 if (pid == null || pid.isNew()) -
trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
r8388 r8510 25 25 public class RelationMemberListTableCellRenderer extends JLabel implements TableCellRenderer { 26 26 27 public static final Color BGCOLOR_EMPTY_ROW = new Color(234, 234,234);28 public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197,197);29 public static final Color BGCOLOR_IN_OPPOSITE = new Color(255, 234,213);30 public static final Color BGCOLOR_SELECTED = new Color(143, 170,255);27 public static final Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234); 28 public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197); 29 public static final Color BGCOLOR_IN_OPPOSITE = new Color(255, 234, 213); 30 public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255); 31 31 32 32 private transient Map<OsmPrimitiveType, ImageIcon> icons; … … 55 55 Color bgColor = diffItem.state.getColor(); 56 56 RelationMemberData member = (RelationMemberData) diffItem.value; 57 text = member == null ?"":member.getRole();57 text = member == null ? "" : member.getRole(); 58 58 setText(text); 59 59 setToolTipText(text); … … 83 83 int row, int column) { 84 84 85 Item member = (TwoColumnDiff.Item) value;85 Item member = (TwoColumnDiff.Item) value; 86 86 renderIcon((RelationMemberData) member.value); 87 87 switch(column) { -
trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
r6792 r8510 30 30 @Override 31 31 public void tableChanged(TableModelEvent e) { 32 Rectangle rect = table.getCellRect(((DiffTableModel) e.getSource()).getFirstChange(), 0, true);32 Rectangle rect = table.getCellRect(((DiffTableModel) e.getSource()).getFirstChange(), 0, true); 33 33 table.scrollRectToVisible(rect); 34 34 } -
trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
r8390 r8510 32 32 @Override 33 33 public void valueChanged(ListSelectionEvent e) { 34 DefaultListSelectionModel referenceModel = (DefaultListSelectionModel) e.getSource();34 DefaultListSelectionModel referenceModel = (DefaultListSelectionModel) e.getSource(); 35 35 int i = referenceModel.getMinSelectionIndex(); 36 36 for (ListSelectionModel model : participants) { … … 38 38 continue; 39 39 } 40 model.setSelectionInterval(i, i);40 model.setSelectionInterval(i, i); 41 41 } 42 42 } -
trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
r8444 r8510 18 18 */ 19 19 public class TagTableCellRenderer extends JLabel implements TableCellRenderer { 20 public static final Color BGCOLOR_DIFFERENCE = new Color(255, 197,197);20 public static final Color BGCOLOR_DIFFERENCE = new Color(255, 197, 197); 21 21 22 22 /** … … 85 85 return this; 86 86 87 String key = (String) value;87 String key = (String) value; 88 88 HistoryBrowserModel.TagTableModel model = getTagTableModel(table); 89 89 -
trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
r8318 r8510 32 32 33 33 public enum DiffItemType { 34 INSERTED(new Color(0xDD, 0xFF, 0xDD)), DELETED(new Color(255,197,197)), CHANGED(new Color(255,234,213)), 35 SAME(new Color(234,234,234)), EMPTY(new Color(234,234,234)); 34 INSERTED(new Color(0xDD, 0xFF, 0xDD)), 35 DELETED(new Color(255, 197, 197)), 36 CHANGED(new Color(255, 234, 213)), 37 SAME(new Color(234, 234, 234)), 38 EMPTY(new Color(234, 234, 234)); 36 39 37 40 private final Color color; … … 39 42 this.color = color; 40 43 } 44 41 45 public Color getColor() { 42 46 return color; … … 91 95 int ib = 0; 92 96 93 while (script != null) {97 while (script != null) { 94 98 int deleted = script.deleted; 95 99 int inserted = script.inserted; 96 while (ia < script.line0 && ib < script.line1){100 while (ia < script.line0 && ib < script.line1) { 97 101 Item cell = new Item(DiffItemType.SAME, a[ia]); 98 102 referenceDiff.add(cell); … … 102 106 } 103 107 104 while (inserted > 0 || deleted > 0) {105 if (inserted > 0 && deleted > 0) {108 while (inserted > 0 || deleted > 0) { 109 if (inserted > 0 && deleted > 0) { 106 110 referenceDiff.add(new Item(DiffItemType.CHANGED, a[ia++])); 107 111 currentDiff.add(new Item(DiffItemType.CHANGED, b[ib++])); 108 } else if (inserted > 0) {112 } else if (inserted > 0) { 109 113 referenceDiff.add(new Item(DiffItemType.EMPTY, null)); 110 114 currentDiff.add(new Item(DiffItemType.INSERTED, b[ib++])); … … 118 122 script = script.link; 119 123 } 120 while (ia < a.length && ib < b.length) {124 while (ia < a.length && ib < b.length) { 121 125 referenceDiff.add(new Item(DiffItemType.SAME, a[ia++])); 122 126 currentDiff.add(new Item(DiffItemType.SAME, b[ib++])); -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r8426 r8510 92 92 pnl1.add(lblInfo, BorderLayout.CENTER); 93 93 94 JPanel pnlUserAndChangeset = new JPanel(new GridLayout(2, 2));94 JPanel pnlUserAndChangeset = new JPanel(new GridLayout(2, 2)); 95 95 lblUser = new UrlLabel("", 2); 96 96 pnlUserAndChangeset.add(new JLabel(tr("User:"))); -
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r8475 r8510 124 124 super(popupMenu); 125 125 } 126 126 127 @Override 127 128 public void mousePressed(MouseEvent e) { … … 136 137 } 137 138 } 139 138 140 @Override 139 141 protected int checkTableSelection(JTable table, Point p) { … … 228 230 private UserInfoAction userInfoAction; 229 231 232 /** 233 * Constructs a new {@code VersionTablePopupMenu}. 234 */ 235 public VersionTablePopupMenu() { 236 super(); 237 build(); 238 } 239 230 240 protected void build() { 231 241 changesetInfoAction = new ChangesetInfoAction(); … … 234 244 add(userInfoAction); 235 245 } 236 public VersionTablePopupMenu() {237 super();238 build();239 }240 246 241 247 public void prepare(HistoryOsmPrimitive primitive) { … … 251 257 public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, 252 258 int row, int column) { 253 setSelected(value != null && (Boolean) value);259 setSelected(value != null && (Boolean) value); 254 260 setHorizontalAlignment(SwingConstants.CENTER); 255 261 return this; … … 314 320 int maxwidth = 0; 315 321 316 for (int row =0; row<tbl.getRowCount(); row++) {322 for (int row = 0; row < tbl.getRowCount(); row++) { 317 323 TableCellRenderer tcr = tbl.getCellRenderer(row, col); 318 324 Object val = tbl.getValueAt(row, col);
Note:
See TracChangeset
for help on using the changeset viewer.