Commit f5fca47cae6963c715f7112660694e10885a4162
1 parent
c9635e23
Exists in
master
and in
7 other branches
Ajustes no estilo do ícone de busca
Showing
2 changed files
with
114 additions
and
112 deletions
Show diff stats
classesjs/classe_gadgets.js
| @@ -185,7 +185,10 @@ i3GEO.gadgets = | @@ -185,7 +185,10 @@ i3GEO.gadgets = | ||
| 185 | ins = "<table><tr><td>" + i; | 185 | ins = "<table><tr><td>" + i; |
| 186 | temp = 'i3GEO.Interface.adicionaKml();'; | 186 | temp = 'i3GEO.Interface.adicionaKml();'; |
| 187 | ins += | 187 | ins += |
| 188 | - "</td><td><img src='" + i3GEO.configura.locaplic + "/imagens/branco.gif" + "' class='tic' onclick='" + temp | 188 | + "</td><td><img src='" + i3GEO.configura.locaplic |
| 189 | + + "/imagens/branco.gif" | ||
| 190 | + + "' class='tic' onclick='" | ||
| 191 | + + temp | ||
| 189 | + "' /></td></tr></table>"; | 192 | + "' /></td></tr></table>"; |
| 190 | $i(id).innerHTML = ins; | 193 | $i(id).innerHTML = ins; |
| 191 | } | 194 | } |
| @@ -220,8 +223,9 @@ i3GEO.gadgets = | @@ -220,8 +223,9 @@ i3GEO.gadgets = | ||
| 220 | } | 223 | } |
| 221 | if (!$i("i3geo_escalanum")) { | 224 | if (!$i("i3geo_escalanum")) { |
| 222 | i = | 225 | i = |
| 223 | - "<form id='i3GEOescalanumForm' >" | ||
| 224 | - + $inputText(id, "100", "i3geo_escalanum", $trad("d10"), "10", parseInt(i3GEO.parametros.mapscale, 10)) | 226 | + "<form id='i3GEOescalanumForm' >" + $inputText(id, "100", "i3geo_escalanum", $trad("d10"), "10", parseInt( |
| 227 | + i3GEO.parametros.mapscale, | ||
| 228 | + 10)) | ||
| 225 | + "</form>"; | 229 | + "</form>"; |
| 226 | ins = "<table style='width:120px;'><tr><td>" + i; | 230 | ins = "<table style='width:120px;'><tr><td>" + i; |
| 227 | temp = 'var nova = document.getElementById("i3geo_escalanum").value;'; | 231 | temp = 'var nova = document.getElementById("i3geo_escalanum").value;'; |
| @@ -279,8 +283,7 @@ i3GEO.gadgets = | @@ -279,8 +283,7 @@ i3GEO.gadgets = | ||
| 279 | if ($i(id)) { | 283 | if ($i(id)) { |
| 280 | if (!$i("imagemEscalaGrafica")) { | 284 | if (!$i("imagemEscalaGrafica")) { |
| 281 | ins = | 285 | ins = |
| 282 | - "<img class='menuarrow' src=\"" | ||
| 283 | - + i3GEO.configura.locaplic | 286 | + "<img class='menuarrow' src=\"" + i3GEO.configura.locaplic |
| 284 | + "/imagens/branco.gif\" title='opções' onclick='i3GEO.mapa.dialogo.opcoesEscala()' style='cursor:pointer'/><img id=imagemEscalaGrafica src='' />"; | 287 | + "/imagens/branco.gif\" title='opções' onclick='i3GEO.mapa.dialogo.opcoesEscala()' style='cursor:pointer'/><img id=imagemEscalaGrafica src='' />"; |
| 285 | $i(id).innerHTML = ins; | 288 | $i(id).innerHTML = ins; |
| 286 | } | 289 | } |
| @@ -328,89 +331,95 @@ i3GEO.gadgets = | @@ -328,89 +331,95 @@ i3GEO.gadgets = | ||
| 328 | if (typeof (console) !== 'undefined') | 331 | if (typeof (console) !== 'undefined') |
| 329 | console.info("i3GEO.gadgets.mostraBuscaRapida()"); | 332 | console.info("i3GEO.gadgets.mostraBuscaRapida()"); |
| 330 | 333 | ||
| 331 | - var i, ins, temp, fbusca; | 334 | + var ins, temp, fbusca, hashMustache, templateMustache; |
| 332 | if (arguments.length === 0) { | 335 | if (arguments.length === 0) { |
| 333 | id = i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.idhtml; | 336 | id = i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.idhtml; |
| 334 | } | 337 | } |
| 335 | i3GEO.gadgets.mostraBuscaRapida.id = id; | 338 | i3GEO.gadgets.mostraBuscaRapida.id = id; |
| 336 | - if ($i(id)) { | ||
| 337 | - i = | ||
| 338 | - "<form id=i3GEObotaoFormBuscaRapida" | ||
| 339 | - + id | ||
| 340 | - + " >" | ||
| 341 | - + "<div class='i3geoForm' style='width:160px;'><input class=i3geoFormSemIcone type=text value='' id='valorBuscaRapida" | ||
| 342 | - + id + "' /></div>" + "</form>"; | ||
| 343 | - ins = | ||
| 344 | - "<table><tr><td><a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic | ||
| 345 | - + "/ajuda_usuario.php?idcategoria=8&idajuda=71' ><img src='" + i3GEO.configura.locaplic + "/imagens/branco.gif' /></a></td>" | ||
| 346 | - + "<td><img src='" + i3GEO.configura.locaplic + "/imagens/branco.gif" + "' title='" + $trad("p13") | ||
| 347 | - + "' class='ticPropriedades2' id=i3GEObotaoPropriedadesBuscaRapida" + id | ||
| 348 | - + " style='margin-right:5px;margin-left:5px;'/></td>" | ||
| 349 | - + "<td>" + i + "</td>" | ||
| 350 | - + "<td><img src='" + i3GEO.configura.locaplic | ||
| 351 | - + "/imagens/branco.gif" + "' class='ticfind' id=i3GEObotaoBuscaRapida" + id + " style='margin-left:3px;' /></td></tr></table>"; | ||
| 352 | - temp = $i(id); | ||
| 353 | - if (temp) { | ||
| 354 | - fbusca = | ||
| 355 | - function() { | ||
| 356 | - if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google === false | ||
| 357 | - && i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.servicosexternos === false | ||
| 358 | - && i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.temasmapa === false) { | ||
| 359 | - i3GEO.janela.tempoMsg($trad("x35")); | ||
| 360 | - return; | ||
| 361 | - } | ||
| 362 | - if ($i("valorBuscaRapida" + id).value === "") { | ||
| 363 | - i3GEO.janela.tempoMsg($trad("x36")); | ||
| 364 | - return; | ||
| 365 | - } | ||
| 366 | - i3GEO.janela.cria( | ||
| 367 | - "300px", | ||
| 368 | - "280px", | ||
| 369 | - i3GEO.configura.locaplic + "/ferramentas/buscarapida/index.htm", | ||
| 370 | - "", | ||
| 371 | - "", | ||
| 372 | - $trad("o2")); | ||
| 373 | - return false; | ||
| 374 | - }; | ||
| 375 | - temp.innerHTML = ins; | ||
| 376 | - $i("i3GEObotaoBuscaRapida" + id).onclick = fbusca; | ||
| 377 | - $i("i3GEObotaoFormBuscaRapida" + id).onsubmit = fbusca; | ||
| 378 | - $i("i3GEObotaoPropriedadesBuscaRapida" + id).onclick = | ||
| 379 | - function() { | ||
| 380 | - var ins, interno = "", externo = "", google = ""; | ||
| 381 | - i3GEO.janela.cria("300px", "150px", "", "", "", $trad("s5"), "i3GEOpropriedadesBuscaRapida" + id); | ||
| 382 | - if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.servicosexternos) { | ||
| 383 | - externo = "checked"; | ||
| 384 | - } | ||
| 385 | - if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.temasmapa) { | ||
| 386 | - interno = "checked"; | ||
| 387 | - } | ||
| 388 | - ins = | ||
| 389 | - "<p class=paragrafo >" | ||
| 390 | - + $trad("x37") | ||
| 391 | - + ":</p>" | ||
| 392 | - + "<table class=lista3 >" | ||
| 393 | - + "<tr><td><input style=cursor:pointer onclick='i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.servicosexternos = this.checked' type=checkbox " | ||
| 394 | - + externo | ||
| 395 | - + " ></td><td> " | ||
| 396 | - + $trad("x38") | ||
| 397 | - + "</td></tr>" | ||
| 398 | - + "<tr><td><input style=cursor:pointer onclick='i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.temasmapa = this.checked' type=checkbox " | ||
| 399 | - + interno + " ></td><td>" + $trad("x39") + "</td></tr>"; | ||
| 400 | - if (i3GEO.Interface.ATUAL === "googlemaps") { | ||
| 401 | - if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google) { | ||
| 402 | - google = "checked"; | ||
| 403 | - } | ||
| 404 | - ins += | ||
| 405 | - "<tr><td><input style=cursor:pointer onclick='i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google = this.checked' type=checkbox " | ||
| 406 | - + google + " ></td><td>Google</td></tr>"; | ||
| 407 | - } else { | ||
| 408 | - i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google = false; | 339 | + temp = $i(id); |
| 340 | + if (temp) { | ||
| 341 | + hashMustache = { | ||
| 342 | + "idform" : "i3GEObotaoFormBuscaRapida" + id, | ||
| 343 | + "idinput" : "valorBuscaRapida" + id, | ||
| 344 | + "link" : i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=8&idajuda=71", | ||
| 345 | + "branco" : i3GEO.configura.locaplic + "/imagens/branco.gif", | ||
| 346 | + "ajuda" : $trad("p13"), | ||
| 347 | + "prop" : "i3GEObotaoPropriedadesBuscaRapida" + id, | ||
| 348 | + "busca" : "i3GEObotaoBuscaRapida" + id | ||
| 349 | + }; | ||
| 350 | + templateMustache = | ||
| 351 | + "" + "<table><tr>" | ||
| 352 | + + " <td><a class=ajuda_usuario target=_blank href='{{link}}' ><img src='{{branco}}' /></a></td>" | ||
| 353 | + + " <td><img src='{{branco}}' title='{{ajuda}}' class='ticPropriedades2' id={{prop}} style='margin-right:5px;margin-left:5px;'/></td>" | ||
| 354 | + + " <td>" | ||
| 355 | + + " <form id={{idform}}>" | ||
| 356 | + + " <div class='i3geoForm' style='width:160px;'><input class=i3geoFormSemIcone type=text value='' id='{{idinput}}' /></div>" | ||
| 357 | + + " </form>" | ||
| 358 | + + " </td>" | ||
| 359 | + + " <td><img src='{{branco}}' class='ticfind' id={{busca}} style='margin-left:3px;' /></td>" | ||
| 360 | + + "</tr></table>"; | ||
| 361 | + | ||
| 362 | + ins = Mustache.render(templateMustache, hashMustache); | ||
| 363 | + temp.innerHTML = ins; | ||
| 364 | + fbusca = | ||
| 365 | + function() { | ||
| 366 | + if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google === false && i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.servicosexternos === false | ||
| 367 | + && i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.temasmapa === false) { | ||
| 368 | + i3GEO.janela.tempoMsg($trad("x35")); | ||
| 369 | + return; | ||
| 370 | + } | ||
| 371 | + if ($i("valorBuscaRapida" + id).value === "") { | ||
| 372 | + i3GEO.janela.tempoMsg($trad("x36")); | ||
| 373 | + return; | ||
| 374 | + } | ||
| 375 | + i3GEO.janela.cria( | ||
| 376 | + "300px", | ||
| 377 | + "280px", | ||
| 378 | + i3GEO.configura.locaplic + "/ferramentas/buscarapida/index.htm", | ||
| 379 | + "", | ||
| 380 | + "", | ||
| 381 | + $trad("o2")); | ||
| 382 | + return false; | ||
| 383 | + }; | ||
| 384 | + $i("i3GEObotaoBuscaRapida" + id).onclick = fbusca; | ||
| 385 | + $i("i3GEObotaoFormBuscaRapida" + id).onsubmit = fbusca; | ||
| 386 | + $i("i3GEObotaoPropriedadesBuscaRapida" + id).onclick = | ||
| 387 | + function() { | ||
| 388 | + var ins, interno = "", externo = "", google = ""; | ||
| 389 | + i3GEO.janela.cria("300px", "150px", "", "", "", $trad("s5"), "i3GEOpropriedadesBuscaRapida" + id); | ||
| 390 | + if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.servicosexternos) { | ||
| 391 | + externo = "checked"; | ||
| 392 | + } | ||
| 393 | + if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.temasmapa) { | ||
| 394 | + interno = "checked"; | ||
| 395 | + } | ||
| 396 | + ins = | ||
| 397 | + "<p class=paragrafo >" + $trad("x37") | ||
| 398 | + + ":</p>" | ||
| 399 | + + "<table class=lista3 >" | ||
| 400 | + + "<tr><td><input style=cursor:pointer onclick='i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.servicosexternos = this.checked' type=checkbox " | ||
| 401 | + + externo | ||
| 402 | + + " ></td><td> " | ||
| 403 | + + $trad("x38") | ||
| 404 | + + "</td></tr>" | ||
| 405 | + + "<tr><td><input style=cursor:pointer onclick='i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.temasmapa = this.checked' type=checkbox " | ||
| 406 | + + interno | ||
| 407 | + + " ></td><td>" | ||
| 408 | + + $trad("x39") | ||
| 409 | + + "</td></tr>"; | ||
| 410 | + if (i3GEO.Interface.ATUAL === "googlemaps") { | ||
| 411 | + if (i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google) { | ||
| 412 | + google = "checked"; | ||
| 409 | } | 413 | } |
| 410 | - ins += "</table><br>" + "<p class=paragrafo >" + $trad("x40") + "</p>"; | ||
| 411 | - $i("i3GEOpropriedadesBuscaRapida" + id + "_corpo").innerHTML = ins; | ||
| 412 | - }; | ||
| 413 | - } | 414 | + ins += |
| 415 | + "<tr><td><input style=cursor:pointer onclick='i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google = this.checked' type=checkbox " + google | ||
| 416 | + + " ></td><td>Google</td></tr>"; | ||
| 417 | + } else { | ||
| 418 | + i3GEO.gadgets.PARAMETROS.mostraBuscaRapida.google = false; | ||
| 419 | + } | ||
| 420 | + ins += "</table><br>" + "<p class=paragrafo >" + $trad("x40") + "</p>"; | ||
| 421 | + $i("i3GEOpropriedadesBuscaRapida" + id + "_corpo").innerHTML = ins; | ||
| 422 | + }; | ||
| 414 | } | 423 | } |
| 415 | }, | 424 | }, |
| 416 | /** | 425 | /** |
| @@ -440,11 +449,13 @@ i3GEO.gadgets = | @@ -440,11 +449,13 @@ i3GEO.gadgets = | ||
| 440 | } | 449 | } |
| 441 | ins += | 450 | ins += |
| 442 | "<tr><td><img id='i3geo_zoomanterior' class='zoomAnterior' title='anterior' src='" + i3GEO.configura.locaplic | 451 | "<tr><td><img id='i3geo_zoomanterior' class='zoomAnterior' title='anterior' src='" + i3GEO.configura.locaplic |
| 443 | - + "/imagens/branco.gif" + "' /></td>"; | 452 | + + "/imagens/branco.gif" |
| 453 | + + "' /></td>"; | ||
| 444 | ins += "<td> </td>"; | 454 | ins += "<td> </td>"; |
| 445 | ins += | 455 | ins += |
| 446 | "<td><img id='i3geo_zoomproximo' class='zoomProximo' title='proximo' src='" + i3GEO.configura.locaplic | 456 | "<td><img id='i3geo_zoomproximo' class='zoomProximo' title='proximo' src='" + i3GEO.configura.locaplic |
| 447 | - + "/imagens/branco.gif" + "' /></td>"; | 457 | + + "/imagens/branco.gif" |
| 458 | + + "' /></td>"; | ||
| 448 | ins += "</tr></table>"; | 459 | ins += "</tr></table>"; |
| 449 | $i(id).innerHTML = ins; | 460 | $i(id).innerHTML = ins; |
| 450 | } | 461 | } |
| @@ -585,8 +596,13 @@ i3GEO.gadgets = | @@ -585,8 +596,13 @@ i3GEO.gadgets = | ||
| 585 | if (confm.submenus[confm.menu[i].id].length > 0) { | 596 | if (confm.submenus[confm.menu[i].id].length > 0) { |
| 586 | ins += | 597 | ins += |
| 587 | '<li class="yuimenubaritem" style="padding-top:2px;"><a style="' + estilo | 598 | '<li class="yuimenubaritem" style="padding-top:2px;"><a style="' + estilo |
| 588 | - + '" href="#" class="yuimenubaritemlabel" ' + t + 'id="menu' + confm.menu[i].id + '" > ' | ||
| 589 | - + confm.menu[i].nome + '</a></li>'; | 599 | + + '" href="#" class="yuimenubaritemlabel" ' |
| 600 | + + t | ||
| 601 | + + 'id="menu' | ||
| 602 | + + confm.menu[i].id | ||
| 603 | + + '" > ' | ||
| 604 | + + confm.menu[i].nome | ||
| 605 | + + '</a></li>'; | ||
| 590 | } | 606 | } |
| 591 | } | 607 | } |
| 592 | ins += '</ul>'; | 608 | ins += '</ul>'; |
| @@ -633,11 +649,7 @@ i3GEO.gadgets = | @@ -633,11 +649,7 @@ i3GEO.gadgets = | ||
| 633 | // marca o tipo de interface em uso | 649 | // marca o tipo de interface em uso |
| 634 | // | 650 | // |
| 635 | temp = [ | 651 | temp = [ |
| 636 | - "omenudataInterface1", | ||
| 637 | - "omenudataInterface2", | ||
| 638 | - "omenudataInterface3", | ||
| 639 | - "omenudataInterface4", | ||
| 640 | - "omenudataInterface5" | 652 | + "omenudataInterface1", "omenudataInterface2", "omenudataInterface3", "omenudataInterface4", "omenudataInterface5" |
| 641 | ]; | 653 | ]; |
| 642 | n = temp.length; | 654 | n = temp.length; |
| 643 | while (n > 0) { | 655 | while (n > 0) { |
| @@ -672,11 +684,7 @@ i3GEO.gadgets = | @@ -672,11 +684,7 @@ i3GEO.gadgets = | ||
| 672 | // desabilita opções em interfaces específicas | 684 | // desabilita opções em interfaces específicas |
| 673 | // | 685 | // |
| 674 | temp = [ | 686 | temp = [ |
| 675 | - "omenudataFerramentas7b", | ||
| 676 | - "omenudataArquivos3", | ||
| 677 | - "omenudataJanelas1", | ||
| 678 | - "omenudataJanelas3", | ||
| 679 | - "omenudataFerramentas2a" | 687 | + "omenudataFerramentas7b", "omenudataArquivos3", "omenudataJanelas1", "omenudataJanelas3", "omenudataFerramentas2a" |
| 680 | ]; | 688 | ]; |
| 681 | n = temp.length; | 689 | n = temp.length; |
| 682 | while (n > 0) { | 690 | while (n > 0) { |
| @@ -691,23 +699,17 @@ i3GEO.gadgets = | @@ -691,23 +699,17 @@ i3GEO.gadgets = | ||
| 691 | switch (i3GEO.Interface.ATUAL) { | 699 | switch (i3GEO.Interface.ATUAL) { |
| 692 | case "openlayers": | 700 | case "openlayers": |
| 693 | temp = [ | 701 | temp = [ |
| 694 | - "omenudataArquivos3", | ||
| 695 | - "omenudataJanelas1" | 702 | + "omenudataArquivos3", "omenudataJanelas1" |
| 696 | ]; | 703 | ]; |
| 697 | break; | 704 | break; |
| 698 | case "googlemaps": | 705 | case "googlemaps": |
| 699 | temp = [ | 706 | temp = [ |
| 700 | - "omenudataArquivos3", | ||
| 701 | - "omenudataJanelas1", | ||
| 702 | - "omenudataJanelas3" | 707 | + "omenudataArquivos3", "omenudataJanelas1", "omenudataJanelas3" |
| 703 | ]; | 708 | ]; |
| 704 | break; | 709 | break; |
| 705 | case "googleearth": | 710 | case "googleearth": |
| 706 | temp = [ | 711 | temp = [ |
| 707 | - "omenudataFerramentas7b", | ||
| 708 | - "omenudataArquivos3", | ||
| 709 | - "omenudataJanelas3", | ||
| 710 | - "omenudataFerramentas2a" | 712 | + "omenudataFerramentas7b", "omenudataArquivos3", "omenudataJanelas3", "omenudataFerramentas2a" |
| 711 | ]; | 713 | ]; |
| 712 | break; | 714 | break; |
| 713 | } | 715 | } |
formatEclipse.xml
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> | 50 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> |
| 51 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> | 51 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> |
| 52 | <setting id="org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> | 52 | <setting id="org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> |
| 53 | -<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="37"/> | 53 | +<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="48"/> |
| 54 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> | 54 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> |
| 55 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_binary_operator" value="insert"/> | 55 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_binary_operator" value="insert"/> |
| 56 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> | 56 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> |
| @@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
| 58 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> | 58 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> |
| 59 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> | 59 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> |
| 60 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> | 60 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> |
| 61 | -<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_method_invocation" value="53"/> | 61 | +<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_method_invocation" value="48"/> |
| 62 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> | 62 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> |
| 63 | <setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_objlit_initializer" value="1"/> | 63 | <setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_objlit_initializer" value="1"/> |
| 64 | <setting id="org.eclipse.wst.jsdt.core.compiler.compliance" value="1.5"/> | 64 | <setting id="org.eclipse.wst.jsdt.core.compiler.compliance" value="1.5"/> |
| @@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
| 88 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> | 88 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> |
| 89 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> | 89 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> |
| 90 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> | 90 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> |
| 91 | -<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_expressions_in_array_initializer" value="49"/> | 91 | +<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_expressions_in_array_initializer" value="48"/> |
| 92 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> | 92 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> |
| 93 | <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_after_package" value="1"/> | 93 | <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_after_package" value="1"/> |
| 94 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_comma_in_objlit_initializer" value="insert"/> | 94 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_comma_in_objlit_initializer" value="insert"/> |
| @@ -178,12 +178,12 @@ | @@ -178,12 +178,12 @@ | ||
| 178 | <setting id="org.eclipse.wst.jsdt.core.formatter.keep_imple_if_on_one_line" value="false"/> | 178 | <setting id="org.eclipse.wst.jsdt.core.formatter.keep_imple_if_on_one_line" value="false"/> |
| 179 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> | 179 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> |
| 180 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> | 180 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> |
| 181 | -<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_binary_expression" value="49"/> | 181 | +<setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_binary_expression" value="80"/> |
| 182 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> | 182 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> |
| 183 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/> | 183 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/> |
| 184 | <setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> | 184 | <setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> |
| 185 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> | 185 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> |
| 186 | -<setting id="org.eclipse.wst.jsdt.core.formatter.lineSplit" value="200"/> | 186 | +<setting id="org.eclipse.wst.jsdt.core.formatter.lineSplit" value="140"/> |
| 187 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> | 187 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> |
| 188 | <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_html" value="true"/> | 188 | <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_html" value="true"/> |
| 189 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> | 189 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> |
| @@ -229,7 +229,7 @@ | @@ -229,7 +229,7 @@ | ||
| 229 | <setting id="org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> | 229 | <setting id="org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> |
| 230 | <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> | 230 | <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> |
| 231 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_object_initializer" value="insert"/> | 231 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_object_initializer" value="insert"/> |
| 232 | -<setting id="org.eclipse.wst.jsdt.core.formatter.comment.line_length" value="80"/> | 232 | +<setting id="org.eclipse.wst.jsdt.core.formatter.comment.line_length" value="140"/> |
| 233 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> | 233 | <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> |
| 234 | <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> | 234 | <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> |
| 235 | <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block" value="end_of_line"/> | 235 | <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block" value="end_of_line"/> |