projects
/
demoscenemusic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
499a060
)
Add missing @Override annotations.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 25 Apr 2012 13:10:34 +0000
(15:10 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 25 Apr 2012 13:10:34 +0000
(15:10 +0200)
src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultBase.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultGroup.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultParty.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultStyle.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultTrack.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
b/src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
index
f079af1
..
af73754
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
@@
-48,6
+48,7
@@
public class Core implements ServletContextListener {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public void contextInitialized(ServletContextEvent servletContextEvent) {
servletContextEvent.getServletContext().setAttribute("core", this);
try {
public void contextInitialized(ServletContextEvent servletContextEvent) {
servletContextEvent.getServletContext().setAttribute("core", this);
try {
@@
-64,6
+65,7
@@
public class Core implements ServletContextListener {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public void contextDestroyed(ServletContextEvent arg0) {
/* do nothing. */
}
public void contextDestroyed(ServletContextEvent arg0) {
/* do nothing. */
}
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index
f53559e
..
06cfccc
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@
-119,6
+119,7
@@
public class DataManager {
private class LazyArtist extends DefaultArtist {
private final Memoizer<Void> tracksMemoizer = new Memoizer<Void>(new Callable<Void>() {
private class LazyArtist extends DefaultArtist {
private final Memoizer<Void> tracksMemoizer = new Memoizer<Void>(new Callable<Void>() {
+ @Override
public Void call() throws DatabaseException {
if (!hasValue("tracks")) {
value("tracks", Collection.class).set(getTracksByArtist(id()));
public Void call() throws DatabaseException {
if (!hasValue("tracks")) {
value("tracks", Collection.class).set(getTracksByArtist(id()));
@@
-152,6
+153,7
@@
public class DataManager {
return super.groups();
}
return super.groups();
}
+ @Override
public Collection<Track> tracks() {
tracksMemoizer.get();
return super.tracks();
public Collection<Track> tracks() {
tracksMemoizer.get();
return super.tracks();
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
index
d876169
..
c739275
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
@@
-30,10
+30,12
@@
public class DefaultArtist extends DefaultBase implements Artist {
super(id);
}
super(id);
}
+ @Override
public String name() {
return value("name", String.class).get();
}
public String name() {
return value("name", String.class).get();
}
+ @Override
public Artist name(String name) {
value("name", String.class).set(name);
return this;
public Artist name(String name) {
value("name", String.class).set(name);
return this;
@@
-42,6
+44,7
@@
public class DefaultArtist extends DefaultBase implements Artist {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
@SuppressWarnings("unchecked")
public Collection<Group> groups() {
return value("groups", Collection.class).get();
@SuppressWarnings("unchecked")
public Collection<Group> groups() {
return value("groups", Collection.class).get();
@@
-50,11
+53,13
@@
public class DefaultArtist extends DefaultBase implements Artist {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public Artist groups(Collection<Group> groups) {
value("groups", Collection.class).set(groups);
return this;
}
public Artist groups(Collection<Group> groups) {
value("groups", Collection.class).set(groups);
return this;
}
+ @Override
public Collection<Track> tracks() {
return value("tracks", Collection.class).get();
}
public Collection<Track> tracks() {
return value("tracks", Collection.class).get();
}
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultBase.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultBase.java
index
83f3cee
..
589ba86
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultBase.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultBase.java
@@
-37,6
+37,7
@@
public class DefaultBase implements Base {
}
public String id() {
}
public String id() {
+ @Override
return id;
}
return id;
}
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultGroup.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultGroup.java
index
0899b6d
..
16b2cca
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultGroup.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultGroup.java
@@
-33,6
+33,7
@@
public class DefaultGroup extends DefaultBase implements Group {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public String name() {
return value("name", String.class).get();
}
public String name() {
return value("name", String.class).get();
}
@@
-40,6
+41,7
@@
public class DefaultGroup extends DefaultBase implements Group {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public Group name(String name) {
value("name", String.class).set(name);
return this;
public Group name(String name) {
value("name", String.class).set(name);
return this;
@@
-48,6
+50,7
@@
public class DefaultGroup extends DefaultBase implements Group {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public String url() {
return value("url", String.class).get();
}
public String url() {
return value("url", String.class).get();
}
@@
-55,6
+58,7
@@
public class DefaultGroup extends DefaultBase implements Group {
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Override
public Group url(String url) {
value("url", String.class).set(url);
return this;
public Group url(String url) {
value("url", String.class).set(url);
return this;
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultParty.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultParty.java
index
353e6bb
..
dd684b3
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultParty.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultParty.java
@@
-28,10
+28,12
@@
public class DefaultParty extends DefaultBase implements Party {
super(id);
}
super(id);
}
+ @Override
public String name() {
return value("name", String.class).get();
}
public String name() {
return value("name", String.class).get();
}
+ @Override
public DefaultParty name(String name) {
value("name", String.class).set(name);
return this;
public DefaultParty name(String name) {
value("name", String.class).set(name);
return this;
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultStyle.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultStyle.java
index
4a0ceec
..
50b489f
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultStyle.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultStyle.java
@@
-28,10
+28,12
@@
public class DefaultStyle extends DefaultBase implements Style {
super(id);
}
super(id);
}
+ @Override
public String name() {
return value("name", String.class).get();
}
public String name() {
return value("name", String.class).get();
}
+ @Override
public Style name(String name) {
value("name", String.class).set(name);
return this;
public Style name(String name) {
value("name", String.class).set(name);
return this;
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultTrack.java
b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultTrack.java
index
ee882a1
..
db358f8
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultTrack.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/data/DefaultTrack.java
@@
-31,28
+31,34
@@
public class DefaultTrack extends DefaultBase implements Track {
super(id);
}
super(id);
}
+ @Override
public String name() {
return value("name", String.class).get();
}
public String name() {
return value("name", String.class).get();
}
+ @Override
public Track name(String name) {
value("name", String.class).set(name);
return this;
}
public Track name(String name) {
value("name", String.class).set(name);
return this;
}
+ @Override
public List<Artist> artists() {
return value("artists", List.class).get();
}
public List<Artist> artists() {
return value("artists", List.class).get();
}
+ @Override
public Track artists(List<Artist> artists) {
value("artists", List.class).set(artists);
return this;
}
public Track artists(List<Artist> artists) {
value("artists", List.class).set(artists);
return this;
}
+ @Override
public Collection<Style> styles() {
return value("styles", Collection.class).get();
}
public Collection<Style> styles() {
return value("styles", Collection.class).get();
}
+ @Override
public Track styles(Collection<? extends Style> styles) {
value("styles", Collection.class).set(styles);
return this;
public Track styles(Collection<? extends Style> styles) {
value("styles", Collection.class).set(styles);
return this;