quick fix for #325

sort resource list before removing duplicates dont add jsf.js and bsf.js manually anymore
TheCoder4eu · May 7, 2016 · c0b302f · c0b302f
1 parent 178c711
commit c0b302f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/net/bootsfaces/component/iconAwesome/IconAwesome.java b/src/main/java/net/bootsfaces/component/iconAwesome/IconAwesome.java
@@ -39,8 +39,6 @@ public class IconAwesome extends Icon {
 
 	public IconAwesome() {
 		Tooltip.addResourceFiles();
-		AddResourcesListener.addBasicJSResource("javax.faces", "jsf.js");
-		AddResourcesListener.addBasicJSResource("bsf", "js/bsf.js");
 		AddResourcesListener.addThemedCSSResource("core.css");
 		// AddResourcesListener.addThemedCSSResource("font-awesome.css");
 		setRendererType(DEFAULT_RENDERER);

diff --git a/src/main/java/net/bootsfaces/component/inputText/InputText.java b/src/main/java/net/bootsfaces/component/inputText/InputText.java
@@ -77,8 +77,6 @@ public String getDefaultEventName() {
 	public InputText() {
 		setRendererType("net.bootsfaces.component.inputText.InputText");
 		Tooltip.addResourceFiles();
-		AddResourcesListener.addBasicJSResource("javax.faces", "jsf.js");
-		AddResourcesListener.addBasicJSResource("bsf", "js/bsf.js");
 		AddResourcesListener.addThemedCSSResource("core.css");
 		AddResourcesListener.addThemedCSSResource("bsf.css");
 		renderLabel = BsfUtils.getInitParam("net.bootsfaces.defaults.renderLabel");

diff --git a/src/main/java/net/bootsfaces/component/inputTextarea/InputTextarea.java b/src/main/java/net/bootsfaces/component/inputTextarea/InputTextarea.java
@@ -77,8 +77,6 @@ public String getFamily() {
 
 	public InputTextarea() {
 		setRendererType("net.bootsfaces.component.InputTextareaRenderer");
-		//		AddResourcesListener.addBasicJSResource("javax.faces", "jsf.js");
-		//		AddResourcesListener.addBasicJSResource("bsf", "js/bsf.js");
 		AddResourcesListener.addThemedCSSResource("core.css");
 		AddResourcesListener.addThemedCSSResource("bsf.css");
 		Tooltip.addResourceFiles();

diff --git a/src/main/java/net/bootsfaces/component/tree/Tree.java b/src/main/java/net/bootsfaces/component/tree/Tree.java
@@ -53,7 +53,6 @@ public class Tree extends UIComponentBase implements ClientBehaviorHolder {
 	 */
 	public Tree() {
 		setRendererType(DEFAULT_RENDERER);
-		AddResourcesListener.addBasicJSResource("javax.faces", "jsf.js");
 		AddResourcesListener.addThemedCSSResource("bootstrap-treeview.min.css");
 		AddResourcesListener.addThemedCSSResource("bsf.css");
 		AddResourcesListener.addThemedCSSResource("core.css");

diff --git a/src/main/java/net/bootsfaces/listeners/AddResourcesListener.java b/src/main/java/net/bootsfaces/listeners/AddResourcesListener.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -361,7 +362,15 @@ private void addResourceIfNecessary(UIViewRoot root, FacesContext context, UIOut
 	private void removeDuplicateResources(UIViewRoot root, FacesContext context) {
 		List<UIComponent> resourcesToRemove = new ArrayList<UIComponent>();
 		Map<String, UIComponent> alreadyThere = new HashMap<String, UIComponent>();
-		for (UIComponent resource : root.getComponentResources(context, "head")) {
+		List<UIComponent> components = new ArrayList<UIComponent>(
+				root.getComponentResources(context, "head"));
+		Collections.sort(components, new Comparator<UIComponent>() {
+			@Override
+			public int compare(UIComponent o1, UIComponent o2) {
+				return o1.getClientId().compareTo(o2.getClientId());
+			}
+		});
+		for (UIComponent resource : components) {
 			String name = (String) resource.getAttributes().get("name");
 			String library = (String) resource.getAttributes().get("library");
 			String key = library + "/" + name + "/" + resource.getClass().getName();