Examples: Export into binary, check for null when installing

kasemir · May 10, 2016 · 99581f5 · 99581f5
1 parent 18f05b7
commit 99581f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...csstudio.display.builder.examples/src/org/csstudio/display/builder/examples/Examples.java b/...csstudio.display.builder.examples/src/org/csstudio/display/builder/examples/Examples.java
@@ -8,6 +8,7 @@
 package org.csstudio.display.builder.examples;
 
 import java.net.URL;
+import java.util.Objects;
 
 import org.csstudio.display.builder.model.ModelPlugin;
 import org.csstudio.examples.SampleSet;
@@ -17,12 +18,13 @@
 /** Example support for installing the model's examples
  *  @author Kay Kasemir
  */
+@SuppressWarnings("nls")
 public class Examples implements SampleSet
 {
     @Override
     public URL getDirectoryURL()
     {
         final Bundle bundle = Platform.getBundle(ModelPlugin.ID);
-        return bundle.getEntry("/examples");
+        return Objects.requireNonNull(bundle.getEntry("/examples"), "Cannot locate examples");
     }
 }
diff --git a/org.csstudio.display.builder.model/build.properties b/org.csstudio.display.builder.model/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                schema/,\
                plugin.properties,\
-               preferences.ini
+               preferences.ini,\
+               examples/