Merge branch 'master' into rhbz756235

Conflicts: server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
zanata · Dec 1, 2011 · effab9c · effab9c
2 parents 77180fd + bbc9688
commit effab9c
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 21 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
@@ -164,7 +164,7 @@ public static LocaleId getLocaleId()
 
    public static void redirectToLogin()
    {
-      redirectToUrl(getModuleParentBaseUrl() + "account/sign_in?continue=" + URL.encodeComponent(Window.Location.getHref()));
+      redirectToUrl(getModuleParentBaseUrl() + "account/sign_in?continue=" + URL.encodeQueryString(Window.Location.getHref()));
    }
 
    public static void redirectToLogout()

diff --git a/...er/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java b/...er/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
@@ -45,12 +45,9 @@ interface TransFilterViewUiBinder extends UiBinder<Widget, TransFilterView>
    @UiField(provided = true)
    ClearableTextBox filterTextBox;
 
-   private final TransFilterMessages messages;
-
    @Inject
    public TransFilterView(final Resources resources, final TransFilterMessages messages, final UiMessages uiMessages)
    {
-      this.messages = messages;
       this.filterTextBox = new ClearableTextBox(resources, uiMessages);
       filterTextBox.setEmptyText(messages.findSourceOrTargetString());
       initWidget(uiBinder.createAndBindUi(this));

diff --git a/...ata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java b/...ata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
@@ -31,7 +31,6 @@
 import org.zanata.webtrans.client.events.NavTransUnitEvent.NavigationType;
 import org.zanata.webtrans.client.resources.NavigationMessages;
 import org.zanata.webtrans.client.ui.UserConfigConstants;
-
 import org.zanata.webtrans.shared.model.TransUnit;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -49,7 +48,6 @@
 import com.google.gwt.gen2.table.client.CellEditor;
 import com.google.gwt.gen2.table.override.client.HTMLTable;
 import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
@@ -45,12 +45,9 @@ public class SourcePanel extends Composite implements HasValue<TransUnit>, HasCl
    private final Label sourceLabel;
    private TransUnit value;
 
-   private final NavigationMessages messages;
-
    public SourcePanel(TransUnit value, NavigationMessages messages)
    {
       this.value = value;
-      this.messages = messages;
       panel = new HorizontalPanel();
       panel.setSize("100%", "100%");
 

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
@@ -10,7 +10,7 @@ public interface WebTransMessages extends Messages
 {
 
    @DefaultMessage("{0} participants")
-   @PluralText({ "one", "One participant" })
+   @AlternateMessage({ "one", "One participant" })
    @Description("Title of the minimized users panel")
    String nUsersOnline(@PluralCount int numUsers);
 

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
@@ -5,10 +5,8 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.BlurEvent;
-import com.google.gwt.event.dom.client.BlurHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.FocusEvent;
-import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.uibinder.client.UiBinder;

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
@@ -17,7 +17,6 @@
 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.Anchor;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Image;

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
@@ -70,14 +70,11 @@ interface GlossaryViewUiBinder extends UiBinder<Widget, GlossaryView>
    @Inject
    private EventBus eventBus;
 
-   private final Resources resources;
-
    private boolean isFocused;
 
    @Inject
    public GlossaryView(final UiMessages messages, Resources resources)
    {
-      this.resources = resources;
       initWidget(uiBinder.createAndBindUi(this));
       exactButton.setText(messages.phraseButtonLabel());
       exactButton.setValue(true);

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
@@ -31,7 +31,6 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.LayoutPanel;
 import com.google.gwt.user.client.ui.SplitLayoutPanel;

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EditTransUnitHandler.java b/server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EditTransUnitHandler.java
@@ -10,10 +10,8 @@
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.log.Log;
-import org.zanata.model.HTextFlow;
 import org.zanata.security.ZanataIdentity;
 import org.zanata.webtrans.server.ActionHandlerFor;
-import org.zanata.webtrans.server.TranslationWorkspace;
 import org.zanata.webtrans.server.TranslationWorkspaceManager;
 import org.zanata.webtrans.shared.rpc.EditingTranslationAction;
 import org.zanata.webtrans.shared.rpc.EditingTranslationResult;
@@ -37,9 +35,11 @@ public class EditTransUnitHandler extends AbstractActionHandler<EditingTranslati
    public EditingTranslationResult execute(EditingTranslationAction action, ExecutionContext context) throws ActionException
    {
       ZanataIdentity.instance().checkLoggedIn();
-      HTextFlow hTextFlow = (HTextFlow) session.get(HTextFlow.class, action.getTransUnitId().getValue());
+      // HTextFlow hTextFlow = (HTextFlow) session.get(HTextFlow.class,
+      // action.getTransUnitId().getValue());
 
-      TranslationWorkspace workspace = translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId());
+      // TranslationWorkspace workspace =
+      // translationWorkspaceManager.getOrRegisterWorkspace(action.getWorkspaceId());
 
       // If TransUnit is not editing, you can start editing now.
       // if(!workspace.containTransUnit(action.getTransUnitId()) &&

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/shared/NoSuchWorkspaceException.java b/server/zanata-war/src/main/java/org/zanata/webtrans/shared/NoSuchWorkspaceException.java
@@ -5,6 +5,9 @@
 public class NoSuchWorkspaceException extends ActionException
 {
 
+   // generated
+   private static final long serialVersionUID = -2005366902022840676L;
+
    public NoSuchWorkspaceException()
    {
       super();

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.java b/server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.java
@@ -7,6 +7,9 @@
 
 public final class SessionId implements Identifier<String>, Serializable
 {
+   // generated
+   private static final long serialVersionUID = 6713691712353126602L;
+
    private String id;
 
    @SuppressWarnings("unused")

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java b/server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
@@ -7,6 +7,9 @@
 public class TransMemoryDetailsList implements Result
 {
 
+   // generated
+   private static final long serialVersionUID = 4068321598270485290L;
+
    private ArrayList<TransMemoryDetails> items;
 
    @SuppressWarnings("unused")

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WrappedAction.java b/server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WrappedAction.java
@@ -7,6 +7,9 @@
 
 public class WrappedAction<R extends Result> implements Action<R>, IsSerializable
 {
+   // generated
+   private static final long serialVersionUID = 4059317550536068556L;
+
    private Action<R> action;
    private String csrfToken;