--- a/ProjectProblem.st Wed Mar 27 20:36:57 2013 +0100
+++ b/ProjectProblem.st Wed Mar 27 20:51:41 2013 +0100
@@ -477,7 +477,7 @@
"/ ^class
"/ the above is exactly:
- ^ Smalltalk classNamed:className
+ ^ Smalltalk classNamed:className
"Created: / 26-07-2012 / 10:21:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -488,9 +488,9 @@
"Return a (HTML) describing the problem."
^
-'Class %2 is listed in project definition (%1) before its superclass.
+'Class %2 is listed in project definition (%1) before its superclass.
<br>Such a class will fail to compile (if the package is being stc-compiled)
-and load (if the package is being loaded from source).
+and load (if the package is being loaded from source).
<br>Make sure class (%3) is listed before (%2).
'
@@ -558,7 +558,7 @@
class is listed only once.
'
bindWith: (self linkToClass: className)
- with: (self linkToClass: self packageDefinitionClass class selector: #extensionMethodNames)
+ with: (self linkToClass: self packageDefinitionClass class selector: #extensionMethodNames)
"Modified: / 13-09-2012 / 17:40:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -641,9 +641,9 @@
"Return a (HTML) describing the problem."
^
-'Class %2 is listed in project definition (%1) before one of its pools (%3).
-<br>Such class will fail to compile (if the package is being stc-compiled)
-and load (if the package is being loaded from source).
+'Class %2 is listed in project definition (%1) before one of its pools (%3).
+<br>Such class will fail to compile (if the package is being stc-compiled)
+and load (if the package is being loaded from source).
<br>Make sure class (%3) is listed before (%2).
'
@@ -688,10 +688,10 @@
^
'A class %1 uses pool %2 but it does not exist.
-The pool should be removed from the class definition;
+The pool should be removed from the class definition;
otherwise the package won''t compile due to a missing class.'
bindWith: (self linkToClass: className)
- with: (self linkToClass: poolName)
+ with: (self linkToClass: poolName)
"Modified: / 23-02-2012 / 13:48:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -716,7 +716,7 @@
Due to a bug in stc, such code will fail to compile. A pool definition
must contain a fully qualified class name including namespace.'
bindWith: (self linkToClass: className)
- with: (self linkToClass: poolName)
+ with: (self linkToClass: poolName)
"Modified: / 13-09-2012 / 16:32:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -737,7 +737,7 @@
^
'A class %1 uses pool %2 but it does not exist.
-The pool should be removed from the class definition;
+The pool should be removed from the class definition;
otherwise the package won''t compile due to a missing class.'
bindWith: (self linkToClass: className) with: poolName
@@ -800,10 +800,10 @@
description
"Return a (HTML) describing the problem."
-^'Method %1 is not listed in %2.
+^'Method %1 is not listed in %2.
<br>It should either be listed in the project definition, or moved to the owning classes package'
bindWith: (self linkToMethod)
- with: (self linkToClass: self packageDefinitionClass class selector: #extensionMethodNames)
+ with: (self linkToClass: self packageDefinitionClass class selector: #extensionMethodNames)
"Modified: / 23-02-2012 / 14:34:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -819,7 +819,7 @@
!ProjectProblem::ExtensionMethodNotListed methodsFor:'fixing'!
doMoveToClassesPackage
- "move the extension method to the owning classes package.
+ "move the extension method to the owning classes package.
Return false if fix fails, true otherwise"
| cls mthd |
@@ -833,7 +833,7 @@
!
doUpdateExtensionMethodsInProject
- "update the extension method info in the project definition.
+ "update the extension method info in the project definition.
Return false if fix fails, true otherwise"
| def cls |
@@ -849,8 +849,8 @@
fixes
^Array
- with: (Array with: 'Update project definition' with: [ self doUpdateExtensionMethodsInProject ])
- with: (Array with: 'Move to classes package' with: [ self doMoveToClassesPackage ])
+ with: (Array with: 'Update project definition' with: [ self doUpdateExtensionMethodsInProject ])
+ with: (Array with: 'Move to classes package' with: [ self doMoveToClassesPackage ])
! !
!ProjectProblem::MethodCompilabilityIssue methodsFor:'accessing'!
@@ -861,27 +861,27 @@
| issuePrinter |
issuePrinter := [:stream :issue|
- stream nextPutAll:'<li>'.
- issue descriptionOn: stream.
- stream nextPutAll:'</li>'.
- stream cr.
+ stream nextPutAll:'<li>'.
+ issue descriptionOn: stream.
+ stream nextPutAll:'</li>'.
+ stream cr.
].
^ String streamContents:[:s|
- s
- nextPutAll: 'The following problems have been found in ';
- nextPutAll: self linkToMethod;
- nextPutAll: ':'; cr;
- nextPutAll: '<ul>'.
- errors ? #() do:[:issue|issuePrinter value: s value: issue].
- warnings ? #() do:[:issue|issuePrinter value: s value: issue].
- s
- nextPutAll: '</ul>'.
+ s
+ nextPutAll: 'The following problems have been found in ';
+ nextPutAll: self linkToMethod;
+ nextPutAll: ':'; cr;
+ nextPutAll: '<ul>'.
+ errors ? #() do:[:issue|issuePrinter value: s value: issue].
+ warnings ? #() do:[:issue|issuePrinter value: s value: issue].
+ s
+ nextPutAll: '</ul>'.
- errors notNil ifTrue:[
- s nextPutAll:
+ errors notNil ifTrue:[
+ s nextPutAll:
'STC won''t compile such code, therefore you must fix it before committing'
- ].
+ ].
]
"Modified: / 11-04-2012 / 15:51:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -944,8 +944,8 @@
"Argh!!!!!!!! If its an ignorable error, why signal error!!!!!! Bad design,
even worse workaround. Sigh."
- thisContext sender sender sender sender selector == #ignorableParseError:
- ifTrue:[ ^ self ].
+ thisContext sender sender sender sender selector == #ignorableParseError:
+ ifTrue:[ ^ self ].
errors isNil ifTrue:[ errors := OrderedCollection new].
errors add: (Error message: aMessage from: position to: endPos)
@@ -1083,7 +1083,7 @@
are not committed and will be lost when you restart/recompile.
Method should be moved to some package, %2 maybe?'
bindWith: (self linkToMethod)
- with: package
+ with: package
"Modified: / 23-02-2012 / 14:21:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -1120,13 +1120,13 @@
description
"Return a (HTML) describing the problem."
-^'Method %1>>%2 listed in %3 but does not exist.
+^'Method %1>>%2 listed in %3 but does not exist.
This does not hurt if you stc-compile all your code, but such a package will fail to
(auto)load from sources.
It is highly recommended to remove the method from the list (%3).'
bindWith: className with: selector
- with: (self linkToClass: self packageDefinitionClass class selector: #extensionMethodNames)
+ with: (self linkToClass: self packageDefinitionClass class selector: #extensionMethodNames)
"Modified: / 23-02-2012 / 15:18:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -1153,7 +1153,7 @@
<BR>It is recommended to leave ST/X, restore the old source or compile a system
based on the current source, restart ST/X, reapply the chages and commit then.'
bindWith: (self linkToMethod)
- with: package
+ with: package
"Modified: / 11-04-2012 / 12:47:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -1184,7 +1184,7 @@
and/or source code management settings.
'
bindWith: (self linkToMethod)
- with: package
+ with: package
"Modified: / 11-04-2012 / 12:44:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -1211,8 +1211,8 @@
"Return a (HTML) describing the problem."
package = 'stx' ifTrue:[
- ^
-'Move your code to another package.
+ ^
+'Move your code to another package.
<br>The package named "stx" is reserveed for exept''s ST/X development.'
].
@@ -1244,9 +1244,9 @@
doCreateAs:whatType
ProjectDefinition
- definitionClassForPackage:package
- projectType: whatType
- createIfAbsent:true.
+ definitionClassForPackage:package
+ projectType: whatType
+ createIfAbsent:true.
!
doCreateAsGUIApplication
@@ -1264,24 +1264,22 @@
fixes
package = 'stx' ifTrue:[ ^ #() ].
- ^ {
- { 'Create as Library' . [ self doCreateAsLibrary ] }.
- { 'Create as GUI Application' . [ self doCreateAsGUIApplication ] }.
- { 'Create as non-GUI Application' . [ self doCreateAsNonGUIApplication ] }.
- }
+ ^ Array
+ with: (Array with:'Create as Library' with:[ self doCreateAsLibrary ] )
+ with: (Array with:'Create as GUI Application' with:[ self doCreateAsGUIApplication ] )
+ with: (Array with:'Create as non-GUI Application' with:[ self doCreateAsNonGUIApplication ] )
! !
!ProjectProblem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.9 2013-03-27 19:30:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.10 2013-03-27 19:51:41 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.9 2013-03-27 19:30:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.10 2013-03-27 19:51:41 cg Exp $'
!
version_SVN
^ '§Id: ProjectProblem.st 1962 2012-09-10 10:34:08Z vranyj1 §'
! !
-