Skip to content

Commit 2e7d533

Browse files
DrodtDrodt
committed
Format after merge
1 parent 8e9cf61 commit 2e7d533

File tree

10 files changed

+57
-62
lines changed

10 files changed

+57
-62
lines changed

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/StatementBlock.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import de.uka.ilkd.key.logic.PosInProgram;
1717
import de.uka.ilkd.key.logic.ProgramPrefix;
1818
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
19-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
2019
import de.uka.ilkd.key.util.Debug;
2120

2221
import org.key_project.util.ExtList;

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/ClassDeclaration.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: GPL-2.0-only */
44
package de.uka.ilkd.key.java.ast.declaration;
55

6+
import java.util.List;
7+
68
import de.uka.ilkd.key.java.ast.Comment;
79
import de.uka.ilkd.key.java.ast.PositionInfo;
810
import de.uka.ilkd.key.java.ast.ProgramElement;
@@ -11,13 +13,12 @@
1113
import de.uka.ilkd.key.java.visitor.Visitor;
1214
import de.uka.ilkd.key.logic.ProgramElementName;
1315
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
16+
1417
import org.key_project.util.ExtList;
1518
import org.key_project.util.collection.ImmutableArray;
1619
import org.key_project.util.collection.ImmutableList;
1720
import org.key_project.util.collection.ImmutableSLList;
1821

19-
import java.util.List;
20-
2122
/**
2223
* There are several types of class declarations:
2324
* <ul>

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/ConstructorDeclaration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
import de.uka.ilkd.key.java.ast.reference.TypeReference;
1313
import de.uka.ilkd.key.java.visitor.Visitor;
1414
import de.uka.ilkd.key.logic.ProgramElementName;
15-
1615
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
17-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
16+
1817
import org.key_project.util.ExtList;
1918
import org.key_project.util.collection.ImmutableArray;
2019

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/declaration/JavaDeclaration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@
2525
import de.uka.ilkd.key.java.ast.JavaNonTerminalProgramElement;
2626
import de.uka.ilkd.key.java.ast.PositionInfo;
2727
import de.uka.ilkd.key.java.ast.declaration.modifier.*;
28-
2928
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
3029

31-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
3230
import org.key_project.util.ExtList;
3331
import org.key_project.util.collection.ImmutableArray;
3432

3533
import org.jspecify.annotations.NonNull;
36-
import org.key_project.util.collection.ImmutableList;
3734

3835
/**
3936
* Java declaration.

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/statement/Do.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
import de.uka.ilkd.key.java.ast.*;
99
import de.uka.ilkd.key.java.ast.expression.Expression;
1010
import de.uka.ilkd.key.java.visitor.Visitor;
11-
1211
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLLoopSpec;
13-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
12+
1413
import org.key_project.util.ExtList;
1514

1615
/**

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/statement/EnhancedFor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
import de.uka.ilkd.key.java.ast.declaration.LocalVariableDeclaration;
1010
import de.uka.ilkd.key.java.visitor.CreatingASTVisitor;
1111
import de.uka.ilkd.key.java.visitor.Visitor;
12-
1312
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLLoopSpec;
14-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
13+
1514
import org.key_project.util.ExtList;
1615

1716
import org.jspecify.annotations.NonNull;

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/statement/For.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
import de.uka.ilkd.key.java.ast.declaration.VariableSpecification;
1111
import de.uka.ilkd.key.java.ast.expression.Expression;
1212
import de.uka.ilkd.key.java.visitor.Visitor;
13-
14-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
1513
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLLoopSpec;
16-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
14+
1715
import org.key_project.util.ExtList;
1816
import org.key_project.util.collection.ImmutableArray;
1917

‎key.core/src/main/java/de/uka/ilkd/key/java/ast/statement/While.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
import de.uka.ilkd.key.java.ast.*;
99
import de.uka.ilkd.key.java.ast.expression.Expression;
1010
import de.uka.ilkd.key.java.visitor.Visitor;
11-
1211
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLLoopSpec;
13-
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLSpecCase;
12+
1413
import org.key_project.util.ExtList;
1514

1615
/**

‎key.core/src/main/java/de/uka/ilkd/key/java/loader/JP2KeYConverter.java‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,11 @@
33
* SPDX-License-Identifier: GPL-2.0-only */
44
package de.uka.ilkd.key.java.loader;
55

6-
import com.github.javaparser.ast.*;
7-
import com.github.javaparser.ast.Modifier;
8-
import com.github.javaparser.ast.body.*;
9-
import com.github.javaparser.ast.body.ConstructorDeclaration;
10-
import com.github.javaparser.ast.body.FieldDeclaration;
11-
import com.github.javaparser.ast.body.MethodDeclaration;
12-
import com.github.javaparser.ast.comments.TraditionalJavadocComment;
13-
import com.github.javaparser.ast.expr.*;
14-
import com.github.javaparser.ast.key.*;
15-
import com.github.javaparser.ast.key.sv.*;
16-
import com.github.javaparser.ast.modules.*;
17-
import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
18-
import com.github.javaparser.ast.stmt.*;
19-
import com.github.javaparser.ast.type.*;
20-
import com.github.javaparser.ast.visitor.GenericVisitorAdapter;
21-
import com.github.javaparser.ast.visitor.Visitable;
22-
import com.github.javaparser.resolution.UnsolvedSymbolException;
23-
import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
24-
import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl;
25-
import com.github.javaparser.resolution.types.ResolvedType;
26-
import com.github.javaparser.resolution.types.ResolvedVoidType;
27-
import com.github.javaparser.symbolsolver.JavaSymbolSolver;
28-
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration;
29-
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserVariableDeclaration;
6+
import java.net.URI;
7+
import java.util.*;
8+
import java.util.function.Predicate;
9+
import java.util.stream.Collectors;
10+
3011
import de.uka.ilkd.key.java.*;
3112
import de.uka.ilkd.key.java.ast.*;
3213
import de.uka.ilkd.key.java.ast.CompilationUnit;
@@ -57,22 +38,43 @@
5738
import de.uka.ilkd.key.logic.sort.ProgramSVSort;
5839
import de.uka.ilkd.key.rule.metaconstruct.*;
5940
import de.uka.ilkd.key.speclang.jml.pretranslation.*;
60-
import org.jspecify.annotations.NonNull;
61-
import org.jspecify.annotations.Nullable;
41+
6242
import org.key_project.logic.Namespace;
6343
import org.key_project.logic.op.Function;
6444
import org.key_project.logic.op.sv.OperatorSV;
6545
import org.key_project.logic.op.sv.SchemaVariable;
6646
import org.key_project.logic.sort.Sort;
6747
import org.key_project.util.collection.ImmutableArray;
48+
49+
import com.github.javaparser.ast.*;
50+
import com.github.javaparser.ast.Modifier;
51+
import com.github.javaparser.ast.body.*;
52+
import com.github.javaparser.ast.body.ConstructorDeclaration;
53+
import com.github.javaparser.ast.body.FieldDeclaration;
54+
import com.github.javaparser.ast.body.MethodDeclaration;
55+
import com.github.javaparser.ast.comments.TraditionalJavadocComment;
56+
import com.github.javaparser.ast.expr.*;
57+
import com.github.javaparser.ast.key.*;
58+
import com.github.javaparser.ast.key.sv.*;
59+
import com.github.javaparser.ast.modules.*;
60+
import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
61+
import com.github.javaparser.ast.stmt.*;
62+
import com.github.javaparser.ast.type.*;
63+
import com.github.javaparser.ast.visitor.GenericVisitorAdapter;
64+
import com.github.javaparser.ast.visitor.Visitable;
65+
import com.github.javaparser.resolution.UnsolvedSymbolException;
66+
import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
67+
import com.github.javaparser.resolution.model.typesystem.ReferenceTypeImpl;
68+
import com.github.javaparser.resolution.types.ResolvedType;
69+
import com.github.javaparser.resolution.types.ResolvedVoidType;
70+
import com.github.javaparser.symbolsolver.JavaSymbolSolver;
71+
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration;
72+
import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserVariableDeclaration;
73+
import org.jspecify.annotations.NonNull;
74+
import org.jspecify.annotations.Nullable;
6875
import org.slf4j.Logger;
6976
import org.slf4j.LoggerFactory;
7077

71-
import java.net.URI;
72-
import java.util.*;
73-
import java.util.function.Predicate;
74-
import java.util.stream.Collectors;
75-
7678
import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
7779
import static java.lang.String.format;
7880

‎key.core/src/main/java/de/uka/ilkd/key/java/transformations/pipeline/JMLTransformer.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,22 @@
1616

1717
package de.uka.ilkd.key.java.transformations.pipeline;
1818

19+
import java.net.URI;
20+
import java.util.*;
21+
import java.util.regex.Pattern;
22+
23+
import de.uka.ilkd.key.parser.Location;
24+
import de.uka.ilkd.key.settings.ProofIndependentSettings;
25+
import de.uka.ilkd.key.speclang.PositionedString;
26+
import de.uka.ilkd.key.speclang.jml.pretranslation.*;
27+
import de.uka.ilkd.key.speclang.njml.PreParser;
28+
import de.uka.ilkd.key.speclang.translation.SLTranslationException;
29+
import de.uka.ilkd.key.util.MiscTools;
30+
31+
import org.key_project.util.collection.ImmutableList;
32+
import org.key_project.util.collection.ImmutableSLList;
33+
import org.key_project.util.java.StringUtil;
34+
1935
import com.github.javaparser.*;
2036
import com.github.javaparser.ast.*;
2137
import com.github.javaparser.ast.body.*;
@@ -35,26 +51,12 @@
3551
import com.github.javaparser.ast.type.Type;
3652
import com.github.javaparser.ast.visitor.VoidVisitorWithDefaults;
3753
import com.google.common.base.Strings;
38-
import de.uka.ilkd.key.parser.Location;
39-
import de.uka.ilkd.key.settings.ProofIndependentSettings;
40-
import de.uka.ilkd.key.speclang.PositionedString;
41-
import de.uka.ilkd.key.speclang.jml.pretranslation.*;
42-
import de.uka.ilkd.key.speclang.njml.PreParser;
43-
import de.uka.ilkd.key.speclang.translation.SLTranslationException;
44-
import de.uka.ilkd.key.util.MiscTools;
4554
import org.antlr.v4.runtime.ParserRuleContext;
4655
import org.antlr.v4.runtime.misc.Interval;
4756
import org.jspecify.annotations.NonNull;
48-
import org.key_project.util.collection.ImmutableList;
49-
import org.key_project.util.collection.ImmutableSLList;
50-
import org.key_project.util.java.StringUtil;
5157
import org.slf4j.Logger;
5258
import org.slf4j.LoggerFactory;
5359

54-
import java.net.URI;
55-
import java.util.*;
56-
import java.util.regex.Pattern;
57-
5860

5961
/**
6062
* RecodeR transformation that parses JML comments, and attaches code-like

0 commit comments

Comments
 (0)