[WIP]: magritte-metamodel#2 - Reduce Duplication with Magritte

seandenigris · Jul 15, 2018 · 7cf42a6 · 7cf42a6
1 parent ce9dca1
commit 7cf42a6
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 56 deletions.
diff --git a/...-Magritte-Core.package/TBSListCompositionComponent.class/instance/editorAvailableStyle.st b/...-Magritte-Core.package/TBSListCompositionComponent.class/instance/editorAvailableStyle.st
@@ -0,0 +1,3 @@
+as yet unclassified
+editorAvailableStyle
+	^ 'span3'
diff --git a/...ritte-Core.package/TBSListCompositionComponent.class/instance/renderEditorAvailableOn..st b/...ritte-Core.package/TBSListCompositionComponent.class/instance/renderEditorAvailableOn..st
diff --git a/...trap-Magritte-Core.package/TBSMagritteCheckboxComponent.class/instance/renderEditorOn..st b/...trap-Magritte-Core.package/TBSMagritteCheckboxComponent.class/instance/renderEditorOn..st
@@ -2,10 +2,4 @@ rendering
 renderEditorOn: html
 	html div
 		class: 'checkbox';
-		with: [
-			html label: [ 
-				html checkbox
-					id: self labelId;
-					disabled: self isReadonly;
-					on: #value of: self.
-				html space; render: self magritteDescription checkboxLabel ] ]
+		with: [ super renderEditorOn: html ]
diff --git a/...ritte-Core.package/TBSMagritteDisabledTextInputComponent.class/instance/renderInputOn..st b/...ritte-Core.package/TBSMagritteDisabledTextInputComponent.class/instance/renderInputOn..st
@@ -2,16 +2,9 @@ rendering
 renderInputOn: html
 	| textInput |
 	textInput := html textInput.
-	description placeholder notNil ifTrue: [ 
-		textInput placeholder: description placeholder ].
-
-	description cssClasses isEmpty ifFalse: [
-		textInput class: (String streamContents: [:stream |
-			description cssClasses 
-				do: [:cls | stream nextPutAll: cls] 
-				separatedBy: [stream nextPut: Character space]])].
-
+	description placeholder ifNotNil: [ :ph | textInput placeholder: ph ].
+	description cssClasses do: [ :cls | textInput class: cls ].
 	textInput
 		id: self labelId;
 		disabled;
-		on: #string of: self. 
+		on: #string of: self
diff --git a/src/Bootstrap-Magritte-Core.package/TBSMagritteFormRenderer.class/instance/classFor..st b/src/Bootstrap-Magritte-Core.package/TBSMagritteFormRenderer.class/instance/classFor..st
diff --git a/src/Bootstrap-Magritte-Core.package/TBSMagritteFormRenderer.class/instance/htmlErrorClass.st b/src/Bootstrap-Magritte-Core.package/TBSMagritteFormRenderer.class/instance/htmlErrorClass.st
@@ -0,0 +1,3 @@
+private
+htmlErrorClass
+	^ 'has-error'
diff --git a/src/Bootstrap-Magritte-Core.package/TBSMagritteFormRenderer.class/instance/renderControl..st b/src/Bootstrap-Magritte-Core.package/TBSMagritteFormRenderer.class/instance/renderControl..st
diff --git a/...otstrap-Magritte-Core.package/TBSMagritteOneToManyComponent.class/instance/buildReport.st b/...otstrap-Magritte-Core.package/TBSMagritteOneToManyComponent.class/instance/buildReport.st
diff --git a/...otstrap-Magritte-Core.package/TBSMagritteOneToManyComponent.class/instance/reportClass.st b/...otstrap-Magritte-Core.package/TBSMagritteOneToManyComponent.class/instance/reportClass.st
@@ -0,0 +1,4 @@
+private
+reportClass
+
+	^ TBSMagritteReport
diff --git a/...ap-Magritte-Core.package/TBSMagritteRadioGroupComponent.class/instance/renderEditorOn..st b/...ap-Magritte-Core.package/TBSMagritteRadioGroupComponent.class/instance/renderEditorOn..st
diff --git a/...Magritte-Core.package/TBSMagritteRadioGroupComponent.class/instance/renderSeparatorOn..st b/...Magritte-Core.package/TBSMagritteRadioGroupComponent.class/instance/renderSeparatorOn..st
@@ -0,0 +1,2 @@
+rendering
+renderSeparatorOn: html