equal
deleted
inserted
replaced
308 ] ifFalse:[ |
308 ] ifFalse:[ |
309 replacementClassName := Dialog |
309 replacementClassName := Dialog |
310 requestClassName:(resources |
310 requestClassName:(resources |
311 stringWithCRs:'Create dummy class for "%1"?\(will be created in Namespace "%2")' |
311 stringWithCRs:'Create dummy class for "%1"?\(will be created in Namespace "%2")' |
312 with:className with:(Class nameSpaceQuerySignal query ? Smalltalk) name) |
312 with:className with:(Class nameSpaceQuerySignal query ? Smalltalk) name) |
313 initialAnswer:suggestion. |
313 initialAnswer:(suggestion ? className). |
314 ]. |
314 ]. |
315 replacementClassName isEmptyOrNil ifTrue:[ AbortOperationRequest raise ]. |
315 replacementClassName isEmptyOrNil ifTrue:[ AbortOperationRequest raise ]. |
316 |
316 |
317 action == #create ifTrue:[ |
317 action == #create ifTrue:[ |
318 Object |
318 Object |
359 newMethod := class compile:source classified:methodCategory logged:true. |
359 newMethod := class compile:source classified:methodCategory logged:true. |
360 newMethod notNil ifTrue:[ |
360 newMethod notNil ifTrue:[ |
361 newMethod package: newPackage. |
361 newMethod package: newPackage. |
362 ]. |
362 ]. |
363 |
363 |
364 "Modified: / 07-09-2011 / 21:09:19 / cg" |
|
365 "Modified: / 29-03-2014 / 23:29:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
364 "Modified: / 29-03-2014 / 23:29:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
365 "Modified: / 18-06-2017 / 14:15:29 / cg" |
366 ! ! |
366 ! ! |
367 |
367 |
368 !MethodChange methodsFor:'comparing'! |
368 !MethodChange methodsFor:'comparing'! |
369 |
369 |
370 isConflict |
370 isConflict |