From 0cb8a2201963b77fbb428e98954c58c26b27706b Mon Sep 17 00:00:00 2001 From: Alan Nelson Date: Fri, 30 Oct 2015 09:59:25 -0400 Subject: [PATCH 1/2] modified: SoundCloud.java modified: User.java --- src/main/java/de/voidplus/soundcloud/SoundCloud.java | 7 ++----- src/main/java/de/voidplus/soundcloud/User.java | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/voidplus/soundcloud/SoundCloud.java b/src/main/java/de/voidplus/soundcloud/SoundCloud.java index 8f5b529..918c599 100644 --- a/src/main/java/de/voidplus/soundcloud/SoundCloud.java +++ b/src/main/java/de/voidplus/soundcloud/SoundCloud.java @@ -7,7 +7,6 @@ import org.apache.http.HttpStatus; import org.json.simple.JSONArray; import org.json.simple.parser.JSONParser; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -17,10 +16,8 @@ public class SoundCloud { - public static final String VERSION = "0.2.1"; - public enum Type { USER, TRACK, @@ -309,7 +306,7 @@ private T api(String api, Rest rest, Object value, String[] filters) { } } else { - System.err.println("Invalid status received: " + response.getStatusLine()); + System.err.println("Error, Invalid status received: " + response.getStatusLine()); } break; case POST: @@ -933,4 +930,4 @@ private String replaceJsonsBlank(String string) { return matcher.replaceAll(":null"); } -} \ No newline at end of file +} diff --git a/src/main/java/de/voidplus/soundcloud/User.java b/src/main/java/de/voidplus/soundcloud/User.java index 4f3ef2c..1d0dd88 100644 --- a/src/main/java/de/voidplus/soundcloud/User.java +++ b/src/main/java/de/voidplus/soundcloud/User.java @@ -31,11 +31,11 @@ public class User { public User() { } - + public Integer getId() { return id; } - + public String getUsername() { return username; } @@ -183,4 +183,4 @@ public String toString() { + ", primary_email_confirmed=" + primary_email_confirmed + "]"; } -} \ No newline at end of file +} From 5f2c7e74f5f6bb187e502e8167c52c8a68207915 Mon Sep 17 00:00:00 2001 From: Alan Nelson Date: Fri, 30 Oct 2015 10:06:03 -0400 Subject: [PATCH 2/2] modified: Group.java --- .../java/de/voidplus/soundcloud/Group.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/voidplus/soundcloud/Group.java b/src/main/java/de/voidplus/soundcloud/Group.java index 35cc259..1b71f2f 100644 --- a/src/main/java/de/voidplus/soundcloud/Group.java +++ b/src/main/java/de/voidplus/soundcloud/Group.java @@ -3,14 +3,14 @@ public class Group { private Integer id; - private String created_at; + private String createdAt; private String permalink; private String name; - private String short_description; + private String shortDescription; private String description; private String uri; - private String permalink_url; - private String artwork_url; + private String permalinkUrl; + private String artworkUrl; private User creator; public Group() @@ -38,7 +38,7 @@ public void setDescription(String description) { } public String getCreatedAt() { - return created_at; + return createdAt; } public String getPermalink() { @@ -46,11 +46,11 @@ public String getPermalink() { } public String getShortDescription() { - return short_description; + return shortDescription; } - public void setShortDescription(String short_description) { - this.short_description = short_description; + public void setShortDescription(String shortDescription) { + this.shortDescription = shortDescription; } public String getUri() { @@ -58,11 +58,11 @@ public String getUri() { } public String getPermalinkUrl() { - return permalink_url; + return permalinkUrl; } public String getArtworkUrl() { - return artwork_url; + return artworkUrl; } public User getCreator() { @@ -71,10 +71,10 @@ public User getCreator() { @Override public String toString() { - return "Group [id=" + id + ", created_at=" + created_at + return "Group [id=" + id + ", createdAt=" + createdAt + ", permalink=" + permalink + ", name=" + name + ", uri=" - + uri + ", permalink_url=" + permalink_url + ", artwork_url=" - + artwork_url + ", creator=" + creator + "]"; + + uri + ", permalinkUrl=" + permalinkUrl + ", artworkUrl=" + + artworkUrl + ", creator=" + creator + "]"; } -} \ No newline at end of file +}