Skip to content

Commit 1611348

Browse files
bradhbradh
committed
[IMG-124] Update of checkstyle plugin to 2.17 (checkstyle 6.11.2) for cgm and core modules.
1 parent 1743d2c commit 1611348

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+76
-85
lines changed

‎cgm/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<plugin>
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-checkstyle-plugin</artifactId>
84-
<version>2.12.1</version>
84+
<version>${checkstyleplugin.version}</version>
8585
<executions>
8686
<execution>
8787
<id>validate</id>

‎cgm/src/main/java/org/codice/imaging/cgm/BeginMetafileElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
3030

3131
class BeginMetafileElement extends StringFixedArgumentElement {
3232

33-
public BeginMetafileElement() {
33+
BeginMetafileElement() {
3434
super(CgmIdentifier.BEGIN_METAFILE);
3535
}
3636

‎cgm/src/main/java/org/codice/imaging/cgm/BeginPictureBodyElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
2828

2929
class BeginPictureBodyElement extends NoArgumentsElement implements AbstractElement {
3030

31-
public BeginPictureBodyElement() {
31+
BeginPictureBodyElement() {
3232
super(CgmIdentifier.BEGIN_PICTURE_BODY);
3333
}
3434

‎cgm/src/main/java/org/codice/imaging/cgm/BeginPictureElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
3030

3131
class BeginPictureElement extends StringFixedArgumentElement implements AbstractElement {
3232

33-
public BeginPictureElement() {
33+
BeginPictureElement() {
3434
super(CgmIdentifier.BEGIN_PICTURE);
3535
}
3636

‎cgm/src/main/java/org/codice/imaging/cgm/CgmParser.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -78,12 +78,8 @@ private static AbstractElement instantiateElementWithNoArguments(final Class ele
7878
try {
7979
Constructor<AbstractElement> defaultConstructor = elementClass.getDeclaredConstructor();
8080
return defaultConstructor.newInstance();
81-
} catch (NoSuchMethodException |
82-
SecurityException |
83-
InstantiationException |
84-
IllegalAccessException |
85-
IllegalArgumentException |
86-
InvocationTargetException ex) {
81+
} catch (NoSuchMethodException | SecurityException | InstantiationException
82+
| IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
8783
LOGGER.error(ex.getMessage(), ex);
8884
}
8985
return null;

‎cgm/src/main/java/org/codice/imaging/cgm/CharacterHeightElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@ class CharacterHeightElement extends ElementHelpers implements AbstractElement {
3232

3333
private int characterHeight;
3434

35-
public CharacterHeightElement() {
35+
CharacterHeightElement() {
3636
super(CgmIdentifier.CHARACTER_HEIGHT);
3737
}
3838

‎cgm/src/main/java/org/codice/imaging/cgm/CharacterOrientationElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@ class CharacterOrientationElement extends ElementHelpers implements AbstractElem
3535
private int xCharacterBaseComponent;
3636
private int yCharacterBaseComponent;
3737

38-
public CharacterOrientationElement() {
38+
CharacterOrientationElement() {
3939
super(CgmIdentifier.CHARACTER_ORIENTATION);
4040
}
4141

‎cgm/src/main/java/org/codice/imaging/cgm/CircleElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@ class CircleElement extends ElementHelpers implements AbstractElement {
3535
private Point centre;
3636
private int radius;
3737

38-
public CircleElement() {
38+
CircleElement() {
3939
super(CgmIdentifier.CIRCLE);
4040
}
4141

‎cgm/src/main/java/org/codice/imaging/cgm/CircularArcCentreElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@ class CircularArcCentreElement extends ElementHelpers implements AbstractElement
4141

4242
private static final double FULL_CIRCLE = 360.0;
4343

44-
public CircularArcCentreElement() {
44+
CircularArcCentreElement() {
4545
super(CgmIdentifier.CIRCULAR_ARC_CENTRE);
4646
}
4747

‎cgm/src/main/java/org/codice/imaging/cgm/EdgeColourElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class EdgeColourElement extends CommonColourElement {
3131

32-
public EdgeColourElement() {
32+
EdgeColourElement() {
3333
super(CgmIdentifier.EDGE_COLOUR);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/EdgeTypeElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class EdgeTypeElement extends CommonIndexedElement implements AbstractElement {
3131

32-
public EdgeTypeElement() {
32+
EdgeTypeElement() {
3333
super(CgmIdentifier.EDGE_TYPE);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/EdgeWidthElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
3030

3131
class EdgeWidthElement extends CommonSizeSpecificationElement implements AbstractElement {
3232

33-
public EdgeWidthElement() {
33+
EdgeWidthElement() {
3434
super(CgmIdentifier.EDGE_WIDTH);
3535
}
3636

‎cgm/src/main/java/org/codice/imaging/cgm/EllipseElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ class EllipseElement extends ElementHelpers implements AbstractElement {
3636
private Point endpointOfFirstConjugateDiameter;
3737
private Point endpointOfSecondConjugateDiameter;
3838

39-
public EllipseElement() {
39+
EllipseElement() {
4040
super(CgmIdentifier.ELLIPSE);
4141
}
4242

‎cgm/src/main/java/org/codice/imaging/cgm/EndMetafileElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
2828

2929
class EndMetafileElement extends NoArgumentsElement implements AbstractElement {
3030

31-
public EndMetafileElement() {
31+
EndMetafileElement() {
3232
super(CgmIdentifier.END_METAFILE);
3333
}
3434

‎cgm/src/main/java/org/codice/imaging/cgm/EndPictureElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
2727

2828
class EndPictureElement extends NoArgumentsElement implements AbstractElement {
2929

30-
public EndPictureElement() {
30+
EndPictureElement() {
3131
super(CgmIdentifier.END_PICTURE);
3232
}
3333

‎cgm/src/main/java/org/codice/imaging/cgm/FontListElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@ class FontListElement extends ElementHelpers implements AbstractElement {
3434

3535
private final List<String> fonts = new ArrayList<>();
3636

37-
public FontListElement() {
37+
FontListElement() {
3838
super(CgmIdentifier.FONT_LIST);
3939
}
4040

‎cgm/src/main/java/org/codice/imaging/cgm/HatchIndexElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class HatchIndexElement extends CommonIndexedElement {
3131

32-
public HatchIndexElement() {
32+
HatchIndexElement() {
3333
super(CgmIdentifier.HATCH_INDEX);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/LineColourElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class LineColourElement extends CommonColourElement {
3131

32-
public LineColourElement() {
32+
LineColourElement() {
3333
super(CgmIdentifier.LINE_COLOUR);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/LineTypeElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class LineTypeElement extends CommonIndexedElement implements AbstractElement {
3131

32-
public LineTypeElement() {
32+
LineTypeElement() {
3333
super(CgmIdentifier.LINE_TYPE);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/LineWidthElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class LineWidthElement extends CommonSizeSpecificationElement implements AbstractElement {
3131

32-
public LineWidthElement() {
32+
LineWidthElement() {
3333
super(CgmIdentifier.LINE_WIDTH);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/MetafileDescriptionElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
2929

3030
class MetafileDescriptionElement extends StringFixedArgumentElement implements AbstractElement {
3131

32-
public MetafileDescriptionElement() {
32+
MetafileDescriptionElement() {
3333
super(CgmIdentifier.METAFILE_DESCRIPTION);
3434
}
3535

‎cgm/src/main/java/org/codice/imaging/cgm/MetafileElementsListElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@ class MetafileElementsListElement extends ElementHelpers implements AbstractElem
3535

3636
private final List<CgmIdentifier> elementsList = new ArrayList<>();
3737

38-
public MetafileElementsListElement() {
38+
MetafileElementsListElement() {
3939
super(CgmIdentifier.METAFILE_ELEMENT_LIST);
4040
}
4141

‎cgm/src/main/java/org/codice/imaging/cgm/MetafileVersionElement.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
2727

2828
class MetafileVersionElement extends IntegerArgumentElement {
2929

30-
public MetafileVersionElement() {
30+
MetafileVersionElement() {
3131
super(CgmIdentifier.METAFILE_VERSION);
3232
}
3333

‎cgm/src/main/java/org/codice/imaging/cgm/PolygonElement.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, Codice
2+
* Copyright (c) 2014, 2016, Codice
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,8 @@
3636
class PolygonElement extends ElementHelpers implements AbstractElement {
3737

3838
private List<Point> points;
39-
public PolygonElement() {
39+
40+
PolygonElement() {
4041
super(CgmIdentifier.POLYGON);
4142
}
4243

0 commit comments

Comments
 (0)