Changeset 6814 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2014-02-05T23:22:04+01:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r6316 r6814 87 87 */ 88 88 protected void loadIcons() { 89 mergeComplete = ImageProvider.get("dialogs /conflict","mergecomplete.png" );90 mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" );89 mergeComplete = ImageProvider.get("dialogs", "valid.png" ); 90 mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" ); 91 91 } 92 92 -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java
r6453 r6814 23 23 import org.openstreetmap.josm.Main; 24 24 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 25 import org.openstreetmap.josm.gui.widgets.JosmTextField; 25 26 import org.openstreetmap.josm.io.ChangesetQuery; 27 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException; 26 28 import org.openstreetmap.josm.io.OsmApi; 27 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlException;28 29 import org.openstreetmap.josm.tools.ImageProvider; 29 import org.openstreetmap.josm.gui.widgets.JosmTextField;30 30 31 31 … … 166 166 protected void feedbackValid() { 167 167 if (getCurrentFeedback().equals("valid")) return; 168 lblValid.setIcon(ImageProvider.get("dialogs /changeset", "valid"));168 lblValid.setIcon(ImageProvider.get("dialogs", "valid")); 169 169 lblValid.setToolTipText(""); 170 170 lblValid.putClientProperty("valid", "valid"); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r6653 r6814 41 41 */ 42 42 public class OsmApiUrlInputPanel extends JPanel { 43 43 44 44 /** 45 45 * OSM API URL property key. … … 54 54 /** indicates whether to use the default OSM URL or not */ 55 55 private JCheckBox cbUseDefaultServerUrl; 56 56 57 57 private ApiUrlPropagator propagator; 58 58 … … 154 154 } 155 155 } 156 156 157 157 /** 158 158 * Returns the entered API URL, stripped of leading and trailing white characters. 159 * @return the entered API URL, stripped of leading and trailing white characters. 159 * @return the entered API URL, stripped of leading and trailing white characters. 160 160 * May be an empty string if nothing has been entered. In this case, it means the user wants to use {@link OsmApi#DEFAULT_API_URL}. 161 161 * @see Utils#strip(String) … … 189 189 public void run() { 190 190 if (task.isSuccess()) { 191 lblValid.setIcon(ImageProvider.get("dialogs /changeset", "valid"));191 lblValid.setIcon(ImageProvider.get("dialogs", "valid")); 192 192 lblValid.setToolTipText(tr("The API URL is valid.")); 193 193 lastTestedUrl = url;
Note:
See TracChangeset
for help on using the changeset viewer.