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.

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

LayoutEditor: Draw tracks as tracks! #4433

Merged
merged 469 commits into from Dec 5, 2017

Conversation

Projects
@geowar1
Contributor

geowar1 commented Nov 19, 2017

No description provided.

@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Nov 19, 2017

The conflicts here are resolved in #4430, and should go away when that is merged.

@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Nov 23, 2017

Complilation errors, starting with:

[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] /home/travis/build/JMRI/JMRI/java/src/jmri/jmrit/display/layoutEditor/LayoutTrackDrawingOptionsDialog.java:[1048,22] <identifier> expected
[ERROR] /home/travis/build/JMRI/JMRI/java/src/jmri/jmrit/display/layoutEditor/LayoutTrackDrawingOptionsDialog.java:[1048,21] not a statement
[ERROR] /home/travis/build/JMRI/JMRI/java/src/jmri/jmrit/display/layoutEditor/LayoutTrackDrawingOptionsDialog.java:[1052,5] illegal start of expression
[ERROR] /home/travis/build/JMRI/JMRI/java/src/jmri/jmrit/display/layoutEditor/LayoutTrackDrawingOptionsDialog.java:[1052,18] ';' expected
[ERROR] /home/travis/build/JMRI/JMRI/java/src/jmri/jmrit/display/layoutEditor/LayoutTrackDrawingOptionsDialog.java:[1053,5] illegal start of 

rhwood and others added some commits Nov 24, 2017

Merge pull request #4454 from JMRI/revert-4442-UsbBrowserPanel-PreExp…
…and-UsbHub-UsbTreeNodes

Revert "UsbBrowserPanel:PreExpand UsbHub UsbTreeNodes"
Merge pull request #4453 from geowar1/master
Remove duplicate "InstanceManager.setLightManager(lightManager);"
Group USB Utility classes together.
Also use consistent capitolization.
Prevent construction and add real test
Also stop NetBeans IDE from showing errors on unknown imports in test classes.
Return null if product name not on device
This allows consumers to fall back on using the .toString() method of the USB device if it does not embed a product name, or there is an exception getting the product name.
Make all hubs immediately exandable
Including hubs at root level and hubs that have nothing connected.
Add JColorChooser code to button actions
Change applyButtonActionPerformed to copy options before applying them.
Add topology image
Taken from Patternfly (https://patternfly.org) font and rendered as PNG by self. Source license is Apache v2.0 (https://github.com/patternfly/patternfly/blob/master/LICENSE.txt).
Add USB image
Taken from Font Awesome 4.7 (http://fontawesome.io) font and rendered as PNG by self. Source license is SIL OFL 1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL).
Refinements to USB Browser
- All roots in tree have expansion handles if there are chldren.
- Additional information for USB device.
- Copying USB device information possible.
- Non-generic icons used for nodes.
Merge pull request #4459 from bobjacobsen/bobj-start-loconet
Add script to start LocoNet logging
@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Nov 25, 2017

Travis graphical restarted after failing with:

[INFO] Running jmri.jmrix.dccpp.dccppovertcp.ServerFrameTest
ERROR - Proceeding to initialize class jmri.jmrix.dccpp.dccppovertcp.Server while already in initialization [main] jmri.InstanceManager.?()
java.lang.Exception: Thread "main"
	at jmri.InstanceManager.getNullableDefault(InstanceManager.java:233)
	at jmri.InstanceManager.getDefault(InstanceManager.java:188)
	at jmri.jmrix.dccpp.dccppovertcp.Server.getInstance(Server.java:60)
	at jmri.jmrix.dccpp.dccppovertcp.ServerFrameTest.setUp(ServerFrameTest.java:30)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
	at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:365)
	at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:272)
	at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:236)
	at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:159)
	at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:386)
	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:323)
	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:143)
ERROR -     Prior initialization: [main] jmri.InstanceManager.?()
java.lang.Exception: Thread ClientRxHandler:127.0.0.1
	at jmri.InstanceManager.setInitializationState(InstanceManager.java:898)
	at jmri.InstanceManager.getNullableDefault(InstanceManager.java:231)
	at jmri.InstanceManager.getDefault(InstanceManager.java:188)
	at jmri.jmrix.dccpp.dccppovertcp.ClientRxHandler.run(ClientRxHandler.java:142)
[ERROR] Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.085 s <<< FAILURE! - in jmri.jmrix.dccpp.dccppovertcp.ServerFrameTest
[ERROR] getInstanceTest(jmri.jmrix.dccpp.dccppovertcp.ServerFrameTest)  Time elapsed: 0.084 s  <<< FAILURE!
java.lang.AssertionError: Unexpected ERROR or FATAL messages emitted
	at org.junit.Assert.fail(Assert.java:88)
	at org.junit.Assert.assertTrue(Assert.java:41)
	at org.junit.Assert.assertFalse(Assert.java:64)
	at apps.tests.Log4JFixture.tearDown(Log4JFixture.java:38)
	at jmri.util.JUnitUtil.tearDown(JUnitUtil.java:118)
	at jmri.jmrix.dccpp.dccppovertcp.ServerFrameTest.tearDown(ServerFrameTest.java:35)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
	at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:365)
	at org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:272)
	at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:236)
	at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:159)
	at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:386)
	at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:323)
	at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:143)

[INFO] Running jmri.jmrix.dccpp.dccppovertcp.configurexml.ConnectionConfigXmlTest

@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Nov 25, 2017

AppVeyor failed while checking for duplicate keys:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-antrun-plugin:1.8:run (test) on project jmri: An Ant BuildException has occured: The following error occurred while executing this line:
[ERROR] C:\projects\jmri\build.xml:2356: The following error occurred while executing this line:
[ERROR] C:\projects\jmri\build.xml:1125: duplicate key check: key MainlineToolTip defined more than once (650:This column is for mainline options) (C:\projects\jmri\java\src\jmri\jmrit\display\layoutEditor\LayoutEditorBundle.properties:67:Select whether track segment is part of a mainline, or is a side track. + 650:This column is for mainline options)
[ERROR] around Ant part ...<ant antfile="C:\projects\jmri/build.xml">... @ 4:45 in C:\projects\jmri\target\antrun\build-main.xml

rhwood and others added some commits Dec 3, 2017

Address instead of suppress FindBugs warnings
- Address FindBugs warnings about relying on the results of a method call being consistent.
- Override a single method to return an instance of the desired class instead of suppressing multiple warnings about unchecked casts.
Merge pull request #4499 from silverailscolo/eb-catalog-i18n
Panel/Catalog Preview background
Merge pull request #4486 from devel-bobm/dbm-LnBdOpsModeProgramming
LocoNet BdOpsMode programming improvements
Merge pull request #4504 from bobjacobsen/bobj-dbm-LnBdOpsModeProgram…
…ming

Tests for Digitrax board programming
Merge pull request #4501 from rhwood/table-prefs
Refinements to table preferences handling
@geowar1

This comment has been minimized.

Contributor

geowar1 commented Dec 4, 2017

This is DONE! (and can be assigned and merged when(/if?) checks pass!!!

@geowar1 geowar1 changed the title from WIP: LayoutEditor: Draw tracks as tracks! to LayoutEditor: Draw tracks as tracks! Dec 4, 2017

@bobjacobsen

This comment has been minimized.

Member

bobjacobsen commented Dec 5, 2017

Test complete, so this merges to LayoutEditor-development branch. Download files for user-level testing should be built at http://jmri.tagadab.com/jenkins/job/TestReleases/job/LayoutEditor%20development/ in an hour or two.

@bobjacobsen bobjacobsen merged commit 890f57c into JMRI:LayoutEditor-development Dec 5, 2017

4 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.9%) to 39.717%
Details

@geowar1 geowar1 deleted the geowar1:WIP-LayoutEditor-Draw-tracks-as-tracks! branch Dec 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment