Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LayoutEditor: findbug fixes #4430

Merged
merged 97 commits into from
Nov 20, 2017
Merged

LayoutEditor: findbug fixes #4430

merged 97 commits into from
Nov 20, 2017

Conversation

geowar1
Copy link
Contributor

@geowar1 geowar1 commented Nov 18, 2017

No description provided.

pabender and others added 30 commits October 4, 2017 11:41
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
fbcd956
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
58d5fca
@pabender
start of code to transition consist manager registration to new insta…
6bdb476 
…nce manager format.
@pabender
more work updating consist manager registration
5e5e5fd
@pabender
more work towards updated registration of consist managers
31c6a0b
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
db69d0f
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
4c1d564
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
a7f7574
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
f700a1d
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
b2e507a
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
4e103df
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
70da0a7
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
991c1cf
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
c632ab9
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
4745494
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
80df2d4
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
385cfca
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
be3bb81
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
2bbb3d0
@pabender
:Merge branch 'master' of http://github.com/JMRI/JMRI
6b38ced
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
9a97f56
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
88fa3bf
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
19e8269
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
a5e7f18
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
0c66057
@silverailscolo
Merge remote-tracking branch 'JMRI/master'
78d2b05
@silverailscolo
Merge remote-tracking branch 'JMRI/master'
566ea70
@pabender
Merge branch 'master' of https://github.com/JMRI/JMRI
c7bb9ac
@pabender
The ecos doesn't support a raw CommandStation, so don't implement the…
12e81a4 
… jmri.CommandStation interface.
@pabender
call super for provides/get
0ef3ea3
pabender and others added 17 commits November 16, 2017 20:52
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
eeaf366
@pabender
test setup required by changes to superclass.
1569027
@pabender
test initialization
1483801
@pabender
class should extend NmraConsistManager, since the created consists ar…
1772b59 
…e derived from NmraConsist.
@pabender
remove extra "implements" (because the class these are derived from i…
aa7c296 
…mplements the interface)
@pabender
make a method that should be static static; deprecate duplicate insta…
3193984 
…nce of the same method in another class.
@pabender
Merge branch 'master' of http://github.com/JMRI/JMRI
d7594a8
@pabender
Merge branch 'master' of https://github.com/pabender/JMRI
fa6c074
@pabender
add InternalConsistManager and a test for the internal consist manager.
90608d0
@pabender
duplicate tests with only an OpsMode Programmer installed
73ba31c
@pabender
extend AbstractConsistManager instead of one of the generic consist m…
b27200a 
…anagers to avoid initialization issues.
@pabender
proper test setup
828ee5d
@pabender
update consist tool documentation
69dcb7b
@pabender
Merge pull request JMRI#4410 from pabender/master
0856ef5 
Create generic consist managers associated with each system.
@geowar1
Findbug fixes; log.info => log.debug
885bb17
@geowar1
Merge branch 'master' into LayoutEditor-Findbug-fixes
c6dcd79
@geowar1
Merge branch 'master' into LayoutEditor-Findbug-fixes
96c83ac
@bobjacobsen bobjacobsen changed the base branch from master to LayoutEditor-development November 19, 2017 01:49
@bobjacobsen
Copy link
Member

Moved to referenced LayoutEditor-development branch and CI restarted.

@bobjacobsen bobjacobsen mentioned this pull request Nov 19, 2017
Merged
@bobjacobsen
Copy link
Member

Travis graphical passed, but headless failed and was restarted:

[ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.011 s <<< FAILURE! - in jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableActionTest
[ERROR] testCTor(jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableActionTest)  Time elapsed: 0.011 s  <<< ERROR!
java.awt.HeadlessException
	at java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:204)
	at java.awt.Window.<init>(Window.java:536)
	at java.awt.Frame.<init>(Frame.java:420)
	at java.awt.Frame.<init>(Frame.java:385)
	at javax.swing.JFrame.<init>(JFrame.java:189)
	at jmri.util.JmriJFrame.<init>(JmriJFrame.java:83)
	at jmri.util.JmriJFrame.<init>(JmriJFrame.java:124)
	at jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableAction.<init>(LayoutBlockRouteTableAction.java:37)
	at jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableActionTest.testCTor(LayoutBlockRouteTableActionTest.java:19)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)

@bobjacobsen
Copy link
Member

Same error on Travis headless as above. Looks like there's a test running in headless mode that attempts to open a window.

[ERROR] testCTor(jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableActionTest)  Time elapsed: 0.014 s  <<< ERROR!
java.awt.HeadlessException
	at java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:204)
	at java.awt.Window.<init>(Window.java:536)
	at java.awt.Frame.<init>(Frame.java:420)
	at java.awt.Frame.<init>(Frame.java:385)
	at javax.swing.JFrame.<init>(JFrame.java:189)
	at jmri.util.JmriJFrame.<init>(JmriJFrame.java:83)
	at jmri.util.JmriJFrame.<init>(JmriJFrame.java:124)
	at jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableAction.<init>(LayoutBlockRouteTableAction.java:37)
	at jmri.jmrit.display.layoutEditor.blockRoutingTable.LayoutBlockRouteTableActionTest.testCTor(LayoutBlockRouteTableActionTest.java:19)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

@geowar1
Add "Assume headless" to LayoutBlockRouteTableActionTest
1b35f9d 
If this passes all checks please assign and merge…
@geowar1 geowar1 changed the title Layout editor findbug fixes LayoutEditor: findbug fixes Nov 20, 2017
@bobjacobsen bobjacobsen merged commit 18311d3 into JMRI:LayoutEditor-development Nov 20, 2017
@geowar1 geowar1 deleted the LayoutEditor-Findbug-fixes branch November 20, 2017 21:25
@bobjacobsen bobjacobsen mentioned this pull request Feb 22, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@geowar1 geowar1

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@geowar1 @bobjacobsen @pabender @silverailscolo @dheap