diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java index 3361fdf..2d6a9be 100644 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java +++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/InviteFriends.java @@ -4,13 +4,12 @@ import org.gcube.portlets.user.invitefriends.client.ui.InviteWidget; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.user.client.ui.RootPanel; - /** - * Entry point classes define onModuleLoad(). + * + * @author Massimiliano Assante, ISTI-CNR + * */ public class InviteFriends implements EntryPoint { - - /** * This is the entry point method. */ diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/Messages.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/Messages.java deleted file mode 100644 index 129ea92..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/Messages.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.gcube.portlets.user.invitefriends.client; - -public interface Messages extends com.google.gwt.i18n.client.Messages { - - @DefaultMessage("Enter your name") - String nameField(); - - @DefaultMessage("Send") - String sendButton(); -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/Images.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/Images.java deleted file mode 100644 index ee5bdc1..0000000 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/Images.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.gcube.portlets.user.invitefriends.client.resources; - -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.ImageResource; - -public interface Images extends ClientBundle { - - @Source("members-loader.gif") - ImageResource membersLoader(); - - @Source("mail-32.png") - ImageResource postToIcon(); -} diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/mail-32.png b/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/mail-32.png deleted file mode 100644 index 3fc95f6..0000000 Binary files a/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/mail-32.png and /dev/null differ diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/members-loader.gif b/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/members-loader.gif deleted file mode 100644 index 89ae681..0000000 Binary files a/src/main/java/org/gcube/portlets/user/invitefriends/client/resources/members-loader.gif and /dev/null differ diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java index f673899..456a0fd 100644 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java +++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/InviteWidget.java @@ -1,17 +1,10 @@ package org.gcube.portlets.user.invitefriends.client.ui; -import org.gcube.portlets.user.invitefriends.client.validation.ValidationErrorsActivity; +import org.gcube.portlets.user.invitefriends.client.validation.FormErrorsValidation; -import com.github.gwtbootstrap.client.ui.Button; -import com.github.gwtbootstrap.client.ui.Form; -import com.github.gwtbootstrap.client.ui.HelpBlock; -import com.github.gwtbootstrap.client.ui.Modal; -import com.github.gwtbootstrap.client.ui.TextBox; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.SimplePanel; @@ -25,33 +18,18 @@ public class InviteWidget extends Composite{ public static final String DISPLAY_NAME = "Invite people to this VRE"; - private static InviteWidgetUiBinder uiBinder = GWT - .create(InviteWidgetUiBinder.class); + private static InviteWidgetUiBinder uiBinder = GWT.create(InviteWidgetUiBinder.class); - interface InviteWidgetUiBinder extends UiBinder { - } + interface InviteWidgetUiBinder extends UiBinder { } @UiField HTML header; - @UiField SimplePanel validationErrorsFormPanel; public InviteWidget() { super(); initWidget(uiBinder.createAndBindUi(this)); header.setText(DISPLAY_NAME); - - new ValidationErrorsActivity().start(validationErrorsFormPanel, null); + new FormErrorsValidation().start(validationErrorsFormPanel, null); } -// -// @UiHandler("openModal") -// public void onClick(ClickEvent e) { -// helpBlock.setText("We will send the invitation email to: "+emailAddress.getText()); -// modalWindow.show(); -// } -// -// @UiHandler("cancelInvite") -// public void onCancelClick(ClickEvent e) { -// modalWindow.hide(); -// } -// + } diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsActivity.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java similarity index 85% rename from src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsActivity.java rename to src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java index 2ae68a6..f66c7db 100644 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsActivity.java +++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormErrorsValidation.java @@ -10,7 +10,7 @@ import javax.validation.ConstraintViolation; import javax.validation.Path; import javax.validation.metadata.ConstraintDescriptor; -import org.gcube.portlets.user.invitefriends.client.validation.ValidationErrorsView.UserDetails; +import org.gcube.portlets.user.invitefriends.client.validation.FormView.UserDetails; import com.google.gwt.activity.shared.AbstractActivity; import com.google.gwt.editor.client.EditorDriver; @@ -19,22 +19,19 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.gwt.validation.client.impl.PathImpl; /** - * Showcase for ErrorEditors validation decoration of TextBoxes. * - * @author ivangsa + * @author Massimiliano Assante, ISTI-CNR * */ -public class ValidationErrorsActivity extends AbstractActivity implements ValidationErrorsView.Delegate { - - private ValidationErrorsView view; - +public class FormErrorsValidation extends AbstractActivity implements FormView.Delegate { + private FormView view; /** * @see com.google.gwt.activity.shared.Activity#start(com.google.gwt.user.client.ui.AcceptsOneWidget, com.google.gwt.event.shared.EventBus) */ @Override public void start(AcceptsOneWidget panel, EventBus eventBus) { - view = new ValidationErrorsViewImpl(this); + view = new FormViewImpl(this); panel.setWidget(view); } @@ -44,7 +41,7 @@ public class ValidationErrorsActivity extends AbstractActivity implements Valida EditorDriver editorDriver = view.getEditorDriver(); UserDetails login = editorDriver.flush(); Set> violations = validate(login); - /* This will decorate widgets implementing HasEditorErrors with validation messages */ + //decorate widgets implementing HasEditorErrors with validation messages return editorDriver.setConstraintViolations( (Set) violations); } diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsView.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java similarity index 86% rename from src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsView.java rename to src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java index fc12c88..2910cdb 100644 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsView.java +++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormView.java @@ -7,10 +7,11 @@ import com.google.gwt.editor.client.EditorDriver; import com.google.gwt.user.client.ui.IsWidget; /** - * @author ivangsa + * + * @author Massimiliano Assante, ISTI-CNR * */ -public interface ValidationErrorsView extends IsWidget { +public interface FormView extends IsWidget { public static class UserDetails { String email; diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsViewImpl.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormViewImpl.java similarity index 75% rename from src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsViewImpl.java rename to src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormViewImpl.java index 89d161b..582f480 100644 --- a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsViewImpl.java +++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormViewImpl.java @@ -19,15 +19,16 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; /** - * @author ivangsa + * + * @author Massimiliano Assante, ISTI-CNR * */ -public class ValidationErrorsViewImpl extends Composite implements ValidationErrorsView, Editor { +public class FormViewImpl extends Composite implements FormView, Editor { - interface Binder extends UiBinder {} + interface Binder extends UiBinder {} private static Binder uiBinder = GWT.create(Binder.class); - interface Driver extends SimpleBeanEditorDriver { } + interface Driver extends SimpleBeanEditorDriver { } private Driver driver = GWT.create(Driver.class); private final Delegate delegate; @@ -45,7 +46,7 @@ public class ValidationErrorsViewImpl extends Composite implements ValidationErr /** * */ - public ValidationErrorsViewImpl(Delegate delegate) { + public FormViewImpl(Delegate delegate) { super(); this.delegate = delegate; initWidget(uiBinder.createAndBindUi(this)); @@ -69,7 +70,7 @@ public class ValidationErrorsViewImpl extends Composite implements ValidationErr @Override - public EditorDriver getEditorDriver() { + public EditorDriver getEditorDriver() { return driver; } } diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsViewImpl.ui.xml b/src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormViewImpl.ui.xml similarity index 100% rename from src/main/java/org/gcube/portlets/user/invitefriends/client/validation/ValidationErrorsViewImpl.ui.xml rename to src/main/java/org/gcube/portlets/user/invitefriends/client/validation/FormViewImpl.ui.xml