commit c22ab598d80de08983d40b58a96ccca7c47fbaa7
author Edwin Kempin <edwin.kempin@sap.com> Thu Apr 02 12:56:32 2015 +0200
committer Edwin Kempin <edwin.kempin@sap.com> Thu Apr 02 13:10:42 2015 +0200
tree 3bca00b8a655e00931161fc3d9c71d0af3d7dd87
parent 50423dd520371ca378d9e2fd87c51c0f1d05ad9b

Show type (IMPORT/COPY) for project imports

Change-Id: Ieede8c895fa32986a96c99874346f89f8c2a76bc
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/importer/client/ImportProjectListScreen.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/client/ImportProjectListScreen.java b/src/main/java/com/googlesource/gerrit/plugins/importer/client/ImportProjectListScreen.java
index c305ab9..0b747c3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/client/ImportProjectListScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/client/ImportProjectListScreen.java
@@ -56,7 +56,7 @@
   }
 
   private void display(NativeMap<ImportProjectInfo> map) {
-    int columns = 5;
+    int columns = 6;
     FlexTable t = new FlexTable();
     t.setStyleName("importer-importProjectTable");
     FlexCellFormatter fmt = t.getFlexCellFormatter();
@@ -67,10 +67,11 @@
     fmt.addStyleName(0, 0, "leftMostCell");
 
     t.setText(0, 0, "Project Name");
-    t.setText(0, 1, "From");
-    t.setText(0, 2, "Last Import By");
-    t.setText(0, 3, "Last Import At");
-    t.setText(0, 4, "Actions");
+    t.setText(0, 1, "Type");
+    t.setText(0, 2, "From");
+    t.setText(0, 3, "Last Import By");
+    t.setText(0, 4, "Last Import At");
+    t.setText(0, 5, "Actions");
 
     int row = 1;
     for (final String project : map.keySet()) {
@@ -83,26 +84,27 @@
 
       t.setWidget(row, 0, new InlineHyperlink(
           project, "/x/" + Plugin.get().getName() + "/projects/" + project));
+      t.setText(row, 1, info.from() != null ? "IMPORT" : "COPY");
 
       if (info.from() != null) {
         String srcProjectUrl = projectUrl(info, project);
-        t.setWidget(row, 1, new Anchor(srcProjectUrl, srcProjectUrl));
+        t.setWidget(row, 2, new Anchor(srcProjectUrl, srcProjectUrl));
       } else {
-        t.setWidget(row, 1,
+        t.setWidget(row, 2,
             new InlineHyperlink(project, "/admin/projects/" + project));
       }
 
       List<ImportInfo> importList = Natives.asList(info.imports());
       if (!importList.isEmpty()) {
         ImportInfo lastImportInfo = importList.get(importList.size() - 1);
-        t.setText(row, 2, lastImportInfo.user().username());
-        t.setText(row, 3, removeNs(lastImportInfo.timestamp()));
+        t.setText(row, 3, lastImportInfo.user().username());
+        t.setText(row, 4, removeNs(lastImportInfo.timestamp()));
       } else {
-        t.setText(row, 2, "N/A");
         t.setText(row, 3, "N/A");
+        t.setText(row, 4, "N/A");
       }
 
-      t.setWidget(row, 4, new ImportActionPanel(project));
+      t.setWidget(row, 5, new ImportActionPanel(project));
 
       row++;
     }

src/main/java/com/googlesource/gerrit/plugins/importer/client/ProjectImportsScreen.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/client/ProjectImportsScreen.java b/src/main/java/com/googlesource/gerrit/plugins/importer/client/ProjectImportsScreen.java
index 41160dd..6ea04b5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/client/ProjectImportsScreen.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/client/ProjectImportsScreen.java
@@ -63,6 +63,7 @@
     MyTable t = new MyTable();
     t.setStyleName("importer-projectImportInfoTable");
     t.addRow("Project Name", project);
+    t.addRow("Type", info.from() != null ? "IMPORT" : "COPY");
 
     if (info.from() != null) {
       String srcProjectUrl = projectUrl(info, project);