Changeset 104 in josm for src/org/openstreetmap/josm/gui/ConflictResolver.java

Timestamp:

2006-07-03T00:31:24+02:00 (18 years ago)

Author:

imi

Message:

• started i18n
• started "download incomplete ways" action
• added straight line selection mode

File:

• src/org/openstreetmap/josm/gui/ConflictResolver.java (modified) (6 diffs)

src/org/openstreetmap/josm/gui/ConflictResolver.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.Component;
@@ -76 +79 @@
                 }
 
-                public String getColumnName(int columnIndex) {return columnIndex == 0 ? "Key" : "Value";}
+                public String getColumnName(int columnIndex) {return columnIndex == 0 ? tr("Key") : tr("Value");}
                 public int getColumnCount() {return 2;}
                 public boolean isCellEditable(int row, int column) {return false;}
@@ -158 +161 @@
                 
                 if (this.conflicts.isEmpty())
-                        throw new RuntimeException("No conflicts but in conflict list:\n" + Arrays.toString(conflicts.entrySet().toArray()));
+                        throw new RuntimeException(tr("No conflicts but in conflict list:\n{0}" , Arrays.toString(conflicts.entrySet().toArray())));
 
                 // have to initialize the JTables here and not in the declaration, because its constructor
@@ -227 +230 @@
                 resolveTable.addMouseListener(new DblClickListener(null));
 
-                add(new JLabel(conflicts.size()+" object"+(conflicts.size()==1?" has":"s have")+" conflicts:"), GBC.eol().insets(0,0,0,10));
+                add(new JLabel(trn("{0} object has conflicts:","{0} objects have conflicts:",conflicts.size(),conflicts.size())), GBC.eol().insets(0,0,0,10));
 
                 JPanel p = new JPanel(new GridBagLayout());
-                p.add(new JLabel("my version:"), GBC.eol());
+                p.add(new JLabel(tr("my version:")), GBC.eol());
                 p.add(new JScrollPane(myTable), GBC.eol().fill(GBC.BOTH));
                 p.add(new JButton(new ResolveAction("down", Resolution.MY)), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,0));
@@ -236 +239 @@
 
                 p = new JPanel(new GridBagLayout());
-                p.add(new JLabel("their version:"), GBC.eol());
+                p.add(new JLabel(tr("their version:")), GBC.eol());
                 p.add(new JScrollPane(theirTable), GBC.eol().fill(GBC.BOTH));
                 p.add(new JButton(new ResolveAction("down", Resolution.THEIR)), GBC.eol().anchor(GBC.CENTER).insets(0,5,0,0));
@@ -242 +245 @@
 
                 add(new JButton(new ResolveAction("up", null)), GBC.eol().anchor(GBC.CENTER));
-                add(new JLabel("resolved version:"), GBC.eol().insets(0,5,0,0));
+                add(new JLabel(tr("resolved version:")), GBC.eol().insets(0,5,0,0));
                 add(new JScrollPane(resolveTable), GBC.eol().anchor(GBC.CENTER).fill(GBC.BOTH));
         }