From 9f7d0bc05798aadf3b81a153c4498d265579d4a8 Mon Sep 17 00:00:00 2001
From: Tom Morris <tfmorris@gmail.com>
Date: Fri, 7 Sep 2012 21:49:00 +0000
Subject: [PATCH] FIXED - task 607: Make memory/heap reporting more
 user-friendly http://code.google.com/p/google-refine/issues/detail?id=607

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2542 7d457c2a-affb-35e4-300a-418c747d4874
---
 .../modules/core/scripts/index/create-project-ui.js    | 10 +++++++++-
 .../modules/core/styles/index/create-project-ui.less   |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/main/webapp/modules/core/scripts/index/create-project-ui.js b/main/webapp/modules/core/scripts/index/create-project-ui.js
index e6f72f8ac..9ecc75e4a 100644
--- a/main/webapp/modules/core/scripts/index/create-project-ui.js
+++ b/main/webapp/modules/core/scripts/index/create-project-ui.js
@@ -228,7 +228,15 @@ Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID,
           $('#create-project-progress-timing').empty();
         }
         $('#create-project-progress-message').text(progress.message);
-        $('#create-project-progress-memory').text("Heap usage: "+progress.memory+'/'+progress.maxmemory+"MB");
+        if ('memory' in progress) {
+          var percent = progress.memory * 100.0 / progress.maxmemory;
+          $('#create-project-progress-memory').text("Memory usage: "+percent.toFixed()+'% ('+progress.memory+'/'+progress.maxmemory+"MB)");
+          if (percent > 90) {
+            $('#create-project-progress-memory').addClass('warning');
+          } else {
+            $('#create-project-progress-memory').removeClass('warning');
+          }
+        }
       }
     },
     "json"
diff --git a/main/webapp/modules/core/styles/index/create-project-ui.less b/main/webapp/modules/core/styles/index/create-project-ui.less
index e64350f96..27148e92d 100644
--- a/main/webapp/modules/core/styles/index/create-project-ui.less
+++ b/main/webapp/modules/core/styles/index/create-project-ui.less
@@ -122,6 +122,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   background: #eee;
   width: 100%;
   }
+  
+#create-project-progress-memory {
+  }
+
+#create-project-progress-memory.warning {
+  color: #D8000C;
+  background-color: #FFBABA;
+  }
 
 #create-project-iframe {
   position: fixed;