Tools__ChangeSetBrowser2.st
branchjv
changeset 12681 adbbcc25326f
parent 12680 4e2f5b0d4cb2
child 12805 7d5a56d8c41f
--- a/Tools__ChangeSetBrowser2.st	Tue Apr 16 10:22:43 2013 +0200
+++ b/Tools__ChangeSetBrowser2.st	Tue Apr 16 16:11:00 2013 +0200
@@ -29,14 +29,14 @@
 
 ToolApplicationModel subclass:#ChangeSetBrowser2
 	instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile
-                navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
-                selection1Holder list2 list2Holder selection2Holder classHolder
-                languageHolder codeAspectHolder showRemovedAspect showSameAspect
-                showTimestampHolder sourceView changeSourceHolder
-                imageSourceHolder targetPackage targetNamespace allowRemoveHolder
-                allowAcceptHolder infoPanel updateChangeFileHolder
-                showFilterHolder showingRegularChangesetHolder isWorkingHolder
-                isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect'
+		navigatorChangesetHolder navigatorSpecHolder list1 list1Holder
+		selection1Holder list2 list2Holder selection2Holder classHolder
+		languageHolder codeAspectHolder showRemovedAspect showSameAspect
+		showTimestampHolder sourceView changeSourceHolder
+		imageSourceHolder targetPackage targetNamespace allowRemoveHolder
+		allowAcceptHolder infoPanel updateChangeFileHolder
+		showFilterHolder showingRegularChangesetHolder isWorkingHolder
+		isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect'
 	classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages'
 	poolDictionaries:''
 	category:'Interface-Browsers-ChangeSet'
@@ -80,7 +80,6 @@
 "
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'instance creation'!
 
 on: aStringOrChangeSet
@@ -128,7 +127,6 @@
     "Created: / 17-05-2012 / 23:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'accessing'!
 
 showRemoved
@@ -141,7 +139,6 @@
     ShowRemoved := aBoolean
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'help specs'!
 
 flyByHelpSpec
@@ -365,7 +362,6 @@
     "Modified: / 01-08-2012 / 18:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'image specs'!
 
 applyFromLastSnapshotIcon
@@ -636,7 +632,6 @@
 @P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself]
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'interface opening'!
 
 confirmChanges: aChangeSet
@@ -741,7 +736,6 @@
     "Modified: / 26-07-2012 / 13:19:30 / cg"
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'interface specs'!
 
 hierarchicalNavigatorSpec
@@ -905,10 +899,11 @@
                (SubChannelInfoSpec
                   subAspect: showTimestampHolder
                   aspect: showTimestampHolder
+                )
                (SubChannelInfoSpec
                   subAspect: showConflictsOnlyHolder
                   aspect: showConflictsOnlyAspect
-                )
+
                 )
               )
               createNewApplication: true
@@ -919,6 +914,8 @@
 
         )
       )
+
+    "Modified: / 16-04-2013 / 16:10:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 twoColumnNavigatorSpec
@@ -1243,7 +1240,6 @@
     "Modified: / 16-03-2012 / 13:09:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'menu specs'!
 
 changeMenu
@@ -1793,7 +1789,6 @@
       )
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'plugIn spec'!
 
 aspectSelectors
@@ -1813,7 +1808,6 @@
 
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'accessing'!
 
 allowAccept: aBoolean
@@ -1931,7 +1925,6 @@
     "Created: / 26-10-2010 / 23:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'accessing - defaults'!
 
 defaultTitle
@@ -1940,7 +1933,6 @@
     "Modified: / 08-04-2011 / 10:10:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'accessing - menus'!
 
 list1MenuHolder
@@ -1969,7 +1961,6 @@
     "Modified (format): / 05-09-2011 / 16:07:34 / cg"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'actions'!
 
 accept: source
@@ -1991,7 +1982,6 @@
     "Modified: / 19-07-2011 / 19:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'aspects'!
 
 allowAcceptHolder
@@ -2439,10 +2429,7 @@
 
     "Created: / 07-09-2011 / 15:54:03 / cg"
     "Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
- !
-
+! !
 
 !ChangeSetBrowser2 methodsFor:'aspects-queries'!
 
@@ -2482,7 +2469,6 @@
     "Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'change & update'!
 
 changesetChanged
@@ -2582,7 +2568,6 @@
     "Created: / 24-10-2009 / 19:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'initialization'!
 
 list1View: aSubApplicationView
@@ -2601,7 +2586,6 @@
     "Modified: / 10-09-2012 / 14:22:50 / cg"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'menu actions'!
 
 doApply
@@ -2977,7 +2961,6 @@
     "Created: / 07-09-2011 / 12:47:15 / cg"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'menu actions - changes'!
 
 changeMenuApply: changeList
@@ -3392,7 +3375,6 @@
     "Created: / 23-07-2012 / 13:13:11 / cg"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'!
 
 changeMenuApplyChange: aChange
@@ -3480,7 +3462,6 @@
     "Modified: / 21-01-2013 / 17:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'private'!
 
 changesDo:aBlock
@@ -3604,7 +3585,6 @@
     "Created: / 07-09-2011 / 20:12:04 / cg"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'queries'!
 
 canApplyChanges
@@ -3643,7 +3623,6 @@
     "Created: / 04-08-2011 / 18:25:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 methodsFor:'testing'!
 
 isHierarchical
@@ -3670,7 +3649,6 @@
     "Created: / 30-03-2012 / 11:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2::ChangeEditor class methodsFor:'documentation'!
 
 documentation
@@ -3707,7 +3685,6 @@
 "
 ! !
 
-
 !ChangeSetBrowser2::ChangeEditor class methodsFor:'interface specs'!
 
 windowSpec
@@ -3791,7 +3768,6 @@
     "Modified: / 16-03-2012 / 13:08:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2::ChangeEditor methodsFor:'accessing'!
 
 sourceChangeHolder
@@ -3810,7 +3786,6 @@
     sourceImageHolder := something.
 ! !
 
-
 !ChangeSetBrowser2::ChangeEditor methodsFor:'aspects'!
 
 changeHolder
@@ -3921,7 +3896,6 @@
     showdiffHolder := something.
 ! !
 
-
 !ChangeSetBrowser2::ChangeEditor methodsFor:'change & update'!
 
 changeChanged
@@ -3951,7 +3925,6 @@
     "Modified: / 29-11-2011 / 11:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version