Merge branch 'integration/master' into rhbz1006063

Conflicts: zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
zanata · Oct 1, 2013 · c6cc2cb · c6cc2cb
2 parents 5176265 + 45d9907
commit c6cc2cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 25 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java b/zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
@@ -61,12 +61,12 @@ public Object aroundInvoke(InvocationContext ic) throws Exception {
 
             Object[] keys = new Object[2 + ic.getParameters().length];
             int i = 0;
-            keys[i++] = ic.getTarget().getClass().getName(); // Key by class
-                                                             // name
-            keys[i++] = m.getName(); // Key by method name
-            for (Object param : ic.getParameters()) // Key by each parameter
-                                                    // called
-            {
+            // Key by class name:
+            keys[i++] = ic.getTarget().getClass().getName();
+            // Key by method name:
+            keys[i++] = m.getName();
+            // Key by each parameter called:
+            for (Object param : ic.getParameters()) {
                 keys[i++] = param;
             }
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
@@ -61,16 +61,10 @@
 import net.customware.gwt.presenter.client.widget.WidgetPresenter;
 
 public class AppPresenter extends WidgetPresenter<AppDisplay> implements
-// @formatter:off
-    ShowSideMenuEventHandler,
-    WorkspaceContextUpdateEventHandler,
-    DocumentStatsUpdatedEventHandler,
-    PresenterRevealedHandler,
-    AttentionModeActivationEventHandler,
-    ProjectStatsUpdatedEventHandler,
-    AppDisplay.Listener
-// @formatter:on
-{
+        ShowSideMenuEventHandler, WorkspaceContextUpdateEventHandler,
+        DocumentStatsUpdatedEventHandler, PresenterRevealedHandler,
+        AttentionModeActivationEventHandler, ProjectStatsUpdatedEventHandler,
+        AppDisplay.Listener {
 
     private static final String WORKSPACE_TITLE_QUERY_PARAMETER_KEY = "title";
 
@@ -290,7 +284,6 @@ public void showView(MainView viewToShow) {
     /**
      * Set selected document to the given document, update name and stats to
      * match the newly selected document.
-     *
      * @param docId
      *            id of the document to select
      */
@@ -408,7 +401,6 @@ public void onPresenterRevealed(PresenterRevealedEvent event) {
 
     /**
      * Facilitate unit testing. Will be no-op if in client(GWT compiled) mode.
-     *
      * @param projectStats
      *            project stats
      * @param selectedDocumentStats

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
@@ -78,8 +78,7 @@ public class TransUnitsTablePresenter extends
         NavigationService.PageDataChangeListener,
         TransUnitsTableDisplay.Listener, TableRowSelectedEventHandler,
         LoadingEventHandler, RefreshPageEventHandler, UserConfigChangeHandler,
-        RequestPageValidationHandler
-{
+        RequestPageValidationHandler {
 
     private final TransUnitsTableDisplay display;
     private final TranslationHistoryPresenter translationHistoryPresenter;
@@ -106,8 +105,7 @@ public TransUnitsTablePresenter(TransUnitsTableDisplay display,
             TargetContentsPresenter targetContentsPresenter,
             TranslatorInteractionService translatorService,
             TranslationHistoryPresenter translationHistoryPresenter,
-            WebTransMessages messages, UserOptionsService userOptionsService)
-    {
+            WebTransMessages messages, UserOptionsService userOptionsService) {
         super(display, eventBus);
         this.display = display;
         this.translationHistoryPresenter = translationHistoryPresenter;
@@ -365,7 +363,6 @@ public void onLoading(LoadingEvent event) {
 
     /**
      * For testing only. Will not work in GWT compiled mode.
-     *
      * @param selectedId
      *            current selected id
      */

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
@@ -143,8 +143,7 @@ public Map<ValidationAction, List<String>> getErrorMessages() {
     }
 
     public void setVisibleIfHasError(boolean visible) {
-        if (!displayMessages.isEmpty()) // has error message
-        {
+        if (!displayMessages.isEmpty()) { // has error message
             setVisible(visible);
         }
         setVisible(false);