Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Code cleanup: import static.

Browse Source
This commit is contained in:
akwizgran
2012-09-27 10:44:07 +01:00
parent e534722d60
commit 7f94707dab
14 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -4,6 +4,7 @@ import static net.sf.briar.db.DatabaseConstants.BYTES_PER_SWEEP;
import static net.sf.briar.db.DatabaseConstants.CRITICAL_FREE_SPACE;
import static net.sf.briar.db.DatabaseConstants.MAX_BYTES_BETWEEN_SPACE_CHECKS;
import static net.sf.briar.db.DatabaseConstants.MAX_MS_BETWEEN_SPACE_CHECKS;
import static net.sf.briar.db.DatabaseConstants.MAX_UPDATE_INTERVAL;
import static net.sf.briar.db.DatabaseConstants.MIN_FREE_SPACE;
import java.io.IOException;
@@ -673,7 +674,7 @@ DatabaseCleaner.Callback {
private boolean updateIsDue(long sent) {
long now = clock.currentTimeMillis();
return now - sent >= DatabaseConstants.MAX_UPDATE_INTERVAL;
return now - sent >= MAX_UPDATE_INTERVAL;
}
public TransportUpdate generateTransportUpdate(ContactId c)

10
components/net/sf/briar/plugins/PluginManagerImpl.java
View File

@@ -1,5 +1,8 @@
package net.sf.briar.plugins;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PROPERTY_LENGTH;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,7 +33,6 @@ import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.protocol.ProtocolConstants;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.ui.UiCallback;
@@ -241,20 +243,20 @@ class PluginManagerImpl implements PluginManager {
public void setLocalProperties(TransportProperties p) {
assert id != null;
if(p.size() > ProtocolConstants.MAX_PROPERTIES_PER_TRANSPORT) {
if(p.size() > MAX_PROPERTIES_PER_TRANSPORT) {
if(LOG.isLoggable(Level.WARNING))
LOG.warning("Plugin " + id + " set too many properties");
return;
}
for(String s : p.keySet()) {
if(s.length() > ProtocolConstants.MAX_PROPERTY_LENGTH) {
if(s.length() > MAX_PROPERTY_LENGTH) {
if(LOG.isLoggable(Level.WARNING))
LOG.warning("Plugin " + id + " set long key: " + s);
return;
}
}
for(String s : p.values()) {
if(s.length() > ProtocolConstants.MAX_PROPERTY_LENGTH) {
if(s.length() > MAX_PROPERTY_LENGTH) {
if(LOG.isLoggable(Level.WARNING))
LOG.warning("Plugin " + id + " set long value: " + s);
return;

5
components/net/sf/briar/plugins/file/FilePlugin.java
View File

@@ -1,5 +1,7 @@
package net.sf.briar.plugins.file;
import static net.sf.briar.api.transport.TransportConstants.MIN_CONNECTION_LENGTH;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -16,7 +18,6 @@ import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.TransportConstants;
import org.apache.commons.io.FileSystemUtils;
@@ -69,7 +70,7 @@ public abstract class FilePlugin implements SimplexPlugin {
File f = new File(dir, filename);
try {
long capacity = getCapacity(dir.getPath());
if(capacity < TransportConstants.MIN_CONNECTION_LENGTH) return null;
if(capacity < MIN_CONNECTION_LENGTH) return null;
OutputStream out = new FileOutputStream(f);
return new FileTransportWriter(f, out, capacity, this);
} catch(IOException e) {

10
components/net/sf/briar/protocol/AuthorReader.java
View File

@@ -1,5 +1,8 @@
package net.sf.briar.protocol;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PUBLIC_KEY_LENGTH;
import java.io.IOException;
import net.sf.briar.api.crypto.CryptoComponent;
@@ -7,11 +10,10 @@ import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.protocol.Author;
import net.sf.briar.api.protocol.AuthorFactory;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.ProtocolConstants;
import net.sf.briar.api.protocol.Types;
import net.sf.briar.api.serial.DigestingConsumer;
import net.sf.briar.api.serial.StructReader;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
class AuthorReader implements StructReader<Author> {
@@ -29,8 +31,8 @@ class AuthorReader implements StructReader<Author> {
// Read and digest the data
r.addConsumer(digesting);
r.readStructId(Types.AUTHOR);
String name = r.readString(ProtocolConstants.MAX_AUTHOR_NAME_LENGTH);
byte[] publicKey = r.readBytes(ProtocolConstants.MAX_PUBLIC_KEY_LENGTH);
String name = r.readString(MAX_AUTHOR_NAME_LENGTH);
byte[] publicKey = r.readBytes(MAX_PUBLIC_KEY_LENGTH);
r.removeConsumer(digesting);
// Build and return the author
AuthorId id = new AuthorId(messageDigest.digest());

10
components/net/sf/briar/protocol/GroupReader.java
View File

@@ -1,5 +1,8 @@
package net.sf.briar.protocol;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PUBLIC_KEY_LENGTH;
import java.io.IOException;
import net.sf.briar.api.crypto.CryptoComponent;
@@ -7,11 +10,10 @@ import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupFactory;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.ProtocolConstants;
import net.sf.briar.api.protocol.Types;
import net.sf.briar.api.serial.DigestingConsumer;
import net.sf.briar.api.serial.StructReader;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.StructReader;
class GroupReader implements StructReader<Group> {
@@ -29,10 +31,10 @@ class GroupReader implements StructReader<Group> {
// Read and digest the data
r.addConsumer(digesting);
r.readStructId(Types.GROUP);
String name = r.readString(ProtocolConstants.MAX_GROUP_NAME_LENGTH);
String name = r.readString(MAX_GROUP_NAME_LENGTH);
byte[] publicKey = null;
if(r.hasNull()) r.readNull();
else publicKey = r.readBytes(ProtocolConstants.MAX_PUBLIC_KEY_LENGTH);
else publicKey = r.readBytes(MAX_PUBLIC_KEY_LENGTH);
r.removeConsumer(digesting);
// Build and return the group
GroupId id = new GroupId(messageDigest.digest());

4
components/net/sf/briar/protocol/MessageImpl.java
View File

@@ -1,10 +1,10 @@
package net.sf.briar.protocol;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_BODY_LENGTH;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.ProtocolConstants;
/** A simple in-memory implementation of a message. */
class MessageImpl implements Message {
@@ -22,7 +22,7 @@ class MessageImpl implements Message {
int bodyStart, int bodyLength) {
if(bodyStart + bodyLength > raw.length)
throw new IllegalArgumentException();
if(bodyLength > ProtocolConstants.MAX_BODY_LENGTH)
if(bodyLength > MAX_BODY_LENGTH)
throw new IllegalArgumentException();
this.id = id;
this.parent = parent;

5
components/net/sf/briar/transport/ConnectionDispatcherImpl.java
View File

@@ -1,5 +1,7 @@
package net.sf.briar.transport;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
@@ -19,7 +21,6 @@ import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.IncomingConnectionExecutor;
import net.sf.briar.api.transport.TransportConstants;
import com.google.inject.Inject;
@@ -64,7 +65,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
}
private byte[] readTag(InputStream in) throws IOException {
byte[] b = new byte[TransportConstants.TAG_LENGTH];
byte[] b = new byte[TAG_LENGTH];
int offset = 0;
while(offset < b.length) {
int read = in.read(b, offset, b.length - offset);