From 32c1932fe9cff4dd62ebd6f71c6c306952999945 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Wed, 15 Oct 2014 14:52:44 +0400
Subject: [PATCH] IDEA-131113 Use project names in Redmine repository UI

Seems that in some old versions of Redmine it was possible to create
project without unique identifier assigned and thus such projects were shown
as "null"s in projects tree.
---
 .../intellij/tasks/redmine/RedmineRepository.java    |  2 +-
 .../tasks/redmine/RedmineRepositoryEditor.java       | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java
index e4a7a293f64f..f4ee73e93eb2 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java
@@ -232,7 +232,7 @@ public class RedmineRepository extends NewBaseRepositoryImpl {
   public String getPresentableName() {
     String name = super.getPresentableName();
     if (myCurrentProject != null && myCurrentProject != UNSPECIFIED_PROJECT) {
-      name += "/projects/" + myCurrentProject.getIdentifier();
+      name += "/projects/" + StringUtil.notNullize(myCurrentProject.getIdentifier(), myCurrentProject.getName());
     }
     return name;
   }
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryEditor.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryEditor.java
index 1ca2971d2be0..783fa82f8394 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryEditor.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepositoryEditor.java
@@ -3,6 +3,7 @@ package com.intellij.tasks.redmine;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBox;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.tasks.config.BaseRepositoryEditor;
 import com.intellij.tasks.impl.TaskUiUtil;
 import com.intellij.tasks.redmine.model.RedmineProject;
@@ -106,16 +107,11 @@ public class RedmineRepositoryEditor extends BaseRepositoryEditor<RedmineReposit
             //if (value.myLevel == 0 && value.myProject != RedmineRepository.UNSPECIFIED_PROJECT) {
               //setFont(UIUtil.getListFont().deriveFont(Font.BOLD));
             //}
-            StringBuilder builder = new StringBuilder();
-            if (value.myLevel != 0) {
-              for (int i = 0; i < value.myLevel; i++) {
-                builder.append("   ");
-              }
-            }
-            setText(builder.append(value.myProject.getIdentifier()).toString());
+            setText(StringUtil.repeat("   ", value.myLevel) + value.myProject.getName());
           }
           else {
-            setText(value.myProject.getIdentifier());
+            // Do not indent selected project
+            setText(value.myProject.getName());
           }
         }
       }