- Timestamp:
- 2015-12-29T18:51:22+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r9210 r9212 461 461 ret.setEtag(urlConn.getHeaderField("ETag")); 462 462 463 if (Main.isDebugEnabled()) {464 for (Entry<String, List<String>> header: urlConn.getHeaderFields().entrySet()) {463 if (Main.isDebugEnabled()) { 464 for (Entry<String, List<String>> header: urlConn.getHeaderFields().entrySet()) { 465 465 log.log(Level.FINE, "Response header - {0}: {1}", new Object[]{header.getKey(), header.getValue()}); 466 466 } -
trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java
r8674 r9212 13 13 * the decimal format 999.999 14 14 */ 15 DECIMAL_DEGREES 15 DECIMAL_DEGREES(tr("Decimal Degrees")), 16 16 17 17 /** 18 18 * the degrees/minutes/seconds format 9 deg 99 min 99 sec 19 19 */ 20 DEGREES_MINUTES_SECONDS 20 DEGREES_MINUTES_SECONDS(tr("deg\u00B0 min'' sec\"")), 21 21 22 22 /** 23 23 * the nautical format 24 24 */ 25 NAUTICAL 25 NAUTICAL(tr("deg\u00B0 min'' (Nautical)")), 26 26 27 27 /** 28 28 * coordinates East/North 29 29 */ 30 EAST_NORTH 30 EAST_NORTH(tr("Projected Coordinates")); 31 31 32 32 private String displayName; -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
r8510 r9212 11 11 public enum OsmPrimitiveType { 12 12 13 NODE 14 WAY 15 RELATION 13 NODE(marktr(/* ICON(data/) */"node"), Node.class, NodeData.class), 14 WAY(marktr(/* ICON(data/) */"way"), Way.class, WayData.class), 15 RELATION(marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class), 16 16 17 17 /* only for display, no real type */ 18 CLOSEDWAY 19 MULTIPOLYGON 18 CLOSEDWAY(marktr(/* ICON(data/) */"closedway"), null, WayData.class), 19 MULTIPOLYGON(marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class); 20 20 21 21 private static final Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION); -
trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
r8674 r9212 34 34 BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217, 255, 217)), 35 35 36 BGCOLOR_TAG_KEEP_ONE 37 FGCOLOR_TAG_KEEP_ONE 36 BGCOLOR_TAG_KEEP_ONE(marktr("Conflict background: keep one tag"), new Color(217, 255, 217)), 37 FGCOLOR_TAG_KEEP_ONE(marktr("Conflict foreground: keep one tag"), Color.black), 38 38 BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray), 39 39 FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black), 40 BGCOLOR_TAG_KEEP_ALL 41 FGCOLOR_TAG_KEEP_ALL 40 BGCOLOR_TAG_KEEP_ALL(marktr("Conflict background: keep all tags"), new Color(255, 234, 213)), 41 FGCOLOR_TAG_KEEP_ALL(marktr("Conflict foreground: keep all tags"), Color.black), 42 42 BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255, 234, 213)), 43 43 FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black), 44 44 45 BGCOLOR_MEMBER_KEEP 46 FGCOLOR_MEMBER_KEEP 45 BGCOLOR_MEMBER_KEEP(marktr("Conflict background: keep member"), new Color(217, 255, 217)), 46 FGCOLOR_MEMBER_KEEP(marktr("Conflict foreground: keep member"), Color.black), 47 47 BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray), 48 48 FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
r8291 r9212 17 17 * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with their version 18 18 */ 19 MY_WITH_THEIR 19 MY_WITH_THEIR(tr("My with Their"), new ListRole[] {MY_ENTRIES, THEIR_ENTRIES}), 20 20 21 21 /** 22 22 * compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version 23 23 */ 24 MY_WITH_MERGED 24 MY_WITH_MERGED(tr("My with Merged"), new ListRole[] {MY_ENTRIES, MERGED_ENTRIES}), 25 25 26 26 /** -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
r8513 r9212 32 32 33 33 private enum Policy { 34 ASK 34 ASK("ask"), 35 35 ALWAYS("always"), 36 36 NEVER("never");
Note:
See TracChangeset
for help on using the changeset viewer.