Merge branch 'master' into feature/jsp-support

Conflicts:
	codepulse/src/main/scala/com/secdec/codepulse/tracer/TraceManager.scala
	codepulse/src/main/scala/com/secdec/codepulse/tracer/TraceUploadData.scala

Author: baffles

codepulse/src/main/resources/toserve/pages/TraceSwitcher/TraceSwitcher.js

@@ -148,9 +148,7 @@ template html.
 				onUploadError(e.responseText)
 			},
 			progress: function(e, data){
-				// The actual upload will appear like 90% of the progress.
-				// The remaining 10% is for the server to parse the file and respond.
-				updateProgress(0.9 * +data.loaded / +data.total)
+				updateProgress(+data.loaded / +data.total)
 			}
 		})
 
@@ -178,10 +176,6 @@ template html.
 				error: function(xhr, status){ onUploadError(xhr.responseText) },
 				success: function(data){ onUploadDone(data) }
 			})
-			// TraceAPI.uploadFilePath(path, function(data, err){
-			// 	if(err) onUploadError(err)
-			// 	else onUploadDone(data)
-			// })
 		}
 
 		function updateProgress(ratio){

codepulse/src/main/resources/toserve/pages/traces/TraceStatus.js

@@ -48,21 +48,17 @@
 	/*
 	 * Watch for `tracer-state-change` events to update the trace status
 	 */
-	$(document).on('tracer-state-change', function(event, params){
-		switch(params['state']){
-		case 'connecting':
-			statusBus.push('connecting')
-			break
-		case 'started':
-			statusBus.push('running')
-			break
-		case 'finished':
-			statusBus.push('idle')
-			break
-		}
-	})
+	$(document).on('tracer-state-change', function(event, state){ statusBus.push(state) })
 
-	Trace.status = statusProp.noLazy()
+	Trace.status = statusProp.noLazy().log('Trace State:')
 	Trace.running = runningProp.noLazy()
 
+	Trace.ready = function(f){
+		$(document).ready(function(){
+			Trace.status
+				.takeWhile(function(status){ return status == 'loading' })
+				.onEnd(f)
+		})
+	}
+
 })(this.Trace || (this.Trace = {}))

codepulse/src/main/resources/toserve/pages/traces/TraceTreeData.js

@@ -26,23 +26,28 @@
 		treeDataReady = false,
 		treeDataReadyCallbacks = []
 
-	TraceAPI.loadTreemap(function(d){
+	// Load the treemap data once the trace's status is no longer 'loading'
+	Trace.ready(function(){
+		console.log('Trace finished loading. Time to load the treemap data')
 
-		treeProjector = new TreeProjector(d)
+		TraceAPI.loadTreemap(function(d){
 
-		fullTree = treeProjector.projectFullTree(true /* generate self nodes for packages */)
+			treeProjector = new TreeProjector(d)
 
-		fullTree.forEachNode(true, function(n){
-			coverageSets[n.id] = d3.set()
-			if(n.kind == 'method') totalNumMethods++
-		})
+			fullTree = treeProjector.projectFullTree(true /* generate self nodes for packages */)
 
-		treeDataReady = true
+			fullTree.forEachNode(true, function(n){
+				coverageSets[n.id] = d3.set()
+				if(n.kind == 'method') totalNumMethods++
+			})
 
-		treeDataReadyCallbacks.forEach(function(callback){
-			callback()
-		})
+			treeDataReady = true
 
+			treeDataReadyCallbacks.forEach(function(callback){
+				callback()
+			})
+
+		})
 	})
 
 	Trace.__defineGetter__('totalNumMethods', function(){

codepulse/src/main/resources/toserve/pages/traces/editable.js

@@ -46,9 +46,13 @@ place.
 
 		function saveEditor(){
 			var txt = $input.val().trim()
-			$content.text(txt)
-			setEditing(false)
-			$elem.trigger('edited', txt)
+			if(!txt){
+				closeEditor()
+			} else {
+				$content.text(txt)
+				setEditing(false)
+				$elem.trigger('editable.save', txt)
+			}
 		}
 
 		function closeEditor(){
@@ -57,6 +61,7 @@ place.
 			} else {
 				setEditing(false)
 			}
+			$elem.trigger('editable.cancel')
 		}
 
 		$input.keydown(function(e){
@@ -80,6 +85,8 @@ place.
 
 		this.open = function(){ setEditing(true) }
 
+		this.getText = function(){ return $content.text().trim() }
+
 		//$elem.on('click', ':not(.editing)', function(){ setEditing(true) })
 		$content.on('click', function(){
 			setEditing(true) 
@@ -102,6 +109,10 @@ place.
 			e.open()
 		}
 
+		if(action == 'getText'){
+			return e.getText()
+		}
+
 		return this
 	}
 

codepulse/src/main/resources/toserve/pages/traces/trace-recording-controls.js

@@ -459,77 +459,55 @@
 			controlsContainer.find('.recording-adder-button'), 
 			controlsContainer.find('.recordingsList'))
 
-		// Load any existing user-created recordings from the server, adding them to the UI
-		TraceAPI.requestRecordings(function(recordings, error){
-			if(error){ console.error('failed to load recordings') }
-			else {
-				recordings.forEach(function(rec){ customRecordingAdder.addNewRecording(rec, false) })
-			}
+		// Load any existing user-created recordings from the server, adding them to the UI.
+		// Don't actually do it until the trace is 'ready' (i.e. the state isn't 'loading').
+		Trace.ready(function(){
+			TraceAPI.requestRecordings(function(recordings, error){
+				if(error){ console.error('failed to load recordings') }
+				else {
+					recordings.forEach(function(rec){ customRecordingAdder.addNewRecording(rec, false) })
+				}
+			})
 		})
 
 		// assign the 'trace-running' attribute to the controlsContainer, depending on the trace state
 		Trace.running.assign(controlsContainer, 'attr', 'trace-running')
 
-		/*
-		 * Load the current trace status and set the UI accordingly.
-		 * (Don't use animations; just instantly show/hide things.)
-		 */
-		TraceAPI.requestStatus(function(status, error){
-			if(error) console.error('failed to load tracer status from server')
-			else switch(status){
-			case 'idle':
-				newTraceButton.show()
-				connectionWaitingText.hide()
-				endTraceButton.hide().overlay('ready')
-				break
-			case 'connecting':
-				newTraceButton.hide()
-				connectionWaitingText.show()
-				endTraceButton.hide().overlay('ready')
-				break
-			case 'running':
-				newTraceButton.hide()
-				connectionWaitingText.hide()
-				endTraceButton.show().overlay('ready')
-				break
-			case 'ending':
-				newTraceButton.hide()
-				connectionWaitingText.hide()
-				endTraceButton.show().overlay('wait')
-				break
+		// Update the state of the newTraceArea based on the Trace's state.
+		;(function(){
+			function togglerFunc($elem){
+				return function(show, animate){
+					if(animate) $elem[show? 'slideDown': 'slideUp']()
+					else $elem[show? 'show': 'hide']()
+				}
 			}
-		})
+			var toggleNewTraceButton = togglerFunc(newTraceButton),
+				toggleConnectingText = togglerFunc(connectionWaitingText),
+				toggleEndTraceButton = togglerFunc(endTraceButton)
 
-		/*
-		 * React to `tracer-state-change` events by showing and hiding
-		 * the appropriate elements using nice animations.
-		 */
-		$(document).on('tracer-state-change', function(event, params){
-			switch(params['state']){
-			case 'connecting':
-				newTraceButton.slideUp()
-				connectionWaitingText.slideDown()
-				endTraceButton.hide()
-				break
-			case 'connected':
-				// ...nothing?
-				break
-			case 'started':
-				newTraceButton.hide()
-				connectionWaitingText.slideUp()
-				endTraceButton.slideDown()
-				break
-			case 'finished':
-				newTraceButton.slideDown()
-				connectionWaitingText.hide()
-				endTraceButton.slideUp()
-				endTraceButton.overlay('ready')
-				break
-			case 'deleted':
-				alert('This trace has been deleted. You will be redirected to the home screen')
-				window.location.href = '/'
+			function toggleFinishing(finishing){ endTraceButton.overlay(finishing ? 'wait': 'ready') }
+
+			function onStateChange(state, animate){
+				toggleNewTraceButton(state == 'idle', animate)
+				toggleConnectingText(state == 'connecting', animate)
+				toggleEndTraceButton(state == 'running' || state == 'ending', animate)
+				toggleFinishing(state == 'ending')
 			}
-		})
+
+			var gotFirstValue = false,
+				valuesThatCount = d3.set(['idle', 'connecting', 'running', 'ending'])
+
+			// When the state changes, show or hide the appropriate divs.
+			// Depending on whether this is the first 'visible' state change, the show/hide 
+			// effect will have an animation. (it animates after the initial change).
+			Trace.status.onValue(function(state){
+				var doAnimate = gotFirstValue
+
+				gotFirstValue = gotFirstValue || valuesThatCount.has(state)
+
+				onStateChange(state, doAnimate)
+			})
+		})()
 
 		/* Clicking the newTraceButton asks the server to look for
 		 * a new tracer connection. This may be ignored if the trace
@@ -542,7 +520,6 @@
 		 * that will be closed when the trace's state becomes 'finished'.
 		 */
 		endTraceButton.click(function(){ 
-			endTraceButton.overlay('wait')
 			TraceAPI.requestEnd() 
 		})
 

codepulse/src/main/resources/toserve/pages/traces/traces.css

@@ -2,6 +2,22 @@ body {
 	background: #6D6D6D;
 }
 
+body > .overlay {
+	/* The waiting overlay for when the trace is loading data.
+	 * It needs to be in front of the other fixed-position things,
+	 * but behind the header and footer.
+	 */
+	z-index: 2;
+}
+
+body > .overlay:before {
+	content: 'Processing upload data...';
+	position: absolute;
+	top: calc(50% - 50px);
+	width: 100%;
+	text-align: center;
+}
+
 /*************************\
 | High Level Page Layouts |
 \*************************/

codepulse/src/main/resources/toserve/pages/traces/traces.js

@@ -48,6 +48,30 @@ $(document).ready(function(){
 			return spinner
 		})()
 
+	// Set a UI state for the 'loading' and 'deleted' states.
+	;(function(){
+		var wasLoading = false
+		Trace.status.onValue(function(status){
+			console.log('watching UI, status = ', status)
+			if(status == 'loading'){
+				wasLoading = true
+				$('body').overlay('wait')
+			} else {
+				$('body').overlay('ready')
+			}
+
+			if(status == 'deleted'){
+				if(wasLoading){
+					alert('Processing upload data failed. You will be redirected to the home screen.')
+				} else {
+					alert('This trace has been deleted. You will be redirected to the home screen.')
+				}
+				window.location.href = '/'
+			}
+		})
+	})()
+
+
 	// When the `treemapColoringStateChanges` fires, use the current `legendData`
 	// to generate a new treemap coloring function, and update the treemap's colors
 	// with that.
@@ -290,6 +314,21 @@ $(document).ready(function(){
 						else i = i.parent
 					}
 
+					// take the last path node of its kind from the path.
+					// e.g. [P1, P2, C1, C2, C3, M] becomes [P2, C3, M]
+					var pathCondensed = []
+					for(i = path.length-1; i>=0; i--){
+						var newPath = path[i],
+							prevPath = path[i+1],
+							newKind = newPath.kind
+							prevKind = prevPath && prevPath.kind
+						if(newKind != prevKind){
+							pathCondensed.unshift(newPath)
+						}
+					}
+					// render the condensed path instead of the full path.
+					path = pathCondensed
+
 					function recurse(i){
 						if(i > path.length) return
 
@@ -324,12 +363,33 @@ $(document).ready(function(){
 
 	// Allow the header title to be edited.
 	// When it changes, send the change to the server to check for name conflicts
-	$('h1.editable').editable().on('edited', function(e, newName){
-		TraceAPI.renameTrace(newName, function(reply, error){
-			if(!error){
-				var hasNameConflict = (reply.warn == 'nameConflict')
-				$('.nameConflict').toggleClass('hasConflict', hasNameConflict)
+	$('h1.editable').editable().on('editable.save.cancel', function(e, newName){
+		var n = e.namespace
+		if(!n) return
+
+		var nc = $('.nameConflict')
+
+		var shouldSave = false
+		if(n == 'save') shouldSave = true
+		else if(n == 'cancel'){
+			if(nc.hasClass('noTraceName')){
+				shouldSave = true
+				newName = $(this).editable('getText') || 'Untitled'
 			}
-		})
+		}
+
+		if(shouldSave){
+			TraceAPI.renameTrace(newName, function(reply, error){
+				if(!error){
+					var hasNameConflict = (reply.warn == 'nameConflict')
+					$('.nameConflict').toggleClass('hasConflict', hasNameConflict)
+				}
+			})
+		}
+	})
+
+	// If the nameConflict container has the 'noTraceName' class, open up the name editor now
+	$('.nameConflict.noTraceName').each(function(){
+		$('h1.editable').editable('open')
 	})
 })