Changeset 23192 in osm for applications/editors/josm/plugins/roadsigns
- Timestamp:
- 2010-09-15T18:59:53+02:00 (14 years ago)
- Location:
- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java
r22423 r23192 471 471 public JComponent buildPreviewPanel() { 472 472 JPanel previewPanel = new JPanel(new GridBagLayout()); 473 473 474 474 String[] columnNames = {tr("Key"), tr("Value")}; 475 475 String[][] data = {{}}; … … 495 495 scroll.setPreferredSize(dim); 496 496 scroll.setMinimumSize(dim); /* minimum size is relevant for multisplit layout */ 497 497 498 498 addTrafficSignTag = new JCheckBox(tr("{0} tag", "traffic_sign")); 499 499 addTrafficSignTag.setSelected(Main.pref.getBoolean("plugin.roadsigns.addTrafficSignTag")); … … 503 503 } 504 504 }); 505 505 506 506 previewPanel.add(scroll, GBC.eol().fill()); 507 507 previewPanel.add(addTrafficSignTag, GBC.eol()); … … 544 544 final TreeMap<String, String> map= new TreeMap<String, String>(); 545 545 String traffic_sign = ""; 546 546 547 547 for (SignCombination sc : sel.combos) { 548 548 final Map<String, String> env = new HashMap<String, String>(); … … 596 596 } 597 597 } 598 598 599 599 Map<String, TagEvaluater> tags = new LinkedHashMap<String, TagEvaluater>(); 600 600 for (SignWrapper sw : sc.signs) { … … 654 654 map.putAll(result); 655 655 } 656 656 657 657 if (combo_traffic_sign.length() != 0) { 658 658 if (traffic_sign.length() != 0) { -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java
r22420 r23192 104 104 } 105 105 curSign.iconURL = iconURL; 106 106 107 107 if ("yes".equals(atts.getValue("supplementary"))) { 108 108 curSign.isSupplementing = true; 109 109 } 110 110 111 111 curSign.wiki = atts.getValue("wiki"); 112 112 curSign.loc_wiki = getLocalized(atts, "wiki"); … … 296 296 } 297 297 } 298 298 299 299 /** 300 300 * -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScannerConstants.java
r21967 r23192 3 3 4 4 5 /** 5 /** 6 6 * Token literal values and constants. 7 7 * Generated by org.javacc.parser.OtherFilesGen#start() -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScannerTokenManager.java
r21967 r23192 167 167 } 168 168 static final int[] jjnextStates = { 169 1, 3, 5, 6, 9, 10, 169 1, 3, 5, 6, 9, 10, 170 170 }; 171 171 … … 176 176 /** Lexer state names. */ 177 177 public static final String[] lexStateNames = { 178 "DEFAULT", 178 "DEFAULT", 179 179 }; 180 180 protected SimpleCharStream input_stream; … … 259 259 260 260 /** Get the next Token. */ 261 public Token getNextToken() 261 public Token getNextToken() 262 262 { 263 263 Token matchedToken; … … 266 266 EOFLoop : 267 267 for (;;) 268 { 269 try 270 { 268 { 269 try 270 { 271 271 curChar = input_stream.BeginToken(); 272 } 272 } 273 273 catch(java.io.IOException e) 274 { 274 { 275 275 jjmatchedKind = 0; 276 276 matchedToken = jjFillToken(); -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParseException.java
r21967 r23192 127 127 retval += add_escapes(tok.image); 128 128 retval += " \""; 129 tok = tok.next; 129 tok = tok.next; 130 130 } 131 131 retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn; … … 144 144 */ 145 145 protected String eol = System.getProperty("line.separator", "\n"); 146 146 147 147 /** 148 148 * Used to convert raw characters to their escaped version -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/SimpleCharStream.java
r21967 r23192 205 205 206 206 /** 207 * @deprecated 207 * @deprecated 208 208 * @see #getEndColumn 209 209 */ … … 214 214 215 215 /** 216 * @deprecated 216 * @deprecated 217 217 * @see #getEndLine 218 218 */ … … 449 449 columnDiff = nextColDiff; 450 450 i++; 451 } 451 } 452 452 453 453 if (i < len) -
applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/TokenMgrError.java
r21967 r23192 89 89 * Returns a detailed message for the Error when it is thrown by the 90 90 * token manager to indicate a lexical error. 91 * Parameters : 91 * Parameters : 92 92 * EOFSeen : indicates if EOF caused the lexical error 93 93 * curLexState : lexical state in which this error occurred … … 109 109 * You can also modify the body of this method to customize your error messages. 110 110 * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not 111 * of end-users concern, so you can return something like : 111 * of end-users concern, so you can return something like : 112 112 * 113 113 * "Internal Error : Please file a bug report .... "
Note:
See TracChangeset
for help on using the changeset viewer.