Projects >> zanata-server >>c0829ee16d231967873585b47d8dc9b7d49201de

Chunk
Conflicting content 
   private final DispatchAsync dispatcher;
   private final WorkspaceContext workspaceContext;
   private DocumentInfo currentDocument;
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

=======
   private final TranslationStats projectStats = new TranslationStats();
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
   private final WebTransMessages messages;

   @Inject
Solution content 
   private final DispatchAsync dispatcher;
   private final WorkspaceContext workspaceContext;
   private DocumentInfo currentDocument;
   private final WebTransMessages messages;

   @Inject
File
DocumentListPresenter.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            }
         }
      }));
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
=======

      registerHandler(eventBus.addHandler(TransUnitUpdatedEvent.getType(), new TransUnitUpdatedEventHandler()
      {
         @Override
         public void onTransUnitUpdated(TransUnitUpdatedEvent event)
         {
            TransUnitCount projectCount = projectStats.getUnitCount();
            projectCount.decrement(event.getPreviousStatus());
            projectCount.increment(event.getTransUnit().getStatus());
            TransUnitWords projectWords = projectStats.getWordCount();
            projectWords.decrement(event.getPreviousStatus(), event.getWordCount());
            projectWords.increment(event.getTransUnit().getStatus(), event.getWordCount());
            getDisplay().getTransUnitCountBar().setStats(projectStats);

            DocumentId docId = event.getDocumentId();
            TransUnitUpdatedEventHandler handler = display.getDocumentNode(docId);
            if (handler != null)
               handler.onTransUnitUpdated(event);
         }
      }));
      loadDocumentList();
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
   }

   final class BasicContentFilter implements ContentFilter
Solution content 
            }
         }
      }));

      registerHandler(eventBus.addHandler(TransUnitUpdatedEvent.getType(), new TransUnitUpdatedEventHandler()
      {
         @Override
         public void onTransUnitUpdated(TransUnitUpdatedEvent event)
         {
            DocumentId docId = event.getDocumentId();
            TransUnitUpdatedEventHandler handler = display.getDocumentNode(docId);
            if (handler != null)
               handler.onTransUnitUpdated(event);
         }
      }));
      loadDocumentList();
   }

   final class BasicContentFilter implements ContentFilter
File
DocumentListPresenter.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
            long start = System.currentTimeMillis();
            final ArrayList documents = result.getDocuments();
            Log.info("Received doc list for " + result.getProjectIterationId() + ": " + documents.size() + " elements");
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
            setDocumentList(documents);
         }
      });
   }

   private void loadDocsStatus()
   {
      dispatcher.execute(new GetProjectStatusCount(), new AsyncCallback()
      {
         @Override
         public void onFailure(Throwable caught)
         {
            Log.info("load Doc Status failure " + caught.getMessage());
         }

         @Override
         public void onSuccess(GetProjectStatusCountResult result)
         {
            ArrayList listStatus = result.getStatus();
            Log.info("Received project status for " + listStatus.size() + " elements");
            statuscache.clear();
            for (DocumentStatus doc : listStatus)
=======
            display.setList(documents);
            Log.info("Time to load docs into DocListView: " + String.valueOf(System.currentTimeMillis() - start));
            start = System.currentTimeMillis();
            for (DocumentInfo doc : documents)
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
            {
               projectStats.add(doc.getStats());
            }
Solution content 
            long start = System.currentTimeMillis();
            final ArrayList documents = result.getDocuments();
            Log.info("Received doc list for " + result.getProjectIterationId() + ": " + documents.size() + " elements");
            display.setList(documents);
            Log.info("Time to load docs into DocListView: " + String.valueOf(System.currentTimeMillis() - start));
            start = System.currentTimeMillis();
            TranslationStats projectStats = new TranslationStats(); // projStats
                                                                    // = 0
            for (DocumentInfo doc : documents)
            {
               projectStats.add(doc.getStats());
            }
File
DocumentListPresenter.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
            {
               projectStats.add(doc.getStats());
            }
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

            // re-use these stats for the project stats
            eventBus.fireEvent(new ProjectStatsRetrievedEvent(listStatus));
=======
            display.getTransUnitCountBar().setStats(projectStats);
            Log.info("Time to calculate project stats: " + String.valueOf(System.currentTimeMillis() - start));
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
         }
      });
   }
Solution content 
            {
               projectStats.add(doc.getStats());
            }

            // re-use these stats for the project stats
            eventBus.fireEvent(new ProjectStatsRetrievedEvent(projectStats));
            Log.info("Time to calculate project stats: " + String.valueOf(System.currentTimeMillis() - start));
         }
      });
   }
File
DocumentListPresenter.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
import org.zanata.common.TransUnitWords;
import org.zanata.webtrans.client.events.TransUnitUpdatedEvent;
import org.zanata.webtrans.client.events.TransUnitUpdatedEventHandler;
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
import org.zanata.webtrans.client.resources.WebTransMessages;
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
import org.zanata.webtrans.shared.model.DocumentId;
=======
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
import org.zanata.webtrans.shared.model.DocumentInfo;

import com.google.gwt.view.client.ListDataProvider;
Solution content 
import org.zanata.common.TransUnitWords;
import org.zanata.webtrans.client.events.TransUnitUpdatedEvent;
import org.zanata.webtrans.client.events.TransUnitUpdatedEventHandler;
import org.zanata.webtrans.client.resources.WebTransMessages;
import org.zanata.webtrans.shared.model.DocumentInfo;

import com.google.gwt.view.client.ListDataProvider;
File
DocumentNode.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import net.customware.gwt.presenter.client.EventBus;

import org.zanata.webtrans.client.editor.filter.ContentFilter;
<<<<<<< HEAD:server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
import org.zanata.webtrans.client.presenter.DocumentListPresenter;
import org.zanata.webtrans.client.resources.Resources;
import org.zanata.webtrans.client.resources.UiMessages;
import org.zanata.webtrans.client.resources.WebTransMessages;
=======
import org.zanata.webtrans.client.events.TransUnitUpdatedEventHandler;
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73:server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
import org.zanata.webtrans.client.ui.ClearableTextBox;
import org.zanata.webtrans.client.ui.DocumentListTable;
Solution content 
import net.customware.gwt.presenter.client.EventBus;

import org.zanata.webtrans.client.editor.filter.ContentFilter;
import org.zanata.webtrans.client.presenter.DocumentListPresenter;
import org.zanata.webtrans.client.resources.Resources;
import org.zanata.webtrans.client.resources.UiMessages;
import org.zanata.webtrans.client.resources.WebTransMessages;
import org.zanata.webtrans.client.events.TransUnitUpdatedEventHandler;
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
import org.zanata.webtrans.client.ui.ClearableTextBox;
import org.zanata.webtrans.client.ui.DocumentListTable;
File
DocumentListView.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.zanata.webtrans.shared.rpc.EditingTranslationResult;
import org.zanata.webtrans.shared.rpc.GetDocumentList;
import org.zanata.webtrans.shared.rpc.GetDocumentListResult;
<<<<<<< HEAD
import org.zanata.webtrans.shared.rpc.GetGlossary;
import org.zanata.webtrans.shared.rpc.GetGlossaryResult;
import org.zanata.webtrans.shared.rpc.GetProjectStatusCount;
import org.zanata.webtrans.shared.rpc.GetProjectStatusCountResult;
=======
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73
import org.zanata.webtrans.shared.rpc.GetStatusCount;
import org.zanata.webtrans.shared.rpc.GetStatusCountResult;
import org.zanata.webtrans.shared.rpc.GetTransUnitList;
Solution content 
import org.zanata.webtrans.shared.rpc.EditingTranslationResult;
import org.zanata.webtrans.shared.rpc.GetDocumentList;
import org.zanata.webtrans.shared.rpc.GetDocumentListResult;
import org.zanata.webtrans.shared.rpc.GetGlossary;
import org.zanata.webtrans.shared.rpc.GetGlossaryResult;
import org.zanata.webtrans.shared.rpc.GetStatusCount;
import org.zanata.webtrans.shared.rpc.GetStatusCountResult;
import org.zanata.webtrans.shared.rpc.GetTransUnitList;
File
DummyDispatchAsync.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
         AsyncCallback _callback = (AsyncCallback) callback;
         Scheduler.get().scheduleDeferred(new DummyGetTranslatorListCommand(_action, _callback));
      }
<<<<<<< HEAD
      else if (action instanceof GetProjectStatusCount)
      {
         final GetProjectStatusCount _action = (GetProjectStatusCount) action;
         AsyncCallback _callback = (AsyncCallback) callback;
         Scheduler.get().scheduleDeferred(new DummyGetProjectStatusCountCommand(_action, _callback));
      }
=======
>>>>>>> 288ab772dea4e168b72ea91bf728cf6933b69f73
      else if (action instanceof GetStatusCount)
      {
         final GetStatusCount _action = (GetStatusCount) action;
Solution content 
         AsyncCallback _callback = (AsyncCallback) callback;
         Scheduler.get().scheduleDeferred(new DummyGetTranslatorListCommand(_action, _callback));
      }
      else if (action instanceof GetStatusCount)
      {
         final GetStatusCount _action = (GetStatusCount) action;
File
DummyDispatchAsync.java
Developer's decision
Version 2
Kind of conflict
Cast expression
If statement
Method invocation
Variable