Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #959 from andrewgaul/checkstyle-multiple-variable-declarations 

Enforce a single variable declaration per line
This commit is contained in:
Adrian Cole 2012-11-05 11:36:32 -08:00
parent 6eb0cd197f 9d643b569a
commit 760824800e
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java
View File

@ -124,7 +124,8 @@ public class VirtualMachineToNodeMetadata implements Function<VirtualMachine, No
builder.status(vmStateToNodeStatus.get(from.getState())); builder.status(vmStateToNodeStatus.get(from.getState()));
Set<String> publicAddresses = newHashSet(), privateAddresses = newHashSet(); Set<String> publicAddresses = newHashSet();
Set<String> privateAddresses = newHashSet();
if (from.getIPAddress() != null) { if (from.getIPAddress() != null) {
boolean isPrivate = isPrivateIPAddress(from.getIPAddress()); boolean isPrivate = isPrivateIPAddress(from.getIPAddress());
if (isPrivate) { if (isPrivate) {

3
core/src/main/java/org/jclouds/crypto/Sha512Crypt.java
View File

@ -158,7 +158,8 @@ public class Sha512Crypt {
byte[] temp_result; byte[] temp_result;
byte[] p_bytes = null; byte[] p_bytes = null;
byte[] s_bytes = null; byte[] s_bytes = null;
int cnt, cnt2; int cnt;
int cnt2;
int rounds = ROUNDS_DEFAULT; // Default number of rounds. int rounds = ROUNDS_DEFAULT; // Default number of rounds.
StringBuilder buffer; StringBuilder buffer;

4
labs/abiquo/src/main/java/org/jclouds/abiquo/domain/infrastructure/Machine.java
View File

@ -286,7 +286,9 @@ public class Machine extends AbstractPhysicalMachine {
public static class Builder { public static class Builder {
private RestContext<AbiquoApi, AbiquoAsyncApi> context; private RestContext<AbiquoApi, AbiquoAsyncApi> context;
private String name, description; private String name;
private String description;
private Integer virtualRamInMb; private Integer virtualRamInMb;

3
labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToIpAddress.java
View File

@ -50,7 +50,8 @@ public class IMachineToIpAddress implements Function<IMachine, String> {
public String apply(IMachine machine) { public String apply(IMachine machine) {
String macAddress = machine.getNetworkAdapter(0l).getMACAddress(); String macAddress = machine.getNetworkAdapter(0l).getMACAddress();
int offset = 0, step = 2; int offset = 0;
int step = 2;
for (int j = 1; j <= 5; j++) { for (int j = 1; j <= 5; j++) {
macAddress = new StringBuilder(macAddress).insert(j * step + offset, ":").toString().toLowerCase(); macAddress = new StringBuilder(macAddress).insert(j * step + offset, ":").toString().toLowerCase();
offset++; offset++;

3
labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java
View File

@ -182,7 +182,8 @@ public class NodeCreator implements Function<NodeSpec, NodeAndInitialCredentials
} }
private long findSlotForNetworkAttachment(IMachine clone, NetworkAttachmentType networkAttachmentType) { private long findSlotForNetworkAttachment(IMachine clone, NetworkAttachmentType networkAttachmentType) {
long slot = -1, i = 0; long slot = -1;
long i = 0;
while (slot == -1 && i < 4) { while (slot == -1 && i < 4) {
if(clone.getNetworkAdapter(i).getAttachmentType().equals(networkAttachmentType)) if(clone.getNetworkAdapter(i).getAttachmentType().equals(networkAttachmentType))
slot = i; slot = i;

1
resources/checkstyle.xml
View File

@ -12,6 +12,7 @@
<property name="max" value="120"/> <property name="max" value="120"/>
</module> </module>
<module name="ModifierOrder"/> <module name="ModifierOrder"/>
<module name="MultipleVariableDeclarations"/>
<module name="UnusedImports"/> <module name="UnusedImports"/>
</module> </module>
</module> </module>