Skip to content

Commit b40f54a

Browse files
tlkcmaglie
authored andcommitted
Declare fields at the top of the class
Improve Codacy PR quality requirements: Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes.
1 parent 4883880 commit b40f54a

7 files changed

+61
-66
lines changed

Diff for: arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java

+18-20
Original file line numberDiff line numberDiff line change
@@ -44,61 +44,59 @@
4444
public class ContributedLibrary extends DownloadableContribution {
4545

4646
private String url;
47+
private String version;
48+
private String checksum;
49+
private long size;
50+
private String archiveFileName;
51+
private String name;
52+
private String maintainer;
53+
private String author;
54+
private String website;
55+
private String category;
56+
private String licence;
57+
private String paragraph;
58+
private String sentence;
59+
private ArrayList<String> architectures;
60+
private ArrayList<String> types;
61+
private ArrayList<ContributedLibraryDependency> dependencies;
62+
private ArrayList<String> providesIncludes;
63+
4764
public String getUrl() { return url; }
4865

49-
private String version;
5066
public String getVersion() { return version; }
5167

52-
private String checksum;
5368
public String getChecksum() { return checksum; }
5469

55-
private long size;
5670
public long getSize() { return size; }
5771

58-
private String archiveFileName;
5972
public String getArchiveFileName() { return archiveFileName; }
6073

61-
62-
63-
private String name;
6474
public String getName() { return name; }
6575

66-
private String maintainer;
6776
public String getMaintainer() { return maintainer; }
6877

69-
private String author;
7078
public String getAuthor() { return author; }
7179

72-
private String website;
7380
public String getWebsite() { return website; }
7481

75-
private String category;
7682
public String getCategory() { return category; }
83+
7784
public void setCategory(String category) { this.category = category; }
7885

79-
private String licence;
8086
public String getLicense() { return licence; }
8187

82-
private String paragraph;
8388
public String getParagraph() { return paragraph; }
8489

85-
private String sentence;
8690
public String getSentence() { return sentence; }
8791

88-
private ArrayList<String> architectures;
8992
public List<String> getArchitectures() { return architectures; }
9093

91-
private ArrayList<String> types;
9294
public List<String> getTypes() { return types; }
9395

94-
private ArrayList<ContributedLibraryDependency> dependencies;
9596
public List<ContributedLibraryDependency> getDependencies() { return dependencies; }
9697

97-
private ArrayList<String> providesIncludes;
9898
public List<String> getProvidesIncludes() { return providesIncludes; }
9999

100-
101-
102100
public static final Comparator<ContributedLibrary> CASE_INSENSITIVE_ORDER = (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName());
103101

104102
private Optional<UserLibrary> installedLib = Optional.empty();

Diff for: arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232
public class ContributedLibraryDependency {
3333

3434
private String name;
35+
private String version;
36+
3537
public String getName() { return name; }
3638

37-
private String version;
3839
public String getVersion() { return version; }
3940

4041
@Override

Diff for: arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,28 @@
3535
public class ContributedPackage {
3636

3737
private String name;
38+
private String maintainer;
39+
private String websiteURL;
40+
private String email;
41+
private ArrayList<ContributedPlatform> platforms = new ArrayList<ContributedPlatform>();
42+
private ArrayList<ContributedTool> tools = new ArrayList<ContributedTool>();
43+
private ContributedHelp help;
44+
private boolean trusted;
45+
3846
public String getName() { return name; }
3947

40-
private String maintainer;
4148
public String getMaintainer() { return maintainer; }
4249

43-
private String websiteURL;
4450
public String getWebsiteURL() { return websiteURL; }
4551

46-
private String email;
4752
public String getEmail() { return email; }
4853

49-
private ArrayList<ContributedPlatform> platforms = new ArrayList<ContributedPlatform>();
5054
public List<ContributedPlatform> getPlatforms() { return platforms; }
5155

52-
private ArrayList<ContributedTool> tools = new ArrayList<ContributedTool>();
5356
public List<ContributedTool> getTools() { return tools; }
5457

55-
private ContributedHelp help;
5658
public ContributedHelp getHelp() { return help; }
5759

58-
private boolean trusted;
59-
6060
public ContributedPlatform findPlatform(String architecture, String version) {
6161
if (architecture == null || version == null) {
6262
return null;

Diff for: arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java

+17-20
Original file line numberDiff line numberDiff line change
@@ -38,42 +38,47 @@
3838
public class ContributedPlatform extends DownloadableContribution {
3939

4040
private String url;
41+
private String version;
42+
private long size;
43+
private String archiveFileName;
44+
private String name;
45+
private String category;
46+
private String architecture;
47+
private String checksum;
48+
private ArrayList<ContributedToolReference> toolsDependencies = new ArrayList<ContributedToolReference>();
49+
private ArrayList<ContributedBoard> boards = new ArrayList<ContributedBoard>();
50+
private ContributedHelp help;
51+
private boolean installed;
52+
private File installedFolder;
53+
private boolean builtIn;
54+
private Map<ContributedToolReference, ContributedTool> resolvedToolReferences;
55+
private ContributedPackage parentPackage;
56+
4157
public String getUrl() { return url; }
4258

43-
private String version;
4459
public String getVersion() { return version; }
4560

46-
private long size;
4761
public long getSize() { return size; }
4862

49-
private String archiveFileName;
5063
public String getArchiveFileName() { return archiveFileName; }
5164

52-
private String name;
5365
public String getName() { return name; }
5466

55-
private String category;
5667
public String getCategory() { return category; }
68+
5769
public void setCategory(String category) { this.category = category; }
5870

59-
private String architecture;
6071
public String getArchitecture() { return architecture; }
6172

62-
private String checksum;
6373
@Override
6474
public String getChecksum() { return checksum; }
6575

66-
private ArrayList<ContributedToolReference> toolsDependencies = new ArrayList<ContributedToolReference>();
6776
public List<ContributedToolReference> getToolsDependencies() { return toolsDependencies; }
6877

69-
private ArrayList<ContributedBoard> boards = new ArrayList<ContributedBoard>();
7078
public List<ContributedBoard> getBoards() { return boards; }
7179

72-
private ContributedHelp help;
7380
public ContributedHelp getHelp() { return help; }
7481

75-
private boolean installed;
76-
7782
public boolean isInstalled() {
7883
return installed;
7984
}
@@ -82,8 +87,6 @@ public void setInstalled(boolean installed) {
8287
this.installed = installed;
8388
}
8489

85-
private File installedFolder;
86-
8790
public File getInstalledFolder() {
8891
return installedFolder;
8992
}
@@ -92,8 +95,6 @@ public void setInstalledFolder(File installedFolder) {
9295
this.installedFolder = installedFolder;
9396
}
9497

95-
private boolean builtIn;
96-
9798
public boolean isBuiltIn() {
9899
return builtIn;
99100
}
@@ -108,10 +109,6 @@ public void setBuiltIn(boolean builtIn) {
108109
return px - py;
109110
};
110111

111-
private Map<ContributedToolReference, ContributedTool> resolvedToolReferences;
112-
113-
private ContributedPackage parentPackage;
114-
115112
public List<ContributedTool> getResolvedTools() {
116113
return new LinkedList<>(resolvedToolReferences.values());
117114
}

Diff for: arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,19 @@
3939
public class ContributedTool {
4040

4141
private String name;
42+
private String version;
43+
private ArrayList<HostDependentDownloadableContribution> systems = new ArrayList<HostDependentDownloadableContribution>();
44+
private boolean installed;
45+
private File installedFolder;
46+
private boolean builtIn;
47+
private ContributedPackage contributedPackage;
48+
4249
public String getName() { return name; }
4350

44-
private String version;
4551
public String getVersion() { return version; }
4652

47-
private ArrayList<HostDependentDownloadableContribution> systems = new ArrayList<HostDependentDownloadableContribution>();
4853
public List<HostDependentDownloadableContribution> getSystems() { return systems; }
4954

50-
private boolean installed;
51-
5255
public boolean isInstalled() {
5356
return installed;
5457
}
@@ -57,8 +60,6 @@ public void setInstalled(boolean installed) {
5760
this.installed = installed;
5861
}
5962

60-
private File installedFolder;
61-
6263
public File getInstalledFolder() {
6364
return installedFolder;
6465
}
@@ -67,8 +68,6 @@ public void setInstalledFolder(File installedFolder) {
6768
this.installedFolder = installedFolder;
6869
}
6970

70-
private boolean builtIn;
71-
7271
public boolean isBuiltIn() {
7372
return builtIn;
7473
}
@@ -77,8 +76,6 @@ public void setBuiltIn(boolean builtIn) {
7776
this.builtIn = builtIn;
7877
}
7978

80-
private ContributedPackage contributedPackage;
81-
8279
public ContributedPackage getPackage() {
8380
return contributedPackage;
8481
}

Diff for: arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@
3434
public class ContributedToolReference {
3535

3636
private String name;
37+
private String version;
38+
private String packager;
39+
3740
public String getName() { return name; }
3841

39-
private String version;
4042
public String getVersion() { return version; }
4143

42-
private String packager;
4344
public String getPackager() { return packager; }
4445

4546
public ContributedTool resolve(Collection<ContributedPackage> packages) {

Diff for: arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,22 @@
3535
public class HostDependentDownloadableContribution extends DownloadableContribution {
3636

3737
private String url;
38+
private String version;
39+
private String checksum;
40+
private long size;
41+
private String archiveFileName;
42+
private String host;
43+
3844
public String getUrl() { return url; }
3945

40-
private String version;
4146
public String getVersion() { return version; }
4247

43-
private String checksum;
4448
public String getChecksum() { return checksum; }
4549

46-
private long size;
4750
public long getSize() { return size; }
4851

49-
private String archiveFileName;
5052
public String getArchiveFileName() { return archiveFileName; }
5153

52-
private String host;
5354
public String getHost() { return host; }
5455

5556
@Override

0 commit comments

Comments
 (0)