[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/fatPages confirmAddress,1.1.1.1,1.2,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/fatPages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5030

Modified Files:
	confirmAddress 
Log Message:
use safe replace style dialog

Index: confirmAddress
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/fatPages/confirmAddress,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** confirmAddress	26 Mar 2005 19:42:45 -0000	1.1.1.1
--- confirmAddress	16 Feb 2006 17:52:28 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.fatPages.confirmAddress
  
! on confirmAddress (adr) {
	ÇChanges
		Ç3/31/2004; 1:37:38 PM by JES
			ÇUse string.popFileFromAddress to shorten the address in the replace confirmation dialog.
	loop { //get destination address from the user, confirmation
		on popPath (s) {
			local (i, flbrackets = false, ch);
			local (flquotes = false);
			for i = sizeof (s) downto 2 {
				ch = s [i];
				if ch == '"' {
					if s [i - 1] != '\\' {
						if flquotes {
							flquotes = false}
						else {
							flquotes = true}}};
				if ch == ']' {
					if not flquotes {
						flbrackets = true}};
				if ch == '[' {
					if not flquotes {
						flbrackets = false}};
				if ch == '.' {
					if not flquotes and not flbrackets {
						s = string.mid (s, 1, i - 1);
						return (s)}}};
			return (s)};
		
		if not dialog.ask ("Name for imported object?", @adr) {
			return (false)};
		
		local (objname = nameOf (adr^));
		
		if objname == "" { // objname isn't interpretable as an address
			if not dialog.confirm ("Can't import to " + popPath (adr) + " because the table doesn't exist.") {
				return (false)};
			continue}; //try again
		
		if objname == adr { //avoid importing into a local
			adr = @root.[adr]}
		else {
			adr = address (adr)};
		if defined (adr^) { //confirm, we're going to over-write it
			if not dialog.yesNo ("Replace existing object named " + string.popFileFromAddress (adr) + "?") {
				continue}};
		break};
	return (adr)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.fatPages.confirmAddress
  
! on confirmAddress (adr) {
	ÇChanges
		Ç2/8/06; 7:08:17 PM by TAC
			Çuse safe replace style dialog
		Ç3/31/2004; 1:37:38 PM by JES
			ÇUse string.popFileFromAddress to shorten the address in the replace confirmation dialog.
	
	loop { //get destination address from the user, confirmation
		on popPath (s) {
			local (i, flbrackets = false, ch);
			local (flquotes = false);
			for i = sizeof (s) downto 2 {
				ch = s [i];
				if ch == '"' {
					if s [i - 1] != '\\' {
						if flquotes {
							flquotes = false}
						else {
							flquotes = true}}};
				if ch == ']' {
					if not flquotes {
						flbrackets = true}};
				if ch == '[' {
					if not flquotes {
						flbrackets = false}};
				if ch == '.' {
					if not flquotes and not flbrackets {
						s = string.mid (s, 1, i - 1);
						return (s)}}};
			return (s)};
		
		if not dialog.ask ("Name for imported object?", @adr) {
			return (false)};
		
		local (objname = nameOf (adr^));
		
		if objname == "" { // objname isn't interpretable as an address
			if not dialog.confirm ("Can't import to " + popPath (adr) + " because the table doesn't exist.") {
				return (false)};
			continue}; //try again
		
		if objname == adr { //avoid importing into a local
			adr = @root.[adr]}
		else {
			adr = address (adr)};
		
		if defined (adr^) { //confirm, we're going to over-write it
			if dialog.twoWay ("Replace existing object named " + string.popFileFromAddress (adr) + "?", "No", "Replace") {
				continue}};
		
		break};
	
	return (adr)}
\ No newline at end of file