Fix compile errors after RAP core ResourceManager rework
diff --git a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResources.java b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResources.java
index fdaa053..c8ea0b1 100644
--- a/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResources.java
+++ b/bundles/org.eclipse.rap.clientscripting/src/org/eclipse/rap/clientscripting/internal/resources/ClientScriptingResources.java
@@ -19,7 +19,7 @@
public final class ClientScriptingResources {
- private static final String PREFIX = "org/eclipse/rap/clientscripting/";
+ private static final String PREFIX = "org/eclipse/rap/clientscripting/";
private static final String[] ALL_RESOURCES = {
"ClientScriptingUtil.js",
"EventBindingAdapter.js",
@@ -30,7 +30,7 @@
"SWT.js",
"WidgetProxy.js"
};
-
+
public static void register( Application application ) {
ClientscriptingResourceLoader resourceLoader = new ClientscriptingResourceLoader();
for( String resourceName : ALL_RESOURCES ) {
@@ -40,14 +40,14 @@
private ClientScriptingResources() {
}
-
+
private static class ClientscriptingResourceLoader implements ResourceLoader {
public InputStream getResourceAsStream( String resourceName ) throws IOException {
ClassLoader classLoader = ClientScriptingResources.class.getClassLoader();
return classLoader.getResourceAsStream( PREFIX + resourceName );
}
-
+
}
}
diff --git a/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java b/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java
index 99a3834..603efee 100644
--- a/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java
+++ b/bundles/org.eclipse.rap.demo.clientscripting/src/org/eclipse/rap/demo/clientscripting/internal/ValidationExampleContribution.java
@@ -10,11 +10,10 @@
******************************************************************************/
package org.eclipse.rap.demo.clientscripting.internal;
-import org.eclipse.rap.clientscripting.internal.resources.ClientScriptingResource;
+import org.eclipse.rap.clientscripting.internal.resources.ClientScriptingResources;
import org.eclipse.rap.examples.IExampleContribution;
import org.eclipse.rap.examples.IExamplePage;
import org.eclipse.rap.rwt.application.Application;
-import org.eclipse.rap.rwt.resources.IResource;
@SuppressWarnings( "restriction" )
@@ -33,8 +32,6 @@
}
public void configure( Application application ) {
- for( IResource resource : ClientScriptingResource.ALL_RESOURCES ) {
- application.addResource( resource );
- }
+ ClientScriptingResources.register( application );
}
}
diff --git a/tests/org.eclipse.rap.clientscripting.jstest/src/org/eclipse/rap/clientscripting/internal/ClientScriptingResourcesContribution.java b/tests/org.eclipse.rap.clientscripting.jstest/src/org/eclipse/rap/clientscripting/internal/ClientScriptingResourcesContribution.java
index 459ba01..86d12a3 100644
--- a/tests/org.eclipse.rap.clientscripting.jstest/src/org/eclipse/rap/clientscripting/internal/ClientScriptingResourcesContribution.java
+++ b/tests/org.eclipse.rap.clientscripting.jstest/src/org/eclipse/rap/clientscripting/internal/ClientScriptingResourcesContribution.java
@@ -13,7 +13,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.eclipse.rap.clientscripting.internal.resources.ClientScriptingResource;
+import org.eclipse.rap.clientscripting.internal.resources.ClientScriptingResources;
import org.eclipse.rap.rwt.jstest.TestContribution;
@@ -45,7 +45,7 @@
}
public InputStream getResourceAsStream( String resourceName ) throws IOException {
- return ClientScriptingResource.class.getResourceAsStream( resourceName );
+ return ClientScriptingResources.class.getResourceAsStream( resourceName );
}
}
