Reformat files using Android Studio

android-studio/bin/format.sh -m '*.java' -r brouter-routing-app

To rebase active branches on top of the new master just rebase your
branch onto the commit prior to the reformatting and format every commit
of your branch using (<commit> should be replaced by this commit)

git rebase \
        --strategy-option=theirs \
        --onto <commit> \
        --exec 'format.sh -m "*.java" -r brouter-routing-app' \
        --exec 'git commit --all --no-edit --amend' \
        <commit>~

To ignore this mass edit during git blame see `.git-blame-ignore-revs`
This commit is contained in:
Manuel Fuhr 2021-11-20 16:50:23 +01:00
parent 13e0e382c1
commit 54d5c5e943
18 changed files with 3025 additions and 3662 deletions

View file

@ -7,44 +7,38 @@ import java.util.TreeSet;
/**
* Decsription of a service config
*/
public class ServiceModeConfig
{
public class ServiceModeConfig {
public String mode;
public String profile;
public TreeSet<String> nogoVetos;
public ServiceModeConfig( String line )
{
StringTokenizer tk = new StringTokenizer( line );
public ServiceModeConfig(String line) {
StringTokenizer tk = new StringTokenizer(line);
mode = tk.nextToken();
profile = tk.nextToken();
nogoVetos = new TreeSet<String>();
while( tk.hasMoreTokens() )
{
nogoVetos.add( tk.nextToken() );
while (tk.hasMoreTokens()) {
nogoVetos.add(tk.nextToken());
}
}
public ServiceModeConfig( String mode, String profile )
{
public ServiceModeConfig(String mode, String profile) {
this.mode = mode;
this.profile = profile;
nogoVetos = new TreeSet<String>();
}
public String toLine()
{
StringBuilder sb = new StringBuilder( 100 );
sb.append( mode ).append( ' ' ).append( profile );
for( String veto: nogoVetos ) sb.append( ' ' ).append( veto );
public String toLine() {
StringBuilder sb = new StringBuilder(100);
sb.append(mode).append(' ').append(profile);
for (String veto : nogoVetos) sb.append(' ').append(veto);
return sb.toString();
}
public String toString()
{
StringBuilder sb = new StringBuilder( 100 );
sb.append( mode ).append( "->" ).append( profile );
sb.append ( " [" + nogoVetos.size() + "]" );
public String toString() {
StringBuilder sb = new StringBuilder(100);
sb.append(mode).append("->").append(profile);
sb.append(" [" + nogoVetos.size() + "]");
return sb.toString();
}
}