--- a/Tools__ChangeList.st Fri Jan 27 22:18:53 2012 +0100
+++ b/Tools__ChangeList.st Sun Jan 29 12:53:39 2012 +0000
@@ -27,9 +27,9 @@
"{ NameSpace: Tools }"
-BrowserListWithFilter subclass:#ChangeList
- instanceVariableNames:'listHolder showRemovedHolder showSameHolder allowRemoveHolder
- allowAcceptHolder'
+BrowserList subclass:#ChangeList
+ instanceVariableNames:'listHolder listView showRemovedHolder showSameHolder
+ acceptEnabledHolder'
classVariableNames:'LastSelectionConditionString'
poolDictionaries:''
category:'Interface-Browsers-ChangeSet'
@@ -75,39 +75,126 @@
!ChangeList class methodsFor:'image specs'!
iconEqual
- ^ ToolbarIconLibrary iconEqual12x12
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
- "Modified: / 31-08-2011 / 10:52:34 / cg"
+ "
+ self iconEqual inspect
+ ImageEditor openOnClass:self andSelector:#iconEqual
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'Tools::ChangeList class iconEqual'
+ ifAbsentPut:[(Depth8Image new) width: 12; height: 12; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@8*;H2M+ 5[7K,\3L7-/F1[?''.Z*6/+3%.MK@2\&99L;\.-?P7[6=/^GV+KGL2-ST@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@8*;H2M+
+5[7K,\3L7-/F1[?''.Z*6/+3%.MK@2\&99L;\.-?P7[6=/^GV+KGL2-ST@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[255 248 248 63 144 224 64 152 232 79 160 232 64 152 224 64 144 224 63 136 224 48 128 216 48 120 216 47 112 216 47 112 208 32 104 208 32 96 208 31 88 200 16 88 200 16 80 200 15 72 192 15 64 192 0 64 192 0 56 184 0 56 176 0 48 160 143 200 248 128 200 248 127 192 248 112 184 248 111 176 248 96 168 248 95 160 248 80 152 248 79 144 248 64 128 248 63 120 248 48 112 248 32 104 248 31 96 248 16 88 248 15 80 248 0 72 248 0 64 240 0 48 168 112 176 248 111 168 248 96 160 248 95 152 248 80 144 248 79 136 248 63 128 248 48 120 248 47 112 248 15 72 248 0 48 176 95 168 232 191 224 248 191 216 248 176 208 248 175 208 248 175 200 248 160 200 248 160 192 248 159 192 248 159 184 248 144 184 248 144 176 248 143 168 248 128 168 248 128 160 248 127 160 248 127 152 240 31 72 176 111 168 232 240 240 248 240 232 240 63 88 176 239 232 240 240 240 240 48 88 176 96 168 224 224 224 232 96 160 224 223 216 232 48 80 176 224 224 240 223 216 224 96 152 224 96 152 216 95 152 216 239 232 232 208 208 224 48 120 208 80 144 208 80 136 208 79 128 200 79 120 200 79 120 192 64 112 192 64 104 184 63 104 184 63 96 184 15 56 160 0 0 0 207 216 240 240 144 24 255 248 48 255 248 96 255 248 24 240 208 24 255 248 152 255 248 88 255 248 136 255 248 176 255 248 200 227 227 236 225 225 234 244 244 249 242 242 247 218 217 230 212 211 224 234 234 242 253 253 254 251 251 252 227 226 235 226 226 237 243 243 247 220 220 231 240 239 244 237 237 244 233 233 240 52 89 178 231 231 238 50 87 176 229 229 239 248 248 251 246 246 249 223 223 233 222 221 232 238 238 244 56 94 181 55 92 180 53 90 178 233 232 239 51 88 176 232 232 241 251 251 253 249 249 251 228 228 237 225 224 234 241 241 246 238 237 243 56 93 180 254 254 255 229 229 237 227 227 238 246 246 250 244 244 248 219 219 230 236 236 243 255 255 255 51 88 177 231 230 238 249 249 252 247 247 250 241 241 247 239 239 245 236 235 242 54 91 179 231 231 240 176 175 128 176 240 159 143 159 128 127 208 96 175 239 144 15 79 0 160 176 95 0 160 0 64 176 48 112 159 95 0 96 0 144 159 143 96 207 80 127 159 111 63 175 48 96 207 79 80 176 64 31 159 31 143 224 112 64 176 63 95 207 79 63 160 47 0 127 0 80 191 64 176 240 144 143 239 112 15 160 15 16 95 16 0 80 0 143 224 111 191 240 159 175 240 144 15 127 15 0 175 0 144 239 127 0 79 0 0 112 0 0 95 0 15 112 15 111 207 80 16 79 16 15 79 15 16 80 16 128 223 111 159 159 63 15 64 15 31 144 16 16 80 15 128 224 111 176 239 159 95 112 80 15 175 15 144 224 127 95 192 79 31 95 15 32 160 31 48 159 47 32 159 31 15 128 15 95 160 47 0 111 0 127 223 96 15 80 0 64 112 63 159 239 127]; mask:((ImageMask new) width: 12; height: 12; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@/?<O?5??G?<@@@@@C?<O?6??G?<@@@') ; yourself); yourself]
!
iconEqualGrayed
- ^ ToolbarIconLibrary iconEqualGray12x12
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
- "Modified: / 31-08-2011 / 10:54:00 / cg"
+ "
+ self iconEqualGrayed inspect
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'Tools::ChangeList class iconEqualGrayed'
+ ifAbsentPut:[self iconEqual asGrayImageDepth: 8]
!
iconMinus
- ^ ToolbarIconLibrary iconMinus12x12
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
- "Modified: / 31-08-2011 / 10:51:26 / cg"
+ "
+ self iconMinus inspect
+ ImageEditor openOnClass:self andSelector:#iconMinus
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'Tools::ChangeList class iconMinus'
+ ifAbsentPut:[(Depth8Image new) width: 12; height: 12; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@8*;H2M+ 5[7K,\3L7-/F1[?''.Z*6/+3%.MK@2\&99L;\.-?P7[6=/^GV
++KGL2-ST@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[255 248 248 63 144 224 64 152 232 79 160 232 64 152 224 64 144 224 63 136 224 48 128 216 48 120 216 47 112 216 47 112 208 32 104 208 32 96 208 31 88 200 16 88 200 16 80 200 15 72 192 15 64 192 0 64 192 0 56 184 0 56 176 0 48 160 143 200 248 128 200 248 127 192 248 112 184 248 111 176 248 96 168 248 95 160 248 80 152 248 79 144 248 64 128 248 63 120 248 48 112 248 32 104 248 31 96 248 16 88 248 15 80 248 0 72 248 0 64 240 0 48 168 112 176 248 111 168 248 96 160 248 95 152 248 80 144 248 79 136 248 63 128 248 48 120 248 47 112 248 15 72 248 0 48 176 95 168 232 191 224 248 191 216 248 176 208 248 175 208 248 175 200 248 160 200 248 160 192 248 159 192 248 159 184 248 144 184 248 144 176 248 143 168 248 128 168 248 128 160 248 127 160 248 127 152 240 31 72 176 111 168 232 240 240 248 240 232 240 63 88 176 239 232 240 240 240 240 48 88 176 96 168 224 224 224 232 96 160 224 223 216 232 48 80 176 224 224 240 223 216 224 96 152 224 96 152 216 95 152 216 239 232 232 208 208 224 48 120 208 80 144 208 80 136 208 79 128 200 79 120 200 79 120 192 64 112 192 64 104 184 63 104 184 63 96 184 15 56 160 0 0 0 207 216 240 240 144 24 255 248 48 255 248 96 255 248 24 240 208 24 255 248 152 255 248 88 255 248 136 255 248 176 255 248 200 227 227 236 225 225 234 244 244 249 242 242 247 218 217 230 212 211 224 234 234 242 253 253 254 251 251 252 227 226 235 226 226 237 243 243 247 220 220 231 240 239 244 237 237 244 233 233 240 52 89 178 231 231 238 50 87 176 229 229 239 248 248 251 246 246 249 223 223 233 222 221 232 238 238 244 56 94 181 55 92 180 53 90 178 233 232 239 51 88 176 232 232 241 251 251 253 249 249 251 228 228 237 225 224 234 241 241 246 238 237 243 56 93 180 254 254 255 229 229 237 227 227 238 246 246 250 244 244 248 219 219 230 236 236 243 255 255 255 51 88 177 231 230 238 249 249 252 247 247 250 241 241 247 239 239 245 236 235 242 54 91 179 231 231 240 176 175 128 176 240 159 143 159 128 127 208 96 175 239 144 15 79 0 160 176 95 0 160 0 64 176 48 112 159 95 0 96 0 144 159 143 96 207 80 127 159 111 63 175 48 96 207 79 80 176 64 31 159 31 143 224 112 64 176 63 95 207 79 63 160 47 0 127 0 80 191 64 176 240 144 143 239 112 15 160 15 16 95 16 0 80 0 143 224 111 191 240 159 175 240 144 15 127 15 0 175 0 144 239 127 0 79 0 0 112 0 0 95 0 15 112 15 111 207 80 16 79 16 15 79 15 16 80 16 128 223 111 159 159 63 15 64 15 31 144 16 16 80 15 128 224 111 176 239 159 95 112 80 15 175 15 144 224 127 95 192 79 31 95 15 32 160 31 48 159 47 32 159 31 15 128 15 95 160 47 0 111 0 127 223 96 15 80 0 64 112 63 159 239 127]; mask:((ImageMask new) width: 12; height: 12; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@,@@@@E@@G?<O?0??C?<@@F@@D@@@@@') ; yourself); yourself]
!
iconMinusGrayed
- ^ ToolbarIconLibrary iconMinusGray12x12
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
- "Modified: / 31-08-2011 / 10:54:40 / cg"
+ "
+ self iconMinusGrayed inspect
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'Tools::ChangeList class iconMinusGrayed'
+ ifAbsentPut:[self iconMinus asGrayImageDepth: 8]
!
iconPlus
- ^ ToolbarIconLibrary iconPlus12x12
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
- "Modified: / 31-08-2011 / 10:51:39 / cg"
+ "
+ self iconPlus inspect
+ ImageEditor openOnClass:self andSelector:#addOverlayIcon3
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'XPToolbarIconLibrary class addOverlayIcon3'
+ ifAbsentPut:[(Depth8Image new) width: 12; height: 12; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@K_ 5^ @@@@@@@@@@LGI*,\@@@@@@@@@@M*+5<\@@@@@@@@@@N&(.[4@@@@@8*;H2M+X1K7K,\3L7-/F1[?''.Z*6/+3%.MK@2\&99L;\.-?P7[6=/^F*
+,;GL2-ST@@@@@L6;/,H@@@@@@@@@@NN>+=D@@@@@@@@@@LN57<<@@@@@@@@@@N[V+M$@@@@@') ; colorMapFromArray:#[255 248 248 63 144 224 64 152 232 79 160 232 64 152 224 64 144 224 63 136 224 48 128 216 48 120 216 47 112 216 47 112 208 32 104 208 32 96 208 31 88 200 16 88 200 16 80 200 15 72 192 15 64 192 0 64 192 0 56 184 0 56 176 0 48 160 143 200 248 128 200 248 127 192 248 112 184 248 111 176 248 96 168 248 95 160 248 80 152 248 79 144 248 64 128 248 63 120 248 48 112 248 32 104 248 31 96 248 16 88 248 15 80 248 0 72 248 0 64 240 0 48 168 112 176 248 111 168 248 96 160 248 95 152 248 80 144 248 79 136 248 63 128 248 48 120 248 47 112 248 15 72 248 0 48 176 95 168 232 191 224 248 191 216 248 176 208 248 175 208 248 175 200 248 160 200 248 160 192 248 159 192 248 159 184 248 144 184 248 144 176 248 143 168 248 128 168 248 128 160 248 127 160 248 127 152 240 31 72 176 111 168 232 240 240 248 240 232 240 63 88 176 239 232 240 240 240 240 48 88 176 96 168 224 224 224 232 96 160 224 223 216 232 48 80 176 224 224 240 223 216 224 96 152 224 96 152 216 95 152 216 239 232 232 208 208 224 48 120 208 80 144 208 80 136 208 79 128 200 79 120 200 79 120 192 64 112 192 64 104 184 63 104 184 63 96 184 15 56 160 0 0 0 207 216 240 240 144 24 255 248 48 255 248 96 255 248 24 240 208 24 255 248 152 255 248 88 255 248 136 255 248 176 255 248 200 227 227 236 225 225 234 244 244 249 242 242 247 218 217 230 212 211 224 234 234 242 253 253 254 251 251 252 227 226 235 226 226 237 243 243 247 220 220 231 240 239 244 237 237 244 233 233 240 52 89 178 231 231 238 50 87 176 229 229 239 248 248 251 246 246 249 223 223 233 222 221 232 238 238 244 56 94 181 55 92 180 53 90 178 233 232 239 51 88 176 232 232 241 251 251 253 249 249 251 228 228 237 225 224 234 241 241 246 238 237 243 56 93 180 254 254 255 229 229 237 227 227 238 246 246 250 244 244 248 219 219 230 236 236 243 255 255 255 51 88 177 231 230 238 249 249 252 247 247 250 241 241 247 239 239 245 236 235 242 54 91 179 231 231 240 176 175 128 176 240 159 143 159 128 127 208 96 175 239 144 15 79 0 160 176 95 0 160 0 64 176 48 112 159 95 0 96 0 144 159 143 96 207 80 127 159 111 63 175 48 96 207 79 80 176 64 31 159 31 143 224 112 64 176 63 95 207 79 63 160 47 0 127 0 80 191 64 176 240 144 143 239 112 15 160 15 16 95 16 0 80 0 143 224 111 191 240 159 175 240 144 15 127 15 0 175 0 144 239 127 0 79 0 0 112 0 0 95 0 15 112 15 111 207 80 16 79 16 15 79 15 16 80 16 128 223 111 159 159 63 15 64 15 31 144 16 16 80 15 128 224 111 176 239 159 95 112 80 15 175 15 144 224 127 95 192 79 31 95 15 32 160 31 48 159 47 32 159 31 15 128 15 95 160 47 0 111 0 127 223 96 15 80 0 64 112 63 159 239 127 95 159 79 16 175 16]; mask:((ImageMask new) width: 12; height: 12; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C0,O@@<EC0G?<O?0??C?<@<FC0DO@@<@') ; yourself); yourself]
!
iconPlusGrayed
- ^ ToolbarIconLibrary iconPlusGray12x12
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
- "Modified: / 31-08-2011 / 10:54:46 / cg"
+ "
+ self iconPlusGrayed inspect
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'Tools::ChangeList class iconPlusGrayed'
+ ifAbsentPut:[self iconPlus asGrayImageDepth: 8]
! !
!ChangeList class methodsFor:'interface specs'!
@@ -144,7 +231,7 @@
name: 'List'
layout: (LayoutFrame 0 0 0 0 0 1 0 1)
model: selectionHolder
- menu: menuHolderWithShowFilter
+ menu: menuHolder
hasHorizontalScrollBar: true
hasVerticalScrollBar: true
listModel: listHolder
@@ -152,29 +239,12 @@
useIndex: false
highlightMode: line
doubleClickSelector: selectionDoubleclicked
- postBuildCallback: postBuildListView:
- )
- (InputFieldSpec
- name: 'Filter'
- layout: (LayoutFrame 0 0 0 0 0 1 26 0)
- initiallyInvisible: true
- model: filterPatternHolder
- immediateAccept: true
- acceptOnLeave: false
- acceptOnReturn: false
- acceptOnTab: false
- acceptOnPointerLeave: false
- emptyFieldReplacementText: 'Search Filter...'
- usePreferredHeight: true
- useDynamicPreferredHeight: true
- postBuildCallback: postBuildFilterView:
+ postBuildCallback: postBuildList:
)
)
)
)
-
- "Modified: / 29-11-2011 / 15:52:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList class methodsFor:'menu specs'!
@@ -186,7 +256,6 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
-
"
MenuEditor new openOnClass:Tools::ChangeList andSelector:#listMenu
(Menu new fromLiteralArrayEncoding:(Tools::ChangeList listMenu)) startUp
@@ -202,14 +271,14 @@
label: 'Apply'
itemValue: listMenuApply
translateLabel: true
- isVisible: allowAcceptHolder
+ isVisible: acceptEnabledHolder
shortcutKey: Accept
)
(MenuItem
label: 'Apply all'
itemValue: listMenuApplyAll
translateLabel: true
- isVisible: allowAcceptHolder
+ isVisible: acceptEnabledHolder
)
(MenuItem
enabled: hasSingleChangeSelectedAndCanBrowse
@@ -225,12 +294,10 @@
itemValue: listMenuDeleteSelection
nameKey: Delete
translateLabel: true
- isVisible: allowRemoveHolder
shortcutKey: Delete
)
(MenuItem
label: '-'
- isVisible: allowRemoveHolder
)
(MenuItem
label: 'Select...'
@@ -285,7 +352,6 @@
(MenuItem
label: 'Show Deleted'
translateLabel: true
- isVisible: allowRemoveHolder
indication: showRemovedHolder
)
(MenuItem
@@ -313,9 +379,7 @@
(if this app is embedded in a subCanvas)."
^ #(
- #allowAcceptHolder
- #allowRemoveHolder
-
+ #acceptEnabledHolder
#inGeneratorHolder
#menuHolder
#outGeneratorHolder
@@ -324,34 +388,21 @@
#showSameHolder
).
- "Modified: / 24-01-2012 / 19:54:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-08-2011 / 18:42:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList methodsFor:'accessing'!
-allowAccept
- ^ self allowAcceptHolder value
+acceptEnabled
+ "return the value in 'acceptEnabledHolder'"
- "Created: / 24-01-2012 / 19:52:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-allowAccept: aBoolean
- ^ self allowAcceptHolder value: aBoolean
-
- "Created: / 24-01-2012 / 19:52:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^ self acceptEnabledHolder value
!
-allowRemoved
- ^ self allowRemoveHolder value ? true
-
- "Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
+acceptEnabled: newValue
+ "set the value in 'acceptEnabledHolder'"
-list
- ^ listHolder value
-
- "Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 27-12-2011 / 14:18:25 / cg"
+ self acceptEnabledHolder value: newValue
!
selection
@@ -361,16 +412,6 @@
"Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-selectionIndices
- |sel|
-
- (sel := self selectionHolder value) isEmptyOrNil ifTrue:[^ #()].
- ^ sel collect:[:each | self list identityIndexOf:each].
-
- "Created: / 05-12-2009 / 14:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 27-12-2011 / 10:56:20 / cg"
-!
-
showRemoved
^self showRemovedHolder value ? true
@@ -382,68 +423,29 @@
selectionDoubleclicked
- self listMenuBrowse
-"/ | app |
-"/
-"/ self selection do:
-"/ [:e|e removed: e removed not].
-"/ ((app := self masterApplication) respondsTo: #redrawChangeListViews)
-"/ ifTrue:[app redrawChangeListViews].
+ | app |
- "Modified: / 24-01-2012 / 22:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ self selection do:
+ [:e|e removed: e removed not].
+ ((app := self masterApplication) respondsTo: #redrawChangeListViews)
+ ifTrue:[app redrawChangeListViews].
+
+ "Modified: / 16-03-2011 / 22:51:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList methodsFor:'aspects'!
-allowAcceptHolder
+acceptEnabledHolder
"return/create the valueHolder 'acceptEnabledHolder'"
- allowAcceptHolder isNil ifTrue:[
- allowAcceptHolder := ValueHolder with:nil "defaultValue here".
+ acceptEnabledHolder isNil ifTrue:[
+ acceptEnabledHolder := ValueHolder with:nil "defaultValue here".
].
- ^ allowAcceptHolder
-
- "Created: / 24-01-2012 / 19:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-allowAcceptHolder:something
- "set the 'allowAcceptHolder' value holder (automatically generated)"
-
- allowAcceptHolder := something.
+ ^ acceptEnabledHolder
!
-allowRemoveHolder
- "return/create the 'allowRemoveHolder' value holder (automatically generated)"
-
- allowRemoveHolder isNil ifTrue:[
- allowRemoveHolder := ValueHolder with:true.
- allowRemoveHolder addDependent:self.
- ].
- ^ allowRemoveHolder
-
- "Modified (comment): / 24-01-2012 / 19:44:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-allowRemoveHolder:something
- "set the 'showRemovedHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- allowRemoveHolder notNil ifTrue:[
- oldValue := allowRemoveHolder value.
- allowRemoveHolder removeDependent:self.
- ].
- allowRemoveHolder := something.
- allowRemoveHolder notNil ifTrue:[
- allowRemoveHolder addDependent:self.
- ].
- newValue := allowRemoveHolder value.
- oldValue ~~ newValue ifTrue:[
- self
- update:#value
- with:newValue
- from:allowRemoveHolder.
- ].
+acceptEnabledHolder:aValueModel
+ acceptEnabledHolder := aValueModel.
!
listHolder
@@ -528,10 +530,10 @@
self updateList
].
+
^super update: aspect with: param from: sender
"Created: / 24-10-2009 / 19:47:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (format): / 27-12-2011 / 14:20:30 / cg"
! !
!ChangeList methodsFor:'event processing'!
@@ -543,7 +545,7 @@
button ~= 1 ifTrue:[^aView buttonPress:button x:x y:y].
itemIndex := aView yVisibleToLineNr:y.
- itemIndex isNil ifTrue:[^self].
+ itemIndex ifNil:[^self].
itemIndex == 0 ifTrue:[^self].
itemIndex > aView list size ifTrue:[^self].
item := aView list at: itemIndex.
@@ -555,12 +557,11 @@
aView invalidate
"Created: / 08-12-2009 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-11-2011 / 14:55:41 / cg"
!
handlesButtonPress:button inView:aView
- ^listView scrolledView == aView
+ ^listView == aView
"Created: / 08-12-2009 / 14:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -584,12 +585,12 @@
!ChangeList methodsFor:'hooks'!
-postBuildListView: aView
+postBuildList: aView
- super postBuildListView: aView.
- listView scrolledView delegate: self.
+ listView := aView scrolledView.
+ listView delegate: self.
- "Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Created: / 08-12-2009 / 14:10:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList methodsFor:'initialization'!
@@ -625,29 +626,22 @@
listMenuBrowse
- self listMenuBrowseChanges:
- ((self selectionHolder value ? #()) collect:[:e|e change])
-
- "Modified: / 24-01-2012 / 22:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-listMenuBrowseChanges: changes
-
| classes methods methodsOnly |
classes := Set new.
methods := Set new.
methodsOnly := true.
- changes do:
+ self selectionHolder value do:
[:each|
- each isClassChange ifTrue:
- [each changeClass ifNotNil:
- [classes add: each changeClass.
- each isMethodCodeChange
+ each change isClassChange ifTrue:
+ [each change changeClass ifNotNil:
+ [classes add: each change changeClass.
+ each change isMethodCodeChange
ifTrue:
- [each changeMethod ifNotNil:
- [methods add:each changeMethod]]
+ [each change changeMethod ifNotNil:
+ [methods add:each change changeMethod]]
ifFalse:
[methodsOnly := false]]]].
+
methodsOnly
ifTrue:
[methods size = 1
@@ -658,8 +652,10 @@
ifTrue:[Smalltalk browserClass browseClass: classes anyOne]
ifFalse:[Smalltalk browserClass browseClasses: classes]]
+
+
+
"Modified: / 24-10-2009 / 22:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 24-01-2012 / 22:00:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
listMenuDeleteSelection
@@ -804,24 +800,19 @@
!
updateList
- |inGenerator changeset newList |
+ |inGenerator changeset|
inGenerator := self inGeneratorHolder value.
changeset := inGenerator ifNil:[ #() ] ifNotNil:[ inGenerator ].
- newList := changeset
+ self listHolder value:(changeset
select:
[:chg |
(self showRemovedHolder value or:[ chg removed not ])
and:[self showSameHolder value or:[chg delta ~~ #=]]
- ].
- newList := self filterList: newList.
- newList := newList collect:[:chg | self listEntryFor:chg ].
- self listHolder value ~= newList ifTrue:[
- self listHolder value: newList.
- ]
+ ]
+ thenCollect:[:chg | self listEntryFor:chg ])
- "Modified: / 29-11-2011 / 15:38:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 28-12-2011 / 15:46:15 / cg"
+ "Modified: / 04-08-2011 / 19:07:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList methodsFor:'queries'!
@@ -897,11 +888,12 @@
!
change:aChange
+
self assert: ((aChange isKindOf: Change) or:[aChange isKindOf: RefactoryChange]).
+
change := aChange.
"Modified: / 25-07-2009 / 23:40:38 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified (format): / 04-12-2011 / 14:58:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
changeClass
@@ -918,54 +910,38 @@
children
- children isNil ifTrue:[
- change isCompositeChange ifTrue:[
- children := OrderedCollection new: change changes size.
- change changes do:[:chg|
- ((self application showRemovedHolder value or:[ chg removed not ])
- and:[self application showSameHolder value or:[chg delta ~~ #=]])
- ifTrue:[
- children add: ((self application listEntryFor: chg) parent: self)
- ]
- ].
- ] ifFalse:[
- children := #()
- ]
- ].
+ children ifNil:
+ [children :=
+ change isCompositeChange
+ ifTrue:[change changes select:
+ [:chg|
+ (self application showRemovedHolder value or:[ chg removed not ])
+ and:[self application showSameHolder value or:[chg delta ~~ #=]]]
+ thenCollect:[:chg|(self application listEntryFor: chg) parent: self]]
+ ifFalse:[#()]
+ ].
^children
"Created: / 25-07-2009 / 23:32:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified (format): / 18-11-2011 / 14:56:25 / cg"
- "Modified: / 04-12-2011 / 15:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-08-2011 / 18:48:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
delta
- "/ obsolete: please use deltaDetail
^change delta
"Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 31-08-2011 / 10:30:02 / cg"
-!
-
-deltaDetail
-
- ^change deltaDetail
-
- "Created: / 29-10-2010 / 14:32:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Created: / 31-08-2011 / 10:29:21 / cg"
!
iconDelta
| iconSelector |
iconSelector := self iconSelector.
- iconSelector isNil ifTrue:[^nil].
+ iconSelector ifNil:[^nil].
self removed ifTrue:[iconSelector := iconSelector , #Grayed].
^self application class perform: iconSelector asSymbol.
"Created: / 05-12-2009 / 14:11:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-11-2011 / 14:56:33 / cg"
!
iconRemoved
@@ -1019,7 +995,7 @@
| cx icon |
cx := x := newX.
- self application allowRemoveHolder value ifTrue:
+ self application showRemoved ifTrue:
[(icon := self iconRemoved) ifNotNil:
[icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) ].
cx := cx + 22."experimental value - this looks good"].
@@ -1030,43 +1006,32 @@
super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h
- "Modified: / 24-01-2012 / 21:44:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 05-12-2009 / 14:49:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeList::ListEntry methodsFor:'private'!
iconSelector
- | delta |
-
- delta := change deltaDetail.
- delta shortDeltaSymbol = #+ ifTrue:[^#iconPlus].
- delta shortDeltaSymbol = #- ifTrue:[^#iconMinus].
- delta shortDeltaSymbol = #= ifTrue:[^#iconEqual].
-
- ^ nil.
- "Modified: / 31-08-2011 / 10:39:32 / cg"
-! !
-
-!ChangeList::ListEntry methodsFor:'protocol-queries'!
+ | delta |
+ delta := change delta.
+ delta = #+ ifTrue:[^#iconPlus].
+ delta = #- ifTrue:[^#iconMinus].
+ delta = #= ifTrue:[^#iconEqual].
-hasChildren
-
- ^ change isCompositeChange and:[change changes notEmptyOrNil ].
-
- "Created: / 04-12-2011 / 14:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ ^nil.
! !
!ChangeList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.13 2012-01-24 22:18:39 vrany Exp $'
+ ^ '$Id: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.5 2011/08/04 18:18:29 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.13 2012-01-24 22:18:39 vrany Exp $'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.5 2011/08/04 18:18:29 vrany Exp §'
!
version_SVN
- ^ '§Id: Tools__ChangeList.st 7486 2009-10-26 22:06:24Z vranyj1 §'
-! !
+ ^ '$Id: Tools__ChangeList.st 7486 2009-10-26 22:06:24Z vranyj1 $'
+! !
\ No newline at end of file