Skip to content

Commit

Permalink
Merge pull request #23 from JMRI/master
Browse files Browse the repository at this point in the history 
2019-09-03
  • Loading branch information
@mmosher5501
mmosher5501 committed Sep 3, 2019
2 parents 68a8eba + 13ce6bf commit 43457fb
Show file tree
Hide file tree
Showing 3,435 changed files with 54,591 additions and 37,472 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
41 changes: 22 additions & 19 deletions .classpath
View file
Expand Up @@ -53,6 +53,7 @@
<classpathentry kind="lib" path="lib/jhall.jar"/>
<classpathentry kind="lib" path="lib/jhidrawplugin.jar"/>
<classpathentry kind="lib" path="lib/jinput.jar"/>
<classpathentry kind="lib" path="lib/jinputvalidator-0.6.0.jar"/>
<classpathentry kind="lib" path="lib/joal.jar"/>
<classpathentry kind="lib" path="lib/jsr305.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
Expand Down Expand Up @@ -92,10 +93,7 @@
<classpathentry kind="lib" path="lib/websocket-common-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/websocket-server-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/websocket-servlet-9.4.7.v20170914.jar"/>
<classpathentry kind="lib" path="lib/pi4j-core.jar"/>
<classpathentry kind="lib" path="lib/pi4j-device.jar"/>
<classpathentry kind="lib" path="lib/pi4j-gpio-extension.jar"/>
<classpathentry kind="lib" path="lib/pi4j-service.jar"/>
<classpathentry kind="lib" path="lib/pi4j-core-1.2.jar"/>
<classpathentry kind="lib" path="lib/beansbinding-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/mockito-core-2.13.0.jar"/>
Expand All @@ -116,47 +114,52 @@
<classpathentry kind="lib" path="lib/usb-api-1.0.2.jar"/>
<classpathentry kind="lib" path="lib/usb4java-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/usb4java-javax-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/org-openide-util-lookup-RELEASE82.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/cucumber-core-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-java-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-java8-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-junit-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/org-openide-util-lookup-RELEASE110.jar"/>
<classpathentry kind="lib" path="lib/cucumber-core-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-java-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-java8-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-junit-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-html-0.2.7.jar"/>
<classpathentry kind="lib" path="lib/cucumber-jvm-deps-1.0.6.jar"/>
<classpathentry kind="lib" path="lib/cucumber-picocontainer-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/gherkin-4.1.3.jar"/>
<classpathentry kind="lib" path="lib/cucumber-picocontainer-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/cucumber-expressions-6.2.2.jar"/>
<classpathentry kind="lib" path="lib/gherkin-5.1.0.jar"/>
<classpathentry kind="lib" path="lib/gherkin-jvm-deps-1.0.4.jar"/>
<classpathentry kind="lib" path="lib/picocontainer-2.15.jar"/>
<classpathentry kind="lib" path="lib/tag-expressions-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/tag-expressions-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/typetools-0.5.0.jar"/>
<classpathentry kind="lib" path="lib/datatable-1.1.12.jar"/>
<classpathentry kind="lib" path="lib/datatable-dependencies-1.1.12.jar"/>
<classpathentry kind="lib" path="lib/webdrivermanager-3.4.0.jar"/>
<classpathentry kind="lib" path="lib/jarchivelib-1.0.0.jar"/>
<classpathentry kind="lib" path="lib/mqtt-client-0.4.0.jar"/>
<classpathentry kind="lib" path="lib/jsplitbutton-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/thumbnailator-0.4.8.jar"/>
<classpathentry kind="lib" path="lib/assertj-core-3.12.0.jar"/>
<classpathentry kind="src" path=".apt_generated">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path=".apt_generated_tests">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
Expand Down
32 changes: 32 additions & 0 deletions .codeclimate.yml
View file
@@ -0,0 +1,32 @@
version: "2" # CodeClimate API version is a string, not a number
checks:
argument-count:
config:
threshold: 4 # CodeClimate default
complex-logic:
config:
threshold: 4 # CodeClimate default
file-lines:
config:
threshold: 250 # CodeClimate default
method-complexity:
config:
threshold: 5 # CodeClimate default
method-count:
config:
threshold: 20 # CodeClimate default
method-lines:
config:
threshold: 25 # CodeClimate default
nested-control-flow:
config:
threshold: 4 # CodeClimate default
return-statements:
config:
threshold: 4 # CodeClimate default
similar-code:
config:
threshold: # language-specific defaults. an override will affect all languages.
identical-code:
config:
threshold: # language-specific defaults. an override will affect all languages.
5 changes: 3 additions & 2 deletions .factorypath
View file
Expand Up @@ -68,7 +68,7 @@
<factorypathentry kind="VARJAR" id="M2_REPO/net/java/jinput/jinput-platform/2.0.6/jinput-platform-2.0.6-natives-osx.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/apple/AppleJavaExtensions/1.5/AppleJavaExtensions-1.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/net/sourceforge/javacsv/javacsv/2.0/javacsv-2.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/openlcb/openlcb/0.7.25/openlcb-0.7.25.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/openlcb/openlcb/0.7.26/openlcb-0.7.26.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/net/java/linoleum/jlfgr/1_0/jlfgr-1_0.jar" enabled="true" runInBatchMode="false"/>
Expand All @@ -87,10 +87,11 @@
<factorypathentry kind="VARJAR" id="M2_REPO/com/github/spotbugs/spotbugs-annotations/3.1.7/spotbugs-annotations-3.1.7.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/digi/xbee/xbee-java-library/1.2.1/xbee-java-library-1.2.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/github/purejavacomm/purejavacomm/1.0.1.RELEASE/purejavacomm-1.0.1.RELEASE.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/netbeans/api/org-openide-util-lookup/RELEASE82/org-openide-util-lookup-RELEASE82.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/netbeans/api/org-openide-util-lookup/RELEASE110/org-openide-util-lookup-RELEASE110.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/hid4java/hid4java/0.5.0/hid4java-0.5.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/networknt/json-schema-validator/1.0.10/json-schema-validator-1.0.10.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/paho/mqtt-client/0.4.0/mqtt-client-0.4.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/alexandriasoftware/swing/jsplitbutton/1.3.1/jsplitbutton-1.3.1.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/alexandriasoftware/swing/jinputvalidator/0.6.0/jinputvalidator-0.6.0.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/net/coobird/thumbnailator/0.4.8/thumbnailator-0.4.8.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -46,6 +46,7 @@ nohup.out

# private / per-user configuration files
/nbproject/private
/nbproject/nbjdk.properties
/web/app/nbproject/private
/scripts/config-portable/nbproject/private
/.idea/workspace.xml
Expand All @@ -55,6 +56,7 @@ local.properties
*.original~
.metadata
RemoteSystemsTempFiles
.idea/libraries/**

# user-installed components
/web/TrainCrew
Expand Down
11 changes: 8 additions & 3 deletions .idea/JMRI.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 43457fb

Please sign in to comment.