rhbz983373 - de-reference obsolete variable when context change

zanata · Jul 15, 2013 · c8fdd38 · c8fdd38
1 parent 3174b23
commit c8fdd38
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
@@ -436,7 +436,7 @@ public void  onUserConfigChanged(UserConfigChangeEvent event)
    @Override
    public void onRequestValidation(RequestValidationEvent event)
    {
-      if (equal(sourceContentsPresenter.getCurrentTransUnitIdOrNull(), currentTransUnitId))
+      if (hasSelectedRow() && equal(sourceContentsPresenter.getCurrentTransUnitIdOrNull(), currentTransUnitId))
       {
          for (ToggleEditor editor : display.getEditors())
          {
@@ -494,11 +494,6 @@ public void addUndoLink(int row, UndoLink undoLink)
 
    public void showData(List<TransUnit> transUnits)
    {
-      if(display != null)
-      {
-         display.resetEditorsAndCachedTargets();
-      }
-
       ImmutableList.Builder<TargetContentsDisplay> builder = ImmutableList.builder();
       for (TransUnit transUnit : transUnits)
       {
@@ -513,6 +508,7 @@ public void showData(List<TransUnit> transUnits)
          builder.add(display);
       }
       displayList = builder.build();
+      display = null;
    }
 
    public List<TargetContentsDisplay> getDisplays()

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
@@ -69,8 +69,6 @@ public interface TargetContentsDisplay extends WidgetDisplay, HasTransUnitId, Ha
    void setEnableSpellCheck(boolean spellCheckEnabled);
 
    void updateCommentIndicator(int commentsCount);
-
-   void resetEditorsAndCachedTargets();
 
    interface Listener
    {

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
@@ -238,12 +238,7 @@ public ArrayList<String> getNewTargets()
    @Override
    public List<String> getCachedTargets()
    {
-      ArrayList<String> result = Lists.newArrayList();
-      if (cachedValue != null)
-      {
-         result.addAll(cachedValue.getTargets());
-      }
-      return result;
+      return cachedValue.getTargets();
    }
 
    @Override
@@ -252,13 +247,6 @@ public TransUnitId getId()
       return cachedValue.getId();
    }
 
-   @Override
-   public void resetEditorsAndCachedTargets()
-   {
-      cachedValue = null;
-      editors.clear();
-   }
-
    @Override
    public ArrayList<ToggleEditor> getEditors()
    {