Skip to content

Commit

Permalink
reformatted everything
Browse files Browse the repository at this point in the history
  • Loading branch information
sfnelson committed Nov 7, 2011
1 parent f94d9b3 commit fb3bd3c
Show file tree
Hide file tree
Showing 58 changed files with 215 additions and 192 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.google.gwt.event.shared.SimpleEventBus;
import com.google.gwt.inject.client.AbstractGinModule;
import com.google.gwt.place.shared.PlaceController;

import com.google.inject.Provides;
import com.google.inject.Singleton;
import org.sfnelson.blog.client.request.AuthRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.sfnelson.blog.client;

import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.*;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.inject.Inject;
import com.google.web.bindery.event.shared.UmbrellaException;

import com.google.inject.Inject;
import org.sfnelson.blog.client.views.ErrorView;

/**
Expand Down Expand Up @@ -46,16 +46,14 @@ private Throwable getExceptionToDisplay(Throwable e) {
private Throwable unpack(UmbrellaException e) {
if (e.getCauses().size() == 1) {
return e.getCauses().iterator().next();
}
else {
} else {
String message = null;
Throwable last = null;
for (Throwable t : e.getCauses()) {
if (message == null || message.equals(t.getMessage())) {
message = t.getMessage();
last = t;
}
else {
} else {
return e; // different messages, return all.
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sfnelson.blog.client.editors;

import com.google.gwt.editor.client.Editor;
import com.google.web.bindery.requestfactory.shared.EntityProxy;

/**
Expand All @@ -10,6 +9,7 @@
public interface EditorSource<T extends EntityProxy> {

public <X extends T> RootEditor<X> create(int index, Class<X> type);

public void dispose(Object o);

}
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
package org.sfnelson.blog.client.editors;

import com.google.gwt.editor.rebind.model.EditorModel;
import com.google.inject.Provider;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.requestfactory.gwt.client.RequestFactoryEditorDriver;
import com.google.web.bindery.requestfactory.shared.Receiver;
import com.google.web.bindery.requestfactory.shared.ServerFailure;
import org.sfnelson.blog.client.request.ContentProxy;

import com.google.inject.Provider;
import org.sfnelson.blog.client.request.EntryProxy;
import org.sfnelson.blog.client.request.EntryRequest;
import org.sfnelson.blog.client.views.EntryView;
import org.sfnelson.blog.server.domain.Content;
import org.sfnelson.blog.server.domain.Entry;

import java.util.Date;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
package org.sfnelson.blog.client.editors;

import com.google.gwt.editor.client.Editor;
import com.google.gwt.editor.client.EditorDelegate;
import com.google.gwt.editor.client.ValueAwareEditor;
import com.google.web.bindery.event.shared.HandlerRegistration;
import com.google.web.bindery.requestfactory.shared.EntityProxy;

import java.util.Date;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
* Date: 31/10/11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
public interface SelectableEditor {

boolean select();

boolean deselect();

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.web.bindery.event.shared.Event;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.event.shared.HandlerRegistration;

import org.sfnelson.blog.client.request.TaskProxy;
import org.sfnelson.blog.shared.domain.TaskUpdateType;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.web.bindery.event.shared.Event;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.event.shared.HandlerRegistration;

import org.sfnelson.blog.client.request.TaskProxy;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.web.bindery.requestfactory.shared.ProxyFor;
import com.google.web.bindery.requestfactory.shared.ValueProxy;

import org.sfnelson.blog.server.Auth;

/**
Expand All @@ -11,8 +12,12 @@
@ProxyFor(Auth.class)
public interface AuthProxy extends ValueProxy {
String getRedirectURL();

String getEmail();

String getAuthId();

boolean getAuthenticated();

boolean getAuthor();
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.web.bindery.requestfactory.shared.Request;
import com.google.web.bindery.requestfactory.shared.RequestContext;
import com.google.web.bindery.requestfactory.shared.Service;

import org.sfnelson.blog.server.AuthManager;
import org.sfnelson.blog.server.ServiceLocator;

Expand All @@ -13,7 +14,10 @@
@Service(value = AuthManager.class, locator = ServiceLocator.class)
public interface AuthRequest extends RequestContext {
Request<AuthProxy> login(String provider, String returnURL);

Request<AuthProxy> cookie(String authId);

Request<AuthProxy> state();

Request<AuthProxy> logout();
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.web.bindery.requestfactory.shared.EntityProxy;
import com.google.web.bindery.requestfactory.shared.EntityProxyId;
import com.google.web.bindery.requestfactory.shared.ProxyFor;

import org.sfnelson.blog.server.DomainObjectLocator;
import org.sfnelson.blog.server.domain.Author;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.web.bindery.requestfactory.shared.EntityProxy;
import com.google.web.bindery.requestfactory.shared.EntityProxyId;
import com.google.web.bindery.requestfactory.shared.ProxyFor;

import org.sfnelson.blog.server.DomainObjectLocator;
import org.sfnelson.blog.server.domain.Content;

Expand All @@ -13,7 +14,9 @@
@ProxyFor(value = Content.class, locator = DomainObjectLocator.class)
public interface ContentProxy extends EntityProxy, org.sfnelson.blog.domain.Content {
void setType(Type type);

void setValue(String value);

@Override
EntityProxyId<ContentProxy> stableId();
}
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
package org.sfnelson.blog.client.request;

import java.util.Date;

import com.google.web.bindery.requestfactory.shared.EntityProxy;
import com.google.web.bindery.requestfactory.shared.ProxyFor;

import org.sfnelson.blog.server.DomainObjectLocator;
import org.sfnelson.blog.server.domain.Entry;

import java.util.Date;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
* Date: 31/10/11
*/
@ProxyFor(value = Entry.class, locator = DomainObjectLocator.class)
public interface EntryProxy extends EntityProxy, org.sfnelson.blog.domain.Entry {
AuthorProxy getAuthor();

void setAuthor(AuthorProxy author);

Date getPosted();

void setPosted(Date date);

ContentProxy getContent();

void setContent(ContentProxy content);
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package org.sfnelson.blog.client.request;

import java.util.List;

import com.google.web.bindery.requestfactory.shared.ExtraTypes;
import com.google.web.bindery.requestfactory.shared.Request;
import com.google.web.bindery.requestfactory.shared.RequestContext;
import com.google.web.bindery.requestfactory.shared.Service;

import org.sfnelson.blog.server.ServiceLocator;
import org.sfnelson.blog.server.service.EntryService;

import java.util.List;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
* Date: 19/10/11
Expand All @@ -17,13 +18,18 @@
@ExtraTypes({PostProxy.class, UpdateProxy.class})
public interface EntryRequest extends RequestContext {
Request<List<EntryProxy>> getEntries(int start, int limit);

Request<List<PostProxy>> getPosts(int start, int limit);

Request<Void> createEntry(EntryProxy post);

Request<Void> updateEntry(EntryProxy post);

Request<Void> deleteEntry(EntryProxy post);

Request<Void> createContent(ContentProxy post);

Request<Void> updateContent(ContentProxy post);

Request<Void> deleteContent(ContentProxy post);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@

import com.google.web.bindery.requestfactory.shared.EntityProxyId;
import com.google.web.bindery.requestfactory.shared.ProxyFor;

import org.sfnelson.blog.server.DomainObjectLocator;
import org.sfnelson.blog.server.domain.Post;

import java.util.Date;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
* Date: 19/10/11
*/
@ProxyFor(value = Post.class, locator = DomainObjectLocator.class)
public interface PostProxy extends EntryProxy, org.sfnelson.blog.domain.Post {
void setTitle(String title);

ContentProxy getContent();

AuthorProxy getAuthor();

EntityProxyId<PostProxy> stableId();
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
*/
public interface RequestFactory extends com.google.web.bindery.requestfactory.shared.RequestFactory {
TaskRequest taskRequest();

EntryRequest entryRequest();

AuthRequest authRequest();
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
package org.sfnelson.blog.client.request;

import java.util.Date;

import com.google.web.bindery.requestfactory.shared.EntityProxy;
import com.google.web.bindery.requestfactory.shared.EntityProxyId;
import com.google.web.bindery.requestfactory.shared.ProxyFor;

import org.sfnelson.blog.server.DomainObjectLocator;
import org.sfnelson.blog.server.domain.Task;

import java.util.Date;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
* Date: 18/10/11
*/
@ProxyFor(value = Task.class, locator = DomainObjectLocator.class)
public interface TaskProxy extends EntityProxy, org.sfnelson.blog.domain.Task {
void setTitle(String title);

void setContent(ContentProxy content);

ContentProxy getContent();

AuthorProxy getOwner();

void setCreated(Date date);

void setCompleted(Date date);

void setLastUpdate(Date date);

void setAbandoned(Date date);

EntityProxyId<TaskProxy> stableId();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
package org.sfnelson.blog.client.request;

import java.util.List;

import com.google.web.bindery.requestfactory.shared.Request;
import com.google.web.bindery.requestfactory.shared.RequestContext;
import com.google.web.bindery.requestfactory.shared.Service;

import org.sfnelson.blog.server.ServiceLocator;
import org.sfnelson.blog.server.TaskManager;
import org.sfnelson.blog.server.service.TaskService;

import java.util.List;

/**
* Author: Stephen Nelson <stephen@sfnelson.org>
* Date: 18/10/11
*/
@Service(value = TaskService.class, locator = ServiceLocator.class)
public interface TaskRequest extends RequestContext {
Request<List<TaskProxy>> getCurrentTasks(int start, int limit);

Request<Void> createTask(TaskProxy task);

Request<Void> updateTask(TaskProxy task);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.web.bindery.requestfactory.shared.EntityProxyId;
import com.google.web.bindery.requestfactory.shared.ProxyFor;

import org.sfnelson.blog.server.DomainObjectLocator;
import org.sfnelson.blog.server.domain.Update;
import org.sfnelson.blog.shared.domain.TaskUpdateType;
Expand All @@ -13,10 +14,15 @@
@ProxyFor(value = Update.class, locator = DomainObjectLocator.class)
public interface UpdateProxy extends EntryProxy, org.sfnelson.blog.domain.Update {
TaskProxy getTask();

void setTask(TaskProxy task);

TaskUpdateType getType();

void setType(TaskUpdateType type);

ContentProxy getContent();

AuthorProxy getAuthor();

EntityProxyId<UpdateProxy> stableId();
Expand Down
Loading

0 comments on commit fb3bd3c

Please sign in to comment.