projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d281599
)
Store DefaultAlbum in DefaultImage.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sat, 12 Oct 2013 15:35:38 +0000
(17:35 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 28 Feb 2014 21:25:24 +0000
(22:25 +0100)
src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java
patch
|
blob
|
history
src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
index
085091a
..
54e6495
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
+++ b/
src/main/java/net/pterodactylus/sone/data/impl/DefaultImage.java
@@
-29,9
+29,9
@@
import net.pterodactylus.sone.data.Sone;
public class DefaultImage extends AbstractImage {
private final Sone sone;
public class DefaultImage extends AbstractImage {
private final Sone sone;
- private final Album album;
+ private final
Default
Album album;
- public DefaultImage(String id, Sone sone, Album album, String key, long creationTime, int width, int height) {
+ public DefaultImage(String id, Sone sone,
Default
Album album, String key, long creationTime, int width, int height) {
super(id, key, creationTime, width, height);
this.sone = sone;
this.album = album;
super(id, key, creationTime, width, height);
this.sone = sone;
this.album = album;
diff --git
a/src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java
b/src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java
index
b53095f
..
12f20c2
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java
+++ b/
src/main/java/net/pterodactylus/sone/data/impl/DefaultImageBuilder.java
@@
-19,7
+19,6
@@
package net.pterodactylus.sone.data.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkNotNull;
-import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.database.ImageBuilder;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.database.ImageBuilder;
@@
-32,9
+31,9
@@
import net.pterodactylus.sone.database.ImageBuilder;
public class DefaultImageBuilder extends AbstractImageBuilder {
protected final Sone sone;
public class DefaultImageBuilder extends AbstractImageBuilder {
protected final Sone sone;
- protected final Album album;
+ protected final
Default
Album album;
- public DefaultImageBuilder(Sone sone, Album album) {
+ public DefaultImageBuilder(Sone sone,
Default
Album album) {
this.sone = checkNotNull(sone, "sone must not be null");
this.album = checkNotNull(album, "album must not be null");
}
this.sone = checkNotNull(sone, "sone must not be null");
this.album = checkNotNull(album, "album must not be null");
}
diff --git
a/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
b/src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
index
eac5287
..
2f00735
100644
(file)
--- a/
src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
+++ b/
src/test/java/net/pterodactylus/sone/data/impl/DefaultImageBuilderTest.java
@@
-22,7
+22,6
@@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
-import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.database.ImageBuilder;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.database.ImageBuilder;
@@
-44,7
+43,7
@@
public class DefaultImageBuilderTest {
private static final int HEIGHT = 270;
private final Sone sone = mock(Sone.class);
private static final int HEIGHT = 270;
private final Sone sone = mock(Sone.class);
- private final
Album album = mock(
Album.class);
+ private final
DefaultAlbum album = mock(Default
Album.class);
private final ImageBuilder imageBuilder = new DefaultImageBuilder(sone, album);
@Test
private final ImageBuilder imageBuilder = new DefaultImageBuilder(sone, album);
@Test