hg/stx-goodies-smallsense: comparison SmallSense_

equal deleted inserted replaced

-:ff6d19b5d0df
+:ce4e697a363c
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 "
+'From Smalltalk/X, Version:6.2.5.0 on 03-12-2014 at 23:46:57'                   !
 "{ Package: 'stx:goodies/smallsense' }"
 "{ NameSpace: SmallSense }"
 SimpleDialog subclass:#CriticsWindow
 ^ super flyByHelpSpec addPairsFrom:#(
 #disableRule
-'Disable this rule in the future'
+'Disable this rule in the future\(for the rest of this session, unless you save the ruleset)'
 #browseRule
 'Open a browser on the rule'
 )
 UIPainter new openOnClass:SmallSense::CriticsWindow andSelector:#windowSpec
 SmallSense::CriticsWindow new openInterface:#windowSpec
 SmallSense::CriticsWindow open
 "
+<resource: #canvas>
 ^
 #(FullSpec
 name: windowSpec
 window:
 (WindowSpec
 label: 'SmalllintRuleDetail'
 name: 'SmalllintRuleDetail'
 min: (Point 10 10)
-bounds: (Rectangle 0 0 472 308)
+bounds: (Rectangle 0 0 563 384)
 backgroundColor: (Color 100.0 100.0 75.0)
 forceRecursiveBackgroundOfDefaultBackground: true
 )
 component:
 (SpecCollection
 collection: (
 (ActionButtonSpec
 label: 'closeIcon'
 name: 'Button4'
 translateLabel: true
 model: closeRequest
 )
 (HTMLViewSpec
 name: 'Rationale'
-layout: (LayoutFrame 0 0 20 0 -20 1 -60 1)
+layout: (LayoutFrame 0 0 20 0 0 1 -65 1)
 level: 0
 visibilityChannel: rationaleVisibleHolder
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
+miniScrollerHorizontal: true
+miniScrollerVertical: true
 htmlText: ruleRationaleAndFixesHTMLHolder
 postBuildCallback: setupHTMLView:
 )
 (LinkButtonSpec
+label: 'Disable this Rule'
+name: 'Button3'
+layout: (LayoutFrame -1 0 -59 1 -16 1 -30 1)
+activeHelpKey: disableRule
+level: 0
+translateLabel: true
+labelChannel: disableRuleString
+adjust: left
+model: disableLintRule
+keepSpaceForOSXResizeHandleH: true
+)
+(LinkButtonSpec
 name: 'Button1'
-layout: (LayoutFrame -1 0 -59 1 -31 1 -30 1)
+layout: (LayoutFrame 0 0 -29 1 -16 1 0 1)
 activeHelpKey: browseRule
 level: 0
 translateLabel: true
 labelChannel: ruleNameAspect
 adjust: left
 model: browseLintRule
 keepSpaceForOSXResizeHandleH: true
 )
-(LinkButtonSpec
-label: 'Disable this Rule'
-name: 'Button3'
-layout: (LayoutFrame 0 0 -29 1 -30 1 0 1)
-activeHelpKey: disableRule
-level: 0
-translateLabel: true
-labelChannel: disableRuleString
-adjust: left
-model: disableLintRule
-keepSpaceForOSXResizeHandleH: true
-)
 )
 )
 )
 ! !
 !CriticsWindow class methodsFor:'plugIn spec'!
 ! !
 !CriticsWindow methodsFor:'actions'!
 browseLintRule
-|rule ruleClass sel|
+|rule ruleClass|
 rule := self ruleHolder value.
 rule isNil ifTrue:[^ self].
 ruleClass := rule class.
-(ruleClass implements:#rationale) ifTrue:[
-sel := #rationale.
-].
 self close.
 UserPreferences current systemBrowserClass
-openInClass:ruleClass selector:sel.
+openInClass:ruleClass selector:#rationale
 "Created: / 07-09-2011 / 04:09:38 / cg"
 "Modified: / 31-01-2012 / 11:30:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 RBBuiltinRuleSet rulesetBuiltinDefault reject:[:r | r class == rule class].
 self close.
 !
 doQuickFix: quickFixNo
 self closeDownViews.
-[ fixer performFix: quickFixNo ] fork.
+"/ cg: why fork here?
+"[" fixer performFix: quickFixNo "] fork".
 "Created: / 16-02-2012 / 14:19:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CriticsWindow methodsFor:'aspects'!
 !
 disableRuleString
-^ 'Disable this Rule'
+^ ('Disable this Rule'
-colorizeAllWith: Color blue;
+colorizeAllWith: Color blue)
 actionForAll:[ self disableLintRule]
 !
 ruleHolder
 "return/create the 'ruleHolder' value holder (automatically generated)"
 (holder := builder bindingAt:#ruleNameAspect) isNil ifTrue:[
 holder := BlockValue
 with:[:h |
 "/ h displayString , ' ' , (('[browse]' actionForAll:[ self browseLintRule]) colorizeAllWith:Color blue)
-('Browse "',h name,'"-Rule (',h class name,')' "displayString")
+(('Browse Rule Class (',h class name,')' "displayString")
-colorizeAllWith: Color blue;
+colorizeAllWith: Color blue)
 actionForAll:[ self browseLintRule]
 ]
 argument: self ruleHolder.
 builder aspectAt:#ruleNameAspect put:holder.
 ].
 "Modified (format): / 01-02-2012 / 10:57:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !CriticsWindow methodsFor:'change & update'!
+printHTMLForFixesOn:aStream
+"/ fixer printHtmlOn: s.
+|fixes|
+(fixes := fixer fixes) isEmptyOrNil ifTrue:[ ^ self ].
+aStream nextPutAll: '<p>'.
+fixes size > 1 ifTrue:[
+aStream nextPutAll: '<br>'.
+aStream nextPutLine: 'Possible fixes:'.
+].
+aStream nextPutLine:'<ul indent="0">'.
+fixes withIndexDo:[:fix :index|
+aStream
+nextPutAll:'<li><a action="doit: self doQuickFix:';
+nextPutAll: index printString;
+nextPutAll:'">';
+nextPutAll: fix label;
+nextPutAll:'</a></li>'.
+].
+aStream nextPutLine:'</ul>'.
+!
 update:something with:aParameter from:changedObject
 "Invoked when an object that I depend upon sends a change notification."
 changedObject == ruleHolder ifTrue:[
 html := String streamContents:[:s|
 s
 nextPutAll: rule name;
 nextPutAll:'<P>';
 nextPutLine: rule rationale.
-fixer printHtmlOn: s.
+self printHTMLForFixesOn:s.
+"/ fixer printHtmlOn: s.
 ]
 ].
 self ruleRationaleAndFixesHTMLHolder value: html
 aBuilder window allViewBackground:(aBuilder window viewBackground).
 entered := false.
 self updateRationaleAndFixes.
-aBuilder window
+aBuilder window beSlave.
-"windowGroup: codeView windowGroup;"
-bePopUpView;
-beSlave.
 "Created: / 03-04-2011 / 10:45:10 / Jan Vrany "
 "Modified: / 16-02-2012 / 14:14:07 / Jan Vrany "
 !

changeset 312	ce4e697a363c
parent 306	798ea6162eba
child 315	0a4845a0c211