Merge branch 'master' of http://github.com/JMRI/JMRI into testcreation

JMRI · Apr 19, 2018 · 8df1557 · 8df1557
2 parents d96f94f + 510d5ff
commit 8df1557
Show file tree

Hide file tree

Showing 107 changed files with 5,313 additions and 1,414 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ before_script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$HEADLESS" == "false" ]]; then dbus-launch ; fi
 
 script:
-  travis_wait 50 ./scripts/travis.sh
+  travis_wait 40 ./scripts/travis.sh
 
 cache:
   directories:
@@ -45,7 +45,7 @@ sudo: required
 env:
   global:
   # false to silence most maven output; true to catch tests that do not complete
-  - PRINT_SUMMARY=true
+  - PRINT_SUMMARY=false
   - MAVEN_OPTS=-Xmx1536m
   # see http://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#runOrder for valid values
   - RUN_ORDER=filesystem

diff --git a/help/en/JavaHelpSearch/DOCS b/help/en/JavaHelpSearch/DOCS
diff --git a/help/en/JavaHelpSearch/DOCS.TAB b/help/en/JavaHelpSearch/DOCS.TAB
diff --git a/help/en/JavaHelpSearch/OFFSETS b/help/en/JavaHelpSearch/OFFSETS
diff --git a/help/en/JavaHelpSearch/POSITIONS b/help/en/JavaHelpSearch/POSITIONS
diff --git a/help/en/JavaHelpSearch/SCHEMA b/help/en/JavaHelpSearch/SCHEMA
@@ -1,2 +1,2 @@
 JavaSearch 1.0
-TMAP bs=2048 rt=73 fl=-1 id1=15618 id2=1
+TMAP bs=2048 rt=79 fl=-1 id1=15682 id2=1
diff --git a/help/en/JavaHelpSearch/TMAP b/help/en/JavaHelpSearch/TMAP
diff --git a/java/src/jmri/CatalogTreeManager.java b/java/src/jmri/CatalogTreeManager.java
@@ -84,6 +84,11 @@ public interface CatalogTreeManager extends Manager<CatalogTree> {
      */
     public CatalogTree newCatalogTree(String systemName, String userName);
 
+    public void storeImageIndex();
+
+    public boolean isIndexChanged();
+
+    public void indexChanged(boolean changed);
     /**
      * Get a list of all CatalogTree objects' system names.
      *