Fixed bug when selecting a locale that was not present in the current…

… project.
zanata · Nov 4, 2013 · d91be2e · d91be2e
1 parent 276541a
commit d91be2e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/LocaleListBox.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/LocaleListBox.java
@@ -158,14 +158,16 @@ public Locale getLocaleAtSelectedIndex()
    public int getIndexForLocaleId(String localeId)
    {
       //The default reference, "none", should be at index 0
-      if(localeId.equals(UserConfigHolder.DEFAULT_SELECTED_REFERENCE)){
+      if(localeId.equals(UserConfigHolder.DEFAULT_SELECTED_REFERENCE))
+      {
          return 0;
       }
 
       //iterate from index 1 to avoid the default locale at index 0
-      for (int i = 1; i <= locales.size(); i++) 
+      for (int i = 1; i < locales.size(); i++) 
       {
-         if(locales.get(i).getId().getLocaleId().getId().equals(localeId)){
+         if(locales.get(i).getId().getLocaleId().getId().equals(localeId))
+         {
             return i;
          }
       }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java
@@ -88,15 +88,23 @@ public void buildListBox(List<Locale> locales)
    @Override
    public void setSelectedLocale(String localeId)
    {
-      if(localeId.equals(UserConfigHolder.DEFAULT_SELECTED_REFERENCE)){
+      if(localeId.equals(UserConfigHolder.DEFAULT_SELECTED_REFERENCE))
+      {
          sourceLangListBox.setSelectedIndex(0);
          listener.onHideReference();
       }
       else
       {
          int selectedIndex = sourceLangListBox.getIndexForLocaleId(localeId);
          sourceLangListBox.setSelectedIndex(selectedIndex);
-         listener.onShowReference(sourceLangListBox.getLocaleAtSelectedIndex());
+         if (selectedIndex == 0)
+         {
+            listener.onHideReference();            
+         }
+         else
+         {
+            listener.onShowReference(sourceLangListBox.getLocaleAtSelectedIndex());
+         }
       }
    }