Merge pull request square#145 from square/jw/small

Small tweaks.
wolf9s · Feb 15, 2013 · 4c894bd · 4c894bd
2 parents e650d65 + 28fdb93
commit 4c894bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/retrofit/src/main/java/retrofit/io/TypedByteArray.java b/retrofit/src/main/java/retrofit/io/TypedByteArray.java
@@ -32,8 +32,7 @@ public void writeTo(OutputStream out) throws IOException {
     return bytes.length;
   }
 
-  @Override
-  public boolean equals(Object o) {
+  @Override public boolean equals(Object o) {
     if (this == o) return true;
 
     if (o instanceof TypedByteArray) {
@@ -43,8 +42,7 @@ public boolean equals(Object o) {
     return false;
   }
 
-  @Override
-  public int hashCode() {
+  @Override public int hashCode() {
     return Arrays.hashCode(bytes);
   }
 }
diff --git a/retrofit/src/main/java/retrofit/io/TypedFile.java b/retrofit/src/main/java/retrofit/io/TypedFile.java
@@ -50,7 +50,7 @@ public void writeTo(OutputStream out) throws IOException {
    * @throws java.io.IOException if the move fails
    */
   public void moveTo(TypedFile destination) throws IOException {
-    if (mimeType() != destination.mimeType()) {
+    if (!mimeType().equals(destination.mimeType())) {
       throw new IOException("Type mismatch.");
     }
     if (!file.renameTo(destination.file())) {
@@ -62,8 +62,7 @@ public void moveTo(TypedFile destination) throws IOException {
     return file.getAbsolutePath() + " (" + mimeType() + ")";
   }
 
-  @Override
-  public boolean equals(Object o) {
+  @Override public boolean equals(Object o) {
     if (this == o) return true;
     if (o instanceof TypedFile) {
       TypedFile rhs = (TypedFile) o;
@@ -72,8 +71,7 @@ public boolean equals(Object o) {
     return false;
   }
 
-  @Override
-  public int hashCode() {
+  @Override public int hashCode() {
     return file.hashCode();
   }