projects
/
pithos-web-client
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a16cdda
)
Remove hard-coded debugging aids (System.outs etc)
author
Christos KK Loverdos
<loverdos@gmail.com>
Wed, 6 Feb 2013 15:49:35 +0000
(17:49 +0200)
committer
Christos KK Loverdos
<loverdos@gmail.com>
Wed, 6 Feb 2013 15:49:35 +0000
(17:49 +0200)
src/gr/grnet/pithos/web/client/Pithos.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/catalog/GetUserCatalogs.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/rest/DeleteRequest.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/rest/GetRequest.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/rest/HeadRequest.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/rest/PostRequest.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/rest/PutRequest.java
patch
|
blob
|
history
src/gr/grnet/pithos/web/client/rest/RestRequestCallback.java
patch
|
blob
|
history
diff --git
a/src/gr/grnet/pithos/web/client/Pithos.java
b/src/gr/grnet/pithos/web/client/Pithos.java
index
7c94e9c
..
411208f
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/Pithos.java
+++ b/
src/gr/grnet/pithos/web/client/Pithos.java
@@
-660,16
+660,8
@@
public class Pithos implements EntryPoint, ResizeHandler {
private boolean parseUserCredentials() {
Configuration conf = (Configuration) GWT.create(Configuration.class);
Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
private boolean parseUserCredentials() {
Configuration conf = (Configuration) GWT.create(Configuration.class);
Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
- System.out.println("otherProperties = " + otherProperties);
String cookie = otherProperties.get("authCookie");
String cookie = otherProperties.get("authCookie");
- System.out.println("cookie = " + cookie);
- Cookies.setCookie(cookie, "868fbb51-94a4-477d-8da3-dadad080c861|HlPjywM5FGAncsoNDzPZ2Q==");
-// Cookies.setCookie(cookie, "868fbb51-94a4-477d-8da3-dadad080c861%7CHlPjywM5FGAncsoNDzPZ2Q%3D%3D");
- for(String name: Cookies.getCookieNames()) {
- System.out.println("cookie name: " + name);
- }
String auth = Cookies.getCookie(cookie);
String auth = Cookies.getCookie(cookie);
- System.out.println("auth = " + auth);
if(auth == null) {
authenticateUser();
return false;
if(auth == null) {
authenticateUser();
return false;
@@
-681,24
+673,18
@@
public class Pithos implements EntryPoint, ResizeHandler {
auth = auth.substring(0, auth.length() - 1);
}
String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
auth = auth.substring(0, auth.length() - 1);
}
String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
- for(String authPart: authSplit) {
- System.out.println("authPart: " + authPart);
- }
if(authSplit.length != 2) {
authenticateUser();
return false;
}
userID = authSplit[0];
userToken = authSplit[1];
if(authSplit.length != 2) {
authenticateUser();
return false;
}
userID = authSplit[0];
userToken = authSplit[1];
- System.out.println("userID = " + userID);
- System.out.println("userToken = " + userToken);
String gotoUrl = Window.Location.getParameter("goto");
if(gotoUrl != null && gotoUrl.length() > 0) {
Window.Location.assign(gotoUrl);
return false;
}
String gotoUrl = Window.Location.getParameter("goto");
if(gotoUrl != null && gotoUrl.length() > 0) {
Window.Location.assign(gotoUrl);
return false;
}
- System.out.println("Returning true");
return true;
}
return true;
}
@@
-711,13
+697,11
@@
public class Pithos implements EntryPoint, ResizeHandler {
}
public void fetchAccount(final Command callback) {
}
public void fetchAccount(final Command callback) {
- System.out.println("fetchAccount(), userID = " + this.userID + ", userToken = " + this.userToken);
String path = "?format=json";
GetRequest<AccountResource> getAccount = new GetRequest<AccountResource>(AccountResource.class, getApiPath(), userID, path) {
@Override
public void onSuccess(AccountResource _result) {
String path = "?format=json";
GetRequest<AccountResource> getAccount = new GetRequest<AccountResource>(AccountResource.class, getApiPath(), userID, path) {
@Override
public void onSuccess(AccountResource _result) {
- System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " onSuccess()");
account = _result;
if(callback != null) {
callback.execute();
account = _result;
if(callback != null) {
callback.execute();
@@
-728,22
+712,18
@@
public class Pithos implements EntryPoint, ResizeHandler {
@Override
public void onError(Throwable t) {
@Override
public void onError(Throwable t) {
- System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " onError() " + t.getClass().getName() + ": " + t.getMessage());
GWT.log("Error getting account", t);
setError(t);
if(t instanceof RestException) {
GWT.log("Error getting account", t);
setError(t);
if(t instanceof RestException) {
- System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " Error getting account: " + ((RestException) t).getHttpStatusText());
displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
}
else {
displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
}
else {
- System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + "System error fetching user data: " + t.getMessage());
displayError("System error fetching user data: " + t.getMessage());
}
}
@Override
protected void onUnauthorized(Response response) {
displayError("System error fetching user data: " + t.getMessage());
}
}
@Override
protected void onUnauthorized(Response response) {
- System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " onUnauthorized()");
sessionExpired();
}
};
sessionExpired();
}
};
diff --git
a/src/gr/grnet/pithos/web/client/catalog/GetUserCatalogs.java
b/src/gr/grnet/pithos/web/client/catalog/GetUserCatalogs.java
index
752dbbb
..
e234304
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/catalog/GetUserCatalogs.java
+++ b/
src/gr/grnet/pithos/web/client/catalog/GetUserCatalogs.java
@@
-92,16
+92,13
@@
public class GetUserCatalogs implements Scheduler.ScheduledCommand {
}
public void onSuccess(Request request, Response response, JSONObject result, UserCatalogs userCatalogs) {
}
public void onSuccess(Request request, Response response, JSONObject result, UserCatalogs userCatalogs) {
- System.out.println("GetUserCatalogs: " + result);
}
public void onBadStatusCode(Request request, Response response) {
}
public void onBadStatusCode(Request request, Response response) {
-
}
public void onError(Request request, Throwable t) {
GWT.log("GetUserCatalogs", t);
}
public void onError(Request request, Throwable t) {
GWT.log("GetUserCatalogs", t);
- System.out.print("GetUserCatalogs: " + t.getClass().getName() + ": " + t.getMessage());
}
@Override
}
@Override
@@
-111,9
+108,6
@@
public class GetUserCatalogs implements Scheduler.ScheduledCommand {
final String requestData = makeRequestData().toString();
try {
final String requestData = makeRequestData().toString();
try {
- System.out.println("==================================");
- System.out.println("POST " + getURL());
- System.out.println("==================================");
rb.sendRequest(requestData, new RequestCallback() {
@Override
public void onResponseReceived(Request request, Response response) {
rb.sendRequest(requestData, new RequestCallback() {
@Override
public void onResponseReceived(Request request, Response response) {
diff --git
a/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java
b/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java
index
8351801
..
0194db0
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/rest/DeleteRequest.java
+++ b/
src/gr/grnet/pithos/web/client/rest/DeleteRequest.java
@@
-77,7
+77,6
@@
public abstract class DeleteRequest implements ScheduledCommand {
@Override
public void execute() {
@Override
public void execute() {
- System.out.println("DELETE " + api + owner + path);
RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
diff --git
a/src/gr/grnet/pithos/web/client/rest/GetRequest.java
b/src/gr/grnet/pithos/web/client/rest/GetRequest.java
index
c8e7246
..
e087800
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/rest/GetRequest.java
+++ b/
src/gr/grnet/pithos/web/client/rest/GetRequest.java
@@
-94,7
+94,6
@@
public abstract class GetRequest<T extends Resource> implements ScheduledCommand
path += "&t=" + System.currentTimeMillis();
else
path += "?t=" + System.currentTimeMillis();
path += "&t=" + System.currentTimeMillis();
else
path += "?t=" + System.currentTimeMillis();
- System.out.println("GET " + api + owner + path);
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, api + owner + path);
for (String header : headers.keySet()) {
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, api + owner + path);
for (String header : headers.keySet()) {
@@
-104,7
+103,6
@@
public abstract class GetRequest<T extends Resource> implements ScheduledCommand
builder.sendRequest("", new RestRequestCallback<T>(api + owner + path, okCode) {
@Override
public void onSuccess(T object) {
builder.sendRequest("", new RestRequestCallback<T>(api + owner + path, okCode) {
@Override
public void onSuccess(T object) {
- System.out.println("GET onSuccess() " + api + owner + path);
GetRequest.this.onSuccess(object);
}
GetRequest.this.onSuccess(object);
}
@@
-115,7
+113,6
@@
public abstract class GetRequest<T extends Resource> implements ScheduledCommand
@Override
public void onError(Request request, Throwable throwable) {
@Override
public void onError(Request request, Throwable throwable) {
- System.out.println("GET onError()" + api + owner + path);
if (throwable instanceof RestException) {
if (((RestException) throwable).getHttpStatusCode() == 304 && result != null){
GWT.log("Using cache: " + result.toString(), null);
if (throwable instanceof RestException) {
if (((RestException) throwable).getHttpStatusCode() == 304 && result != null){
GWT.log("Using cache: " + result.toString(), null);
diff --git
a/src/gr/grnet/pithos/web/client/rest/HeadRequest.java
b/src/gr/grnet/pithos/web/client/rest/HeadRequest.java
index
d8d2330
..
5b0f0fc
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/rest/HeadRequest.java
+++ b/
src/gr/grnet/pithos/web/client/rest/HeadRequest.java
@@
-96,7
+96,6
@@
public abstract class HeadRequest<T extends Resource> implements ScheduledComman
path += "&t=" + System.currentTimeMillis();
else
path += "?t=" + System.currentTimeMillis();
path += "&t=" + System.currentTimeMillis();
else
path += "?t=" + System.currentTimeMillis();
- System.out.println("HEAD " + api + owner + path);
RequestBuilder builder = new RequestBuilder(RequestBuilder.HEAD, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
RequestBuilder builder = new RequestBuilder(RequestBuilder.HEAD, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
diff --git
a/src/gr/grnet/pithos/web/client/rest/PostRequest.java
b/src/gr/grnet/pithos/web/client/rest/PostRequest.java
index
a0798ac
..
2bc7454
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/rest/PostRequest.java
+++ b/
src/gr/grnet/pithos/web/client/rest/PostRequest.java
@@
-78,7
+78,6
@@
public abstract class PostRequest implements ScheduledCommand {
@Override
public void execute() {
@Override
public void execute() {
- System.out.println("POST " + api + owner + path);
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
diff --git
a/src/gr/grnet/pithos/web/client/rest/PutRequest.java
b/src/gr/grnet/pithos/web/client/rest/PutRequest.java
index
375dd92
..
1b8d734
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/rest/PutRequest.java
+++ b/
src/gr/grnet/pithos/web/client/rest/PutRequest.java
@@
-103,7
+103,6
@@
public abstract class PutRequest implements ScheduledCommand {
@Override
public void execute() {
@Override
public void execute() {
- System.out.println("PUT " + api + owner + path);
RequestBuilder builder = new RequestBuilder(RequestBuilder.PUT, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
RequestBuilder builder = new RequestBuilder(RequestBuilder.PUT, api + owner + path);
for (String header : headers.keySet()) {
builder.setHeader(header, headers.get(header));
diff --git
a/src/gr/grnet/pithos/web/client/rest/RestRequestCallback.java
b/src/gr/grnet/pithos/web/client/rest/RestRequestCallback.java
index
9f4075a
..
91da6da
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/rest/RestRequestCallback.java
+++ b/
src/gr/grnet/pithos/web/client/rest/RestRequestCallback.java
@@
-78,8
+78,6
@@
public abstract class RestRequestCallback<T extends Resource> implements Request
}
catch (Exception e) {}
}
catch (Exception e) {}
- System.out.println("Response headers: " + response.getHeadersAsString());
-
onError(request, new RestException(path, response.getStatusCode(), statusText, text));
}
} catch (Exception e) {
onError(request, new RestException(path, response.getStatusCode(), statusText, text));
}
} catch (Exception e) {