[Sciviews-commits] r516 - in komodo: SciViews-K/content/js SciViews-K-dev/R SciViews-K-dev/content/js

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2013-01-27 18:47:52 +0100 (Sun, 27 Jan 2013)
New Revision: 516

Modified:
   komodo/SciViews-K-dev/R/completion.R
   komodo/SciViews-K-dev/R/objList.R
   komodo/SciViews-K-dev/R/objSearch.R
   komodo/SciViews-K-dev/R/rserver.R
   komodo/SciViews-K-dev/content/js/robjects.js
   komodo/SciViews-K/content/js/robjects.js
Log:
Further changes in SciViews-K and SciViews-K-dev regarding TempEnv -> SciViews:TempEnv

Modified: komodo/SciViews-K/content/js/robjects.js
===================================================================
--- komodo/SciViews-K/content/js/robjects.js	2013-01-27 17:39:14 UTC (rev 515)
+++ komodo/SciViews-K/content/js/robjects.js	2013-01-27 17:47:52 UTC (rev 516)
@@ -54,8 +54,9 @@
 		'formula'];
 
 	// Used in .contextOnShow
-	var nonDetachable = [".GlobalEnv", "TempEnv", "package:svKomodo",
-		"package:svMisc", "package:svSocket", "package:svHttp", "package:base"];
+	var nonDetachable = [".GlobalEnv", "SciViews:TempEnv", "tools:RGUI",
+		"package:svKomodo", "package:svMisc", "package:svSocket",
+		"package:svHttp", "package:base"];
 
 	// Reference to parent object for private functions
 	var _this = this;
@@ -1035,7 +1036,7 @@
 
 			switch (type) {
 			 case "environment":
-				if (name != ".GlobalEnv" && name != "TempEnv")
+				if (name != ".GlobalEnv" && name != "SciViews:TempEnv")
 					envToDetach.push(name);
 				break;
 			 case "object":
@@ -1596,7 +1597,7 @@
 			var listItem = listbox.selectedItem;
 			var pkg = listItem.getAttribute("label");
 
-			if (pkg == ".GlobalEnv" || pkg == "TempEnv" || pkg == "Autoloads")
+			if (pkg == ".GlobalEnv" || pkg == "SciViews:TempEnv" || pkg == "Autoloads")
 				return;
 
 			sv.r.evalCallback(

Modified: komodo/SciViews-K-dev/R/completion.R
===================================================================
--- komodo/SciViews-K-dev/R/completion.R	2013-01-27 17:39:14 UTC (rev 515)
+++ komodo/SciViews-K-dev/R/completion.R	2013-01-27 17:47:52 UTC (rev 516)
@@ -90,8 +90,8 @@
 			type <- "namespace"
 			res <- search()
 			res[!(res %in% c(".GlobalEnv", "package:tcltk", "package:utils",
-				"komodoConnection", "package:methods", "TempEnv", "Autoloads",
-				"package:base"))]
+				"komodoConnection", "package:methods", "SciViews;TempEnv",
+				"Autoloads", "package:base"))]
 	   }, library = {
 			type <- "module"
 			unique(unlist(lapply(.libPaths(), dir), use.names = FALSE))

Modified: komodo/SciViews-K-dev/R/objList.R
===================================================================
--- komodo/SciViews-K-dev/R/objList.R	2013-01-27 17:39:14 UTC (rev 515)
+++ komodo/SciViews-K-dev/R/objList.R	2013-01-27 17:47:52 UTC (rev 516)
@@ -102,7 +102,7 @@
 		allList <- getTemp(".guiObjListCache", default = list())
 
 		if (identical(res, allList[[id]])) Changed <- FALSE else {
-			## Keep a copy of the last version in TempEnv
+			## Keep a copy of the last version in SciViews:TempEnv
 			allList[[id]] <- res
 			assignTemp(".guiObjListCache", allList)
 		}

Modified: komodo/SciViews-K-dev/R/objSearch.R
===================================================================
--- komodo/SciViews-K-dev/R/objSearch.R	2013-01-27 17:39:14 UTC (rev 515)
+++ komodo/SciViews-K-dev/R/objSearch.R	2013-01-27 17:47:52 UTC (rev 516)
@@ -5,7 +5,7 @@
 		oldSearch <- getTemp(".guiObjSearchCache", default = "")
 		## Compare both versions
 		if (length(Search) != length(oldSearch) || !all(Search == oldSearch)) {
-			## Keep a copy of the last version in TempEnv
+			## Keep a copy of the last version in SciViews:TempEnv
 			assignTemp(".guiObjSearchCache", Search)
 			Changed <- TRUE
 		} else Changed <- FALSE

Modified: komodo/SciViews-K-dev/R/rserver.R
===================================================================
--- komodo/SciViews-K-dev/R/rserver.R	2013-01-27 17:39:14 UTC (rev 515)
+++ komodo/SciViews-K-dev/R/rserver.R	2013-01-27 17:47:52 UTC (rev 516)
@@ -58,9 +58,9 @@
 
 `TempEnv` <- function() {
 	srch <- search()
-    if (is.na(match("TempEnv", srch)))
-        attach(NULL, name = "TempEnv", pos = length(srch) - 1L)
-    as.environment("TempEnv")
+    if (is.na(match("SciViews:TempEnv", srch)))
+        attach(NULL, name = "SciViews:TempEnv", pos = length(srch) - 1L)
+    as.environment("SciViews:TempEnv")
 }
 
 `assignTemp` <- function (x, value, replace.existing = TRUE)

Modified: komodo/SciViews-K-dev/content/js/robjects.js
===================================================================
--- komodo/SciViews-K-dev/content/js/robjects.js	2013-01-27 17:39:14 UTC (rev 515)
+++ komodo/SciViews-K-dev/content/js/robjects.js	2013-01-27 17:47:52 UTC (rev 516)
@@ -145,8 +145,9 @@
 		'formula'];
 
 	// Used in .contextOnShow
-	var nonDetachable = [".GlobalEnv", "TempEnv", "package:svGUI",
-		"package:svMisc", "package:svSocket", "package:svGUI", "package:base"];
+	var nonDetachable = [".GlobalEnv", "SciViews:TempEnv", "tools:RGUI",
+		"package:svGUI", "package:svMisc", "package:svSocket", "package:svGUI",
+		"package:base"];
 
 	// Reference to parent object for private functions
 	var _this = this;
@@ -992,7 +993,7 @@
 
 		switch (type) {
 		case "environment":
-			if (name != ".GlobalEnv" && name != "TempEnv")
+			if (name != ".GlobalEnv" && name != "Sciviews:TempEnv")
 				envToDetach.push(name);
 			break;
 		case "object":
@@ -1490,7 +1491,7 @@
 		var listItem = listbox.selectedItem;
 		var pkg = listItem.getAttribute("label");
 
-		if (pkg == ".GlobalEnv" || pkg == "TempEnv") return;
+		if (pkg == ".GlobalEnv" || pkg == "SciViews:TempEnv") return;
 
 		sv.r.evalCallback(
 			'tryCatch(detach("' + pkg.addslashes() +