Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fractal
fractal
Commits
8a854c38
Commit
8a854c38
authored
Dec 30, 2017
by
Lionel Seinturier
Browse files
Add diamon operator whenever possible.
parent
6c0292bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
juliac/core/src/main/java/org/objectweb/fractal/juliac/CompilationRound.java
View file @
8a854c38
...
...
@@ -117,7 +117,7 @@ public class CompilationRound {
* reports an error if the list of files to compile is empty. Note
* however that this is not the case with JDT.
*/
List
<
SourceFile
>
sfs
=
new
ArrayList
<
SourceFile
>();
List
<
SourceFile
>
sfs
=
new
ArrayList
<>();
sfs
.
addAll
(
inputFiles
);
sfs
.
addAll
(
generatedFiles
);
File
classDir
=
jconf
.
getClassDir
();
...
...
@@ -159,13 +159,13 @@ public class CompilationRound {
private
JuliacConfig
jconf
;
/** The source files which are given as input to Juliac. */
private
List
<
SourceFile
>
inputFiles
=
new
ArrayList
<
SourceFile
>();
private
List
<
SourceFile
>
inputFiles
=
new
ArrayList
<>();
/** The resource files. */
private
List
<
SourceFile
>
resourceFiles
=
new
ArrayList
<
SourceFile
>();
private
List
<
SourceFile
>
resourceFiles
=
new
ArrayList
<>();
/** The source files which are generated by Juliac. */
private
List
<
SourceFile
>
generatedFiles
=
new
ArrayList
<
SourceFile
>();
private
List
<
SourceFile
>
generatedFiles
=
new
ArrayList
<>();
/**
* This map contains the source types that triggered the generation of
...
...
@@ -173,8 +173,8 @@ public class CompilationRound {
*
* @since 2.7
*/
private
Map
<
String
,
Object
>
sourceTypes
=
new
HashMap
<
String
,
Object
>();
private
Map
<
String
,
Object
>
sourceTypes
=
new
HashMap
<>();
/** The names of .class files ouputted by the compilation process. */
private
List
<
String
>
outputFiles
=
new
ArrayList
<
String
>();
private
List
<
String
>
outputFiles
=
new
ArrayList
<>();
}
juliac/core/src/main/java/org/objectweb/fractal/juliac/CompilationRounds.java
View file @
8a854c38
...
...
@@ -119,6 +119,6 @@ public class CompilationRounds {
// Data
// --------------------------------------------------------------------
private
List
<
CompilationRound
>
rounds
=
new
ArrayList
<
CompilationRound
>();
private
List
<
CompilationRound
>
rounds
=
new
ArrayList
<>();
private
JuliacConfig
jconf
;
}
juliac/core/src/main/java/org/objectweb/fractal/juliac/helper/MembraneHelper.java
View file @
8a854c38
...
...
@@ -140,7 +140,7 @@ public class MembraneHelper {
public
static
Class
<?>
getGenerator
(
Class
<?>
cl
)
throws
IllegalStateException
{
List
<
Class
<?>>
classes
=
new
ArrayList
<
Class
<?>
>();
List
<
Class
<?>>
classes
=
new
ArrayList
<>();
addSuperClasses
(
cl
,
classes
);
for
(
Class
<?>
c
:
classes
)
{
...
...
@@ -164,7 +164,7 @@ public class MembraneHelper {
public
static
Class
<?>[]
getInterceptors
(
Class
<?>
cl
)
throws
IllegalStateException
{
List
<
Class
<?>>
classes
=
new
ArrayList
<
Class
<?>
>();
List
<
Class
<?>>
classes
=
new
ArrayList
<>();
addSuperClasses
(
cl
,
classes
);
for
(
Class
<?>
c
:
classes
)
{
...
...
@@ -204,11 +204,11 @@ public class MembraneHelper {
*/
public
static
List
<
Field
>
getControllerAnnotatedFields
(
Class
<?>
cl
)
{
List
<
Class
<?>>
classes
=
new
ArrayList
<
Class
<?>
>();
List
<
Class
<?>>
classes
=
new
ArrayList
<>();
MembraneHelper
.
addSuperClasses
(
cl
,
classes
);
List
<
Field
>
fields
=
new
ArrayList
<
Field
>();
Set
<
String
>
names
=
new
HashSet
<
String
>();
List
<
Field
>
fields
=
new
ArrayList
<>();
Set
<
String
>
names
=
new
HashSet
<>();
for
(
Class
<?>
c
:
classes
)
{
Field
[]
fs
=
c
.
getDeclaredFields
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment