--- a/tools/JavaSettingsApplication.st Wed Jan 16 13:37:32 2013 +0000
+++ b/tools/JavaSettingsApplication.st Wed Jan 16 13:47:01 2013 +0000
@@ -2,49 +2,12 @@
AbstractSettingsApplication subclass:#JavaSettingsApplication
instanceVariableNames:'javaReleaseHolder javaReleaseList javaHomeHolder
- javaReleaseIsCustomHolder javaClassPathHolder
- javaSourceDirectoriesHolder infoPanel'
+ javaReleaseIsCustomHolder infoPanel'
classVariableNames:''
poolDictionaries:''
category:'Languages-Java-Tools'
!
-ApplicationModel subclass:#PathEditor
- instanceVariableNames:'selectionHolder pathListEffectiveHolder pathListHolder pathList
- treeList treeView treeListItemForUserDefined'
- classVariableNames:''
- poolDictionaries:''
- privateIn:JavaSettingsApplication
-!
-
-SimpleDialog subclass:#PathElementEditor
- instanceVariableNames:'nameHolder pathHolder enabledHolder'
- classVariableNames:''
- poolDictionaries:''
- privateIn:JavaSettingsApplication::PathEditor
-!
-
-HierarchicalList subclass:#PathElementList
- instanceVariableNames:'userItem userCategory'
- classVariableNames:''
- poolDictionaries:''
- privateIn:JavaSettingsApplication::PathEditor
-!
-
-HierarchicalItem subclass:#Category
- instanceVariableNames:'origin label'
- classVariableNames:''
- poolDictionaries:''
- privateIn:JavaSettingsApplication::PathEditor::PathElementList
-!
-
-HierarchicalItem subclass:#Item
- instanceVariableNames:'element x'
- classVariableNames:''
- poolDictionaries:''
- privateIn:JavaSettingsApplication::PathEditor::PathElementList
-!
-
!JavaSettingsApplication class methodsFor:'initialization'!
@@ -492,46 +455,6 @@
)
! !
-!JavaSettingsApplication methodsFor:'accessing-private'!
-
-javaClassPathEffective
- | rel |
-
- rel := self javaReleaseHolder value.
- ^rel isNil ifTrue:[
- #()
- ] ifFalse:[
- Java effectiveClassPathForRelease: rel
- ]
-
- "Created: / 30-07-2012 / 19:39:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaClassPathLiteralArray
- ^self javaClassPathHolder value asOrderedCollection literalArrayEncoding
-
- "Created: / 02-08-2012 / 10:04:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaSourceDirectoriesEffective
- | rel |
-
- rel := self javaReleaseHolder value.
- ^rel isNil ifTrue:[
- #()
- ] ifFalse:[
- Java effectiveSourceDirectoriesForRelease: rel
- ]
-
- "Created: / 30-07-2012 / 19:39:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaSourcePathLiteralArray
- ^self javaSourceDirectoriesHolder value asOrderedCollection literalArrayEncoding
-
- "Created: / 02-08-2012 / 10:04:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
!JavaSettingsApplication methodsFor:'actions'!
doBrowseJavaHome
@@ -558,43 +481,6 @@
"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-javaClassPathEffectiveAspect
- "return/create the 'javaClassPathHolder' value holder (automatically generated)"
-
- ^BlockValue with: [:rel | self javaClassPathEffective] argument: self javaReleaseHolder
-
- "Created: / 30-07-2012 / 19:38:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaClassPathHolder
- "return/create the 'javaClassPathHolder' value holder (automatically generated)"
-
- javaClassPathHolder isNil ifTrue:[
- javaClassPathHolder := ValueHolder new.
- javaClassPathHolder addDependent:self.
- ].
- ^ javaClassPathHolder
-!
-
-javaClassPathHolder:something
- "set the 'javaClassPathHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- javaClassPathHolder notNil ifTrue:[
- oldValue := javaClassPathHolder value.
- javaClassPathHolder removeDependent:self.
- ].
- javaClassPathHolder := something.
- javaClassPathHolder notNil ifTrue:[
- javaClassPathHolder addDependent:self.
- ].
- newValue := javaClassPathHolder value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:javaClassPathHolder.
- ].
-!
-
javaHomeHolder
<resource: #uiAspect>
@@ -643,53 +529,6 @@
^ javaReleaseList.
"Modified: / 27-07-2012 / 00:13:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaSourceDirectoriesEffectiveAspect
- "return/create the 'javaClassPathHolder' value holder (automatically generated)"
-
- ^BlockValue with: [:rel | self javaSourceDirectoriesEffective] argument: self javaReleaseHolder
-
- "Created: / 30-07-2012 / 19:39:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-javaSourceDirectoriesHolder
- "return/create the 'javaSourceDirectoriesHolder' value holder (automatically generated)"
-
- javaSourceDirectoriesHolder isNil ifTrue:[
- javaSourceDirectoriesHolder := ValueHolder new.
- javaSourceDirectoriesHolder addDependent:self.
- ].
- ^ javaSourceDirectoriesHolder
-!
-
-javaSourceDirectoriesHolder:something
- "set the 'javaSourceDirectoriesHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- javaSourceDirectoriesHolder notNil ifTrue:[
- oldValue := javaSourceDirectoriesHolder value.
- javaSourceDirectoriesHolder removeDependent:self.
- ].
- javaSourceDirectoriesHolder := something.
- javaSourceDirectoriesHolder notNil ifTrue:[
- javaSourceDirectoriesHolder addDependent:self.
- ].
- newValue := javaSourceDirectoriesHolder value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:javaSourceDirectoriesHolder.
- ].
-! !
-
-!JavaSettingsApplication methodsFor:'change & update'!
-
-updatePaths
-
- self javaClassPathHolder value: (currentUserPrefs javaClassPathDecoded) asList.
- self javaSourceDirectoriesHolder value: (currentUserPrefs javaSourcePathDecoded) asList.
-
- "Created: / 27-07-2012 / 18:34:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaSettingsApplication methodsFor:'protocol'!
@@ -703,9 +542,8 @@
].
self javaReleaseHolder value: rel.
- self updatePaths.
- "Modified: / 27-07-2012 / 18:47:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-01-2013 / 13:45:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
basicSaveSettings
@@ -714,10 +552,8 @@
] ifFalse:[
currentUserPrefs javaReleaseSelector: nil.
].
- currentUserPrefs javaClassPath: self javaClassPathLiteralArray.
- currentUserPrefs javaSourcePath: self javaSourcePathLiteralArray.
- "Modified: / 02-08-2012 / 10:05:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-01-2013 / 13:45:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
helpFilename
@@ -753,1039 +589,12 @@
prefRel ~~ setRel ifTrue:[ ^ true ].
- (self
- hasUnsavedChangesInUserEntriesInPath: self javaClassPathHolder value
- comparedTo: currentUserPrefs javaClassPathDecoded)
- ifTrue:[ ^true ].
-
- (self
- hasUnsavedChangesInUserEntriesInPath: self javaSourceDirectoriesHolder value
- comparedTo: currentUserPrefs javaSourcePathDecoded)
- ifTrue:[ ^true ].
-
^false
- "Modified: / 10-08-2012 / 16:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-hasUnsavedChangesInUserEntriesInPath: currentPath comparedTo: originalPath
-
- currentPath size ~~ originalPath size ifTrue:[ ^ true ].
-
- currentPath with: originalPath do:[:current :original|
- current ~= original ifTrue:[ ^ true ]
- ].
- ^false
-
- "Created: / 30-07-2012 / 18:40:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor class methodsFor:'interface specs'!
-
-windowSpec
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "
- UIPainter new openOnClass:JavaSettingsApplication::PathEditor andSelector:#windowSpec
- JavaSettingsApplication::PathEditor new openInterface:#windowSpec
- JavaSettingsApplication::PathEditor open
- "
-
- <resource: #canvas>
-
- ^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'NewApplication'
- name: 'NewApplication'
- bounds: (Rectangle 0 0 300 300)
- )
- component:
- (SpecCollection
- collection: (
- (HierarchicalListViewSpec
- name: 'PathList'
- layout: (LayoutFrame 0 0 0 0 -82 1 0 1)
- model: selectionHolder
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- listModel: treeList
- useIndex: false
- highlightMode: line
- useDefaultIcons: false
- postBuildCallback: postBuildTreeView:
- )
- (VerticalPanelViewSpec
- name: 'Buttons1'
- layout: (LayoutFrame -80 1 0 0 0 1 -22 1)
- horizontalLayout: fit
- verticalLayout: top
- horizontalSpace: 5
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'Add...'
- name: 'ButtonAdd'
- activeHelpKey: addPathElement
- translateLabel: true
- model: actionAdd
- extent: (Point 80 22)
- )
- (ActionButtonSpec
- label: 'Edit...'
- name: 'ButtonEdit'
- activeHelpKey: editPathElement
- translateLabel: true
- model: actionEdit
- enableChannel: canEditHolder
- extent: (Point 80 22)
- )
- (ActionButtonSpec
- label: 'Move Up'
- name: 'ButtonModeUp'
- activeHelpKey: modePathElementUp
- translateLabel: true
- model: actionMoveUp
- enableChannel: canMoveUpHolder
- extent: (Point 80 22)
- )
- (ActionButtonSpec
- label: 'Move Down'
- name: 'ButtonModeDown'
- activeHelpKey: modePathElementDown
- translateLabel: true
- model: actionMoveDown
- enableChannel: canMoveDownHolder
- extent: (Point 80 22)
- )
- (LabelSpec
- name: 'SpacingLabel'
- translateLabel: true
- extent: (Point 80 22)
- )
- (ActionButtonSpec
- label: 'Remove'
- name: 'ButtonRemove'
- activeHelpKey: removePathElement
- translateLabel: true
- model: actionRemove
- enableChannel: canEditHolder
- extent: (Point 80 22)
- )
- )
-
- )
- )
- )
-
- )
- )
-! !
-
-!JavaSettingsApplication::PathEditor class methodsFor:'plugIn spec'!
-
-aspectSelectors
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this. If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "Return a description of exported aspects;
- these can be connected to aspects of an embedding application
- (if this app is embedded in a subCanvas)."
-
- ^ #(
- #pathListEffectiveHolder
- #pathListHolder
- #selectionHolder
- ).
-
-! !
-
-!JavaSettingsApplication::PathEditor methodsFor:'actions'!
-
-actionAdd
-
- | dlg |
- dlg := PathElementEditor new.
- dlg enabled: true.
- dlg open ifTrue:[
- | el |
-
- el := JavaPathElement newFromUser: dlg path.
- el name: dlg name.
- el enabled: dlg enabled.
- self pathList add: el.
- ]
-
- "Modified: / 10-08-2012 / 19:17:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-actionEdit
-
- | sel dlg |
- sel := self selectionHolder value.
- sel origin ~~ JavaPathElement originUser ifTrue:[ ^ self ].
- dlg := PathElementEditor new.
- dlg name: sel element name.
- dlg path: sel element pathName.
- dlg enabled: sel element enabled.
- dlg open ifTrue:[
- sel element name: dlg name.
- sel element pathName: dlg path.
- sel element enabled: dlg enabled.
- self updateModifiedChannel.
- treeView invalidate.
- ]
-
- "Modified: / 13-08-2012 / 22:52:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-actionMoveDown
- | sel |
- sel := self selectionHolder value.
- sel origin ~~ JavaPathElement originUser ifTrue:[ ^ self ].
- self treeList moveDown: sel.
- self selectionHolder value: sel.
-
- "Modified: / 10-08-2012 / 17:11:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-actionMoveUp
- | sel |
- sel := self selectionHolder value.
- sel origin ~~ JavaPathElement originUser ifTrue:[ ^ self ].
- self treeList moveUp: sel.
- self selectionHolder value: sel.
-
- "Modified: / 10-08-2012 / 17:11:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-actionRemove
- | sel |
- sel := self selectionHolder value.
- self selectionHolder value: nil.
- sel isNil ifTrue:[ ^ self ].
- self path remove: sel element.
-
- "Modified: / 02-08-2012 / 09:58:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor methodsFor:'aspects'!
-
-path
- ^self pathList value
-
- "Created: / 30-07-2012 / 18:35:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-pathList
- "return/create the 'pathList' value holder (automatically generated)"
-
- pathList isNil ifTrue:[
- pathList := ValueHolder new.
- pathList addDependent:self.
- ].
- ^ pathList
-!
-
-pathList:something
- "set the 'pathList' value holder (automatically generated)"
-
- |oldValue newValue|
-
- self assert: (something isNil or:[something isList]).
-
- pathList notNil ifTrue:[
- oldValue := pathList value.
- pathList removeDependent:self.
- ].
- pathList := something.
- pathList notNil ifTrue:[
- pathList addDependent:self.
- ].
- newValue := pathList value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:pathList.
- ].
-
- "Modified: / 30-07-2012 / 18:39:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-pathListEffectiveHolder
- "return/create the 'pathListEffectiveHolder' value holder (automatically generated)"
-
- pathListEffectiveHolder isNil ifTrue:[
- pathListEffectiveHolder := ValueHolder new.
- pathListEffectiveHolder addDependent:self.
- ].
- ^ pathListEffectiveHolder
-!
-
-pathListEffectiveHolder:something
- "set the 'pathListEffectiveHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- pathListEffectiveHolder notNil ifTrue:[
- oldValue := pathListEffectiveHolder value.
- pathListEffectiveHolder removeDependent:self.
- ].
- pathListEffectiveHolder := something.
- pathListEffectiveHolder notNil ifTrue:[
- pathListEffectiveHolder addDependent:self.
- ].
- newValue := pathListEffectiveHolder value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:pathListEffectiveHolder.
- ].
-!
-
-pathListHolder
- "return/create the 'pathListHolder' value holder (automatically generated)"
-
- pathListHolder isNil ifTrue:[
- pathListHolder := ValueHolder new.
- pathListHolder addDependent:self.
- ].
- ^ pathListHolder
-!
-
-pathListHolder:something
- "set the 'pathListHolder' value holder (automatically generated)"
-
- |oldValue newValue|
-
- pathListHolder notNil ifTrue:[
- oldValue := pathListHolder value.
- pathListHolder removeDependent:self.
- ].
- pathListHolder := something.
- pathListHolder notNil ifTrue:[
- pathListHolder addDependent:self.
- ].
- newValue := pathListHolder value.
- oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:pathListHolder.
- ].
-!
-
-selectionHolder
- "return/create the 'selectionHolder' value holder (automatically generated)"
-
- selectionHolder isNil ifTrue:[
- selectionHolder := ValueHolder new.
- ].
- ^ selectionHolder
-!
-
-selectionHolder:something
- "set the 'selectionHolder' value holder (automatically generated)"
-
- selectionHolder := something.
-!
-
-treeList
-
- treeList isNil ifTrue:[
- treeList := PathElementList new.
- treeList application: self.
- treeList showRoot: false.
- treeList buildTree
- ].
- ^treeList
-
- "Created: / 27-07-2012 / 18:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor methodsFor:'aspects-queries'!
-
-canEditHolder
-
- ^BlockValue
- with:[:sel|
- sel notNil
- and:[sel isPathElementItem
- and:[sel origin == JavaPathElement originUser]].
- ] argument: self selectionHolder
-
- "Created: / 02-08-2012 / 16:08:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-canMoveDownHolder
-
- ^BlockValue
- with:[:sel|
- sel notNil
- and:[sel isPathElementItem
- and:[sel origin == JavaPathElement originUser
- and:[sel parent children last ~~ sel]]]
- ] argument: self selectionHolder
-
- "Created: / 02-08-2012 / 16:12:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-canMoveUpHolder
-
- ^BlockValue
- with:[:sel|
- sel notNil
- and:[sel isPathElementItem
- and:[sel origin == JavaPathElement originUser
- and:[sel parent children first ~~ sel]]]
- ] argument: self selectionHolder
-
- "Created: / 02-08-2012 / 16:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor methodsFor:'change & update'!
-
-update:something with:aParameter from:changedObject
- "Invoked when an object that I depend upon sends a change notification."
-
- "stub code automatically generated - please change as required"
-
- changedObject == pathListHolder ifTrue:[
- self pathList: pathListHolder value.
- self treeList buildTree.
- ^self.
- ].
-
- changedObject == pathList ifTrue:[
- self updateModifiedChannel.
- something == #insert: ifTrue:[
- self treeList updateAfterInsertAt: aParameter.
- ^self.
- ].
- something == #removeFrom: ifTrue:[
- self treeList updateAfterRemoveFrom: aParameter first to: aParameter second.
- ^self.
- ].
- something == #value ifTrue:[
- self updateTree.
- ^self.
- ].
-
- something == #at: ifTrue:[
- ^self.
- ].
-
- self breakPoint: #jv.
- self updateTree.
- ^ self.
- ].
- super update:something with:aParameter from:changedObject
-
- "Modified: / 10-08-2012 / 17:11:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-updateModifiedChannel
- masterApplication notNil ifTrue:[
- masterApplication perform: #updateModifiedChannel ifNotUnderstood:[].
- ].
-
- "Created: / 30-07-2012 / 20:11:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-updateTree
- self treeList buildTree
-
- "Created: / 27-07-2012 / 18:16:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor methodsFor:'event processing'!
-
-buttonPress:button x:x y:y view:aView
-
- | itemIndex item |
-
- button ~= 1 ifTrue:[^aView buttonPress:button x:x y:y].
-
- itemIndex := aView yVisibleToLineNr:y.
- itemIndex isNil ifTrue:[^self].
- itemIndex == 0 ifTrue:[^self].
- itemIndex > aView list size ifTrue:[^self].
- item := aView list at: itemIndex.
- item isPathElementCategoryItem ifTrue:[
- ^aView buttonPress:button x:x y:y
- ].
- ((aView left + x) between: ((item x ? 0) - 16) and: (item x ? 0)) ifFalse:[
- ^aView buttonPress:button x:x y:y
- ].
-
- item origin ~~ JavaPathElement originRelease ifTrue:[
- item enabled: item enabled not.
- self updateModifiedChannel.
- aView invalidate
- ].
-
- "Created: / 08-12-2009 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 18-11-2011 / 14:55:41 / cg"
- "Modified: / 10-08-2012 / 16:43:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-handlesButtonPress:button inView:aView
-
- ^treeView scrolledView == aView
-
- "Created: / 08-12-2009 / 14:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor methodsFor:'hooks'!
-
-postBuildTreeView: aView
-
- treeView := aView.
- treeView scrolledView delegate: self.
-
- "Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementEditor class methodsFor:'help specs'!
-
-helpSpec
- "This resource specification was automatically generated
- by the UIHelpTool of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIHelpTool may not be able to read the specification."
-
- "
- UIHelpTool openOnClass:JavaSettingsApplication::PathEditor::PathElementEditor
- "
-
- <resource: #help>
-
- ^ super helpSpec addPairsFrom:#(
-
-#enabled
-'When unchecked, path element is ignored by the runtime system'
-
-#name
-'Human readable name displayed in user interface (defaults to filename)'
-
-#path
-'Path to directory or .jar or .zip file'
-
-)
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementEditor class methodsFor:'interface specs'!
-
-windowSpec
- "This resource specification was automatically generated
- by the UIPainter of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the UIPainter may not be able to read the specification."
-
- "
- UIPainter new openOnClass:JavaSettingsApplication::PathEditor::PathElementEditor andSelector:#windowSpec
- JavaSettingsApplication::PathEditor::PathElementEditor new openInterface:#windowSpec
- JavaSettingsApplication::PathEditor::PathElementEditor open
- "
-
- <resource: #canvas>
-
- ^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'Path Element'
- name: 'Path Element'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 558 123)
- )
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Content'
- layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Name:'
- name: 'Label15'
- layout: (LayoutFrame 9 0 9 0 70 0 31 0)
- activeHelpKey: packageMatchPattern
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'NameField'
- layout: (LayoutFrame 71 0 9 0 -9 1 31 0)
- activeHelpKey: name
- enableChannel: useManager
- model: nameHolder
- )
- (LabelSpec
- label: 'Path:'
- name: 'Label16'
- layout: (LayoutFrame 9 0 39 0 70 0 61 0)
- activeHelpKey: path
- translateLabel: true
- adjust: right
- )
- (FilenameInputFieldSpec
- name: 'FilenameEntryField1'
- layout: (LayoutFrame 71 0 39 0 -9 1 61 0)
- activeHelpKey: manager
- model: pathHolder
- )
- (CheckBoxSpec
- label: 'Enabled'
- name: 'CheckBox1'
- layout: (LayoutFrame 66 0 71 0 193 0 90 0)
- activeHelpKey: enabled
- model: enabledHolder
- translateLabel: true
- )
- )
-
- )
- )
- (HorizontalPanelViewSpec
- name: 'Buttons'
- layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
- horizontalLayout: fit
- verticalLayout: center
- horizontalSpace: 3
- verticalSpace: 3
- reverseOrderIfOKAtLeft: true
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'Cancel'
- name: 'Button2'
- translateLabel: true
- model: doCancel
- extent: (Point 277 22)
- )
- (ActionButtonSpec
- label: 'OK'
- name: 'Button1'
- translateLabel: true
- model: doAccept
- enableChannel: doAcceptEnabled
- extent: (Point 278 22)
- )
- )
-
- )
- )
- )
-
- )
- )
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementEditor methodsFor:'accessing'!
-
-enabled
- ^ self enabledHolder value
-
- "Created: / 10-08-2012 / 19:00:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-enabled: aBoolean
- self enabledHolder value: aBoolean
-
- "Created: / 10-08-2012 / 18:59:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-name
- ^self nameHolder value
-
- "Created: / 10-08-2012 / 19:00:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-name: aString
- self nameHolder value: aString
-
- "Created: / 10-08-2012 / 19:00:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-path
- ^self pathHolder value
-
- "Created: / 10-08-2012 / 18:59:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-path: path
- self pathHolder value: path
-
- "Created: / 10-08-2012 / 18:59:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementEditor methodsFor:'aspects'!
-
-doAcceptEnabled
- <resource: #uiAspect>
-
- |holder|
-
- (holder := builder bindingAt:#doAcceptEnabled) isNil ifTrue:[
- holder := BlockValue
- with: [:path | path value notEmptyOrNil ]
- argument: self pathHolder.
-
- builder aspectAt:#doAcceptEnabled put:holder.
- ].
- ^ holder.
-
- "Modified: / 10-08-2012 / 18:56:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-enabledHolder
- <resource: #uiAspect>
-
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- enabledHolder isNil ifTrue:[
- enabledHolder := true asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ enabledHolder addDependent:self.
-"/ enabledHolder onChangeSend:#enabledHolderChanged to:self.
- ].
- ^ enabledHolder.
-!
-
-nameHolder
- <resource: #uiAspect>
-
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- nameHolder isNil ifTrue:[
- nameHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ nameHolder addDependent:self.
-"/ nameHolder onChangeSend:#nameHolderChanged to:self.
- ].
- ^ nameHolder.
-!
-
-pathHolder
- <resource: #uiAspect>
-
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
-
- pathHolder isNil ifTrue:[
- pathHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/ pathHolder addDependent:self.
-"/ pathHolder onChangeSend:#pathHolderChanged to:self.
- ].
- ^ pathHolder.
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList methodsFor:'accessing'!
-
-allElements
- ^self application pathListEffectiveHolder value
-
- "Created: / 30-07-2012 / 19:42:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-userElements
- ^self application pathList
-
- "Created: / 30-07-2012 / 19:42:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList methodsFor:'actions'!
-
-moveDown: item
- | parent index tmp |
- parent := item parent.
- index := parent children indexOf: item.
- index >= parent children size ifTrue: [ ^ self ].
-
- tmp := parent children at: index + 1.
- parent children at: index + 1 put: (parent children at: index).
- parent children at: index put: tmp.
-
- tmp := self userElements at: index + 1.
- self userElements at: index + 1 put: (self userElements at: index).
- self userElements at: index put: tmp.
-
- parent childrenOrderChanged.
- self application selectionHolder changed: #value
-
- "Created: / 10-08-2012 / 17:15:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-moveUp: item
- | parent index tmp |
- parent := item parent.
- index := parent children indexOf: item.
- index < 1 ifTrue: [ ^ self ].
-
- tmp := parent children at: index - 1.
- parent children at: index - 1 put: (parent children at: index).
- parent children at: index put: tmp.
-
- tmp := self userElements at: index - 1.
- self userElements at: index - 1 put: (self userElements at: index).
- self userElements at: index put: tmp.
-
- parent childrenOrderChanged.
- self application selectionHolder changed: #value
-
- "Created: / 10-08-2012 / 17:05:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList methodsFor:'building'!
-
-buildTree
- | rt |
-
- rt := Category new
- addIfNotNil: (self buildCategory: JavaPathElement originRelease);
- addIfNotNil: (self buildCategory: JavaPathElement originPackage);
- addIfNotNil: (self buildCategory: JavaPathElement originEnvironment);
- addIfNotNil: (userCategory := self buildCategory: JavaPathElement originUser);
- yourself.
- userCategory expand.
- self root: rt.
-
- "Created: / 30-07-2012 / 19:00:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList methodsFor:'building-private'!
-
-buildCategory: origin
- | cat elements |
-
- elements := self elementsForOrigin: origin.
- (elements isEmptyOrNil and:[origin ~~ JavaPathElement originUser]) ifTrue:[ ^ nil ].
- cat := Category new origin: origin.
- cat children: (elements collect:[:e| (self buildElement: e) parent: cat]).
- ^cat
-
- "Created: / 27-07-2012 / 18:26:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-buildElement: element
- ^Item new element: element.
-
- "Created: / 27-07-2012 / 18:46:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-elementsForOrigin: origin
- ^origin == JavaPathElement originUser ifTrue:[
- self userElements
- ] ifFalse:[
- self allElements select:[:e|e origin = origin]
- ].
-
- "Created: / 30-07-2012 / 19:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList methodsFor:'change & update'!
-
-updateAfterInsertAt: index
- | el item |
-
- el := self userElements at: index.
- self assert: el origin = JavaPathElement originUser.
- userCategory add: (item := self buildElement: el) beforeIndex: index.
- item parent expand.
- self application selectionHolder value: item.
-
- "Created: / 30-07-2012 / 19:46:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-updateAfterRemoveFrom: start to: stop
-
- userCategory removeFromIndex:start toIndex: stop
-
- "Created: / 02-08-2012 / 09:56:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList::Category methodsFor:'accessing'!
-
-element
- ^nil
-
- "Created: / 30-07-2012 / 19:15:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-label
- label isNil ifTrue:[
- label := self originAsHumanReadableString asText allBold.
- origin ~~ JavaPathElement originUser ifTrue:[
- label colorizeAllWith: Color gray
- ].
- ].
- ^label
-
- "Created: / 27-07-2012 / 18:21:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-origin
- ^ origin
-!
-
-origin:originId
- origin := originId.
-!
-
-originAsHumanReadableString
- origin isNil ifTrue:[^self application resources string: 'Path'].
- origin == JavaPathElement originRelease ifTrue:[^self application resources string: 'Java Runtime'].
- origin == JavaPathElement originEnvironment ifTrue:[^self application resources string: 'System Environment'].
- origin == JavaPathElement originPackage ifTrue:[^self application resources string: 'Package Defined'].
- origin == JavaPathElement originUser ifTrue:[^self application resources string: 'User Defined'].
- self error:'Invalid origin'
-
- "Created: / 27-07-2012 / 18:39:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList::Category methodsFor:'adding & removing'!
-
-addIfNotNil: childOrNil
- childOrNil notNil ifTrue:[self add: childOrNil]
-
- "Created: / 27-07-2012 / 18:51:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList::Category methodsFor:'testing'!
-
-isPathElementCategoryItem
- ^true
-
- "Created: / 30-07-2012 / 14:28:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-isPathElementItem
- ^false
-
- "Created: / 30-07-2012 / 14:28:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList::Item methodsFor:'accessing'!
-
-element
- ^ element
-!
-
-element:something
- element := something.
-!
-
-enabled
- ^element enabled
-
- "Created: / 30-07-2012 / 14:26:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-enabled: aBoolean
- element enabled: aBoolean
-
- "Created: / 30-07-2012 / 14:26:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-icon
- ^element enabled ifTrue:[
- MenuPanel iconIndicationOn
- ] ifFalse:[
- MenuPanel iconIndicationOff
- ].
-
- "Created: / 30-07-2012 / 14:11:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-label
- | label |
- label := element name asText.
- self origin ~~ JavaPathElement originUser ifTrue:[
- label colorizeAllWith: Color gray
- ].
- ^label
-
- "Created: / 27-07-2012 / 18:42:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-origin
- ^element origin
-
- "Created: / 27-07-2012 / 18:41:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-x
- ^ x
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList::Item methodsFor:'displaying'!
-
-__displayLabel:aLabel h:lH on:aGC x:newX y:y h:h
-
- | l w |
-
- l := self label.
- x := newX.
- [
- w := l widthOn: aGC.
- w > (aGC width - x)
- ] whileTrue:[
- l := '...' , (l copyFrom: 9).
- ].
-
- super displayLabel:l h:h on:aGC x:newX y:y h:h.
-
- "Created: / 30-07-2012 / 14:18:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-displayLabel:aLabel h:lH on:aGC x:newX y:y h:h
- x := newX.
- super displayLabel:aLabel h:lH on:aGC x:newX y:y h:h.
-
- "Created: / 30-07-2012 / 14:23:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!JavaSettingsApplication::PathEditor::PathElementList::Item methodsFor:'testing'!
-
-isPathElementCategoryItem
- ^false
-
- "Created: / 30-07-2012 / 14:28:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-isPathElementItem
- ^true
-
- "Created: / 30-07-2012 / 14:28:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-01-2013 / 13:44:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaSettingsApplication class methodsFor:'documentation'!
--- a/tools/Make.proto Wed Jan 16 13:37:32 2013 +0000
+++ b/tools/Make.proto Wed Jan 16 13:47:01 2013 +0000
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/squeak/petitparser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/squeak/petitparser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool
# if you need any additional defines for embedded C code,
@@ -164,8 +164,7 @@
$(OUTDIR)JavaParser_Eclipse.$(O) JavaParser_Eclipse.$(H): JavaParser_Eclipse.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaScannerBase.$(O) JavaScannerBase.$(H): JavaScannerBase.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaSetInspectorView.$(O) JavaSetInspectorView.$(H): JavaSetInspectorView.st $(INCLUDE_TOP)/stx/libtool/SetInspectorView.$(H) $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSettingsApplication.$(O) JavaSettingsApplication.$(H): JavaSettingsApplication.st $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
-$(OUTDIR)JavaSourcePartitionerTests.$(O) JavaSourcePartitionerTests.$(H): JavaSourcePartitionerTests.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPAbstractParseTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)JavaSettingsApplication.$(O) JavaSettingsApplication.$(H): JavaSettingsApplication.st $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaSourceReference.$(O) JavaSourceReference.$(H): JavaSourceReference.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)stx_libjava_tools.$(O) stx_libjava_tools.$(H): stx_libjava_tools.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaCommentNode.$(O) JavaCommentNode.$(H): JavaCommentNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -186,7 +185,7 @@
$(OUTDIR)JavaLongTypeNode.$(O) JavaLongTypeNode.$(H): JavaLongTypeNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaVoidTypeNode.$(O) JavaVoidTypeNode.$(H): JavaVoidTypeNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libjava/JavaClass.$(H) $(INCLUDE_TOP)/stx/libjava/JavaBehavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/tools/Make.spec Wed Jan 16 13:37:32 2013 +0000
+++ b/tools/Make.spec Wed Jan 16 13:47:01 2013 +0000
@@ -80,7 +80,6 @@
JavaSyntaxHighlighter \
JavaSettingsApplication \
JavaSourceReference \
- JavaSourcePartitionerTests \
@@ -116,7 +115,6 @@
$(OUTDIR)JavaSyntaxHighlighter.$(O) \
$(OUTDIR)JavaSettingsApplication.$(O) \
$(OUTDIR)JavaSourceReference.$(O) \
- $(OUTDIR)JavaSourcePartitionerTests.$(O) \
$(OUTDIR)extensions.$(O) \
--- a/tools/bc.mak Wed Jan 16 13:37:32 2013 +0000
+++ b/tools/bc.mak Wed Jan 16 13:47:01 2013 +0000
@@ -34,7 +34,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\squeak\petitparser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\squeak\petitparser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -89,8 +89,7 @@
$(OUTDIR)JavaParser_Eclipse.$(O) JavaParser_Eclipse.$(H): JavaParser_Eclipse.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaScannerBase.$(O) JavaScannerBase.$(H): JavaScannerBase.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaSetInspectorView.$(O) JavaSetInspectorView.$(H): JavaSetInspectorView.st $(INCLUDE_TOP)\stx\libtool\SetInspectorView.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSettingsApplication.$(O) JavaSettingsApplication.$(H): JavaSettingsApplication.st $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
-$(OUTDIR)JavaSourcePartitionerTests.$(O) JavaSourcePartitionerTests.$(H): JavaSourcePartitionerTests.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPAbstractParseTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)JavaSettingsApplication.$(O) JavaSettingsApplication.$(H): JavaSettingsApplication.st $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaSourceReference.$(O) JavaSourceReference.$(H): JavaSourceReference.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)stx_libjava_tools.$(O) stx_libjava_tools.$(H): stx_libjava_tools.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaCommentNode.$(O) JavaCommentNode.$(H): JavaCommentNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -111,7 +110,7 @@
$(OUTDIR)JavaLongTypeNode.$(O) JavaLongTypeNode.$(H): JavaLongTypeNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaVoidTypeNode.$(O) JavaVoidTypeNode.$(H): JavaVoidTypeNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libjava\JavaClass.$(H) $(INCLUDE_TOP)\stx\libjava\JavaBehavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaObject.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/tools/libInit.cc Wed Jan 16 13:37:32 2013 +0000
+++ b/tools/libInit.cc Wed Jan 16 13:47:01 2013 +0000
@@ -36,7 +36,6 @@
_JavaScannerBase_Init(pass,__pRT__,snd);
_JavaSetInspectorView_Init(pass,__pRT__,snd);
_JavaSettingsApplication_Init(pass,__pRT__,snd);
-_JavaSourcePartitionerTests_Init(pass,__pRT__,snd);
_JavaSourceReference_Init(pass,__pRT__,snd);
_stx_137libjava_137tools_Init(pass,__pRT__,snd);
_JavaCommentNode_Init(pass,__pRT__,snd);
--- a/tools/tools.rc Wed Jan 16 13:37:32 2013 +0000
+++ b/tools/tools.rc Wed Jan 16 13:47:01 2013 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Tue, 15 Jan 2013 18:05:00 GMT\0"
+ VALUE "ProductDate", "Wed, 16 Jan 2013 13:45:44 GMT\0"
END
END