BrowserView.st
changeset 2485 2bff81d1febb
parent 2480 8b8af77f0e6c
child 2506 ed2a31e2ecd0
--- a/BrowserView.st	Tue Dec 14 14:58:42 1999 +0100
+++ b/BrowserView.st	Tue Dec 14 15:00:53 1999 +0100
@@ -12381,27 +12381,19 @@
                                 oldVsNew := ex parameter.
                                 oldPkg := oldVsNew key package.
                                 newPkg := oldVsNew value package.
+"/ cg: now always keep the old packageID
                                 answer := OptionBox 
                                               request: 
-('You are about to define a class from another (system-) package.
-The classes original packageID was ''%1''. 
-If you proceed with ''%3'', the new class will be marked as belonging
-to the ''%2'' package (and this warning will not be shown again).
-If you proceed with ''%4'', the class will be installed
-but the old packageID will be preserved.
-Otherwise, hit ''%5'' to leave the class unchanged.
-
-PS: you can disable these checks in the launchers settings-compilation dialog.' 
-                                                  bindWith:(oldPkg asText allBold) 
-                                                      with:(newPkg asText allBold)
-                                                      with:(resources string:'continue')
-                                                      with:(resources string:'keep')
-                                                      with:(resources string:'cancel'))
+('You are about to change the definition of a class from another (system-) package.
+The class is part of the ''%1'' package. 
+
+PS: you can disable this check in the launchers settings-compilation dialog.' 
+                                                  bindWith:(oldPkg asText allBold))
 
                                               label:'Class redefinition'
                                               form:(WarningBox iconBitmap)
-                                              buttonLabels:#('cancel' 'keep' 'continue')
-                                              values:#(#cancel #keep #continue)
+                                              buttonLabels:#('cancel' 'continue')
+                                              values:#(#cancel #keep)
                                               default:#keep.
 
                                 (answer ~~ #cancel) ifTrue:[
@@ -12429,7 +12421,7 @@
         ].
     ]
 
-    "Modified: / 17.6.1998 / 11:39:02 / cg"
+    "Modified: / 14.12.1999 / 15:01:43 / cg"
 !
 
 setAcceptActionForJavaClass
@@ -14066,6 +14058,6 @@
 !BrowserView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.578 1999-12-10 12:10:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.579 1999-12-14 14:00:53 cg Exp $'
 ! !
 BrowserView initialize!