--- a/Tools__NewSystemBrowser.st Tue Oct 14 23:15:53 2014 +0200
+++ b/Tools__NewSystemBrowser.st Tue Oct 14 23:17:21 2014 +0200
@@ -6335,7 +6335,7 @@
label: 'Run Selected Checks...'
itemValue: categoryMenuSmalllintCheck:
translateLabel: true
- argument: smalllintRulesFromUser
+ argument: smalllintRulesAskUser
)
)
@@ -6344,7 +6344,7 @@
)
"Modified: / 05-05-2012 / 10:18:13 / cg"
- "Modified: / 14-10-2014 / 12:55:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-10-2014 / 17:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
categoryMenu
@@ -6961,7 +6961,7 @@
label: 'Run Selected Checks...'
itemValue: classCheckMenuSmalllintCheck:
translateLabel: true
- argument: smalllintRulesFromUser
+ argument: smalllintRulesAskUser
)
(MenuItem
label: '-'
@@ -6992,7 +6992,7 @@
nil
)
- "Modified: / 14-10-2014 / 12:55:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-10-2014 / 17:14:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
classClassVariablesMenu
@@ -10058,7 +10058,7 @@
label: 'Run Selected Checks...'
itemValue: projectMenuSmalllintCheck:
translateLabel: true
- argument: smalllintRulesFromUser
+ argument: smalllintRulesAskUser
)
)
@@ -10067,7 +10067,7 @@
)
"Created: / 05-05-2012 / 10:22:19 / cg"
- "Modified: / 14-10-2014 / 12:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-10-2014 / 17:14:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
projectDebugMenu
@@ -10555,14 +10555,14 @@
label: 'Run Selected Checks...'
itemValue: protocolCheckMenuSmalllintCheck:
translateLabel: true
- argument: smalllintRulesFromUser
- )
- )
- nil
- nil
- )
-
- "Modified: / 14-10-2014 / 12:55:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ argument: smalllintRulesAskUser
+ )
+ )
+ nil
+ nil
+ )
+
+ "Modified: / 14-10-2014 / 17:14:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
protocolMenu
@@ -11089,7 +11089,7 @@
label: 'Run Selected Checks...'
itemValue: selectorCheckMenuSmalllintCheck:
translateLabel: true
- argument: smalllintRulesFromUser
+ argument: smalllintRulesAskUser
)
)
@@ -11098,7 +11098,7 @@
)
"Created: / 17-04-2010 / 10:48:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 14-10-2014 / 12:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-10-2014 / 17:14:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selectorMenu
@@ -27723,9 +27723,10 @@
self
smalllintCheck: self selectedCodeComponentsAsEnvironment
- against: #smalllintRulesFromUser
+ against: #smalllintRulesAskUser
"Created: / 07-03-2012 / 17:40:23 / cg"
+ "Modified: / 14-10-2014 / 17:13:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
smalllintCheck:anEnvironment against:ruleSetSymbol
@@ -27733,7 +27734,7 @@
|rule runRules|
- self assert:(#( #smalllintRulesAll #smalllintRulesFromUser #smalllintRules ) includes:ruleSetSymbol).
+ self assert:(#( #smalllintRulesAskUser #smalllintRules ) includes:ruleSetSymbol).
rule := self perform:ruleSetSymbol asSymbol.
rule isNil ifTrue:[ ^ self ].
@@ -27742,22 +27743,29 @@
"/ for non-composite: has a result
"/ therefore, isEmpty returns true here, so we will be always asked twice!!
+
rule isEmptyInTree ifTrue:[
- ruleSetSymbol ~~ #smalllintRulesFromUser ifTrue:[
- rule := self smalllintRulesFromUser.
- rule isNil ifTrue:[ ^ self ].
- ]
- ].
+"/ ruleSetSymbol ~~ #smalllintRulesAskUser ifTrue:[
+"/ rule := self smalllintRulesAskUser.
+"/ rule isNil ifTrue:[
+"/ "/ User cancelled
+"/ ^ self
+"/ ].
+"/ ]
+ ^ self.
+ ].
+
+ LastLintRulesHolder isNil ifTrue:[
+ LastLintRulesHolder := ValueHolder new.
+ ].
+ LastLintRulesHolder value: rule.
runRules :=
[
- |showResult|
-
self smalllintRunRule:rule onEnvironment:anEnvironment.
- showResult := true.
[rule notNil and:[rule isEmpty]] whileTrue:[
(Dialog confirm:'Nothing special found.\\Proceed to select more/different lint rules.' withCRs) ifTrue:[
- rule := self smalllintRulesFromUser.
+ rule := self smalllintRulesAskUser.
rule notNil ifTrue:[
self smalllintRunRule:rule onEnvironment:anEnvironment.
].
@@ -27784,8 +27792,8 @@
"Modified: / 28-12-2008 / 14:40:01 / bazantj <enter your email here>"
"Created: / 24-02-2009 / 11:02:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 22-07-2009 / 14:38:30 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 28-08-2010 / 20:45:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 15-05-2012 / 10:46:02 / cg"
+ "Modified: / 14-10-2014 / 18:02:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
smalllintRules
@@ -27803,6 +27811,25 @@
"Modified: / 14-10-2014 / 12:50:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+smalllintRulesAskUser
+ | dialog |
+
+ self loadSmalllint.
+ dialog := Tools::LintRuleSelectionDialog new.
+ dialog open.
+ dialog accepted ifTrue:[
+ ^ dialog selectionAsRule.
+ ].
+ ^ nil
+
+ "
+ LastLintRulesHolder := nil.
+ Tools::NewSystemBrowser basicNew smalllintRulesAskUser
+ "
+
+ "Created: / 14-10-2014 / 17:13:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
smalllintRulesDefaultOrAskUser
"Answer a defaulr ruleset configured in UserPreferences or ask user to specify one"
@@ -27810,54 +27837,15 @@
ruleset := UserPreferences current smallLintRulesetDefault.
ruleset isNil ifTrue:[
- ruleset := self smalllintRulesFromUser
+ ruleset := self smalllintRulesAskUser.
+ ruleset notNil ifTrue:[
+ UserPreferences current smallLintRulesetDefault: ruleset.
+ ].
].
^ ruleset
"Created: / 14-10-2014 / 12:50:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-smalllintRulesFromUser
- | dlg rules |
-
- self loadSmalllint.
- dlg := Tools::LintRuleSelectionDialog new.
-
- LastLintRulesHolder notNil ifTrue:[
- rules := LastLintRulesHolder value.
- rules isNil ifTrue:[
- rules := RBCompositeLintRule rulesets detect:[:ruleset | ruleset name = 'Default' ].
- LastLintRulesHolder value: nil.
- ]
- ] ifFalse:[
- RBCompositeLintRule rulesets size > 0 ifTrue:[
- rules := RBCompositeLintRule rulesets detect:[:e|e name = #Default] ifNone:[ RBCompositeLintRule rulesets first]
- ] ifFalse:[
- rules := RBCompositeLintRule allRules
- ].
- ].
-
- dlg ruleset: rules copy.
- dlg open.
- dlg accepted ifTrue:[
- LastLintRulesHolder isNil ifTrue:[
- LastLintRulesHolder := ValueHolder new.
- ].
- LastLintRulesHolder value: dlg selectionAsRule
-
- ].
- ^ nil.
-
-
- "
- LastLintRules := nil.
- Tools::NewSystemBrowser basicNew smalllintRulesFromUser
- "
-
- "Created: / 17-04-2010 / 09:41:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 25-08-2010 / 15:35:16 / Jan Vrany <enter your email here>"
- "Modified (format): / 06-03-2012 / 18:55:09 / cg"
- "Modified: / 13-10-2014 / 13:59:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-10-2014 / 18:16:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
smalllintRulesHolder
@@ -27938,7 +27926,7 @@
"Modified: / 22-07-2009 / 14:38:30 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Created: / 28-08-2010 / 12:12:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 01-03-2012 / 15:22:20 / cg"
- "Modified: / 07-10-2014 / 12:48:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-10-2014 / 18:01:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
spawnSmalllintBrowserByRuleFor: result in:where label:labelOrNil
@@ -57471,18 +57459,6 @@
^RBCompositeLintRule allRules selectAllTaggedAs: #good
"Created: / 06-09-2012 / 14:54:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-smalllintRulesOrGood
- "Returns a set of user-selected SmallLint rules or all 'good' rules,
- if no user selection is done"
-
- ^(LastLintRulesHolder isNil or:[ LastLintRulesHolder value isNil ])
- ifTrue:[ self smalllintRulesGood ]
- ifFalse:[ LastLintRulesHolder value ]
-
- "Created: / 06-09-2012 / 14:49:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 07-10-2014 / 12:31:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!NewSystemBrowser methodsFor:'private-syntax coloring'!
@@ -61613,11 +61589,11 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2116 2014-10-14 14:24:15 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2117 2014-10-14 21:17:21 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2116 2014-10-14 14:24:15 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2117 2014-10-14 21:17:21 vrany Exp $'
!
version_HG
@@ -61626,7 +61602,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st,v 1.2116 2014-10-14 14:24:15 vrany Exp $'
+ ^ '$Id: Tools__NewSystemBrowser.st,v 1.2117 2014-10-14 21:17:21 vrany Exp $'
! !