Skip to content

Commit 9397dd4

Browse files
jordanmonttjordanmontt
authored
Merge pull request #29 from jordanmontt/development
Added an application.
2 parents a76d8ed + 03af9be commit 9397dd4

20 files changed

+267
-131
lines changed

‎src/RewriteRuleBuilder/RewriteRuleBuilderPresenter.class.st

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ RewriteRuleBuilderPresenter class >> menuCommandOn: aBuilder [
6767
{ #category : #'instance creation' }
6868
RewriteRuleBuilderPresenter class >> open [
6969

70-
^ self new openWithSpec
70+
<example>
71+
^ RTApplication new startRuleBuilder
7172
]
7273

7374
{ #category : #accessing }
@@ -90,7 +91,7 @@ RewriteRuleBuilderPresenter >> applyOnAllClasses [
9091
(UIManager default confirm:
9192
'Do you want to apply this rule to all system classes?') ifFalse: [
9293
^ self ].
93-
RTRuleTransformerPresenter
94+
RTCodeTransformerPresenter
9495
runReplaceWithRuleAsAssociation: self lhs text -> self rhs text
9596
isForMethod: false
9697
]
@@ -216,17 +217,17 @@ RewriteRuleBuilderPresenter >> initializePresenters [
216217
icon: MatchToolPresenter icon.
217218
basicEditorButton := self newButton
218219
label: 'Basic Editor';
219-
icon: RTBasicEditorPresenter icon.
220+
icon: RTRuleEditorPresenter icon.
220221
applyOnAllClassesButton := self newButton
221222
label: 'On all classes';
222223
help:
223224
'Apply the current rewrite rule that is on this tool to all classes in the system.';
224-
icon: RTRuleTransformerPresenter icon.
225+
icon: RTCodeTransformerPresenter icon.
225226
applierButton := self newButton
226227
label: 'On selection...';
227228
help:
228229
'Open a tool to apply a saved rewrite rule to a selected set of classes.';
229-
icon: RTRuleTransformerPresenter icon.
230+
icon: RTCodeTransformerPresenter icon.
230231
buttonsBar := self newButtonBar
231232
add: saveRuleButton;
232233
add: applierButton;
@@ -319,16 +320,16 @@ RewriteRuleBuilderPresenter >> openApplier [
319320
| applier |
320321
^ loadedRule
321322
ifNotNil: [
322-
applier := RTRuleTransformerPresenter new.
323+
applier := RTCodeTransformerPresenter new.
323324
applier selectedRules: { loadedRule class }.
324325
applier openWithSpec ]
325-
ifNil: [ RTRuleTransformerPresenter open ]
326+
ifNil: [ RTCodeTransformerPresenter open ]
326327
]
327328

328329
{ #category : #actions }
329330
RewriteRuleBuilderPresenter >> openBasicRuleEditor [
330331

331-
^ RTBasicEditorPresenter new
332+
^ RTRuleEditorPresenter new
332333
rhs: self rhs;
333334
lhs: self lhs;
334335
openWithSpec

‎src/RewriteRuleTools/ApplyRuleOnAllClassesCommand.class.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ApplyRuleOnAllClassesCommand class >> defaultName [
2424
{ #category : #default }
2525
ApplyRuleOnAllClassesCommand class >> iconName [
2626

27-
^ RTRuleTransformerPresenter iconName
27+
^ RTCodeTransformerPresenter iconName
2828
]
2929

3030
{ #category : #executing }

‎src/RewriteRuleTools/MatchToolPresenter.class.st

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ MatchToolPresenter class >> menuCommandOn: aBuilder [
6262
{ #category : #api }
6363
MatchToolPresenter class >> open [
6464
<example>
65-
^ self new openWithSpec
65+
^ RTApplication new startMatchTool
6666
]
6767

68-
{ #category : #accessing }
68+
{ #category : #specs }
6969
MatchToolPresenter class >> title [
7070

7171
^ 'Match Tool'
@@ -100,6 +100,32 @@ MatchToolPresenter >> getBindingsItemsForMatch: bindingsAssociation [
100100
^ newItems flattened
101101
]
102102

103+
{ #category : #initialization }
104+
MatchToolPresenter >> initializeButtons [
105+
106+
executeButton := self newButton.
107+
executeButton
108+
icon: (self iconNamed: #smallDoIt);
109+
label: 'Match';
110+
shortcut: Character cr meta.
111+
]
112+
113+
{ #category : #initialization }
114+
MatchToolPresenter >> initializeEditors [
115+
116+
methodCheckbox := self newCheckBox label: 'Is rule for method?'.
117+
118+
codeLabel := self newLabel label: 'Pharo code'.
119+
120+
codeEditor := self newCode.
121+
codeEditor
122+
withoutLineNumbers;
123+
beForScripting;
124+
text: DefaultRule new inputCode.
125+
126+
ruleEditor := self instantiate: RTSearchForPanel.
127+
]
128+
103129
{ #category : #initialization }
104130
MatchToolPresenter >> initializeLayout [
105131

@@ -134,23 +160,7 @@ MatchToolPresenter >> initializeLayout [
134160
]
135161

136162
{ #category : #initialization }
137-
MatchToolPresenter >> initializePresenters [
138-
139-
methodCheckbox := self newCheckBox label: 'Is rule for method?'.
140-
codeLabel := self newLabel label: 'Pharo code'.
141-
142-
codeEditor := self newCode.
143-
codeEditor
144-
withoutLineNumbers;
145-
beForScripting;
146-
text: DefaultRule new inputCode.
147-
ruleEditor := self instantiate: RTSearchForPanel.
148-
149-
executeButton := self newButton.
150-
executeButton
151-
icon: (self iconNamed: #smallDoIt);
152-
label: 'Match';
153-
shortcut: Character cr meta.
163+
MatchToolPresenter >> initializeMatchesPresenters [
154164

155165
matchesList := self newList.
156166
matchesList display: [ :assoc | assoc key formattedCode ].
@@ -164,7 +174,14 @@ MatchToolPresenter >> initializePresenters [
164174
title: 'Bindings'
165175
evaluated: [ :assoc | assoc value formattedCode ]);
166176
beResizable.
177+
]
167178

179+
{ #category : #initialization }
180+
MatchToolPresenter >> initializePresenters [
181+
182+
self initializeEditors.
183+
self initializeButtons.
184+
self initializeMatchesPresenters.
168185
self initializeLayout.
169186

170187
self focusOrder

‎src/RewriteRuleTools/OpenMatchToolCommand.class.st

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Class {
99
#category : #'RewriteRuleTools-Commands'
1010
}
1111

12+
{ #category : #default }
13+
OpenMatchToolCommand class >> defaultDescription [
14+
15+
^ 'Open MatchTool'
16+
]
17+
1218
{ #category : #default }
1319
OpenMatchToolCommand class >> defaultName [
1420

‎src/RewriteRuleTools/OpenRTApplierCommand.class.st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ OpenRTApplierCommand class >> defaultName [
2424
{ #category : #default }
2525
OpenRTApplierCommand class >> iconName [
2626

27-
^ RTRuleTransformerPresenter iconName
27+
^ RTCodeTransformerPresenter iconName
2828
]
2929

3030
{ #category : #executing }
3131
OpenRTApplierCommand >> execute [
3232

33-
^ RTRuleTransformerPresenter open
33+
^ RTCodeTransformerPresenter open
3434
]

‎src/RewriteRuleTools/OpenRTBasicEditorCommand.class.st

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Class {
99
#category : #'RewriteRuleTools-Commands'
1010
}
1111

12+
{ #category : #default }
13+
OpenRTBasicEditorCommand class >> defaultDescription [
14+
15+
^ 'Open Rewrite Rule Editor'
16+
]
17+
1218
{ #category : #default }
1319
OpenRTBasicEditorCommand class >> defaultName [
1420

@@ -18,13 +24,13 @@ OpenRTBasicEditorCommand class >> defaultName [
1824
{ #category : #default }
1925
OpenRTBasicEditorCommand class >> iconName [
2026

21-
^RTBasicEditorPresenter iconName
27+
^RTRuleEditorPresenter iconName
2228
]
2329

2430
{ #category : #executing }
2531
OpenRTBasicEditorCommand >> execute [
2632

27-
^ RTBasicEditorPresenter new
33+
^ RTRuleEditorPresenter new
2834
lhs: self context lhs;
2935
rhs: self context rhs;
3036
openWithSpec

‎src/RewriteRuleTools/OpenRTExpressionFinderCommand.class.st

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Class {
99
#category : #'RewriteRuleTools-Commands'
1010
}
1111

12+
{ #category : #default }
13+
OpenRTExpressionFinderCommand class >> defaultDescription [
14+
15+
^ 'Find ocurrences of an expression in all Pharo''s code'
16+
]
17+
1218
{ #category : #default }
1319
OpenRTExpressionFinderCommand class >> defaultName [
1420

‎src/RewriteRuleTools/OpenRTHelpBrowserCommand.class.st

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Class {
99
#category : #'RewriteRuleTools-Commands'
1010
}
1111

12+
{ #category : #default }
13+
OpenRTHelpBrowserCommand class >> defaultDescription [
14+
15+
^ 'Help browser'
16+
]
17+
1218
{ #category : #default }
1319
OpenRTHelpBrowserCommand class >> defaultName [
1420

@@ -24,5 +30,5 @@ OpenRTHelpBrowserCommand class >> iconName [
2430
{ #category : #executing }
2531
OpenRTHelpBrowserCommand >> execute [
2632

27-
^ RTRulesHelpPresenter open
33+
^ RTHelpBrowserPresenter open
2834
]

‎src/RewriteRuleTools/OpenRTRuleLoaderCommand.class.st

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Class {
99
#category : #'RewriteRuleTools-Commands'
1010
}
1111

12+
{ #category : #default }
13+
OpenRTRuleLoaderCommand class >> defaultDescription [
14+
15+
^ 'Load a stored Rewrite Rule'
16+
]
17+
1218
{ #category : #default }
1319
OpenRTRuleLoaderCommand class >> defaultName [
1420

‎src/RewriteRuleTools/RTApplication.class.st

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
"
2+
I am an application to use in all RT tool to define costum styles.
3+
"
4+
Class {
5+
#name : #RTApplication,
6+
#superclass : #SpApplication,
7+
#classVars : [
8+
'Current'
9+
],
10+
#category : #'RewriteRuleTools-Application'
11+
}
12+
13+
{ #category : #accessing }
14+
RTApplication class >> current [
15+
16+
^ Current ifNil: [ Current := self new ]
17+
]
18+
19+
{ #category : #running }
20+
RTApplication >> start [
21+
22+
(self newPresenter: RTRuleEditorPresenter) openWithSpec
23+
]
24+
25+
{ #category : #running }
26+
RTApplication >> startExpressionFinder [
27+
28+
^ (self newPresenter: RTExpressionFinderPresenter) openWithSpec
29+
]
30+
31+
{ #category : #running }
32+
RTApplication >> startHelpBrowser [
33+
34+
^ (self newPresenter: RTHelpBrowserPresenter) openWithSpec
35+
]
36+
37+
{ #category : #running }
38+
RTApplication >> startMatchTool [
39+
40+
^ (self newPresenter: MatchToolPresenter) openWithSpec
41+
]
42+
43+
{ #category : #running }
44+
RTApplication >> startRuleBuilder [
45+
46+
^ (self newPresenter: RewriteRuleBuilderPresenter) openWithSpec
47+
]
48+
49+
{ #category : #running }
50+
RTApplication >> startRuleEditor [
51+
52+
^ (self newPresenter: RTRuleEditorPresenter) openWithSpec
53+
]
54+
55+
{ #category : #running }
56+
RTApplication >> startRuleLoader [
57+
58+
^ (self newPresenter: RTRuleLoaderPresenter) openWithSpec
59+
]
60+
61+
{ #category : #running }
62+
RTApplication >> startTransformer [
63+
64+
^ (self newPresenter: RTCodeTransformerPresenter) openWithSpec
65+
]
66+
67+
{ #category : #styling }
68+
RTApplication >> styleSheet [
69+
70+
^ SpStyle defaultStyleSheet,
71+
(SpStyleVariableSTONReader fromString:
72+
'.application [
73+
74+
.container [ Container { #padding: 4, #borderWidth: 2 } ],
75+
.bgOpaque [ Draw { #backgroundColor: EnvironmentColor(#base) } ],
76+
.bgBlue [ Draw { #backgroundColor: #blue } ],
77+
.boldFont [ Font { #bold: true } ],
78+
.textFont [ Font { #name: EnvironmentFont(#default) } ],
79+
.bigFontSize [ Font { #size: 20 } ],
80+
.buttonStyle [ Geometry { #width: 130 } ]
81+
]')
82+
]

‎src/RewriteRuleTools/RTCheatSheetPresenter.class.st

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,19 @@ RTCheatSheetPresenter >> initializeLayout [
3737
{ #category : #initialization }
3838
RTCheatSheetPresenter >> initializePresenters [
3939

40-
textPresenter := self newText
40+
textPresenter := self newText.
41+
textPresenter
4142
text: self helpText;
4243
beNotEditable.
44+
4345
helpButton := self instantiate: (OpenRTHelpBrowserCommand asSpecButtonForContext: self).
46+
47+
self initializeStyles.
4448
self initializeLayout
45-
"cheatSheet color: self theme baseColor"
49+
]
50+
51+
{ #category : #initialization }
52+
RTCheatSheetPresenter >> initializeStyles [
53+
54+
textPresenter addStyle: 'bgOpaque'.
4655
]

0 commit comments

Comments
 (0)