Merge 28b9201 into cedd672

packages/IMAPClient-Core.package/ICEmail.class/instance/asString.st

@@ -1,4 +1,4 @@
-print
+converting
 asString
 
 	^ self headerAsString, String cr, String cr, self bodyAsString, String cr

packages/IMAPClient-Core.package/ICEmail.class/instance/deleteEmailFromDisk.st

@@ -1,5 +1,5 @@
 action
 deleteEmailFromDisk
 
-	self folder emails remove: self. 
+	self folder removeMail: self. 
 	FileDirectory default deleteFileNamed: (self maildirFileName, FileDirectory slash, self uniqueID)		

packages/IMAPClient-Core.package/ICEmail.class/methodProperties.json

@@ -16,7 +16,7 @@
 		"dateInSecondsSince1980" : "tg 7/26/2019 21:04",
 		"dateInSecondsSinceSqueakEpoch" : "tg 7/19/2019 10:35",
 		"deleteEmail" : "fr 7/26/2019 15:41",
-		"deleteEmailFromDisk" : "fr 7/26/2019 15:41",
+		"deleteEmailFromDisk" : "tg 7/26/2019 21:59",
 		"deleted" : "DH 7/19/2018 21:58",
 		"deleted:" : "DH 7/19/2018 19:43",
 		"expungeEmails" : "tg 7/26/2019 13:57",

packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st

@@ -14,7 +14,7 @@ createEmailsWith: maildirDirectory andName: directoryName and: relativeRootFolde
 		relativeRootFolder addFolder: folder.
 		self createEmailsWith: serverDirectory andName: foldername and: folder].
 
-	relativeRootFolder emails addAll: (serverDirectory fileNames collect: [:filename | 
+	relativeRootFolder addMails: (serverDirectory fileNames collect: [:filename | 
 		(filereader get: filename in: (maildirDirectory fullPathFor: directoryName))
 			folder: relativeRootFolder;
 			yourself ]).

packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st

@@ -1,6 +1,6 @@
 login
-testAccountWith: accountInfo
+testAccountWith: anAccountInfo
 
-	self connectAndLoginWith: accountInfo.
+	self connectAndLoginWith: anAccountInfo.
 
 	^ self fatalErrorOccured not

packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json

@@ -24,7 +24,7 @@
 		"connect" : "tg 7/15/2019 13:27",
 		"connectAndLoginWith:" : "tg 7/26/2019 11:43",
 		"connectWith:" : "tg 7/18/2019 23:00",
-		"createEmailsWith:andName:and:" : "tg 7/26/2019 21:04",
+		"createEmailsWith:andName:and:" : "tg 7/26/2019 22:01",
 		"currentFolderName" : "C.G. 7/25/2018 13:50",
 		"currentFolderName:" : "C.G. 7/25/2018 13:50",
 		"currentUIDs" : "fr 7/26/2019 15:48",
@@ -72,7 +72,7 @@
 		"setFlag:and:" : "tg 7/26/2019 13:44",
 		"stream" : "pm 6/9/2019 13:08",
 		"stream:" : "js 6/7/2016 10:17",
-		"testAccountWith:" : "tg 7/15/2019 12:29",
+		"testAccountWith:" : "tg 7/26/2019 22:12",
 		"uids" : "C.G. 7/25/2018 13:59",
 		"uids:" : "pm 6/9/2019 16:52",
 		"username" : "ok 7/26/2019 19:09" } }

packages/IMAPClient-Core.package/ICEndPoint.class/properties.json

@@ -15,7 +15,6 @@
 		"uids",
 		"hierarchyDelimiter",
 		"currentFolderName",
-		"name",
 		"fatalErrorOccured",
 		"folderNameOfTrash" ],
 	"name" : "ICEndPoint",

packages/IMAPClient-Core.package/ICFileReadWriter.class/instance/createPathRecursive.and..st

@@ -10,5 +10,4 @@ createPathRecursive: aPath and: aFileWriter
 				ifFalse: [ aFileWriter createDirectory: subDir first].
 				self createPathRecursive: 
 					(subDir allButFirst joinSeparatedBy: (FileDirectory slash)) 
-					and: (aFileWriter on: subDir first)].
-	^ self
+					and: (aFileWriter on: subDir first)].

packages/IMAPClient-Core.package/ICFileReadWriter.class/methodProperties.json

@@ -4,7 +4,7 @@
 	"instance" : {
 		"createHeaderFrom:" : "pm 6/3/2019 18:34",
 		"createJsonHeaderFrom:" : "C.G. 7/25/2018 14:00",
-		"createPathRecursive:and:" : "fr 7/26/2019 15:53",
+		"createPathRecursive:and:" : "tg 7/26/2019 21:50",
 		"get:in:" : "pm 6/2/2019 15:58",
 		"recipientsFrom:" : "fr 7/26/2019 15:34",
 		"write:in:as:" : "pm 6/2/2019 16:11" } }

packages/IMAPClient-Core.package/ICFolder.class/instance/addMails..st

@@ -0,0 +1,4 @@
+email access
+addMails: aMailCollection
+
+	self emails addAll: aMailCollection.

packages/IMAPClient-Core.package/ICFolder.class/instance/childFolderNamed.with.ifAbsent..st

@@ -1,10 +1,11 @@
 folder hierarchy
 childFolderNamed: childFolderName with: delimiter ifAbsent: block
+
+	| rootPart childPart child parts |
 
 	^ self childFolders 
-		detect: [:child | child folderName = childFolderName] 
+		detect: [:subFolder | subFolder folderName = childFolderName] 
 		ifNone: [ 
-			| rootPart childPart child parts |
 			"splice at delimiter and ask child"
 			parts := childFolderName subStrings: delimiter.
 			(parts size > 1)

packages/IMAPClient-Core.package/ICFolder.class/instance/removeMail..st

@@ -0,0 +1,4 @@
+email access
+removeMail: anICEmail
+
+	self emails remove: anICEmail.

packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json

@@ -10,11 +10,12 @@
 	"instance" : {
 		"accountName" : "ok 7/26/2019 19:06",
 		"addFolder:" : "js 6/7/2016 13:09",
+		"addMails:" : "tg 7/26/2019 22:00",
 		"checkTopicality" : "fr 7/26/2019 15:57",
 		"childFolderNamed:" : "C.G. 7/25/2018 14:02",
 		"childFolderNamed:ifAbsent:" : "tg 7/19/2019 09:19",
 		"childFolderNamed:with:" : "C.G. 6/26/2018 11:01",
-		"childFolderNamed:with:ifAbsent:" : "tg 7/19/2019 12:58",
+		"childFolderNamed:with:ifAbsent:" : "tg 7/26/2019 21:52",
 		"childFolders" : "pm 6/9/2019 13:12",
 		"childFolders:" : "js 6/7/2016 11:32",
 		"countFolders" : "C.G. 7/25/2018 14:02",
@@ -38,6 +39,7 @@
 		"recursiveChildFolders" : "tg 7/25/2019 12:56",
 		"removeFolder:" : "C.G. 7/25/2018 14:03",
 		"removeFolder:ifAbsent:" : "C.G. 7/25/2018 14:04",
+		"removeMail:" : "tg 7/26/2019 21:59",
 		"retrieveFlagsFrom:to:" : "fr 7/26/2019 15:37",
 		"rootFolder" : "ok 7/26/2019 19:05",
 		"startUpdateProcess:" : "tg 7/26/2019 20:33",

packages/IMAPClient-Core.package/ICStreamWrapper.class/instance/connectTo.on..st

@@ -1,10 +1,10 @@
 connection
-connectTo: host on: port
+connectTo: aHost on: aPort
 
 	| hostAddress |
 
-	self useSSL ifTrue: [^ self sslConnectTo: host on: port].
+	self useSSL ifTrue: [^ self sslConnectTo: aHost on: aPort].
 
-	hostAddress := NetNameResolver addressForName: host.
+	hostAddress := NetNameResolver addressForName: aHost.
 	self close.
-	self stream: (SocketStream openConnectionToHost: hostAddress port: port)
+	self stream: (SocketStream openConnectionToHost: hostAddress port: aPort)

packages/IMAPClient-Core.package/ICStreamWrapper.class/instance/sendCommand..st

@@ -1,5 +1,4 @@
 connection
 sendCommand: aString
 
-	Transcript show: 'SENDING: ', aString; cr.
 	self stream sendCommand: aString

packages/IMAPClient-Core.package/ICStreamWrapper.class/instance/sslConnectTo.on..st

@@ -1,8 +1,8 @@
 connection
-sslConnectTo: host on: port
+sslConnectTo: aHost on: aPort
 
 	| hostAddress |
 
-	hostAddress := NetNameResolver addressForName: host.
-	self stream: (SecureSocketStream openConnectionToHost: hostAddress port: port timeout: self class connectionTimeout).
-	self stream sslConnectTo: host
+	hostAddress := NetNameResolver addressForName: aHost.
+	self stream: (SecureSocketStream openConnectionToHost: hostAddress port: aPort timeout: self class connectionTimeout).
+	self stream sslConnectTo: aHost

packages/IMAPClient-Core.package/ICStreamWrapper.class/methodProperties.json

@@ -3,7 +3,7 @@
 		"connectionTimeout" : "ok 7/26/2019 18:50" },
 	"instance" : {
 		"close" : "js 6/14/2016 10:43",
-		"connectTo:on:" : "C.G. 7/25/2018 14:08",
+		"connectTo:on:" : "tg 7/26/2019 22:13",
 		"connectTo:on:with:" : "C.G. 7/25/2018 14:08",
 		"host" : "js 6/7/2016 09:58",
 		"host:" : "js 6/7/2016 09:59",
@@ -13,10 +13,10 @@
 		"nextResponse" : "C.G. 7/25/2018 14:09",
 		"port" : "js 6/7/2016 09:59",
 		"port:" : "pm 6/9/2019 16:59",
-		"sendCommand:" : "DH 6/26/2018 20:20",
+		"sendCommand:" : "tg 7/26/2019 21:57",
 		"ssl" : "pm 6/9/2019 13:14",
 		"ssl:" : "ms 7/12/2016 09:45",
-		"sslConnectTo:on:" : "ok 7/26/2019 18:52",
+		"sslConnectTo:on:" : "tg 7/26/2019 22:13",
 		"stream" : "pm 6/9/2019 13:14",
 		"stream:" : "js 6/7/2016 10:05",
 		"useSSL" : "ms 7/12/2016 09:45" } }

packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testRetrieveFlagsOnly.st

@@ -12,7 +12,7 @@ testRetrieveFlagsOnly
 	mailB := emailObjects second.
 
 	folder := emailObjects first folder.
-	folder emails addAll: emailObjects.
+	folder addMails: emailObjects.
 
 	folderName := self endPoint rootFolderName.
 	path := 'Maildir', FileDirectory slash, folderName, FileDirectory slash, 'inbox'.

packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/methodProperties.json

@@ -36,5 +36,5 @@
 		"testListAllFolders" : "DH 4/27/2018 02:35",
 		"testLogout" : "jwe 6/21/2016 10:15",
 		"testPing" : "jwe 6/21/2016 10:15",
-		"testRetrieveFlagsOnly" : "pm 7/25/2019 12:41",
+		"testRetrieveFlagsOnly" : "tg 7/26/2019 22:01",
 		"testSelectInbox" : "C.G. 7/25/2018 18:00" } }

packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOn.st

@@ -2,5 +2,5 @@ connectOn
 testConnectToOn
 
 	self endPoint accountInfo: self class validAccountInfo.
-	self	shouldnt: [endPoint connectWith: ICMockSocketStream] 
+	self	shouldnt: [self endPoint connectWith: ICMockSocketStream] 
 		raise: Exception

packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/methodProperties.json

@@ -17,7 +17,7 @@
 		"endPoint:" : "pm 6/9/2019 17:17",
 		"setUp" : "AR 7/14/2016 09:17",
 		"tearDown" : "js 6/7/2016 09:42",
-		"testConnectToOn" : "tg 7/10/2019 19:05",
+		"testConnectToOn" : "tg 7/26/2019 21:41",
 		"testConnectToOnWithWrongHost" : "tg 7/10/2019 20:00",
 		"testConnectToOnWithWrongPort" : "tg 7/10/2019 20:00",
 		"testPingIfNotConnected" : "C.G. 7/25/2018 18:02" } }

packages/IMAPClient-Tests.package/ICFileReadWriterTest.class/instance/setUp.st

@@ -1,4 +1,4 @@
-accessing
+running
 setUp
 
 	self readWriter: ICFileReadWriter new

packages/IMAPClient-UI.package/ICEmailDialog.class/instance/body.st

@@ -3,7 +3,7 @@ body
 
 	| mimeDoc body |
 
-	body := email retrieveBody.
+	body := self email retrieveBody.
 	mimeDoc := MailMessage new initializeFromString: body.
 
 	^ mimeDoc bodyTextFormatted

packages/IMAPClient-UI.package/ICEmailDialog.class/instance/recipients.st

@@ -1,4 +1,4 @@
 email access
 recipients
 
-	^ email to joinSeparatedBy: ';'
+	^ self email to joinSeparatedBy: ';'

packages/IMAPClient-UI.package/ICEmailDialog.class/instance/sender.st

@@ -1,4 +1,4 @@
 email access
 sender
 
-	^ email from
+	^ self email from

packages/IMAPClient-UI.package/ICEmailDialog.class/instance/subject.st

@@ -1,4 +1,4 @@
 email access
 subject
 
-	^ email subject ifEmpty: [^ self class defaultSubject]
+	^ self email subject ifEmpty: [^ self class defaultSubject]

packages/IMAPClient-UI.package/ICEmailDialog.class/methodProperties.json

@@ -4,7 +4,7 @@
 		"open" : "ms 7/9/2016 16:43",
 		"openWith:" : "ms 7/9/2016 16:56" },
 	"instance" : {
-		"body" : "pm 6/3/2019 18:41",
+		"body" : "tg 7/26/2019 21:40",
 		"buildBody:" : "pm 6/25/2019 16:29",
 		"buildRecipient:" : "pm 6/25/2019 16:29",
 		"buildSenderLabel:" : "pm 6/25/2019 16:28",
@@ -15,6 +15,6 @@
 		"dialogTitle" : "pm 6/3/2019 18:42",
 		"email" : "ms 7/9/2016 16:56",
 		"email:" : "pm 6/9/2019 17:01",
-		"recipients" : "pm 6/3/2019 18:42",
-		"sender" : "pm 6/3/2019 18:42",
-		"subject" : "tg 7/19/2019 13:09" } }
+		"recipients" : "tg 7/26/2019 21:40",
+		"sender" : "tg 7/26/2019 21:40",
+		"subject" : "tg 7/26/2019 21:40" } }

packages/IMAPClient-UI.package/ICFolderDialog.class/instance/buildAddAccountButton..st

@@ -4,5 +4,5 @@ buildAddAccountButton: builder
 	^ builder pluggableButtonSpec new
 		model: self;
 		frame: (0.8 @ 0 corner: 1 @ 0.05);
-		label: ICFolderDialog addUserIcon;
+		label: self class addUserIcon;
 		action: #createAccount

packages/IMAPClient-UI.package/ICFolderDialog.class/instance/folderNameOf..st

@@ -7,7 +7,7 @@ folderNameOf: folder
 	offset := ''.
 	currentFolder := folder.
 
-	[(currentFolder parent ~= currentFolder) and: (currentFolder parent ~= self rootFolder)] 
+	[(currentFolder parent ~= currentFolder) and: [(currentFolder parent ~= self rootFolder)]]
 		whileTrue: [
 			levelCounter := levelCounter + 1.
 			currentFolder := currentFolder parent].

packages/IMAPClient-UI.package/ICFolderDialog.class/instance/moveEmail..st

@@ -1,7 +1,7 @@
 email selection
 moveEmail: aFolder
 
-	selectedEmail moveEmail: aFolder.
+	self selectedEmail moveEmail: aFolder.
 	self selectedEmail: nil.
 	self
 		changed: #emailsOfSelectedFolder;

packages/IMAPClient-UI.package/ICFolderDialog.class/instance/passwordPromtCallback..st

@@ -9,6 +9,6 @@ passwordPromtCallback: aDictionary
 		(account at: 'accountName') = (aDictionary at: 'accountName')].
 	self uninitializedAccounts removeAt: nextAccount.
 
-	(uninitializedAccounts isEmpty) 
+	(self uninitializedAccounts isEmpty) 
 		ifTrue: [self accountsComplete]
 		ifFalse: [ICPasswordDialog openWith: (self uninitializedAccounts first) and: self]

packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json

@@ -7,7 +7,7 @@
 	"instance" : {
 		"accountsComplete" : "tg 7/25/2019 11:52",
 		"addAccount:" : "tg 7/25/2019 11:47",
-		"buildAddAccountButton:" : "fr 7/7/2019 10:15",
+		"buildAddAccountButton:" : "tg 7/26/2019 22:07",
 		"buildEmailButton:" : "ok 6/20/2019 12:18",
 		"buildEmailList:" : "pm 6/26/2019 14:31",
 		"buildEmailSearch:" : "pm 6/26/2019 14:43",
@@ -41,7 +41,7 @@
 		"filterString" : "lvm 6/26/2018 14:05",
 		"filterString:" : "fr 6/3/2019 15:50",
 		"folderListMenu" : "tg 7/25/2019 11:35",
-		"folderNameOf:" : "tg 7/26/2019 16:27",
+		"folderNameOf:" : "tg 7/26/2019 22:03",
 		"folderWith:" : "pm 6/3/2019 18:47",
 		"initialize" : "tg 7/8/2019 14:56",
 		"initializedAccounts" : "C.G. 7/25/2018 14:18",
@@ -53,13 +53,13 @@
 		"loadOlderEmails" : "tg 7/26/2019 14:49",
 		"loadOlderEmailsProcess" : "DH 7/22/2018 22:02",
 		"modifyFlag:" : "tg 7/26/2019 13:52",
-		"moveEmail:" : "lvm 7/8/2018 11:46",
+		"moveEmail:" : "tg 7/26/2019 21:41",
 		"numberOfFetchedFolders" : "C.G. 7/12/2018 08:14",
 		"numberOfFetchedFolders:" : "pm 6/9/2019 17:03",
 		"numberOfFolders" : "C.G. 7/12/2018 08:15",
 		"numberOfFolders:" : "pm 6/9/2019 17:03",
 		"openEmail:" : "tg 7/26/2019 16:19",
-		"passwordPromtCallback:" : "tg 7/26/2019 16:25",
+		"passwordPromtCallback:" : "tg 7/26/2019 21:41",
 		"progressCallback" : "tg 7/26/2019 16:21",
 		"rootFolder" : "ms 6/26/2016 14:05",
 		"rootFolder:" : "pm 6/9/2019 17:03",

packages/IMAPClient-UI.package/ICLoginDialog.class/instance/insertDefaults.st

@@ -1,5 +1,5 @@
 login
 insertDefaults
 
-	((self serverPort isNil) or: (self serverPort asString isEmpty))
-		ifTrue: [self serverPort: ICLoginDialog defaultPort asString asText].
+	((self serverPort isNil) or: [(self serverPort asString isEmpty)])
+		ifTrue: [self serverPort: self class defaultPort asString asText].

packages/IMAPClient-UI.package/ICLoginDialog.class/instance/lastCharacterIsTab..st

@@ -1,6 +1,4 @@
 helper
 lastCharacterIsTab: aString
 
-	aString isEmpty ifTrue: [^ false].
-
-	^ (aString last asciiValue == 9)
+	^ aString notEmpty and: [aString last asciiValue == 9]

packages/IMAPClient-UI.package/ICLoginDialog.class/instance/login.st

@@ -14,5 +14,5 @@ login
 		ifTrue: [
 			self loginMorph abandon.
 			(self updateMode)
-				ifFalse: [folderDialogInstance addAccount: accountInfo]
-				ifTrue: [folderDialogInstance editAccount: accountInfo with: (self endpoint)]]
+				ifFalse: [self folderDialogInstance addAccount: accountInfo]
+				ifTrue: [self folderDialogInstance editAccount: accountInfo with: (self endpoint)]]