Merge 2dacdf3 into 79ebd00

hpi-swa-teaching · Jul 19, 2019 · 5c9d639 · 5c9d639
2 parents 79ebd00 + 2dacdf3
commit 5c9d639
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 48 deletions.
diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st
@@ -11,7 +11,7 @@ createEmailsWith: maildirDirectory andName: directoryName and: relativeRootFolde
 	"for each directory create Folder"
 	(serverDirectory directoryNames) do: [:foldername |
 		folder := (ICFolder new) 
-			name: foldername;
+			folderName: foldername;
 			endpoint: self; 
 			yourself.
 

diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/currentUIDsFor..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/currentUIDsFor..st
@@ -21,5 +21,5 @@ currentUIDsFor: anICFolder
 			removeFirst; 
 			yourself)]
 	ifTrue: [
-			Transcript show: (anICFolder name), ' is an empty folder!'. 
+			Transcript show: (anICFolder folderName), ' is an empty folder!'. 
 			^ OrderedCollection new]
diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json
@@ -17,7 +17,7 @@
 		"errorInvalidAuthenticationConfiguration" : "js 5/15/2016 16:16",
 		"errorInvalidConnectionConfiguration" : "js 5/15/2016 16:15",
 		"errorLoginFailed" : "js 5/15/2016 14:57",
-		"errorNoConnection" : "js 5/15/2016 13:50",
+		"errorNoConnection" : "tg 7/19/2019 09:39",
 		"errorNoPasswordSet" : "js 5/15/2016 13:51",
 		"errorNoUsernameSet" : "js 5/15/2016 13:51",
 		"expungeEmail" : "C.G. 7/25/2018 14:10",
@@ -56,11 +56,11 @@
 		"connect" : "tg 7/15/2019 13:27",
 		"connectAndLoginWith:" : "tg 7/15/2019 12:28",
 		"connectWith:" : "tg 7/18/2019 23:00",
-		"createEmailsWith:andName:and:" : "C.G. 6/26/2018 10:51",
+		"createEmailsWith:andName:and:" : "tg 7/19/2019 09:18",
 		"currentFolderName" : "C.G. 7/25/2018 13:50",
 		"currentFolderName:" : "C.G. 7/25/2018 13:50",
 		"currentUIDs" : "pm 6/3/2019 18:35",
-		"currentUIDsFor:" : "pm 6/3/2019 18:35",
+		"currentUIDsFor:" : "tg 7/19/2019 09:30",
 		"deleteEmail:" : "tg 7/15/2019 12:42",
 		"expungeEmail" : "mw 6/22/2018 23:00",
 		"fatalErrorOccured" : "pm 6/9/2019 13:10",

diff --git a/packages/IMAPClient-Core.package/ICFolder.class/class/named.in..st b/packages/IMAPClient-Core.package/ICFolder.class/class/named.in..st
@@ -4,7 +4,7 @@ named: name in: parent
 	| newFolder |
 
 	newFolder := self new.
-	newFolder	name: name.
+	newFolder folderName: name.
 
 	parent addFolder: newFolder.
 

diff --git a/packages/IMAPClient-Core.package/ICFolder.class/class/named.in.with..st b/packages/IMAPClient-Core.package/ICFolder.class/class/named.in.with..st
@@ -4,7 +4,7 @@ named: name in: parent with: endpoint
 	| newFolder |
 
 	newFolder := (self new)
-		name: name;
+		folderName: name;
 		endpoint: endpoint.
 
 	parent addFolder: newFolder.

diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/childFolderNamed.ifAbsent..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/childFolderNamed.ifAbsent..st
@@ -1,6 +1,6 @@
 folder hierarchy
-childFolderNamed: name ifAbsent: block
+childFolderNamed: childFolderName ifAbsent: block
 
 	^ self childFolders 
-		detect: [:child | child name = name] 
+		detect: [:child | child folderName = childFolderName] 
 		ifNone: [block value]
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/childFolderNamed.with.ifAbsent..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/childFolderNamed.with.ifAbsent..st
@@ -1,16 +1,16 @@
 folder hierarchy
-childFolderNamed: name with: delimiter ifAbsent: block
+childFolderNamed: childFolderName with: delimiter ifAbsent: block
 
 	^ self childFolders 
-		detect: [:child | child name = name] 
+		detect: [:child | child folderName = childFolderName] 
 		ifNone: [ 
 			| rootPart childPart child parts |
 			"splice at delimiter and ask child"
-			parts := name subStrings: delimiter.
+			parts := childFolderName subStrings: delimiter.
 			(parts size > 1)
 				ifTrue: [
 					rootPart := parts first.
 					childPart := parts allButFirst joinSeparatedBy: delimiter.
-					child := self childFolders detect: [ :childFolder | childFolder name = rootPart].
+					child := self childFolders detect: [ :childFolder | childFolder folderName = rootPart].
 					child ifNotNil: [^ child childFolderNamed: childPart with: delimiter ifAbsent: block]].
 			^ block value]
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/folderName..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/folderName..st
@@ -0,0 +1,4 @@
+accessing
+folderName: aString
+
+	folderName := aString
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/folderName.st b/packages/IMAPClient-Core.package/ICFolder.class/instance/folderName.st
@@ -0,0 +1,4 @@
+accessing
+folderName
+
+	^ folderName ifNil: [folderName := self class defaultName]
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/name..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/name..st
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/name.st b/packages/IMAPClient-Core.package/ICFolder.class/instance/name.st
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/path.st b/packages/IMAPClient-Core.package/ICFolder.class/instance/path.st
@@ -2,5 +2,5 @@ folder hierarchy
 path
 
 	^ (self parent == self endpoint rootFolder) 
-		ifTrue: [ self name ] 
-		ifFalse: [ self parent path, self endpoint hierarchyDelimiter, self name]
+		ifTrue: [ self folderName ] 
+		ifFalse: [ self parent path, self endpoint hierarchyDelimiter, self folderName]
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/startUpdateProcess..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/startUpdateProcess..st
@@ -1,7 +1,7 @@
 updateEmails
 startUpdateProcess: anUID
 
-	(self name = 'root') ifTrue: [^self].
+	(self folderName = 'root') ifTrue: [^self].
 
 	[anUID
 		ifNil: [self latestEmails: self class numberOfHeadersToFetchAtTheBeginning]

diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/update..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/update..st
@@ -3,7 +3,7 @@ update: aBlock
 
 	ProgressNotification 
 		signal: (aBlock value) 
-		extra: (self endpoint accountInfo accountName, ' Mailbox. Folder: ', self name).
+		extra: (self endpoint accountInfo accountName, ' Mailbox. Folder: ', self folderName).
 
 	self startUpdateProcess: self highestUniqueID.
 	self childFolders do: [:anICFolder | anICFolder update: aBlock]
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json b/packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json
@@ -2,18 +2,18 @@
 	"class" : {
 		"defaultName" : "js 6/7/2016 11:49",
 		"errorChildDoesNotExist" : "js 6/14/2016 09:27",
-		"named:in:" : "C.G. 7/25/2018 14:12",
-		"named:in:with:" : "C.G. 7/4/2018 13:07",
+		"named:in:" : "tg 7/19/2019 09:27",
+		"named:in:with:" : "tg 7/19/2019 09:19",
 		"newRootFolderWith:" : "C.G. 7/25/2018 14:12",
 		"numberOfHeadersToFetchAtLoadOlderMails" : "DH 7/22/2018 22:37",
 		"numberOfHeadersToFetchAtTheBeginning" : "DH 7/22/2018 22:37" },
 	"instance" : {
 		"addFolder:" : "js 6/7/2016 13:09",
 		"checkTopicality" : "pm 6/3/2019 18:34",
 		"childFolderNamed:" : "C.G. 7/25/2018 14:02",
-		"childFolderNamed:ifAbsent:" : "C.G. 6/26/2018 10:58",
+		"childFolderNamed:ifAbsent:" : "tg 7/19/2019 09:19",
 		"childFolderNamed:with:" : "C.G. 6/26/2018 11:01",
-		"childFolderNamed:with:ifAbsent:" : "DH 7/9/2018 00:23",
+		"childFolderNamed:with:ifAbsent:" : "tg 7/19/2019 12:58",
 		"childFolders" : "pm 6/9/2019 13:12",
 		"childFolders:" : "js 6/7/2016 11:32",
 		"countFolders" : "C.G. 7/25/2018 14:02",
@@ -22,19 +22,19 @@
 		"endpoint" : "ms 7/10/2016 13:24",
 		"endpoint:" : "pm 6/9/2019 16:56",
 		"fetchHeadersFrom:" : "pm 6/3/2019 18:33",
+		"folderName" : "tg 7/19/2019 09:17",
+		"folderName:" : "tg 7/19/2019 09:17",
 		"highestUniqueID" : "pm 6/3/2019 18:34",
 		"latestEmails:" : "pm 6/3/2019 18:34",
 		"loadOlderMails" : "pm 6/3/2019 18:34",
 		"lowestUniqueID" : "pm 6/3/2019 18:34",
-		"name" : "pm 6/9/2019 13:13",
-		"name:" : "js 6/7/2016 11:48",
 		"numOfUnseenMails" : "C.G. 7/25/2018 14:03",
 		"parent" : "tg 6/25/2019 21:21",
 		"parent:" : "js 6/7/2016 11:32",
-		"path" : "C.G. 7/25/2018 14:03",
+		"path" : "tg 7/19/2019 09:20",
 		"removeFolder:" : "C.G. 7/25/2018 14:03",
 		"removeFolder:ifAbsent:" : "C.G. 7/25/2018 14:04",
 		"retrieveFlagsFrom:to:" : "C.G. 7/25/2018 14:04",
-		"startUpdateProcess:" : "pm 6/3/2019 18:34",
+		"startUpdateProcess:" : "tg 7/19/2019 09:19",
 		"update" : "pm 6/3/2019 18:34",
-		"update:" : "tg 7/10/2019 17:37" } }
+		"update:" : "tg 7/19/2019 09:19" } }
diff --git a/packages/IMAPClient-Core.package/ICFolder.class/properties.json b/packages/IMAPClient-Core.package/ICFolder.class/properties.json
@@ -8,7 +8,7 @@
 	"instvars" : [
 		"parent",
 		"childFolders",
-		"name",
+		"folderName",
 		"emails",
 		"endpoint" ],
 	"name" : "ICFolder",

diff --git a/packages/IMAPClient-Tests.package/ICEmailTest.class/instance/testRetrieveBody.st b/packages/IMAPClient-Tests.package/ICEmailTest.class/instance/testRetrieveBody.st
@@ -10,7 +10,7 @@ testRetrieveBody
 
 	folder := ICFolder new.
 	folder endpoint: endpoint;
-		   name: 'dummy';
+		   folderName: 'dummy';
 		   parent: nil.
 
 	self email folder: folder.

diff --git a/packages/IMAPClient-Tests.package/ICEmailTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICEmailTest.class/methodProperties.json
@@ -11,4 +11,4 @@
 		"testAsString" : "mw 5/11/2018 12:06",
 		"testDateFormatted" : "pm 6/3/2019 18:52",
 		"testMinimalHeaderAsString" : "C.G. 7/25/2018 17:53",
-		"testRetrieveBody" : "DH 7/9/2018 15:39" } }
+		"testRetrieveBody" : "tg 7/19/2019 09:31" } }
diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/emailListMenu..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/emailListMenu..st
@@ -15,7 +15,7 @@ emailListMenu: aMenu
 			ifTrue: ['Unflag']
 			ifFalse: ['Mark as flagged'])  
 			action: [self modifyFlag: #flagged];
-		add: (self labelForDeletionAction: self selectedEmail folder name)
+		add: (self labelForDeletionAction: self selectedEmail folder folderName)
 			action: #deleteEmail;
 		add: 'Move to ...' subMenu: self folderListMenu.	
 

diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/folderNameOf..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/folderNameOf..st
@@ -17,4 +17,4 @@ folderNameOf: folder
 
 	1 to: levelCounter do: [ :i | offset := offset , '  '].
 
-	^ offset, folder name
+	^ offset, folder folderName
diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/labelForFolder..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/labelForFolder..st
@@ -5,5 +5,5 @@ labelForFolder: anICFolder
 
 	countOfUnseenMails := anICFolder numOfUnseenMails.
 	countOfUnseenMails > 0
-		ifTrue: [^ anICFolder name, Character tab, '[', countOfUnseenMails asString, ']']
-		ifFalse: [^ anICFolder name, Character tab, '']
+		ifTrue: [^ anICFolder folderName, Character tab, '[', countOfUnseenMails asString, ']']
+		ifFalse: [^ anICFolder folderName, Character tab, '']
diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json
@@ -6,7 +6,7 @@
 	"instance" : {
 		"accountsComplete" : "pm 6/3/2019 18:47",
 		"addAccount:" : "tg 7/18/2019 23:04",
-		"addPasswordToCollection:" : "tg 7/18/2019 23:09",
+		"addPasswordToCollection:" : "tg 7/19/2019 09:24",
 		"buildAddAccountButton:" : "fr 7/7/2019 10:15",
 		"buildEmailButton:" : "ok 6/20/2019 12:18",
 		"buildEmailList:" : "pm 6/26/2019 14:31",
@@ -33,7 +33,7 @@
 		"emailAccounts:" : "C.G. 7/25/2018 14:16",
 		"emailListKeyPress:" : "pm 5/27/2019 14:00",
 		"emailListKeyPressMapping" : "pm 5/27/2019 14:00",
-		"emailListMenu:" : "pm 6/26/2019 14:34",
+		"emailListMenu:" : "tg 7/19/2019 09:30",
 		"emailSearchHelp" : "lvm 7/3/2018 16:09",
 		"emailsOfSelectedFolder" : "pm 6/26/2019 14:32",
 		"emphasizeUnseenAccounts:" : "lvm 7/4/2018 11:18",
@@ -42,14 +42,14 @@
 		"filterString" : "lvm 6/26/2018 14:05",
 		"filterString:" : "fr 6/3/2019 15:50",
 		"folderListMenu" : "C.G. 7/12/2018 08:14",
-		"folderNameOf:" : "C.G. 7/25/2018 14:18",
+		"folderNameOf:" : "tg 7/19/2019 09:30",
 		"folderWith:" : "pm 6/3/2019 18:47",
 		"initialize" : "tg 7/8/2019 14:56",
 		"initializedAccounts" : "C.G. 7/25/2018 14:18",
 		"initializedAccounts:" : "pm 6/9/2019 17:02",
 		"labelForAccount:" : "tg 7/10/2019 18:39",
 		"labelForDeletionAction:" : "C.G. 7/25/2018 14:19",
-		"labelForFolder:" : "C.G. 7/25/2018 14:19",
+		"labelForFolder:" : "tg 7/19/2019 09:19",
 		"labelForMail:" : "pm 6/26/2019 14:34",
 		"loadOlderEmails" : "C.G. 7/25/2018 14:19",
 		"loadOlderEmailsProcess" : "DH 7/22/2018 22:02",

diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/symbolArray.st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/symbolArray.st
@@ -1,4 +1,4 @@
 accessing
 symbolArray
-
-	^ symbolArray ifNil: [symbolArray := {#name. #serverAddress. #serverPort. #username. #password} as: OrderedCollection]
+	
+	^ symbolArray ifNil: [symbolArray := {#accountName. #serverAddress. #serverPort. #username. #password} as: OrderedCollection]
diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json
@@ -62,7 +62,7 @@
 		"ssl" : "ok 7/9/2019 18:58",
 		"ssl:" : "ms 7/13/2016 17:25",
 		"sslCheckBoxLabel" : "ms 7/12/2016 11:00",
-		"symbolArray" : "pm 6/9/2019 13:21",
+		"symbolArray" : "tg 7/19/2019 09:48",
 		"symbolArray:" : "C.G. 7/25/2018 14:24",
 		"toggleSSL" : "ms 7/13/2016 17:37",
 		"updateMode" : "pm 6/9/2019 13:21",